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-framework/src/main/resources/templates/react-admin/ReactList.txt |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/zy-acs-framework/src/main/resources/templates/react-admin/ReactList.txt b/zy-acs-framework/src/main/resources/templates/react-admin/ReactList.txt
index 55cd2ce..5abfdc6 100644
--- a/zy-acs-framework/src/main/resources/templates/react-admin/ReactList.txt
+++ b/zy-acs-framework/src/main/resources/templates/react-admin/ReactList.txt
@@ -14,8 +14,9 @@
     WrapperField,
     useRecordContext,
     useTranslate,
+    useNotify,
     useListContext,
-    useCreatePath,
+    FunctionField,
     TextField,
     NumberField,
     DateField,
@@ -40,7 +41,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';
 
 const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -71,6 +72,7 @@
             { id: '1', name: 'common.enums.statusTrue' },
             { id: '0', name: 'common.enums.statusFalse' },
         ]}
+        resettable
     />,
 ]
 
@@ -103,7 +105,7 @@
                         <MyExportButton />
                     </TopToolbar>
                 )}
-                perPage={25}
+                perPage={DEFAULT_PAGE_SIZE}
             >
                 <StyledDatagrid
                     preferenceKey='@{SIMPLEENTITYNAME}'
@@ -111,11 +113,17 @@
                     rowClick={(id, resource, record) => false}
                     expand={() => <@{ENTITYNAME}Panel />}
                     expandSingle={true}
-                    omit={['id', 'createTime', 'memo']}
+                    omit={['id', 'createTime', 'createBy', 'memo']}
                 >
                     <NumberField source="id" />
 @{REACTLISTCONTENT}
+                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
+                        <TextField source="nickname" />
+                    </ReferenceField>
                     <DateField source="updateTime" label="common.field.updateTime" showTime />
+                    <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
+                        <TextField source="nickname" />
+                    </ReferenceField>
                     <DateField source="createTime" label="common.field.createTime" showTime />
                     <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                     <TextField source="memo" label="common.field.memo" sortable={false} />

--
Gitblit v1.9.1