Commit f481a767 by zhujian

Revert "fix:菜单栏优化"

This reverts commit f022a67e.
parent a715db1c
...@@ -17,6 +17,7 @@ function Aside(props: any) { ...@@ -17,6 +17,7 @@ function Aside(props: any) {
const ctx: any = useContext(XMContext); const ctx: any = useContext(XMContext);
const [selectKey, setSelectKey] = useState(); const [selectKey, setSelectKey] = useState();
const [openKeys, setOpenKeys] = useState(['']); const [openKeys, setOpenKeys] = useState(['']);
const [lastOpenKeys, setLastOpenKeys] = useState(['']);
const [topLogoUrl, setTopLogoUrl] = useState("") const [topLogoUrl, setTopLogoUrl] = useState("")
const [collapsed, setCollapsed] = useState(false) const [collapsed, setCollapsed] = useState(false)
const rootSubmenuKeys = _.pluck(menuList, 'groupCode'); const rootSubmenuKeys = _.pluck(menuList, 'groupCode');
...@@ -26,6 +27,7 @@ function Aside(props: any) { ...@@ -26,6 +27,7 @@ function Aside(props: any) {
if (link.indexOf(item.link) !== -1) { if (link.indexOf(item.link) !== -1) {
setSelectKey(item.groupCode); setSelectKey(item.groupCode);
setOpenKeys([]) setOpenKeys([])
setLastOpenKeys([])
} else if (item.children) { } else if (item.children) {
item.children.map((_item: any, _index: any) => { item.children.map((_item: any, _index: any) => {
if (link.indexOf(_item.link) !== -1) { if (link.indexOf(_item.link) !== -1) {
...@@ -62,8 +64,10 @@ function Aside(props: any) { ...@@ -62,8 +64,10 @@ function Aside(props: any) {
if (typeof key === "string") { if (typeof key === "string") {
if (openKeys.includes(key)) { if (openKeys.includes(key)) {
setOpenKeys([]); setOpenKeys([]);
setLastOpenKeys([]);
} else { } else {
setOpenKeys([key]); setOpenKeys([key]);
setLastOpenKeys([key])
} }
} }
} }
...@@ -75,8 +79,10 @@ function Aside(props: any) { ...@@ -75,8 +79,10 @@ function Aside(props: any) {
if (typeof key === "string") { if (typeof key === "string") {
if (openKeys.includes(key)) { if (openKeys.includes(key)) {
setOpenKeys([]); setOpenKeys([]);
setLastOpenKeys([]);
} else { } else {
setOpenKeys([key]); setOpenKeys([key]);
setLastOpenKeys([key])
} }
} }
} }
...@@ -84,6 +90,11 @@ function Aside(props: any) { ...@@ -84,6 +90,11 @@ function Aside(props: any) {
function handleMenu() { function handleMenu() {
handleMenuType(); handleMenuType();
setCollapsed(!collapsed) setCollapsed(!collapsed)
if (!collapsed) {
setOpenKeys([])
} else {
setOpenKeys(lastOpenKeys)
}
} }
return ( return (
...@@ -122,7 +133,7 @@ function Aside(props: any) { ...@@ -122,7 +133,7 @@ function Aside(props: any) {
<Menu <Menu
style={menuType ? { minHeight: "100%", background: '#0E1935' }:{minHeight: "100%", background: '#0E1935',width:"56px" }} style={menuType ? { minHeight: "100%", background: '#0E1935' }:{minHeight: "100%", background: '#0E1935',width:"56px" }}
selectedKeys={selectKey} selectedKeys={selectKey}
openKeys={menuType ? openKeys : []} openKeys={openKeys}
onOpenChange={onOpenChange} onOpenChange={onOpenChange}
inlineCollapsed={collapsed} inlineCollapsed={collapsed}
mode={menuType ? "inline" : "vertical"} mode={menuType ? "inline" : "vertical"}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment