From c22029e6f768ea588cf22821bd232c0624b951b9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 26 九月 2024 08:14:54 +0800
Subject: [PATCH] Merge branch 'master' of github.com:luxiaotao1123/rsc-flow
---
zy-acs-flow/src/page/jam/JamList.jsx | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/zy-acs-flow/src/page/jam/JamList.jsx b/zy-acs-flow/src/page/jam/JamList.jsx
index d0b299e..b8b77ec 100644
--- a/zy-acs-flow/src/page/jam/JamList.jsx
+++ b/zy-acs-flow/src/page/jam/JamList.jsx
@@ -53,20 +53,27 @@
'& .column-name': {
},
'& .opt': {
- width: 200
+ width: 130
},
}));
const filters = [
- <SearchInput source="condition" alwaysOn />,
+ // <SearchInput source="condition" alwaysOn />,
+ <ReferenceInput source="jamAgv" label="table.field.jam.jamAgv" reference="agv" alwaysOn>
+ <AutocompleteInput label="table.field.jam.jamAgv" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
+ </ReferenceInput>,
+ <SelectInput source="cycleAvo" label="table.field.jam.cycleAvo"
+ choices={[
+ { id: 1, name: 'common.enums.true' },
+ { id: 0, name: 'common.enums.false' },
+ ]}
+ alwaysOn
+ />,
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
<TextInput source="uuid" label="table.field.jam.uuid" />,
<TextInput source="name" label="table.field.jam.name" />,
- <ReferenceInput source="jamAgv" label="table.field.jam.jamAgv" reference="agv">
- <AutocompleteInput label="table.field.jam.jamAgv" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
- </ReferenceInput>,
<ReferenceInput source="jamCode" label="table.field.jam.jamCode" reference="code">
<AutocompleteInput label="table.field.jam.jamCode" optionText="data" filterToQuery={(val) => ({ data: val })} />
</ReferenceInput>,
@@ -82,12 +89,6 @@
<ReferenceInput source="avoSeg" label="table.field.jam.avoSeg" reference="segment">
<AutocompleteInput label="table.field.jam.avoSeg" optionText="id" filterToQuery={(val) => ({ id: val })} />
</ReferenceInput>,
- <SelectInput source="cycleAvo" label="table.field.jam.cycleAvo"
- choices={[
- { id: 1, name: 'common.enums.true' },
- { id: 0, name: 'common.enums.false' },
- ]}
- />,
<ReferenceInput source="cycleCode" label="table.field.jam.cycleCode" reference="code">
<AutocompleteInput label="table.field.jam.cycleCode" optionText="data" filterToQuery={(val) => ({ data: val })} />
</ReferenceInput>,
@@ -132,7 +133,7 @@
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='jam' />
<MyExportButton />
</TopToolbar>
@@ -141,7 +142,7 @@
>
<StyledDatagrid
preferenceKey='jam'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={false}
rowClick={(id, resource, record) => false}
expand={() => <JamPanel />}
expandSingle={true}
@@ -150,8 +151,8 @@
<NumberField source="id" />
<TextField source="uuid" label="table.field.jam.uuid" />
{/* <TextField source="name" label="table.field.jam.name" /> */}
- <ReferenceField source="jamAgv" label="table.field.jam.jamAgv" reference="agv" link={false} sortable={false}>
- <TextField source="uuid" />
+ <ReferenceField source="jamAgv" label="table.field.jam.jamAgv" reference="agv" link={false} sortable={false} >
+ <TextField source="uuid" sx={{ fontWeight: 'bold' }} />
</ReferenceField>
<ReferenceField source="jamCode" label="table.field.jam.jamCode" reference="code" link={false} sortable={false}>
<TextField source="data" />
@@ -160,7 +161,7 @@
<TextField source="id" />
</ReferenceField>
<ReferenceField source="avoAgv" label="table.field.jam.avoAgv" reference="agv" link={false} sortable={false}>
- <TextField source="uuid" />
+ <TextField source="uuid" sx={{ fontWeight: 'bold' }} />
</ReferenceField>
<ReferenceField source="avoCode" label="table.field.jam.avoCode" reference="code" link={false} sortable={false}>
<TextField source="data" />
@@ -189,7 +190,7 @@
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
+ {/* <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} /> */}
<DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
</WrapperField>
</StyledDatagrid>
--
Gitblit v1.9.1