From 1dbfb930e943fede7adfffea8fd9977d894a903b Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 23 一月 2026 08:57:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/system/user/UserList.jsx | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/rsf-admin/src/page/system/user/UserList.jsx b/rsf-admin/src/page/system/user/UserList.jsx
index 687d50a..9356a61 100644
--- a/rsf-admin/src/page/system/user/UserList.jsx
+++ b/rsf-admin/src/page/system/user/UserList.jsx
@@ -84,6 +84,9 @@
"& .opt": {
width: 200,
},
+ "& .roles": {
+ maxWidth: 400,
+ },
"& .column-statusBool": {
maxWidth: 60,
},
@@ -159,6 +162,7 @@
>
<NumberField source="id" />
<TextField source="username" label="table.field.user.username" />
+ <TextField source="nickname" label="table.field.user.nickname" />
<ReferenceField
source="deptId"
label="table.field.user.deptId"
@@ -167,10 +171,9 @@
sortable={false}
>
<TextField source="name" />
- </ReferenceField>
- <TextField source="nickname" label="table.field.user.nickname" />
- <TextField source="code" label="table.field.user.code" />
- <FunctionField
+ </ReferenceField>
+ {/* <TextField source="code" label="table.field.user.code" /> */}
+ {/* <FunctionField
label="table.field.user.sex"
sortable={false}
render={(record) => {
@@ -185,18 +188,18 @@
return "";
}
}}
- />
+ /> */}
<TextField source="phone" label="table.field.user.phone" />
- <TextField source="email" label="table.field.user.email" />
+ {/* <TextField source="email" label="table.field.user.email" />
<TextField source="realName" label="table.field.user.realName" />
<TextField source="idCard" label="table.field.user.idCard" />
- <TextField source="birthday" label="table.field.user.birthday" />
- <RolesField
+ <TextField source="birthday" label="table.field.user.birthday" /> */}
+ <RolesField cellClassName="roles"
source="roles"
label="table.field.user.role"
sortable={false}
/>
- <DateField
+ {/* <DateField
source="updateTime"
label="common.field.updateTime"
showTime
@@ -210,8 +213,8 @@
source="statusBool"
label="common.field.status"
sortable={false}
- />
- <TextField source="memo" label="common.field.memo" sortable={false} />
+ /> */}
+ {/* <TextField source="memo" label="common.field.memo" sortable={false} /> */}
<WrapperField cellClassName="opt" label="common.field.opt">
<EditButton sx={{ padding: "1px", fontSize: ".75rem" }} />
<DeleteButton
--
Gitblit v1.9.1