fix zuiidea#372 update navOpenKeys when copy link open

jianganglu · May 5, 2018 · c66f086 · c66f086
1 parent 07b2175
commit c66f086
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/components/Layout/Menu.js b/src/components/Layout/Menu.js
@@ -5,6 +5,9 @@ import { Link } from 'react-router-dom'
 import { arrayToTree, queryArray } from 'utils'
 import pathToRegexp from 'path-to-regexp'
 
+const { SubMenu } = Menu
+let openKeysFlag = false
+
 const Menus = ({
   siderFold, darkTheme, navOpenKeys, changeOpenKeys, menu, location,
 }) => {
@@ -20,15 +23,15 @@ const Menus = ({
           levelMap[item.id] = item.mpid
         }
         return (
-          <Menu.SubMenu
+          <SubMenu
             key={item.id}
             title={<span>
               {item.icon && <Icon type={item.icon} />}
               {(!siderFoldN || !menuTree.includes(item)) && item.name}
             </span>}
           >
             {getMenus(item.children, siderFoldN)}
-          </Menu.SubMenu>
+          </SubMenu>
         )
       }
       return (
@@ -62,6 +65,7 @@ const Menus = ({
   }
 
   const onOpenChange = (openKeys) => {
+    if (navOpenKeys.length) changeOpenKeys([]), openKeysFlag = true
     const latestOpenKey = openKeys.find(key => !navOpenKeys.includes(key))
     const latestCloseKey = navOpenKeys.find(key => !openKeys.includes(key))
     let nextOpenKeys = []
@@ -85,6 +89,7 @@ const Menus = ({
   let defaultSelectedKeys
   for (let item of menu) {
     if (item.route && pathToRegexp(item.route).exec(location.pathname)) {
+      if (!navOpenKeys.length && item.mpid && !openKeysFlag) changeOpenKeys([String(item.mpid)])
       currentMenu = item
       break
     }