Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into dev

package.json

@@ -22,7 +22,7 @@
     "@typescript-eslint/eslint-plugin": "^2.10.0",
     "@typescript-eslint/eslint-plugin": "^2.10.0",
     "@typescript-eslint/parser": "^2.10.0",
     "@typescript-eslint/parser": "^2.10.0",
     "ali-oss": "^6.12.0",
     "ali-oss": "^6.12.0",
-    "antd": "^4.9.4",
+    "antd": "^4.16.3",
     "array-move": "^3.0.1",
     "array-move": "^3.0.1",
     "axios": "^0.20.0",
     "axios": "^0.20.0",
     "babel-eslint": "10.1.0",
     "babel-eslint": "10.1.0",

src/modules/root/Menu.tsx

@@ -168,9 +168,9 @@ function Aside(props: any) {
   }
   }
   function toggleMenu(item: any) {
   function toggleMenu(item: any) {
     window.RCHistory.push(item.link)
     window.RCHistory.push(item.link)
-    // if (!menuType) {
-    //   setOpenKeys([])
-    // }
+    if (!menuType) {
+      setOpenKeys([])
+    }
   }
   }
   function onOpenChange(key: Key[]) {
   function onOpenChange(key: Key[]) {
     if (typeof key === "string") {
     if (typeof key === "string") {
@@ -202,11 +202,11 @@ function Aside(props: any) {
   function handleMenu() {
   function handleMenu() {
     handleMenuType();
     handleMenuType();
     setCollapsed(!collapsed)
     setCollapsed(!collapsed)
-    if (!collapsed) {
-      setOpenKeys([])
-    } else {
-      setOpenKeys(lastOpenKeys)
-    }
+    // if (!collapsed) {
+    //   setOpenKeys([])
+    // } else {
+    //   setOpenKeys(lastOpenKeys)
+    // }
   }
   }
 
 
   return (
   return (
@@ -243,7 +243,7 @@ function Aside(props: any) {
           <div className="nav">
           <div className="nav">
 
 
         <Menu
         <Menu
-          style={{ minHeight: "100%", background: '#0E1935' }}
+          style={menuType ? { minHeight: "100%", background: '#0E1935' }:{minHeight: "100%", background: '#0E1935',width:"56px" }}
           selectedKeys={selectKey}
           selectedKeys={selectKey}
           openKeys={openKeys}
           openKeys={openKeys}
           onOpenChange={onOpenChange}
           onOpenChange={onOpenChange}
@@ -262,14 +262,13 @@ function Aside(props: any) {
                         icon={<img src={item.img} className="icon-img"></img>}
                         icon={<img src={item.img} className="icon-img"></img>}
                         title={menuType ? <span>{item.groupName}</span> : ""} 
                         title={menuType ? <span>{item.groupName}</span> : ""} 
                         onTitleClick={() => onOpenChange(item.groupCode)}
                         onTitleClick={() => onOpenChange(item.groupCode)}
-                        onTitleMouseEnter={()=> onOpenChangeForHover(item.groupCode)}
                         >
                         >
                   {
                   {
                     item.children.map((_item: any, _index: any) => {
                     item.children.map((_item: any, _index: any) => {
                       if (ctx.xmState.storeUserPermissionList.indexOf(_item.groupCode) === -1) {
                       if (ctx.xmState.storeUserPermissionList.indexOf(_item.groupCode) === -1) {
                         return null;
                         return null;
                       }
                       }
-                      return <Menu.Item onClick={() => { toggleMenu(_item) }} style={{ marginTop: 0 }} key={_item.groupCode + index + _index} onMouseLeave={()=> onOpenChangeForHover(item.groupCode)}>
+                      return <Menu.Item onClick={() => { toggleMenu(_item) }} style={{ marginTop: 0 }} key={_item.groupCode + index + _index} >
                         <span className="name">{_item.groupName}</span>
                         <span className="name">{_item.groupName}</span>
                       </Menu.Item>
                       </Menu.Item>
 
 
@@ -291,7 +290,10 @@ function Aside(props: any) {
       </div>
       </div>
       
       
       </div>
       </div>
-      <VersionPanel />
+      {
+        menuType ? <VersionPanel /> : ""
+      }
+      
       
       
     </div>
     </div>
   );
   );