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

# Conflicts:
#	src/modules/root/Menu.less
#	src/modules/root/Menu.tsx

src/modules/root/Menu.less

@@ -51,12 +51,13 @@
     display: -webkit-flex;
     display: -webkit-flex;
     flex-direction: column;
     flex-direction: column;
     -webkit-flex-direction: column;
     -webkit-flex-direction: column;
+    height: calc(~'100% - 60px');
    
    
     .nav {
     .nav {
       -webkit-flex: 1;
       -webkit-flex: 1;
       cursor: default;
       cursor: default;
       font-size: 16px;
       font-size: 16px;
-      height: calc(~'100% - 72px');
+      height: calc(~'100% - 84px');
       overflow: auto;
       overflow: auto;
       &::-webkit-scrollbar {
       &::-webkit-scrollbar {
         display: none;
         display: none;
@@ -134,34 +135,13 @@
         color: #5e606a;
         color: #5e606a;
       }
       }
     }
     }
-  }
-
-  &.left-container-vertical {
-    width: 56px;
-    .menu-type-icon {
-      margin: 4px 0 0px 22px;
-    }
-    .left {
-      .ant-menu-submenu-arrow {
-        display: none !important;
-      }
-    }
-  }
-  .shink-footer {
-    left: 74px;
-  }
-  // &:hover{
-  //   .menu-type-icon{
-  //     display:inline-block;
-  //   }
-  // }
     .version-info {
     .version-info {
-    position: absolute;
+      // position: absolute;
       height: 84px;
       height: 84px;
       bottom: 0;
       bottom: 0;
-    width: 100%;
+      width: 180px;
       cursor: pointer;
       cursor: pointer;
-    z-index: 10;
+      // z-index: 10;
       padding-top: 10px;
       padding-top: 10px;
       background-color: white;
       background-color: white;
       .row-1 {
       .row-1 {
@@ -269,6 +249,29 @@
         display: block;
         display: block;
       }
       }
     }
     }
+  
+  }
+
+  &.left-container-vertical {
+    width: 56px;
+    .menu-type-icon {
+      margin: 4px 0 0px 22px;
+    }
+    .left {
+      .ant-menu-submenu-arrow {
+        display: none !important;
+      }
+    }
+  }
+  .shink-footer {
+    left: 74px;
+  }
+  // &:hover{
+  //   .menu-type-icon{
+  //     display:inline-block;
+  //   }
+  // }
+
 }
 }
 
 
 .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {
 .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {

src/modules/root/Menu.tsx

@@ -273,8 +273,11 @@ function Aside(props: any) {
             })}
             })}
           </Menu>
           </Menu>
         </div>
         </div>
+        {
+        menuType ? <VersionPanel /> : ""
+        }
       </div>     
       </div>     
-      {menuType ? <VersionPanel /> : ''}
+      
     </div>
     </div>
   );
   );
 }
 }