From a9c3bd7c2281850752731428dbb2cfc466b9aa51 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 09 九月 2024 13:08:24 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/user/UserCreate.jsx | 12 ++++++------
zy-acs-flow/src/i18n/en.js | 2 +-
zy-acs-flow/src/page/user/UserList.jsx | 6 +-----
zy-acs-flow/src/page/user/UserPanel.jsx | 6 ------
zy-acs-flow/src/page/user/UserEdit.jsx | 22 ++++++----------------
5 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index ae0fe52..09c525f 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -139,7 +139,7 @@
phone: "phone",
email: "email",
emailVerified: "email verified",
- deptId: "deptId",
+ deptId: "department",
realName: "real name",
idCard: "idCard",
birthday: "birthday",
diff --git a/zy-acs-flow/src/page/user/UserCreate.jsx b/zy-acs-flow/src/page/user/UserCreate.jsx
index b272ab6..27ae515 100644
--- a/zy-acs-flow/src/page/user/UserCreate.jsx
+++ b/zy-acs-flow/src/page/user/UserCreate.jsx
@@ -93,13 +93,13 @@
validate={required()}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.user.password"
source="password"
parse={v => v}
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.user.nickname"
@@ -107,13 +107,13 @@
parse={v => v}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.user.avatar"
source="avatar"
parse={v => v}
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.user.code"
@@ -146,7 +146,7 @@
parse={v => v}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<SelectInput
label="table.field.user.emailVerified"
source="emailVerified"
@@ -155,7 +155,7 @@
{ id: 1, name: '鏄�' },
]}
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<ReferenceInput
source="deptId"
diff --git a/zy-acs-flow/src/page/user/UserEdit.jsx b/zy-acs-flow/src/page/user/UserEdit.jsx
index b236f19..6105494 100644
--- a/zy-acs-flow/src/page/user/UserEdit.jsx
+++ b/zy-acs-flow/src/page/user/UserEdit.jsx
@@ -71,36 +71,32 @@
autoFocus
validate={required()}
/>
- </Stack>
- <Stack direction='row' gap={2}>
+ {/* <Stack direction='row' gap={2}>
<TextInput
label="table.field.user.password"
source="password"
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
+ </Stack> */}
<TextInput
label="table.field.user.nickname"
source="nickname"
parse={v => v}
/>
</Stack>
- <Stack direction='row' gap={2}>
+ {/* <Stack direction='row' gap={2}>
<TextInput
label="table.field.user.avatar"
source="avatar"
parse={v => v}
/>
- </Stack>
+ </Stack> */}
<Stack direction='row' gap={2}>
<TextInput
label="table.field.user.code"
source="code"
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<SelectInput
label="table.field.user.sex"
source="sex"
@@ -117,15 +113,13 @@
source="phone"
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.user.email"
source="email"
parse={v => v}
/>
</Stack>
- <Stack direction='row' gap={2}>
+ {/* <Stack direction='row' gap={2}>
<SelectInput
label="table.field.user.emailVerified"
source="emailVerified"
@@ -134,7 +128,7 @@
{ id: 1, name: '鏄�' },
]}
/>
- </Stack>
+ </Stack> */}
<Stack direction='row' gap={2}>
<ReferenceInput
source="deptId"
@@ -152,8 +146,6 @@
source="realName"
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.user.idCard"
source="idCard"
@@ -166,8 +158,6 @@
source="birthday"
parse={v => v}
/>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.user.introduction"
source="introduction"
diff --git a/zy-acs-flow/src/page/user/UserList.jsx b/zy-acs-flow/src/page/user/UserList.jsx
index c913302..cf2aa17 100644
--- a/zy-acs-flow/src/page/user/UserList.jsx
+++ b/zy-acs-flow/src/page/user/UserList.jsx
@@ -138,25 +138,21 @@
rowClick={(id, resource, record) => false}
expand={() => <UserPanel />}
expandSingle={true}
- omit={['id', 'createTime', 'memo']}
+ omit={['id', 'birthday', 'updateTime', 'createTime', 'memo']}
>
<NumberField source="id" />
<TextField source="username" label="table.field.user.username" />
- <TextField source="password" label="table.field.user.password" />
<TextField source="nickname" label="table.field.user.nickname" />
- <TextField source="avatar" label="table.field.user.avatar" />
<TextField source="code" label="table.field.user.code" />
<TextField source="sex$" label="table.field.user.sex" sortable={false} />
<TextField source="phone" label="table.field.user.phone" />
<TextField source="email" label="table.field.user.email" />
- <TextField source="emailVerified$" label="table.field.user.emailVerified" sortable={false} />
<ReferenceField source="deptId" label="table.field.user.deptId" reference="dept" link={false}>
<TextField source="name" />
</ReferenceField>
<TextField source="realName" label="table.field.user.realName" />
<TextField source="idCard" label="table.field.user.idCard" />
<TextField source="birthday" label="table.field.user.birthday" />
- <TextField source="introduction" label="table.field.user.introduction" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<DateField source="createTime" label="common.field.createTime" showTime />
diff --git a/zy-acs-flow/src/page/user/UserPanel.jsx b/zy-acs-flow/src/page/user/UserPanel.jsx
index d8fef39..7c6d708 100644
--- a/zy-acs-flow/src/page/user/UserPanel.jsx
+++ b/zy-acs-flow/src/page/user/UserPanel.jsx
@@ -48,12 +48,6 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.user.password"
- property={record.password}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
title="table.field.user.nickname"
property={record.nickname}
/>
--
Gitblit v1.9.1