主状态界面行为 --fix

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

@@ -15,7 +15,6 @@ TARGET=PSAPPDATAENTITY
 <#assign exist = true>
 </#list>
 </#if>
-<#if exist??>
 import EntityUIActionBase from '@/utils/ui-service-base/entity-ui-action-base';
 import { Util, Loading } from '@/ibiz-core/utils';
 import { Notice } from '@/utils';
@@ -36,6 +35,13 @@ export default class ${srfclassname(item.getCodeName())}UIActionBase extends Ent
      */
     public isEnableWorkflow:boolean = false;
 
+    /**
+     * 当前UI服务对应的数据服务对象
+     * 
+     * @memberof  ${srfclassname('${item.getCodeName()}')}UIServiceBase
+     */
+    public dataService:${srfclassname('${item.getCodeName()}')}Service = new ${srfclassname('${item.getCodeName()}')}Service();
+
     /**
      * 所有关联视图
      * 
@@ -85,9 +91,8 @@ export default class ${srfclassname(item.getCodeName())}UIActionBase extends Ent
      * @memberof  ${srfclassname('${item.getCodeName()}')}UIServiceBase
      */
     constructor(opts: any = {}) {
-        super();
-        this.authService = window.authServiceConstructor.getService("${srfclassname('${item.getCodeName()}')?lower_case}");
-        this.dataService = window.appEntityServiceConstructor.getService("${srfclassname('${item.getCodeName()}')?lower_case}");
+        super(opts);
+        this.authService = new ${srfclassname('${item.getCodeName()}')}AuthService(opts);
         this.initViewMap();
         this.initDeMainStateMap();
         this.initDeMainStateOPPrivsMap();
@@ -130,18 +135,19 @@ export default class ${srfclassname(item.getCodeName())}UIActionBase extends Ent
         <#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 dataEntity=item.getPSDataEntity() />);
+        this.allDeMainStateOPPrivsMap.set('${demState.getMSTag()}',Object.assign(<@getDataEntityMainStateOPPrivs mainState=demState dataEntity=item.getPSDataEntity() />,<@getMainStateOPPrivs mainState=demState />));
         </#if>
         </#list>
         </#if>
     }
 
+    <#if item.getAllPSAppDEUIActions()??>
     <#list item.getAllPSAppDEUIActions() as appdeUIAction>
-
 ${P.getLogicCode(appdeUIAction, "LOGIC.vue").code}
     </#list>
+    </#if>
 
-/**
+    /**
      * 获取指定数据的重定向页面
      * 
      * @param srfkey 数据主键
@@ -213,15 +219,14 @@ ${P.getLogicCode(appdeUIAction, "LOGIC.vue").code}
             </#if>
         }
         //多表单，todo
-        const isEnableMultiForm:boolean = false;
-        const multiFormDEField:string|null =null;
+        const multiFormDEField:string|null =<#if de.getFormTypePSDEField()??>"${de.getFormTypePSDEField().getCodeName()?lower_case}"<#else>null</#if>;
 
-        if (isEnableMultiForm && multiFormDEField) {
+        if (multiFormDEField) {
 			const objFormValue:string = curData[multiFormDEField];
 			if(!Environment.isAppMode){
-				return 'MOBEDITVIEW'+objFormValue;
+				return 'MOBEDITVIEW:'+objFormValue;
 			}
-			return 'EDITVIEW'+objFormValue;
+			return 'EDITVIEW:'+objFormValue;
         }
 		if(!Environment.isAppMode){
             if(this.getDEMainStateTag(curData)){
@@ -364,4 +369,3 @@ ${P.getLogicCode(appdeUIAction, "LOGIC.vue").code}
    }
 
 }
\ No newline at end of file
-</#if>
\ No newline at end of file