Merge remote-tracking branch 'origin/devlop' into devlop

zjj

9 天以前 eab76cd34bff799686f68e6b70f86c9001e4913f

 rsf-admin/src/page/container/ContainerList.jsx

@@ -60,8 +60,6 @@

const filters = [
    <SearchInput source="condition" alwaysOn />,
    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,

    <TextInput source="code" label="table.field.container.code" />,
    <TextInput source="name" label="table.field.container.name" />,
@@ -79,13 +77,13 @@
    <SelectInput source="flagRycle" label="table.field.container.flagRycle"
        choices={[
            { id: 1, name: '是' },
            { id:  0, name: '否' },
            { id: 0, name: '否' },
        ]}
    />,
    <SelectInput source="flagLogic" label="table.field.container.flagLogic"
        choices={[
            { id: 1, name: '是' },
            { id:  0, name: '否' },
            { id: 0, name: '否' },
        ]}
    />,

@@ -116,7 +114,7 @@
                        theme.transitions.create(['all'], {
                            duration: theme.transitions.duration.enteringScreen,
                        }),
                    marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
                    marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
                }}
                title={"menu.container"}
                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
@@ -136,16 +134,14 @@
                    preferenceKey='container'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={(id, resource, record) => false}
                    expand={() => <ContainerPanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.container.code" />
                    {/* <TextField source="code" label="table.field.container.code" /> */}
                    <TextField source="name" label="table.field.container.name" />
                    <NumberField source="typeId" label="table.field.container.typeId" />
                    <NumberField source="type" label="table.field.container.typeId" />
                    <NumberField source="used" label="table.field.container.used" />
                    <NumberField source="lenght" label="table.field.container.lenght" />
                    <NumberField source="length" label="table.field.container.lenght" />
                    <NumberField source="width" label="table.field.container.width" />
                    <NumberField source="height" label="table.field.container.height" />
                    <NumberField source="rstLen" label="table.field.container.rstLen" />