From 583b31d46bb8abbee7410d29ca229120ee589cba Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 05 一月 2026 10:10:08 +0800
Subject: [PATCH] # version merge
---
zy-acs-flow/src/page/code/CodeList.jsx | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/zy-acs-flow/src/page/code/CodeList.jsx b/zy-acs-flow/src/page/code/CodeList.jsx
index 6387fa8..5f6f6f7 100644
--- a/zy-acs-flow/src/page/code/CodeList.jsx
+++ b/zy-acs-flow/src/page/code/CodeList.jsx
@@ -30,6 +30,7 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ FunctionField,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -76,9 +77,18 @@
{ id: '1', name: 'common.enums.true' },
{ id: '0', name: 'common.enums.false' },
]}
+ alwaysOn
/>,
- <TextInput source="scale" label="table.field.code.scale" />,
-
+ // <TextInput source="scale" label="table.field.code.scale" />,
+ <SelectInput source="spin" label="table.field.code.spin"
+ choices={[
+ { id: 0, name: 'page.code.enums.spin.na' },
+ { id: 1, name: 'page.code.enums.spin.cw' },
+ { id: 2, name: 'page.code.enums.spin.ccw' },
+ ]}
+ // alwaysOn
+ // emptyText={false}
+ />,
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -128,7 +138,7 @@
rowClick={(id, resource, record) => false}
expand={() => <CodePanel />}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'scale', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
<TextField source="uuid" label="table.field.code.uuid" />
@@ -137,7 +147,22 @@
<NumberField source="y" label="table.field.code.y" />
<BooleanField source="cornerBool" label="table.field.code.corner" sortable={false} />
<TextField source="scale" label="table.field.code.scale" />
-
+ <FunctionField
+ label="table.field.code.spin"
+ sortable={false}
+ render={(record) => {
+ switch (record.spin) {
+ case 0:
+ return translate('page.code.enums.spin.na');
+ case 1:
+ return translate('page.code.enums.spin.cw');
+ case 2:
+ return translate('page.code.enums.spin.ccw');
+ default:
+ return 'N/A';
+ }
+ }}
+ />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
--
Gitblit v1.9.1