From e42c5977ec786eb72af7294e3d3d8bcf4ae47413 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 23 五月 2025 14:24:17 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/layout/SubMenu.jsx | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rsf-admin/src/layout/SubMenu.jsx b/rsf-admin/src/layout/SubMenu.jsx index 8cef9e7..f5be513 100644 --- a/rsf-admin/src/layout/SubMenu.jsx +++ b/rsf-admin/src/layout/SubMenu.jsx @@ -10,17 +10,17 @@ } from '@mui/material'; import ExpandMore from '@mui/icons-material/ExpandMore'; import { useTranslate, useSidebarState } from 'react-admin'; - +import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'; +import KeyboardArrowRightIcon from '@mui/icons-material/KeyboardArrowRight'; const SubMenu = (props) => { const { handleToggle, isOpen, name, icon, children, dense } = props; const translate = useTranslate(); - const [sidebarIsOpen] = useSidebarState(); 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} + {icon ? icon : isOpen ? <KeyboardArrowDownIcon /> : <KeyboardArrowRightIcon />} </ListItemIcon> <Typography variant="inherit" color="textSecondary" sx={{ ml: 1, display: 'flex', alignItems: 'center' }}> {translate(name)} @@ -43,6 +43,10 @@ component="div" disablePadding sx={{ + '& .MuiTypography-root': { + visibility: 'hidden' + }, + '& .MuiMenuItem-root': { transition: 'padding-left 195ms cubic-bezier(0.4, 0, 0.6, 1) 0ms', -- Gitblit v1.9.1