From 019e73c5ea3b6dc8875a9ebc6cfdc6aa6f923dc4 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 07 二月 2025 15:17:06 +0800
Subject: [PATCH] #
---
rsf-admin/src/page/login/index.jsx | 2 +-
rsf-admin/src/page/tenant/TenantPanel.jsx | 7 ++++++-
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java | 8 ++++++--
rsf-admin/src/i18n/zh.js | 1 +
rsf-admin/src/page/login/Login.jsx | 11 +++++++++--
rsf-admin/src/page/tenant/TenantEdit.jsx | 10 +++++++++-
rsf-admin/src/i18n/en.js | 1 +
rsf-admin/src/page/tenant/TenantList.jsx | 4 ++--
rsf-admin/src/page/tenant/TenantCreate.jsx | 10 +++++++++-
9 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index fe4509a..8a9ab6b 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -134,6 +134,7 @@
},
tenant: {
name: "name",
+ flag: "flag",
},
role: {
name: "name",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 016d04c..b4cbb01 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -134,6 +134,7 @@
},
tenant: {
name: "绉熸埛鍚�",
+ flag: "浠ｇ爜",
},
role: {
name: "瑙掕壊鍚嶇О",
diff --git a/rsf-admin/src/page/login/Login.jsx b/rsf-admin/src/page/login/Login.jsx
index e30af97..e1618b3 100644
--- a/rsf-admin/src/page/login/Login.jsx
+++ b/rsf-admin/src/page/login/Login.jsx
@@ -33,7 +33,12 @@
useEffect(() => {
if (tenantList.length > 0 && !tenantId) {
- setValue('tenantId', tenantList[0].id);
+ const rememberTenantId = localStorage.getItem('remember_tenantId');
+ if (rememberTenantId && tenantList.some(t => t.id === Number(rememberTenantId))) {
+ setValue('tenantId', Number(rememberTenantId));
+ } else {
+ setValue('tenantId', tenantList[0].id);
+ }
}
}, [tenantList, setValue]);
@@ -87,7 +92,9 @@
getOptionLabel={(option) => option.name}
value={selectedTenant}
onChange={(_, newValue) => {
- onChange(newValue ? newValue.id : '');
+ const newTenantId = newValue ? newValue.id : '';
+ onChange(newTenantId);
+ localStorage.setItem('remember_tenantId', newTenantId);
}}
renderInput={(params) => (
<TextField
diff --git a/rsf-admin/src/page/login/index.jsx b/rsf-admin/src/page/login/index.jsx
index 5c56eaf..6a70e7a 100644
--- a/rsf-admin/src/page/login/index.jsx
+++ b/rsf-admin/src/page/login/index.jsx
@@ -98,7 +98,7 @@
{tab === 1 && <Register tenantList={tenantList} />}
<Box mt={1} mb={1} sx={{ textAlign: 'center' }}>
- <Typography variant="caption" align="center">rsf - sever</Typography>
+ <Typography variant="caption" align="center">Footer Goes Here</Typography>
</Box>
</Card>
</Box >
diff --git a/rsf-admin/src/page/tenant/TenantCreate.jsx b/rsf-admin/src/page/tenant/TenantCreate.jsx
index 94dfa50..37e3d05 100644
--- a/rsf-admin/src/page/tenant/TenantCreate.jsx
+++ b/rsf-admin/src/page/tenant/TenantCreate.jsx
@@ -90,7 +90,15 @@
validate={required()}
/>
</Grid>
-
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.tenant.flag"
+ source="flag"
+ parse={v => v}
+ autoFocus
+ validate={required()}
+ />
+ </Grid>
<Grid item xs={6} display="flex" gap={1}>
<StatusSelectInput />
</Grid>
diff --git a/rsf-admin/src/page/tenant/TenantEdit.jsx b/rsf-admin/src/page/tenant/TenantEdit.jsx
index 212a3ce..eb0a8d7 100644
--- a/rsf-admin/src/page/tenant/TenantEdit.jsx
+++ b/rsf-admin/src/page/tenant/TenantEdit.jsx
@@ -69,7 +69,15 @@
validate={required()}
/>
</Stack>
-
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.tenant.flag"
+ source="flag"
+ parse={v => v}
+ autoFocus
+ validate={required()}
+ />
+ </Stack>
</Grid>
<Grid item xs={12} md={4}>
<Typography variant="h6" gutterBottom>
diff --git a/rsf-admin/src/page/tenant/TenantList.jsx b/rsf-admin/src/page/tenant/TenantList.jsx
index 3470c93..ac2d782 100644
--- a/rsf-admin/src/page/tenant/TenantList.jsx
+++ b/rsf-admin/src/page/tenant/TenantList.jsx
@@ -59,7 +59,7 @@
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
<TextInput source="name" label="table.field.tenant.name" />,
-
+ <TextInput source="flag" label="table.field.tenant.flag" />,
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -112,7 +112,7 @@
>
<NumberField source="id" />
<TextField source="name" label="table.field.tenant.name" />
-
+ <TextField source="flag" label="table.field.tenant.flag" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<DateField source="createTime" label="common.field.createTime" showTime />
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
diff --git a/rsf-admin/src/page/tenant/TenantPanel.jsx b/rsf-admin/src/page/tenant/TenantPanel.jsx
index fbc5dee..0c822f7 100644
--- a/rsf-admin/src/page/tenant/TenantPanel.jsx
+++ b/rsf-admin/src/page/tenant/TenantPanel.jsx
@@ -41,7 +41,12 @@
property={record.name}
/>
</Grid>
-
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.tenant.flag"
+ property={record.flag}
+ />
+ </Grid>
</Grid>
</CardContent>
</Card >
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java
index a0e33de..d2edd1e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java
@@ -32,6 +32,12 @@
private String name;
/**
+ * 浠ｇ爜
+ */
+ @ApiModelProperty(value= "浠ｇ爜")
+ private String flag;
+
+ /**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
@@ -73,8 +79,6 @@
return null;
}
}
-
-
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
--
Gitblit v1.9.1