From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 十一月 2024 10:22:45 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/page/user/UserList.jsx |   42 +++++++++++++++++++++++-------------------
 1 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/zy-acs-flow/src/page/user/UserList.jsx b/zy-acs-flow/src/page/user/UserList.jsx
index 4db3b37..63f81bd 100644
--- a/zy-acs-flow/src/page/user/UserList.jsx
+++ b/zy-acs-flow/src/page/user/UserList.jsx
@@ -40,7 +40,7 @@
 import MyExportButton from '../components/MyExportButton';
 import PageDrawer from "../components/PageDrawer";
 import MyField from "../components/MyField";
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE } from '@/config/setting';
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
 import * as Common from '@/utils/common';
 import UserListAside from "./UserListAside";
 import RolesField from './RolesField';
@@ -52,13 +52,26 @@
     '& .RaDatagrid-row': {
         cursor: 'auto'
     },
-    '& .column-name': {
+    '& .column-username': {
+        maxWidth: '10em',
+        overflow: 'hidden',
+        textOverflow: 'ellipsis',
+        whiteSpace: 'nowrap',
+    },
+    '& .column-nickname': {
+        maxWidth: '10em',
+        overflow: 'hidden',
+        textOverflow: 'ellipsis',
+        whiteSpace: 'nowrap',
+    },
+    '& .column-deptId': {
+        maxWidth: '10em',
+        overflow: 'hidden',
+        textOverflow: 'ellipsis',
+        whiteSpace: 'nowrap',
     },
     '& .opt': {
         width: 200
-    },
-    '& .column-deptId': {
-        maxWidth: 80
     },
     '& .column-statusBool': {
         maxWidth: 60
@@ -71,7 +84,6 @@
     <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
 
     <TextInput source="username" label="table.field.user.username" />,
-    <TextInput source="password" label="table.field.user.password" />,
     <TextInput source="nickname" label="table.field.user.nickname" />,
     <TextInput source="code" label="table.field.user.code" />,
     <SelectInput source="sex" label="table.field.user.sex"
@@ -83,19 +95,11 @@
     />,
     <TextInput source="phone" label="table.field.user.phone" />,
     <TextInput source="email" label="table.field.user.email" />,
-    <SelectInput source="emailVerified" label="table.field.user.emailVerified"
-        choices={[
-            { id: 0, name: '鍚�' },
-            { id: 1, name: '鏄�' },
-        ]}
-    />,
-    <ReferenceInput source="deptId" reference="dept">
-        <AutocompleteInput label="table.field.user.deptId" optionText="name" />
-    </ReferenceInput>,
+    // <ReferenceInput source="deptId" label="table.field.user.deptId" reference="dept">
+    //     <AutocompleteInput label="table.field.user.deptId" optionText="name" filterToQuery={(val) => ({ name: val })} />
+    // </ReferenceInput>,
     <TextInput source="realName" label="table.field.user.realName" />,
     <TextInput source="idCard" label="table.field.user.idCard" />,
-    <TextInput source="birthday" label="table.field.user.birthday" />,
-    <TextInput source="introduction" label="table.field.user.introduction" />,
 
     <TextInput label="common.field.memo" source="memo" />,
     <SelectInput
@@ -137,7 +141,7 @@
                         <MyExportButton />
                     </TopToolbar>
                 )}
-                perPage={25}
+                perPage={DEFAULT_PAGE_SIZE}
                 aside={<UserListAside />}
             >
                 <StyledDatagrid
@@ -146,7 +150,7 @@
                     rowClick={(id, resource, record) => false}
                     expand={() => <UserPanel />}
                     expandSingle={true}
-                    omit={['id', 'email', 'idCard', 'birthday', 'updateTime', 'createTime', 'memo']}
+                    omit={['id', 'email', 'idCard', 'birthday', 'realName', 'updateTime', 'createTime', 'memo']}
                 >
                     <NumberField source="id" />
                     <TextField source="username" label="table.field.user.username" />

--
Gitblit v1.9.1