From 818c17d880087ebba72d3c6ba1c733a5f7d0457b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 19 九月 2024 16:08:19 +0800
Subject: [PATCH] #
---
zy-acs-framework/src/main/resources/templates/react-admin/ReactList.txt | 3 ++-
zy-acs-flow/src/page/funcSta/FuncStaList.jsx | 17 +++++++++++++++--
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/zy-acs-flow/src/page/funcSta/FuncStaList.jsx b/zy-acs-flow/src/page/funcSta/FuncStaList.jsx
index f41b3e9..c78a966 100644
--- a/zy-acs-flow/src/page/funcSta/FuncStaList.jsx
+++ b/zy-acs-flow/src/page/funcSta/FuncStaList.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';
@@ -57,6 +58,16 @@
},
}));
+const typeMap = {
+ CHARGE: 'page.funcSta.enums.type.charge',
+ STANDBY: 'page.funcSta.enums.type.standby',
+};
+
+const stateMap = {
+ IDLE: 'page.funcSta.enums.state.idle',
+ OCCUPIED: 'page.funcSta.enums.state.occupied',
+};
+
const filters = [
<SearchInput source="condition" alwaysOn />,
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
@@ -78,6 +89,7 @@
{ id: 'STANDBY', name: 'page.funcSta.enums.type.standby' },
]}
alwaysOn
+ resettable
/>,
<SelectInput
source="state"
@@ -87,6 +99,7 @@
{ id: 'OCCUPIED', name: 'page.funcSta.enums.state.occupied' },
]}
alwaysOn
+ resettable
/>,
<ReferenceInput source="code" label="table.field.funcSta.code" reference="code">
<AutocompleteInput label="table.field.funcSta.code" optionText="data" filterToQuery={(val) => ({ data: val })} />
@@ -151,8 +164,8 @@
<ReferenceField source="agvId" label="table.field.funcSta.agvId" reference="agv" link={false} sortable={false}>
<TextField source="uuid" />
</ReferenceField>
- <TextField source="type" label="table.field.funcSta.type" />
- <TextField source="state" label="table.field.funcSta.state" />
+ <FunctionField source="type" label="table.field.funcSta.type" render={record => translate(typeMap[record.type]) || record.type} />
+ <FunctionField source="state" label="table.field.funcSta.state" render={record => translate(stateMap[record.state]) || record.state} />
<ReferenceField source="code" label="table.field.funcSta.code" reference="code" link={false} sortable={false}>
<TextField source="data" />
</ReferenceField>
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 48f6870..50f0583 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
@@ -15,7 +15,7 @@
useRecordContext,
useTranslate,
useListContext,
- useCreatePath,
+ FunctionField,
TextField,
NumberField,
DateField,
@@ -71,6 +71,7 @@
{ id: '1', name: 'common.enums.statusTrue' },
{ id: '0', name: 'common.enums.statusFalse' },
]}
+ resettable
/>,
]
--
Gitblit v1.9.1