调整权限过滤

src/components/app-actionbar/app-actionbar.vue

@@ -100,39 +100,37 @@ export default class AppActionBar extends Vue {
    * @memberof AppActionBar
    */
   public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
-    if(Environment.enablePermissionValid){
-      for (const key in ActionModel) {
-          if (!ActionModel.hasOwnProperty(key)) {
-              return;
-          }
-          const _item = ActionModel[key];
-          if(_item && _item['dataaccaction'] && UIService){
-              let dataActionResult:any;
-              if(Object.is(_item['actiontarget'],"NONE")){
-                  dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
-              }else{
-                  if(data && Object.keys(data).length >0){
-                      dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
-                  }
-              }
-              // 无权限:0;有权限:1
-              if(dataActionResult === 0){
-                  // 禁用:1;隐藏:2;隐藏且默认隐藏:6
-                  if(_item.noprivdisplaymode === 1){
-                      _item.disabled = true;
-                  }
-                  if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
-                      _item.visabled = false;
-                  }else{
-                      _item.visabled = true;
-                  }
-              }
-              if(dataActionResult === 1){
-                  _item.visabled = true;
-                  _item.disabled = false;
-              }
-          }
-      }
+    for (const key in ActionModel) {
+        if (!ActionModel.hasOwnProperty(key)) {
+            return;
+        }
+        const _item = ActionModel[key];
+        if(_item && _item['dataaccaction'] && UIService){
+            let dataActionResult:any;
+            if(Object.is(_item['actiontarget'],"NONE")){
+                dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
+            }else{
+                if(data && Object.keys(data).length >0){
+                    dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
+                }
+            }
+            // 无权限:0;有权限:1
+            if(dataActionResult === 0){
+                // 禁用:1;隐藏:2;隐藏且默认隐藏:6
+                if(_item.noprivdisplaymode === 1){
+                    _item.disabled = true;
+                }
+                if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
+                    _item.visabled = false;
+                }else{
+                    _item.visabled = true;
+                }
+            }
+            if(dataActionResult === 1){
+                _item.visabled = true;
+                _item.disabled = false;
+            }
+        }
     }
   } 
 

src/components/app-form-group/app-form-group.vue

@@ -158,38 +158,36 @@ export default class AppFormGroup extends Vue {
      * @memberof AppFormGroup
      */
     public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
-        if(Environment.enablePermissionValid){
-            for (const key in ActionModel) {
-                if (!ActionModel.hasOwnProperty(key)) {
-                    return;
-                }
-                const _item = ActionModel[key];
-                if(_item && _item['dataaccaction'] && UIService){
-                    let dataActionResult:any;
-                    if(Object.is(_item['actiontarget'],"NONE")){
-                        dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
-                    }else{
-                        if(data && Object.keys(data).length >0){
-                            dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
-                        }
+        for (const key in ActionModel) {
+            if (!ActionModel.hasOwnProperty(key)) {
+                return;
+            }
+            const _item = ActionModel[key];
+            if(_item && _item['dataaccaction'] && UIService){
+                let dataActionResult:any;
+                if(Object.is(_item['actiontarget'],"NONE")){
+                    dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
+                }else{
+                    if(data && Object.keys(data).length >0){
+                        dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
                     }
-                    // 无权限:0;有权限:1
-                    if(dataActionResult === 0){
-                        // 禁用:1;隐藏:2;隐藏且默认隐藏:6
-                        if(_item.noprivdisplaymode === 1){
-                            _item.disabled = true;
-                        }
-                        if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
-                            _item.visabled = false;
-                        }else{
-                            _item.visabled = true;
-                        }
+                }
+                // 无权限:0;有权限:1
+                if(dataActionResult === 0){
+                    // 禁用:1;隐藏:2;隐藏且默认隐藏:6
+                    if(_item.noprivdisplaymode === 1){
+                        _item.disabled = true;
                     }
-                    if(dataActionResult === 1){
+                    if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
+                        _item.visabled = false;
+                    }else{
                         _item.visabled = true;
-                        _item.disabled = false;
                     }
                 }
+                if(dataActionResult === 1){
+                    _item.visabled = true;
+                    _item.disabled = false;
+                }
             }
         }
     } 

src/engine/view/view-engine.ts

@@ -186,39 +186,37 @@ export default class ViewEngine {
      * @memberof ViewEngine
      */
     public calcToolbarItemAuthState(data:any){
-        if(Environment.enablePermissionValid){
-            const _this: any = this;
-            for (const key in _this.view.toolBarModels) {
-                if (!_this.view.toolBarModels.hasOwnProperty(key)) {
-                    return;
-                }
-                const _item = _this.view.toolBarModels[key];
-                if(_item && _item['dataaccaction'] && _this.view.appUIService){
-                    let dataActionResult:any;
-                    if (_item.uiaction && (Object.is(_item.uiaction.target, 'NONE'))){
-                        dataActionResult = _this.view.appUIService.getResourceOPPrivs(_item['dataaccaction']);
-                    }else{
-                        if(data && Object.keys(data).length >0){
-                            dataActionResult= _this.view.appUIService.getAllOPPrivs(data)[_item['dataaccaction']];       
-                        }
+        const _this: any = this;
+        for (const key in _this.view.toolBarModels) {
+            if (!_this.view.toolBarModels.hasOwnProperty(key)) {
+                return;
+            }
+            const _item = _this.view.toolBarModels[key];
+            if(_item && _item['dataaccaction'] && _this.view.appUIService){
+                let dataActionResult:any;
+                if (_item.uiaction && (Object.is(_item.uiaction.target, 'NONE'))){
+                    dataActionResult = _this.view.appUIService.getResourceOPPrivs(_item['dataaccaction']);
+                }else{
+                    if(data && Object.keys(data).length >0){
+                        dataActionResult= _this.view.appUIService.getAllOPPrivs(data)[_item['dataaccaction']];       
                     }
-                    // 无权限:0;有权限:1
-                    if(dataActionResult === 0){
-                        // 禁用:1;隐藏:2;隐藏且默认隐藏:6
-                        if(_item.noprivdisplaymode === 1){
-                            _this.view.toolBarModels[key].disabled = true;
-                        }
-                        if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
-                            _this.view.toolBarModels[key].visabled = false;
-                        }else{
-                            _this.view.toolBarModels[key].visabled = true;
-                        }
+                }
+                // 无权限:0;有权限:1
+                if(dataActionResult === 0){
+                    // 禁用:1;隐藏:2;隐藏且默认隐藏:6
+                    if(_item.noprivdisplaymode === 1){
+                        _this.view.toolBarModels[key].disabled = true;
                     }
-                    if(dataActionResult === 1){
+                    if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
+                        _this.view.toolBarModels[key].visabled = false;
+                    }else{
                         _this.view.toolBarModels[key].visabled = true;
-                        _this.view.toolBarModels[key].disabled = false;
                     }
                 }
+                if(dataActionResult === 1){
+                    _this.view.toolBarModels[key].visabled = true;
+                    _this.view.toolBarModels[key].disabled = false;
+                }
             }
         }
     }