From 37e8e06c8d13146e62ef08d018d86443b9f42f00 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 24 二月 2025 14:46:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/page/dictType/DictTypeList.jsx | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/rsf-admin/src/page/customer/CustomerList.jsx b/rsf-admin/src/page/dictType/DictTypeList.jsx
similarity index 86%
rename from rsf-admin/src/page/customer/CustomerList.jsx
rename to rsf-admin/src/page/dictType/DictTypeList.jsx
index 6973f5f..d668008 100644
--- a/rsf-admin/src/page/customer/CustomerList.jsx
+++ b/rsf-admin/src/page/dictType/DictTypeList.jsx
@@ -34,8 +34,8 @@
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
-import CustomerCreate from "./CustomerCreate";
-import CustomerPanel from "./CustomerPanel";
+import DictTypeCreate from "./DictTypeCreate";
+import DictTypePanel from "./DictTypePanel";
import EmptyData from "../components/EmptyData";
import MyCreateButton from "../components/MyCreateButton";
import MyExportButton from '../components/MyExportButton';
@@ -63,8 +63,9 @@
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
- <TextInput source="uuid" label="table.field.customer.uuid" />,
- <TextInput source="name" label="table.field.customer.name" />,
+ <TextInput source="uuid" label="table.field.dictType.uuid" />,
+ <TextInput source="name" label="table.field.dictType.name" />,
+ <TextInput source="description" label="table.field.dictType.description" />,
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
@@ -78,7 +79,7 @@
/>,
]
-const CustomerList = () => {
+const DictTypeList = () => {
const translate = useTranslate();
const [createDialog, setCreateDialog] = useState(false);
@@ -95,7 +96,7 @@
}),
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
- title={"menu.customer"}
+ title={"menu.dictType"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
@@ -103,23 +104,23 @@
<TopToolbar>
<FilterButton />
<MyCreateButton onClick={() => { setCreateDialog(true) }} />
- <SelectColumnsButton preferenceKey='customer' />
+ <SelectColumnsButton preferenceKey='dictType' />
<MyExportButton />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
>
<StyledDatagrid
- preferenceKey='customer'
+ preferenceKey='dictType'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- expand={() => <CustomerPanel />}
+ expand={() => <DictTypePanel />}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
- <TextField source="uuid" label="table.field.customer.uuid" />
- <TextField source="name" label="table.field.customer.name" />
+ <TextField source="name" label="table.field.dictType.name" />
+ <TextField source="description" label="table.field.dictType.description" />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
@@ -137,12 +138,12 @@
</WrapperField>
</StyledDatagrid>
</List>
- <CustomerCreate
+ <DictTypeCreate
open={createDialog}
setOpen={setCreateDialog}
/>
<PageDrawer
- title='Customer Detail'
+ title='DictType Detail'
drawerVal={drawerVal}
setDrawerVal={setDrawerVal}
>
@@ -151,4 +152,4 @@
)
}
-export default CustomerList;
+export default DictTypeList;
--
Gitblit v1.9.1