Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

昨天 6324285c0a898885b11fdbfb9ff3f4a911d7f587

Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

 rsf-admin/src/page/basicInfo/basStation/CrossZoneAreaField.jsx

@@ -1,4 +1,4 @@
import * as React from 'react';
import  { useState, useRef, useEffect, useMemo, useCallback } from 'react';
import { Stack, Chip, Dialog, DialogTitle, DialogContent, IconButton, CircularProgress } from '@mui/material';
import { useTranslate, useRecordContext } from 'react-admin';
import CloseIcon from '@mui/icons-material/Close';
@@ -7,9 +7,9 @@
const CrossZoneAreaField = () => {
    const translate = useTranslate();
    const record = useRecordContext();
    const [open, setOpen] = React.useState(false);
    const [areaNames, setAreaNames] = React.useState([]);
    const [loading, setLoading] = React.useState(false);
    const [open, setOpen] = useState(false);
    const [areaNames, setAreaNames] = useState([]);
    const [loading, setLoading] = useState(false);

    const handleOpen = () => {
        setOpen(true);
@@ -35,7 +35,7 @@
        }
    };

    React.useEffect(() => {
    useEffect(() => {
        if (record?.areaIds && record.areaIds.length !== 0  && record.areaIds.length > 0) {
            fetchAreaNames();
        }

 rsf-admin/src/page/fields/FieldsEdit.jsx

@@ -104,14 +104,14 @@
                        </Stack>

                    </Grid>
                    <Grid item xs={12} md={4}>
                    {/* <Grid item xs={12} md={4}>
                        <Typography variant="h6" gutterBottom>
                            {translate('common.edit.title.common')}
                        </Typography>
                        <StatusSelectInput />
                        <Box mt="2em" />
                        <MemoInput />
                    </Grid>
                    </Grid> */}
                </Grid>
            </SimpleForm>
        </Edit >

 rsf-admin/src/page/fields/FieldsList.jsx

@@ -123,7 +123,7 @@
                    preferenceKey='fields'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={(id, resource, record) => false}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'memo','statusBool']}
                >
                    <NumberField source="id" />
                    <TextField source="fields" label="table.field.fields.fields" />

 rsf-admin/src/page/fieldsItem/FieldsItemEdit.jsx

@@ -98,14 +98,14 @@
                        </Stack>

                    </Grid>
                    <Grid item xs={12} md={4}>
                    {/* <Grid item xs={12} md={4}>
                        <Typography variant="h6" gutterBottom>
                            {translate('common.edit.title.common')}
                        </Typography>
                        <StatusSelectInput />
                        <Box mt="2em" />
                        <MemoInput />
                    </Grid>
                    </Grid> */}
                </Grid>
            </SimpleForm>
        </Edit >

 rsf-admin/src/page/fieldsItem/FieldsItemList.jsx

@@ -116,7 +116,7 @@
                    preferenceKey='fieldsItem'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={(id, resource, record) => false}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'memo','statusBool']}
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.fieldsItem.uuid" />

 rsf-admin/src/page/system/host/HostEdit.jsx

@@ -68,14 +68,14 @@
                            />
                        </Stack>
                    </Grid>
                    <Grid item xs={12} md={4}>
                    {/* <Grid item xs={12} md={4}>
                        <Typography variant="h6" gutterBottom>
                            {translate('common.edit.title.common')}
                        </Typography>
                        <StatusSelectInput />
                        <Box mt="2em" />
                        <MemoInput />
                    </Grid>
                    </Grid> */}
                </Grid>
            </SimpleForm>
        </Edit >

 rsf-admin/src/page/system/host/HostList.jsx

@@ -102,7 +102,7 @@
                    preferenceKey='host'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={(id, resource, record) => false}
                    omit={['id', 'createTime', 'memo']}
                    omit={['id', 'createTime', 'memo','statusBool']}
                >
                    <NumberField source="id" />
                    <MyField source="name" label="common.field.name"

 rsf-admin/src/page/system/role/RoleList.jsx

@@ -130,7 +130,7 @@
                    preferenceKey='role'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={(id, resource, record) => false}
                    omit={['id', 'createTime', 'memo']}
                    omit={['id', 'createTime', 'memo','statusBool']}
                >
                    <NumberField source="id" />
                    <MyField source="name" label="table.field.role.name"

 rsf-admin/src/page/system/tenant/TenantEdit.jsx

@@ -79,14 +79,14 @@
                            />
                        </Stack>
                    </Grid>
                    <Grid item xs={12} md={4}>
                    {/* <Grid item xs={12} md={4}>
                        <Typography variant="h6" gutterBottom>
                            {translate('common.edit.title.common')}
                        </Typography>
                        <StatusSelectInput />
                        <Box mt="2em" />
                        <MemoInput />
                    </Grid>
                    </Grid> */}
                </Grid>
            </SimpleForm>
        </Edit >

 rsf-admin/src/page/system/tenant/TenantList.jsx

@@ -106,7 +106,7 @@
                    preferenceKey='tenant'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={(id, resource, record) => false}
                    omit={['id', 'createTime', 'memo']}
                    omit={['id', 'createTime', 'memo','statusBool']}
                >
                    <NumberField source="id" />
                    <TextField source="name" label="table.field.tenant.name" />

 rsf-admin/src/page/system/user/UserList.jsx

@@ -154,7 +154,7 @@
          "realName",
          "updateTime",
          "createTime",
          "memo",
          "memo","statusBool"
        ]}
      >
        <NumberField source="id" />