From 6324285c0a898885b11fdbfb9ff3f4a911d7f587 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 14 七月 2025 15:01:21 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/page/system/host/HostEdit.jsx                    |    4 ++--
 rsf-admin/src/page/fields/FieldsEdit.jsx                       |    4 ++--
 rsf-admin/src/page/system/host/HostList.jsx                    |    2 +-
 rsf-admin/src/page/system/role/RoleList.jsx                    |    2 +-
 rsf-admin/src/page/fields/FieldsList.jsx                       |    2 +-
 rsf-admin/src/page/fieldsItem/FieldsItemList.jsx               |    2 +-
 rsf-admin/src/page/system/tenant/TenantList.jsx                |    2 +-
 rsf-admin/src/page/basicInfo/basStation/CrossZoneAreaField.jsx |   10 +++++-----
 rsf-admin/src/page/fieldsItem/FieldsItemEdit.jsx               |    4 ++--
 rsf-admin/src/page/system/tenant/TenantEdit.jsx                |    4 ++--
 rsf-admin/src/page/system/user/UserList.jsx                    |    2 +-
 11 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/rsf-admin/src/page/basicInfo/basStation/CrossZoneAreaField.jsx b/rsf-admin/src/page/basicInfo/basStation/CrossZoneAreaField.jsx
index fc25ff4..e8f9de3 100644
--- a/rsf-admin/src/page/basicInfo/basStation/CrossZoneAreaField.jsx
+++ b/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();
         }
diff --git a/rsf-admin/src/page/fields/FieldsEdit.jsx b/rsf-admin/src/page/fields/FieldsEdit.jsx
index b474bd2..3248bd9 100644
--- a/rsf-admin/src/page/fields/FieldsEdit.jsx
+++ b/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 >
diff --git a/rsf-admin/src/page/fields/FieldsList.jsx b/rsf-admin/src/page/fields/FieldsList.jsx
index c3ac8be..c1bdc5e 100644
--- a/rsf-admin/src/page/fields/FieldsList.jsx
+++ b/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" />
diff --git a/rsf-admin/src/page/fieldsItem/FieldsItemEdit.jsx b/rsf-admin/src/page/fieldsItem/FieldsItemEdit.jsx
index cb80bae..01bf6ec 100644
--- a/rsf-admin/src/page/fieldsItem/FieldsItemEdit.jsx
+++ b/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 >
diff --git a/rsf-admin/src/page/fieldsItem/FieldsItemList.jsx b/rsf-admin/src/page/fieldsItem/FieldsItemList.jsx
index 914518f..d6aceb4 100644
--- a/rsf-admin/src/page/fieldsItem/FieldsItemList.jsx
+++ b/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" />
diff --git a/rsf-admin/src/page/system/host/HostEdit.jsx b/rsf-admin/src/page/system/host/HostEdit.jsx
index 42566f5..b6ba7b6 100644
--- a/rsf-admin/src/page/system/host/HostEdit.jsx
+++ b/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 >
diff --git a/rsf-admin/src/page/system/host/HostList.jsx b/rsf-admin/src/page/system/host/HostList.jsx
index 82dd1e8..f1c8219 100644
--- a/rsf-admin/src/page/system/host/HostList.jsx
+++ b/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"
diff --git a/rsf-admin/src/page/system/role/RoleList.jsx b/rsf-admin/src/page/system/role/RoleList.jsx
index cdecd51..a5432bd 100644
--- a/rsf-admin/src/page/system/role/RoleList.jsx
+++ b/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"
diff --git a/rsf-admin/src/page/system/tenant/TenantEdit.jsx b/rsf-admin/src/page/system/tenant/TenantEdit.jsx
index 3b8efc2..89485b7 100644
--- a/rsf-admin/src/page/system/tenant/TenantEdit.jsx
+++ b/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 >
diff --git a/rsf-admin/src/page/system/tenant/TenantList.jsx b/rsf-admin/src/page/system/tenant/TenantList.jsx
index 7774295..e615d5b 100644
--- a/rsf-admin/src/page/system/tenant/TenantList.jsx
+++ b/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" />
diff --git a/rsf-admin/src/page/system/user/UserList.jsx b/rsf-admin/src/page/system/user/UserList.jsx
index 12e20c8..687d50a 100644
--- a/rsf-admin/src/page/system/user/UserList.jsx
+++ b/rsf-admin/src/page/system/user/UserList.jsx
@@ -154,7 +154,7 @@
           "realName",
           "updateTime",
           "createTime",
-          "memo",
+          "memo","statusBool"
         ]}
       >
         <NumberField source="id" />

--
Gitblit v1.9.1