|
|
@@ -49,7 +49,7 @@ export function useMenu() {
|
|
|
return data;
|
|
|
}
|
|
|
|
|
|
-export function useMenuState() {
|
|
|
+export function useMenuState(collapsed: boolean) {
|
|
|
const [openKeys, setOpenKey] = useState<string[]>(['-1']);
|
|
|
|
|
|
function onOpenChange(keys: string[]) {
|
|
|
@@ -75,11 +75,14 @@ export function useMenuState() {
|
|
|
useEffect(
|
|
|
function() {
|
|
|
const menu = pages.find(val => val.id === activeKey);
|
|
|
- menu && menu.pId !== '0' ? setOpenKey([menu.pId]) : setOpenKey([]);
|
|
|
+ // 查不到菜单,pId不为0,左侧导航收起清空下不操作展开菜单
|
|
|
+ menu && menu.pId !== '0' && !collapsed
|
|
|
+ ? setOpenKey([menu.pId])
|
|
|
+ : setOpenKey([]);
|
|
|
|
|
|
setSelectKey([activeKey]);
|
|
|
},
|
|
|
- [activeKey, pages],
|
|
|
+ [activeKey, collapsed, pages],
|
|
|
);
|
|
|
|
|
|
return [
|