Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7 into dev

APP/src/uiservice/%DE_PKGPATH%/%DE_PKGPATH%-ui-service-base.ts.ftl

 <#ibiztemplate>
 TARGET=PSAPPDATAENTITY
 </#ibiztemplate>
+<#macro getMainStateOPPrivs mainState>
+<#compress>
+<#if mainState.getPSDEMainStateOPPrivs?? && mainState.getPSDEMainStateOPPrivs()??>
+{<#list mainState.getPSDEMainStateOPPrivs() as mainStateOPPriv>'${mainStateOPPriv.getName()}':${mainStateOPPriv.isOPPrivAllowMode()?c<#if mainStateOPPriv_has_next>,</#if>}</#list>}
+<#else>
+{}
+</#if> 
+<#compress>
+</#macro>
 import { Environment } from '@/environments/environment';
 import { UIActionTool,Util } from '@/utils';
 import UIService from '../ui-service';
@@ -85,6 +94,13 @@ export default class ${srfclassname('${item.getCodeName()}')}UIServiceBase exten
      */  
     public allDeMainStateMap:Map<string,string> = new Map();
 
+    /**
+     * 主状态操作标识Map
+     * 
+     * @memberof  ${srfclassname('${item.getCodeName()}')}UIServiceBase
+     */ 
+    public allDeMainStateOPPrivsMap:Map<string,any> = new Map();
+
     /**
      * Creates an instance of  ${srfclassname('${item.getCodeName()}')}UIServiceBase.
      * 
@@ -95,6 +111,7 @@ export default class ${srfclassname('${item.getCodeName()}')}UIServiceBase exten
         super(opts);
         this.initViewMap();
         this.initDeMainStateMap();
+        this.initDeMainStateOPPrivsMap();
     }
 
     /**
@@ -121,9 +138,21 @@ export default class ${srfclassname('${item.getCodeName()}')}UIServiceBase exten
         <#if demState.getMSTag()??>
         this.allDeMainStateMap.set('${demState.getMSTag()}','${demState.getMSTag()}');
         </#if>
-        <#--  <#if demState.getId()?? && demState.getMSTag()??>
-        this.allDeMainStateMap.set('${demState.getId()}','${demState.getMSTag()}');
-        </#if>          -->
+        </#list>
+        </#if>
+    }
+
+    /**
+     * 初始化主状态操作标识
+     * 
+     * @memberof  ${srfclassname('${item.getCodeName()}')}UIServiceBase
+     */  
+    public initDeMainStateOPPrivsMap(){
+        <#if item.getPSDataEntity?? && item.getPSDataEntity()?? && item.getPSDataEntity().getAllPSDEMainStates()??>
+        <#list item.getPSDataEntity().getAllPSDEMainStates() as demState>
+        <#if demState.getMSTag()??>
+        this.allDeMainStateOPPrivsMap.set('${demState.getMSTag()}',<@getMainStateOPPrivs mainState=demState />);
+        </#if>
         </#list>
         </#if>
     }
@@ -310,8 +339,6 @@ ${P.getLogicCode(appdeUIAction, "LOGIC.vue").code}
                 console.error(`当前数据对象不包含属性singleMainField，可能会发生错误`);
             }
         })
-
-        let strTag:String = "";
         for (let i = 0; i <= 1; i++) {
             let strTag:string = (curData[this.mainStateFields[0]])?(i == 0) ? curData[this.mainStateFields[0]] : "":"";
             if (this.mainStateFields.length >= 2) {