权限引擎逻辑调整

src/engine/view/mob-edit-view-engine.ts

@@ -93,6 +93,8 @@ export default class MobEditViewEngine extends ViewEngine {
     public onFormLoad(arg: any): void {
         this.view.$emit('load', arg);
         this.view.$emit('viewdataschange', JSON.stringify({ action: 'load', status: 'success', data: arg }));
+        const newdata: boolean = !Object.is(arg.srfuf, '1');
+        this.calcToolbarItemState(newdata);
         this.calcToolbarItemAuthState(arg);
     }
 
@@ -105,6 +107,8 @@ export default class MobEditViewEngine extends ViewEngine {
     public onFormSave(arg: any): void {
         this.view.$emit('save', arg);
         this.view.$emit('viewdataschange', JSON.stringify({ action: 'save', status: 'success', data: arg }));
+        const newdata: boolean = !Object.is(arg.srfuf, '1');
+        this.calcToolbarItemState(newdata);
         this.calcToolbarItemAuthState(arg);
     }
 

src/engine/view/view-engine.ts

@@ -157,23 +157,25 @@ export default class ViewEngine {
      */
     public calcToolbarItemState(state: boolean, dataaccaction?: any) {
         const _this: any = this;
-        if (!_this.view.toolBarModels || Object.keys(_this.view.toolBarModels).length === 0) {
-            return;
-        }
-
-        for (const key in _this.view.toolBarModels) {
-            if (!_this.view.toolBarModels.hasOwnProperty(key)) {
+        _this.view.toolbarModelList.forEach((tool:any) => {
+            if (!_this.view[tool] || Object.keys(_this.view[tool]).length === 0) {
                 return;
             }
-            const _item = _this.view.toolBarModels[key];
-            if (_item.uiaction && (Object.is(_item.uiaction.target, 'SINGLEKEY') || Object.is(_item.uiaction.target, 'MULTIKEY'))) {
-                _item.disabled = state;
-            }
-            _item.visabled = true;
-            if(_item.noprivdisplaymode && _item.noprivdisplaymode === 6){
-                _item.visabled = false;
+
+            for (const key in _this.view[tool]) {
+                if (!_this.view[tool].hasOwnProperty(key)) {
+                    return;
+                }
+                const _item = _this.view[tool][key];
+                if (_item.uiaction && (Object.is(_item.uiaction.target, 'SINGLEKEY') || Object.is(_item.uiaction.target, 'MULTIKEY'))) {
+                    _item.disabled = state;
+                }
+                _item.visabled = true;
+                if(_item.noprivdisplaymode && _item.noprivdisplaymode === 6){
+                    _item.visabled = false;
+                }
             }
-        }
+        });
     }
 
     /**
@@ -192,7 +194,14 @@ export default class ViewEngine {
                 }
                 const _item = _this.view[tool][key];
                 if(_item && _item['dataaccaction'] && _this.view.appUIService && data && Object.keys(data).length >0){
-                    let dataActionResult:any = _this.view.appUIService.getAllOPPrivs(data)[_item['dataaccaction']];
+                    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