Browse Source

修正组件拒绝访问列表权限判断有误的bug

huqi 5 years ago
parent
commit
3a6848ee26

+ 3 - 1
o2web/source/o2_core/o2/xDesktop/Default.js

@@ -1157,11 +1157,13 @@ o2.xDesktop.Default.StartMenu = new Class({
     },
 
     checkMenuItem: function(value, currentNames){
+        debugger;
+        debugger;
         if (value.visible===false) return false;
         var isAllow = true;
         if (value.allowList) isAllow = (value.allowList.length) ? (value.allowList.isIntersect(currentNames)) : true;
         var isDeny = false;
-        if (value.denyList) isDeny = (value.denyList.length) ? (value.denyList.isIntersect(currentNames)!==-1) : false;
+        if (value.denyList) isDeny = (value.denyList.length) ? (value.denyList.isIntersect(currentNames)) : false;
         return ((!isDeny && isAllow) || o2.AC.isAdministrator());
     },
     createApplicationMenuItem: function(value){

+ 1 - 1
o2web/source/o2_core/o2/xDesktop/Layout.js

@@ -1347,7 +1347,7 @@ MWF.xDesktop.Layout.Top = new Class({
                     var isAllow = true;
                     if (value.allowList) isAllow = (value.allowList.length) ? (value.allowList.isIntersect(currentNames)) : true;
                     var isDeny = false;
-                    if (value.denyList) isDeny = (value.denyList.length) ? (value.denyList.isIntersect(currentNames)!==-1) : false;
+                    if (value.denyList) isDeny = (value.denyList.length) ? (value.denyList.isIntersect(currentNames)) : false;
                     if ((!isDeny && isAllow) || MWF.AC.isAdministrator()){
                         this.createApplicationMenu(value, key);
                     }