From baf8c53a9d798861451a68620cdb946083d5c8a1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 19 九月 2024 10:31:04 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/code/CodeList.jsx | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/zy-acs-flow/src/page/code/CodeList.jsx b/zy-acs-flow/src/page/code/CodeList.jsx
index 6c5611e..30f4095 100644
--- a/zy-acs-flow/src/page/code/CodeList.jsx
+++ b/zy-acs-flow/src/page/code/CodeList.jsx
@@ -42,6 +42,10 @@
import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE } from '@/config/setting';
import * as Common from '@/utils/common';
+import { ImportButton } from '../components/ImportButton'
+import { useCodeImport } from './useCodeImport';
+
+import * as sampleCsv from './importTemp.csv?raw';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -68,8 +72,8 @@
<NumberInput source="y" label="table.field.code.y" />,
<SelectInput source="concer" label="table.field.code.concer"
choices={[
- { id: 1, name: '鏄�' },
- { id: 0, name: '鍚�' },
+ { id: '1', name: 'common.enums.true' },
+ { id: '0', name: 'common.enums.false' },
]}
/>,
<TextInput source="scale" label="table.field.code.scale" />,
@@ -111,6 +115,7 @@
<FilterButton />
<MyCreateButton onClick={() => { setCreateDialog(true) }} />
<SelectColumnsButton preferenceKey='code' />
+ <ImportButton sampleCsv={sampleCsv} useCodeImport={useCodeImport} />
<MyExportButton />
</TopToolbar>
)}
@@ -122,17 +127,23 @@
rowClick={(id, resource, record) => false}
expand={() => <CodePanel />}
expandSingle={true}
- omit={['id', 'createTime', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
<TextField source="uuid" label="table.field.code.uuid" />
<TextField source="data" label="table.field.code.data" />
<NumberField source="x" label="table.field.code.x" />
<NumberField source="y" label="table.field.code.y" />
- <TextField source="concer$" label="table.field.code.concer" sortable={false} />
+ <BooleanField source="cornerBool" label="table.field.code.concer" sortable={false} />
<TextField source="scale" label="table.field.code.scale" />
+ <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