Merge branch 'master' of github.com:luxiaotao1123/rsc-flow

luxiaotao1123

2024-09-26 c22029e6f768ea588cf22821bd232c0624b951b9

 zy-acs-flow/src/page/jam/JamList.jsx

@@ -40,7 +40,7 @@
import MyExportButton from '../components/MyExportButton';
import PageDrawer from "../components/PageDrawer";
import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE } from '@/config/setting';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -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,16 +133,16 @@
                actions={(
                    <TopToolbar>
                        <FilterButton />
                        <MyCreateButton onClick={() => { setCreateDialog(true) }} />
                        {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
                        <SelectColumnsButton preferenceKey='jam' />
                        <MyExportButton />
                    </TopToolbar>
                )}
                perPage={25}
                perPage={DEFAULT_PAGE_SIZE}
            >
                <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>