wuxw пре 7 година
родитељ
комит
3a9fcd9f41

+ 1 - 0
Api/src/main/java/com/java110/api/listener/configMenu/BindingConfigMenuListener.java

@@ -78,6 +78,7 @@ public class BindingConfigMenuListener extends AbstractServiceApiListener {
             saveMenuGroup(viewMenuGroupInfo, context);
         }
         if (!hasKey(addMenuView, "mId")) {
+            addMenuView.put("gId",viewMenuGroupInfo.getString("gId"));
             saveMenu(addMenuView, context);
         }
         if (!hasKey(addPrivilegeView, "pId")) {

+ 5 - 1
WebService/src/main/resources/components/pageFramePackage/menu/menu.js

@@ -82,8 +82,12 @@
                 vc.setMenus(vm.menus);
            },
            miniMenu:function(){
+                if(vc.notNull(vc.getMenuState()) && vc.getMenuState() == 'ON'){
+                    return ;
+                }
+
                 $("body").toggleClass("mini-navbar");
-                //SmoothlyMenu();
+                vc.setMenuState('OFF');
            }
 
        },

+ 9 - 0
WebService/src/main/resources/static/js/core.js

@@ -159,6 +159,15 @@
         return JSON.parse(window.localStorage.getItem('hc_menus'));
     };
 
+    //保存菜单状态
+    vc.setMenuState = function(_menuState){
+        window.localStorage.setItem('hc_menu_state',_menuState);
+    };
+    //获取菜单状态
+    vc.getMenuState = function(){
+        return window.localStorage.getItem('hc_menu_state');
+    };
+
     //保存用户菜单
     vc.saveData = function(_key,_value){
         window.localStorage.setItem(_key,JSON.stringify(_value));

+ 3 - 0
WebService/src/main/resources/static/js/inspinia.js

@@ -280,12 +280,14 @@ function SmoothlyMenu() {
         // Hide menu in order to smoothly turn on when maximize menu
         $('#side-menu').hide();
         // For smoothly turn on menu
+        vc.setMenuState('ON');
         setTimeout(
             function () {
                 $('#side-menu').fadeIn(400);
             }, 200);
     } else if ($('body').hasClass('fixed-sidebar')) {
         $('#side-menu').hide();
+        vc.setMenuState('ON');
         setTimeout(
             function () {
                 $('#side-menu').fadeIn(400);
@@ -293,6 +295,7 @@ function SmoothlyMenu() {
     } else {
         // Remove all inline style from jquery fadeIn function to reset menu state
         $('#side-menu').removeAttr('style');
+        vc.setMenuState('OFF');
     }
 }