From fb6a6482b156527afc4f78ac900c14e4bd63327d Mon Sep 17 00:00:00 2001 From: verou <857149855@qq.com> Date: 星期四, 27 三月 2025 08:31:37 +0800 Subject: [PATCH] fix:菜单修改 --- rsf-admin/src/layout/SubMenu.jsx | 3 ++- rsf-admin/src/layout/MyMenu.jsx | 1 + rsf-admin/src/utils/common.js | 18 ++++++++++++++++++ rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx | 6 ++++-- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/rsf-admin/src/layout/MyMenu.jsx b/rsf-admin/src/layout/MyMenu.jsx index 370630a..547f65a 100644 --- a/rsf-admin/src/layout/MyMenu.jsx +++ b/rsf-admin/src/layout/MyMenu.jsx @@ -89,6 +89,7 @@ primaryText={node.name} leftIcon={getIcon(node.icon)} dense={dense} + sx={{ '& .RaMenuItemLink-icon': { visibility: 'hidden', minWidth: '24px' } }} /> ); } diff --git a/rsf-admin/src/layout/SubMenu.jsx b/rsf-admin/src/layout/SubMenu.jsx index 8cef9e7..bb979eb 100644 --- a/rsf-admin/src/layout/SubMenu.jsx +++ b/rsf-admin/src/layout/SubMenu.jsx @@ -20,7 +20,8 @@ const header = ( <MenuItem dense={dense} onClick={handleToggle} sx={{ display: 'flex', alignItems: 'center' }}> <ListItemIcon sx={{ minWidth: 40, color: 'text.secondary', display: 'flex', alignItems: 'center' }}> - {isOpen ? <ExpandMore /> : icon} + {/* {isOpen ? <ExpandMore /> : icon} */} + {icon} </ListItemIcon> <Typography variant="inherit" color="textSecondary" sx={{ ml: 1, display: 'flex', alignItems: 'center' }}> {translate(name)} diff --git a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx index 84a4abb..977bfab 100644 --- a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx +++ b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx @@ -15,6 +15,8 @@ import ConfirmModal from "@/page/components/ConfirmModal"; import { DataGrid } from '@mui/x-data-grid'; import request from '@/utils/request'; +import { haveChildren } from '@/utils/common'; + const LocAreaMatPanel = () => { const record = useRecordContext(); @@ -94,7 +96,7 @@ const { data: { code, data, msg } } = await request.get(`/locAreaMatRela/groups/${record.id}`); if (code === 200) { - setMatnrTree(data || []) + setMatnrTree(haveChildren(data) || []) } else { notify(msg); } @@ -104,7 +106,7 @@ const { data: { code, data, msg } } = await request.get(`/locAreaMatRela/locType/${record.id}`); if (code === 200) { - setLocTree(data || []) + setLocTree(haveChildren(data) || []) } else { notify(msg); } diff --git a/rsf-admin/src/utils/common.js b/rsf-admin/src/utils/common.js index 2083ca8..309c6eb 100644 --- a/rsf-admin/src/utils/common.js +++ b/rsf-admin/src/utils/common.js @@ -50,3 +50,21 @@ }); return result; }; + +export const haveChildren = (item) => { + if (Array.isArray(item)) { + return item.map((k) => haveChildren(k)); + } + + if (item && typeof item === 'object') { + if (item.id !== undefined) { + item.id = item.id.toString(); + } + + if (item.children && Array.isArray(item.children)) { + item.children = haveChildren(item.children); + } + } + + return item; +}; -- Gitblit v1.9.1