Merge branch 'front' into devlop

skyouc

2025-03-19 3bd07e5f90d5d832b8502252e1daebdd014320f8

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

@@ -79,13 +79,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 +116,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) }} />}
@@ -143,9 +143,9 @@
                    <NumberField source="id" />
                    <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" />