From 05a5ac117a0376d265564e590c5d117b5af6f812 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 09 九月 2024 14:05:59 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/page/user/UserList.jsx |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/zy-acs-flow/src/page/user/UserList.jsx b/zy-acs-flow/src/page/user/UserList.jsx
index c913302..90a92d3 100644
--- a/zy-acs-flow/src/page/user/UserList.jsx
+++ b/zy-acs-flow/src/page/user/UserList.jsx
@@ -42,6 +42,7 @@
 import MyField from "../components/MyField";
 import { PAGE_DRAWER_WIDTH, OPERATE_MODE } from '@/config/setting';
 import * as Common from '@/utils/common';
+import UserListAside from "./UserListAside";
 
 const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
     '& .css-1vooibu-MuiSvgIcon-root': {
@@ -120,7 +121,7 @@
                 }}
                 title={"menu.user"}
                 empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
-                filters={filters}
+                filters={[]}
                 sort={{ field: "create_time", order: "desc" }}
                 actions={(
                     <TopToolbar>
@@ -131,6 +132,7 @@
                     </TopToolbar>
                 )}
                 perPage={25}
+                aside={<UserListAside />}
             >
                 <StyledDatagrid
                     preferenceKey='user'
@@ -138,25 +140,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 />

--
Gitblit v1.9.1