Merge branch 'dev'

@CONTROL/@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl

@@ -5,6 +5,7 @@ import { Subject, Subscription } from 'rxjs';
 import { ControlInterface } from '@/interface/control';
 import { UIActionTool,Util } from '@/utils';
 import NavDataService from '@/service/app/navdata-service';
+import AppCenterService from "@service/app/app-center-service";
 <#if ctrl.getPSAppCounterRefs?? && ctrl.getPSAppCounterRefs()??>
 <#list ctrl.getPSAppCounterRefs() as singleCounterRef>
 <#if singleCounterRef.getPSAppCounter()??>

@CONTROL/@MACRO/SERVICE/FORM.ts.ftl

@@ -70,6 +70,8 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+        data.page = data.page ? data.page : 0;
+        data.size = data.size ? data.size : 1000;
     <#list ctrl.getPSDEFormItems() as deItem>
     <#if deItem.getPSEditor()?? && deItem.getPSEditor().getPSAppDataEntity?? && deItem.getPSEditor().getPSAppDataEntity()?? && deItem.getPSEditor().getPSAppDEDataSet?? && deItem.getPSEditor().getPSAppDEDataSet()??>
     <#assign _appde = deItem.getPSEditor().getPSAppDataEntity()/>

@CONTROL/列表/CONTROL-BASE.vue.ftl

@@ -197,6 +197,15 @@
      */
     public selections: Array<any> = [];
 
+    /**
+     * 应用状态事件
+     *
+     * @public
+     * @type {(Subscription | undefined)}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public appStateEvent: Subscription | undefined;
+
      /**
      * Vue声明周期，组件挂载完毕
      *
@@ -219,7 +228,6 @@
         })
     }
 
-
     /**
      * Vue声明周期，组件创建完毕
      *
@@ -245,6 +253,16 @@
                 }
             });
         }
+        if(AppCenterService && AppCenterService.getMessageCenter()){
+            this.appStateEvent = AppCenterService.getMessageCenter().subscribe(({ name, action, data }) =>{
+                if(!Object.is(name,"${ctrl.getPSAppDataEntity().getCodeName()}")){
+                    return;
+                }
+                if(Object.is(action,'appRefresh')){
+                    this.refresh([data]);
+                }
+            })
+        }
     }    
 
     /**
@@ -265,6 +283,9 @@
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
+        if(this.appStateEvent){
+            this.appStateEvent.unsubscribe();
+        }
         <#if destroyed_block??>
         ${destroyed_block}
         </#if>

@CONTROL/搜索栏/CONTROL.html.ftl

 <#--  content  -->
 <#assign content>
-    @on-change="onSearchBarChange"
+    v-show="isExpandSearchForm"
+    @search="onSearch($event)"
 </#assign>
 <#ibizinclude>
 ../@MACRO/HTML/DEFAULT.html.ftl

@CONTROL/搜索栏/CONTROL.less.ftl

+.search-bar-footer {
+    height: 32px;
+    .search-bar-action {
+        float: right;
+        > .ivu-btn {
+            margin-left: 5px;
+        }
+    }
+}
+
 <#ibizinclude>
 ../@MACRO/CSS/DEFAULT.less.ftl
 </#ibizinclude>

@CONTROL/搜索栏/SERVICE.ts.ftl

+<#assign import_block>
+import UtilService from '@/utilservice/util-service';
+</#assign>
 <#ibizinclude>
 ../@MACRO/SERVICE/SERVICE_HEADER.ts.ftl
 </#ibizinclude>
 
+    /**
+     * 工具服务对象
+     *
+     * @protected
+     * @type {UtilService}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Service
+     */
+    protected utilService: UtilService = new UtilService();
+
+    /**
+     * 加载数据模型
+     *
+     * @param {string} serviceName
+     * @param {*} context
+     * @param {*} viewparams
+     * @memberof ${srfclassname('${ctrl.codeName}')}Service
+     */
+    public loadModel(serviceName: string, context: any, viewparams: any) {
+        return new Promise((resolve: any, reject: any) => {
+            this.utilService.getService(serviceName).then((service: any) => {
+                service.loadModelData(JSON.stringify(context), viewparams).then((response: any) => {
+                    resolve(response);
+                }).catch((response: any) => {
+                    reject(response);
+                });
+            }).catch((response: any) => {
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 保存模型
+     *
+     * @param {string} serviceName
+     * @param {*} context
+     * @param {*} viewparams
+     * @returns
+     * @memberof ${srfclassname('${ctrl.codeName}')}Service
+     */
+    public saveModel(serviceName: string, context: any, viewparams: any) {
+        return new Promise((resolve: any, reject: any) => {
+            this.utilService.getService(serviceName).then((service: any) => {
+                service.saveModelData(JSON.stringify(context), '', viewparams).then((response: any) => {
+                    resolve(response);
+                }).catch((response: any) => {
+                    reject(response);
+                });
+            }).catch((response: any) => {
+                reject(response);
+            });
+        });
+    }
+
 <#ibizinclude>
 ../@MACRO/SERVICE/SERVICE_BOTTOM.ts.ftl
 </#ibizinclude>
\ No newline at end of file

@CONTROL/数据图表 (新)/CONTROL-BASE.vue#AXIS_XAXIS.ftl

@@ -5,7 +5,7 @@ ${item.render.code}
 {
       <#if item.getIndex()??>gridIndex:${item.getIndex()},</#if>
       position:<#if item.getPosition()?? && item.getPosition() =='bottom'>"bottom"<#else>"top"</#if>,
-      type:<#if item.getType()??>'${item.getType()}'<#else>'category'</#if>,
+      type:<#if item.getEChartsType()??>'${item.getEChartsType()}'<#else>'category'</#if>,
       name:<#if item.getCaption()??>'${item.getCaption()}'</#if>,
       <#if item.getMinValue()??>min:${item.getMinValue()},</#if>
       <#if item.getMaxValue()??>max:${item.getMaxValue()},</#if>

@CONTROL/数据图表 (新)/CONTROL-BASE.vue#AXIS_YAXIS.ftl

@@ -5,7 +5,7 @@ ${item.render.code}
 {
       <#if item.getIndex()??>gridIndex:${item.getIndex()},</#if>
       position:<#if item.getPosition()?? && item.getPosition() =='bottom'>"bottom"<#else>"top"</#if>,
-      type:<#if item.getType()?? &&  item.getType() == 'numeric'>'value'<#else>'${item.getType()}'</#if>,
+      type:<#if item.getEChartsType()??>'${item.getEChartsType()}'<#else>'value'</#if>,
       name:<#if item.getCaption()??>'${item.getCaption()}'</#if>,
       <#if item.getMinValue()??>min:${item.getMinValue()},</#if>
       <#if item.getMaxValue()??>max:${item.getMaxValue()},</#if>

@CONTROL/数据图表/CONTROL-BASE.vue#AXIS_XAXIS.ftl

@@ -5,7 +5,7 @@ ${item.render.code}
 {
       <#if item.getIndex()??>gridIndex:${item.getIndex()},</#if>
       position:<#if item.getPosition()?? && item.getPosition() =='bottom'>"bottom"<#else>"top"</#if>,
-      type:<#if item.getType()??>'${item.getType()}'<#else>'category'</#if>,
+      type:<#if item.getEChartsType()??>'${item.getEChartsType()}'<#else>'category'</#if>,
       name:<#if item.getCaption()??>'${item.getCaption()}'</#if>,
       <#if item.getMinValue()??>min:${item.getMinValue()},</#if>
       <#if item.getMaxValue()??>max:${item.getMaxValue()},</#if>

@CONTROL/数据图表/CONTROL-BASE.vue#AXIS_YAXIS.ftl

@@ -5,7 +5,7 @@ ${item.render.code}
 {
       <#if item.getIndex()??>gridIndex:${item.getIndex()},</#if>
       position:<#if item.getPosition()?? && item.getPosition() =='bottom'>"bottom"<#else>"top"</#if>,
-      type:<#if item.getType()?? &&  item.getType() == 'numeric'>'value'<#else>'${item.getType()}'</#if>,
+      type:<#if item.getEChartsType()??>'${item.getEChartsType()}'<#else>'value'</#if>,
       name:<#if item.getCaption()??>'${item.getCaption()}'</#if>,
       <#if item.getMinValue()??>min:${item.getMinValue()},</#if>
       <#if item.getMaxValue()??>max:${item.getMaxValue()},</#if>

@CONTROL/数据视图/CONTROL-BASE.vue.ftl

@@ -240,6 +240,15 @@
      */    
     public sortField: string = '<#if ctrl.getMinorSortPSDEF()??>${ctrl.getMinorSortPSDEF().getCodeName()?lower_case}</#if>';
 
+    /**
+     * 应用状态事件
+     *
+     * @public
+     * @type {(Subscription | undefined)}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public appStateEvent: Subscription | undefined;
+
     /**
      * 排序点击事件
      * @param {string} field 属性名
@@ -328,6 +337,16 @@
                 }
             });
         }
+        if(AppCenterService && AppCenterService.getMessageCenter()){
+            this.appStateEvent = AppCenterService.getMessageCenter().subscribe(({ name, action, data }) =>{
+                if(!Object.is(name,"${ctrl.getPSAppDataEntity().getCodeName()}")){
+                    return;
+                }
+                if(Object.is(action,'appRefresh')){
+                    this.refresh([data]);
+                }
+            })
+        }
     }
 
     /**
@@ -373,6 +392,9 @@
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
+        if(this.appStateEvent){
+            this.appStateEvent.unsubscribe();
+        }
         <#if destroyed_block??>
         ${destroyed_block}
         </#if>

@CONTROL/日历部件/CONTROL-BASE.vue.ftl

@@ -626,6 +626,15 @@ FullCalendar,
      */
     public selections: any[] = [];
 
+    /**
+     * 应用状态事件
+     *
+     * @public
+     * @type {(Subscription | undefined)}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public appStateEvent: Subscription | undefined;
+
     /**
      * 获取多项数据
      *
@@ -674,6 +683,16 @@ FullCalendar,
                 }
             });
         }
+        if(AppCenterService && AppCenterService.getMessageCenter()){
+            this.appStateEvent = AppCenterService.getMessageCenter().subscribe(({ name, action, data }) =>{
+                if(!Object.is(name,"${ctrl.getPSAppDataEntity().getCodeName()}")){
+                    return;
+                }
+                if(Object.is(action,'appRefresh')){
+                    this.refresh();
+                }
+            })
+        }
     }
 
 
@@ -717,6 +736,9 @@ FullCalendar,
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
+        if(this.appStateEvent){
+            this.appStateEvent.unsubscribe();
+        }
         <#if destroyed_block??>
         ${destroyed_block}
         </#if>       

@CONTROL/树视图/CONTROL-BASE.vue.ftl

@@ -240,6 +240,15 @@
     @Provide()
     public expandedKeys: string[] = [];
 
+    /**
+     * 应用状态事件
+     *
+     * @public
+     * @type {(Subscription | undefined)}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public appStateEvent: Subscription | undefined;
+
     /**
      * 选中数据变更事件
      *
@@ -319,6 +328,16 @@
                 }
             });
         }
+        if(AppCenterService && AppCenterService.getMessageCenter()){
+            this.appStateEvent = AppCenterService.getMessageCenter().subscribe(({ name, action, data }) =>{
+                if(!Object.is(name,"${ctrl.getPSAppDataEntity().getCodeName()}")){
+                    return;
+                }
+                if(Object.is(action,'appRefresh')){
+                    this.refresh([data]);
+                }
+            })
+        }
     }
 
     /**
@@ -349,6 +368,9 @@
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
+        if(this.appStateEvent){
+            this.appStateEvent.unsubscribe();
+        }
         <#if destroyed_block??>
         ${destroyed_block}
         </#if>

@CONTROL/状态向导面板/CONTROL.html.ftl

+<#assign content>
+  :showBusyIndicator="${ctrl.isShowBusyIndicator()?c}"
+  <#if ctrl.getPSControlActions()??>
+    <#list ctrl.getPSControlActions() as action>
+      <#if action.getPSAppDEMethod?? && action.getPSAppDEMethod()??>
+    ${action.name?lower_case}Action='${action.getPSAppDEMethod().getCodeName()}' 
+      </#if>
+    </#list>
+  </#if>
+</#assign>
+<#ibizinclude>
+../@MACRO/HTML/DEFAULT.html.ftl
+</#ibizinclude>
\ No newline at end of file

@CONTROL/状态向导面板/CONTROL.less.ftl

+.app-wizard {
+    background: #fff;
+    height: 100%;
+    .view-steps{
+      display: flex;
+      padding: 0 20px;
+      position: relative;
+      .steps_icon{
+        width: 30px;
+        text-align: center;
+        font-size: 20px;
+        background: #409eff;
+        color: #fff;
+        line-height: 50px;
+        height: 50px;
+        margin-top: 21px;
+        z-index: 1;
+
+      }
+      .steps_icon:hover{
+        cursor: pointer;
+      }
+    }
+    .wizard-steps{
+      padding: 10px 20px 10px 70px;
+      margin-bottom: 10px;
+      width: 100%;
+      .steps-item-span{
+        padding: 7px 20px;
+        position: relative;
+        right: 20px;
+      }
+      .drawer-box-shadow{
+        box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+      }
+      .el-step__head.is-process{
+        border-color: #7e8187;
+        color: #7e8187;
+      }
+      .el-step__title.is-process{
+        color: #7e8187;
+      }
+      .el-step__head.is-success{
+        border-color: #1890ff;
+        color: #1890ff;
+      }
+      .el-step__title.is-success{
+        color: #1890ff;
+      }
+      .el-step__title:hover{
+        cursor: pointer;
+      }
+      .app-active-step{
+        .el-icon-check:before {
+          content: "";
+          width: 12px;
+          height: 12px;
+          border-radius: 8px;
+          background-color: #1890ff;
+          display: block;
+        }
+      }
+    }
+    .el-step__main{
+      background-color: rgb(239, 239, 239);
+    }
+    .background-box {
+      height: 50px;
+      width: calc(100% - 40px);
+      position: absolute;
+      background: #efefef;
+      top: 21px;
+      border-top: 2px solid rgb(225, 225, 225);
+    }
+}
+.app-wizard-popover-container{
+  .app-wizard-container{
+    width: 100%;
+    .popover-title{
+      position: absolute;
+      top: 14px;
+      left: 13px;
+    }
+    .app-wizard-header{
+      width: 100%;
+      height: 30px;
+      line-height: 22px;
+      padding: 2px;
+      border-bottom: 1px solid #ccc;
+      margin-bottom: 10px;
+      .app-wizard-header-extra{
+        float: right;
+      }
+    }
+    .app-wizard-content{
+      width: 100%;
+      padding: 4px 0px;
+    }
+    .app-wizard-footer{
+      display: flex;
+    }
+  }
+}
+.el-popper[x-placement^=bottom] {
+  margin-top: 0px;
+}
+.app-wizard-drawer{
+  .app-form {
+    height: calc(100% - 51px);
+  }
+  .drawer-button{
+    display: flex;
+    justify-content: flex-end;
+  }
+}

@CONTROL/状态向导面板/CONTROL.vue.ftl

+<#ibizinclude>
+../@MACRO/CONTROL/CONTROL.vue.ftl
+</#ibizinclude>
\ No newline at end of file

@CONTROL/状态向导面板/MODEL.ts.ftl

+<#ibizinclude>
+../@MACRO/MODEL/MODEL_HEADER.ts.ftl
+</#ibizinclude>
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof ${srfclassname('${ctrl.codeName}')}Model
+    */
+  public getDataItems(): any[] {
+    return [
+<#--  主实体所有属性  -->
+<#if ctrl.getPSAppDataEntity()??>
+  <#assign appDataEntity = ctrl.getPSAppDataEntity() />
+  <#if appDataEntity.getAllPSAppDEFields?? && appDataEntity.getAllPSAppDEFields()??>
+    <#list appDataEntity.getAllPSAppDEFields() as defield>
+      {
+      <#if defield.isKeyField()>
+        name: '${appDataEntity.getCodeName()?lower_case}',
+        prop: '${defield.getCodeName()?lower_case}',
+      <#else>
+        name: '${defield.getCodeName()?lower_case}',
+        prop: '${defield.getCodeName()?lower_case}',
+      </#if>
+      },
+    </#list>
+  </#if>
+</#if>
+<#--  关联主实体的主键  -->
+<#if ctrl.getPSAppDataEntity()??>
+  <#assign appDataEntity = ctrl.getPSAppDataEntity() />
+  <#if appDataEntity.isMajor() == false && appDataEntity.getMinorPSAppDERSs()??>
+    <#list appDataEntity.getMinorPSAppDERSs() as minorAppDERSs>
+      <#if minorAppDERSs.getMajorPSAppDataEntity()??>
+      <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
+      {
+        name: '${majorAppDataEntity.getCodeName()?lower_case}',
+        prop: '${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}',
+        dataType: 'FONTKEY',
+      },
+      </#if>
+    </#list>
+  </#if>
+</#if>
+    ]
+  }
+
+
+<#ibizinclude>
+../@MACRO/MODEL/MODEL_BOTTOM.ts.ftl
+</#ibizinclude>
\ No newline at end of file

@CONTROL/状态向导面板/SERVICE.ts.ftl

+<#ibizinclude>
+../@MACRO/SERVICE/SERVICE_HEADER.ts.ftl
+</#ibizinclude>
+
+    /**
+     * 初始化向导
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Service
+     */
+    @Errorlog
+    public init(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data);
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            } else {
+                result = this.appEntityService.Create(Context,Data, isloading);
+            }
+            result.then((response) => {
+                this.handleResponse(action, response);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 向导结束
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Service
+     */
+    @Errorlog
+    public finish(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data);
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            } else {
+                result = this.appEntityService.Update(Context,Data, isloading);
+            }
+            result.then((response) => {
+                this.handleResponse(action, response);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+<#ibizinclude>
+../@MACRO/SERVICE/SERVICE_BOTTOM.ts.ftl
+</#ibizinclude>
\ No newline at end of file

@CONTROL/状态向导面板/template.properties

+CTRLTYPE=STATEWIZARDPANEL
\ No newline at end of file

@CONTROL/甘特图部件/CONTROL-BASE.vue.ftl

@@ -154,6 +154,15 @@ GanttElastic,
      */
     public tasks: any[] = [];
 
+    /**
+     * 应用状态事件
+     *
+     * @public
+     * @type {(Subscription | undefined)}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public appStateEvent: Subscription | undefined;
+
     /**
      * 监听语言变化
      *
@@ -345,6 +354,16 @@ GanttElastic,
     public created() {
         this.locale = this.$i18n.locale;
         this.load();
+        if(AppCenterService && AppCenterService.getMessageCenter()){
+            this.appStateEvent = AppCenterService.getMessageCenter().subscribe(({ name, action, data }) =>{
+                if(!Object.is(name,"${ctrl.getPSAppDataEntity().getCodeName()}")){
+                    return;
+                }
+                if(Object.is(action,'appRefresh')){
+                    this.refresh();
+                }
+            })
+        }
     }
 
     /**
@@ -361,6 +380,29 @@ GanttElastic,
         }
     }
 
+    /**
+     * vue 生命周期
+     *
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public destroyed() {
+        this.afterDestroy();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     *
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public afterDestroy() {
+        if(this.appStateEvent){
+            this.appStateEvent.unsubscribe();
+        }
+        <#if destroyed_block??>
+        ${destroyed_block}
+        </#if>
+    } 
+
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_BOTTOM-BASE.vue.ftl
 </#ibizinclude>

@CONTROL/表单/CONTROL-BASE.vue#DETAIL_GROUPPANEL.ftl

@@ -4,7 +4,7 @@
 <#if item.render??>
 ${item.render.code}
 <#else>
-<app-form-group layoutType="<#if item.getPSLayout()??>${item.getPSLayout().getLayout()}</#if>" titleStyle="<#if item.getLabelPSSysCss?? && item.getLabelPSSysCss()??>${item.getLabelPSSysCss().getCssName()}</#if>" class='<#if item.getPSSysCss?? && item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' :uiActionGroup="detailsModel.${item.name}.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="<#if langbase??>$t('${langbase}.details.${item.name}')<#else>'${item.getCaption()}'</#if>" :isShowCaption="${item.isShowCaption()?c}" uiStyle="${item.getDetailStyle()}" :titleBarCloseMode="${item.getTitleBarCloseMode()}" :isInfoGroupMode="${item.isInfoGroupMode()?c}" <#if item.getPSSysImage()??>:iconInfo="{<#assign img=item.getPSSysImage()><#if img.getImagePath() ==  "">'iconclass':'${img.getCssClass()}'<#else>'iconpath':'${img.getImagePath()}'</#if>}"</#if>>    
+<app-form-group :manageContainerStatus="detailsModel.${item.name}.manageContainerStatus"  :isManageContainer="detailsModel.${item.name}.isManageContainer" @managecontainerclick="manageContainerClick('${item.name}')" layoutType="<#if item.getPSLayout()??>${item.getPSLayout().getLayout()}</#if>" titleStyle="<#if item.getLabelPSSysCss?? && item.getLabelPSSysCss()??>${item.getLabelPSSysCss().getCssName()}</#if>" class='<#if item.getPSSysCss?? && item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' :uiActionGroup="detailsModel.${item.name}.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="<#if langbase??>$t('${langbase}.details.${item.name}')<#else>'${item.getCaption()}'</#if>" :isShowCaption="${item.isShowCaption()?c}" uiStyle="${item.getDetailStyle()}" :titleBarCloseMode="${item.getTitleBarCloseMode()}" :isInfoGroupMode="${item.isInfoGroupMode()?c}" <#if item.getPSSysImage()??>:iconInfo="{<#assign img=item.getPSSysImage()><#if img.getImagePath() ==  "">'iconclass':'${img.getCssClass()}'<#else>'iconpath':'${img.getImagePath()}'</#if>}"</#if>>    
 <#assign content>
     <#list item.getPSDEFormDetails() as formmenber>
     <#if !(formmenber.isHidden?? && formmenber.isHidden())>

@CONTROL/表单/CONTROL-BASE.vue#DETAIL_MODEL.ftl

 <#ibizinclude>
 ../@MACRO/CONTROL/LANGBASE.vue.ftl
 </#ibizinclude>
-<#assign detail>caption: '${item.getCaption()}', detailType: '${item.getDetailType()}', name: '${item.getName()}', visible: <#if item.getPSDEFDGroupLogic('PANELVISIBLE')??>false<#else>true</#if>, isShowCaption: ${item.isShowCaption()?c}, form: this</#assign>
+<#assign detail>caption: '${item.getCaption()}', detailType: '${item.getDetailType()}', name: '${item.getName()}', visible: <#if item.getPSDEFDGroupLogic('PANELVISIBLE')??>false<#else>true</#if>, isShowCaption: ${item.isShowCaption()?c}, form: this, isControlledContent: <#if item.getShowMoreMode() == 1>true<#else>false</#if> </#assign>
 <#if item.getDetailType()  == 'BUTTON'>
 new FormButtonModel({ ${detail}<#if item.getPSUIAction()??><#assign uiaction=item.getPSUIAction()>, uiaction: { type: '${uiaction.getUIActionType()}', 
  tag: '${uiaction.getUIActionTag()}'<#if (uiaction.getActionTarget()!="")>, actiontarget: '${uiaction.getActionTarget()}'</#if> }</#if> })
@@ -14,7 +14,7 @@ new FormPageModel({ ${detail} })
 <#elseif item.getDetailType()  == 'FORMPART'>
 new FormPartModel({ ${detail} })
 <#elseif item.getDetailType()  == 'GROUPPANEL'>
-new FormGroupPanelModel({ ${detail}, uiActionGroup: { caption: '<#if item.getPSUIActionGroup()??>${item.getPSUIActionGroup().getName()}</#if>', langbase: '<#if langbase??>${langbase}</#if>', extractMode: '<#if item.getActionGroupExtractMode?? && item.getActionGroupExtractMode()??>${item.getActionGroupExtractMode()}<#else>ITEM</#if>', details: [<#if item.getPSUIActionGroup()??><#list item.getPSUIActionGroup().getPSUIActionGroupDetails() as uadetails><#if uadetails_index gt 0>, </#if>{ name: '${item.getName()}_${uadetails.getName()}', caption: '${uadetails.getPSUIAction().getCaption()}', uiactiontag: '<#if uadetails.getPSUIAction().getPSAppDataEntity?? && uadetails.getPSUIAction().getPSAppDataEntity()??>${uadetails.getPSUIAction().getPSAppDataEntity().getCodeName()?lower_case}_</#if>${uadetails.getPSUIAction().getUIActionTag()?lower_case}'<#if uadetails.getPSUIAction().getPSSysImage()??>, <#assign viewimg=uadetails.getPSUIAction().getPSSysImage()/><#if viewimg.getCssClass() != ''>icon: '${viewimg.getCssClass()}'<#else>img: '${viewimg.getImagePath()}'</#if></#if>,isShowCaption:${uadetails.isShowCaption()?c},isShowIcon:${uadetails.isShowIcon()?c} }</#list></#if>] } })
+new FormGroupPanelModel({ ${detail}, uiActionGroup: { caption: '<#if item.getPSUIActionGroup()??>${item.getPSUIActionGroup().getName()}</#if>', langbase: '<#if langbase??>${langbase}</#if>', extractMode: '<#if item.getActionGroupExtractMode?? && item.getActionGroupExtractMode()??>${item.getActionGroupExtractMode()}<#else>ITEM</#if>', details: [<#if item.getPSUIActionGroup()??><#list item.getPSUIActionGroup().getPSUIActionGroupDetails() as uadetails><#if uadetails_index gt 0>, </#if>{ name: '${item.getName()}_${uadetails.getName()}', caption: '${uadetails.getPSUIAction().getCaption()}', uiactiontag: '<#if uadetails.getPSUIAction().getPSAppDataEntity?? && uadetails.getPSUIAction().getPSAppDataEntity()??>${uadetails.getPSUIAction().getPSAppDataEntity().getCodeName()?lower_case}_</#if>${uadetails.getPSUIAction().getUIActionTag()?lower_case}'<#if uadetails.getPSUIAction().getPSSysImage()??>, <#assign viewimg=uadetails.getPSUIAction().getPSSysImage()/><#if viewimg.getCssClass() != ''>icon: '${viewimg.getCssClass()}'<#else>img: '${viewimg.getImagePath()}'</#if></#if>,isShowCaption:${uadetails.isShowCaption()?c},isShowIcon:${uadetails.isShowIcon()?c} }</#list></#if>] }, isManageContainer: <#if item.getShowMoreMode() == 2>true<#else>false</#if>, showMoreModeItems: [<#if item.getPSDEFormDetails()??><#list item.getPSDEFormDetails() as moreItem><#if moreItem.getShowMoreMode() == 1>'${moreItem.getName()}',</#if></#list></#if>]  })
 <#elseif item.getDetailType()  == 'IFRAME'>
 new FormIFrameModel({ ${detail} })
 <#elseif item.getDetailType()  == 'RAWITEM'>

@CONTROL/表单/CONTROL-BASE.vue.ftl

@@ -310,6 +310,24 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 
     </#list>
 
+    /**
+     * 显示更多模式切换操作
+     *
+     * @type {string}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public manageContainerClick(name: string){
+        let model = this.detailsModel[name];
+        if(model.isManageContainer){
+            model.setManageContainerStatus(!model.manageContainerStatus);
+            model.showMoreModeItems.forEach((item:any) => {
+                if(this.detailsModel[item].isControlledContent){
+                    this.detailsModel[item].setVisible(model.manageContainerStatus? this.detailsModel[item].oldVisible : false);
+                }
+            });
+        }
+    }
+
     /**
      * 重置表单项值
      *
@@ -982,14 +1000,25 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
             this.onFormLoad(data,'autoSave');
             this.$emit('save', data);
             <#if ctrl.getControlType() == 'FORM'>
-            this.$store.dispatch('viewaction/datasaved', { viewtag: this.viewtag });
+            AppCenterService.notifyMessage({name:"${ctrl.getPSAppDataEntity().getCodeName()}",action:'appRefresh',data:data});
             </#if>
             this.$nextTick(() => {
                 this.formState.next({ type: 'save', data: data });
             });
         }).catch((response: any) => {
             if (response && response.status && response.data) {
+                if(response.data.errorKey && Object.is(response.data.errorKey,"versionCheck")){
+                    this.$Modal.confirm({
+                        title: '保存数据发生错误',
+                        content: '数据不一致，可能后台数据已经被修改,是否要重新加载数据？',
+                        onOk: () => {
+                            this.refresh([]);
+                        },
+                        onCancel: () => { }
+                    });
+                }else{
                     this.$Notice.error({ title: '错误', desc: response.data.message });
+                }
                 return;
             }
             if (!response || !response.status || !response.data) {
@@ -1054,7 +1083,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
                 this.onFormLoad(data,'save');
                 this.$emit('save', data);
                 <#if ctrl.getControlType() == 'FORM'>
-                this.$store.dispatch('viewaction/datasaved', { viewtag: this.viewtag });
+                AppCenterService.notifyMessage({name:"${ctrl.getPSAppDataEntity().getCodeName()}",action:'appRefresh',data:data});
                 </#if>
                 this.$nextTick(() => {
                     this.formState.next({ type: 'save', data: data });
@@ -1067,8 +1096,19 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
                 resolve(response);
             }).catch((response: any) => {
                 if (response && response.status  && response.data) {
+                    if(response.data.errorKey && Object.is(response.data.errorKey,"versionCheck")){
+                        this.$Modal.confirm({
+                            title: '保存数据发生错误',
+                            content: '数据不一致，可能后台数据已经被修改,是否要重新加载数据？',
+                            onOk: () => {
+                                this.refresh([]);
+                            },
+                            onCancel: () => { }
+                        });
+                    }else{
                         this.$Notice.error({ title: '错误', desc: response.data.message });
                         reject(response);
+                    }
                     return;
                 }
                 if (!response || !response.status || !response.data) {
@@ -1104,6 +1144,9 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
                     this.formState.next({ type: 'remove', data: data });
                     this.data.ismodify = false;
                     this.$Notice.success({ title: '', desc: (data.srfmajortext ? data.srfmajortext : '') + '&nbsp;删除成功！' });
+                    <#if ctrl.getControlType() == 'FORM'>
+                    AppCenterService.notifyMessage({name:"${ctrl.getPSAppDataEntity().getCodeName()}",action:'appRefresh',data:data});
+                    </#if>
                     resolve(response);
                 }
             }).catch((error: any) => {
@@ -1125,10 +1168,6 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
      */
     public async wfstart(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
-            <#--  if(!this.WFStartAction){
-                this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
-                return;
-            }  -->
             const _this: any = this;
             const post: Promise<any> = _this.save({},false);
             post.then((response:any) =>{
@@ -1185,10 +1224,6 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
      */
     public async wfsubmit(data: any,localdata?:any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
-        <#--  if(!this.WFSubmitAction){
-            this.$Notice.error({ title: '错误', desc: '${view.getName()}视图表单WFSubmitAction参数未配置' });
-            return;
-        }  -->
         const _this: any = this;
         const arg: any = data[0];
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1201,6 +1236,9 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
                 // 保存完成UI处理
                 this.onFormLoad(arg,'save');
                 this.$emit('save', arg);
+                <#if ctrl.getControlType() == 'FORM'>
+                AppCenterService.notifyMessage({name:"${ctrl.getPSAppDataEntity().getCodeName()}",action:'appRefresh',data:data});
+                </#if>
                 this.$nextTick(() => {
                     this.formState.next({ type: 'save', data: arg });
                 });
@@ -1288,6 +1326,9 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
             this.fillForm(_data,'updateFormItem');
             this.formLogic({ name: '', newVal: null, oldVal: null });
             this.dataChang.next(JSON.stringify(this.data));
+            <#if ctrl.getControlType() == 'FORM'>
+            AppCenterService.notifyMessage({name:"${ctrl.getPSAppDataEntity().getCodeName()}",action:'appRefresh',data:data});
+            </#if>
             this.$nextTick(() => {
                 this.formState.next({ type: 'updateformitem', ufimode: arg.srfufimode, data: _data });
             });

@CONTROL/表格/CONTROL-BASE.vue.ftl

@@ -116,6 +116,15 @@ import { FormItemModel } from '@/model/form-detail';
      */  
     public codeListService:CodeListService = new CodeListService({ $store: this.$store });
 
+    /**
+     * 应用状态事件
+     *
+     * @public
+     * @type {(Subscription | undefined)}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public appStateEvent: Subscription | undefined;
+
     /**
      * 获取多项数据
      *
@@ -450,17 +459,24 @@ import { FormItemModel } from '@/model/form-detail';
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public allColumns: any[] = [
-        <#if ctrl.getAllPSDEGridColumns()??>
+<#if ctrl.getAllPSDEGridColumns()??>
   <#list ctrl.getAllPSDEGridColumns() as column>
         {
             name: '${column.getName()?lower_case}',
             label: '${column.getCaption()}',
             langtag: '<#if langbase??>${langbase}.columns.${column.getName()?lower_case}</#if>',
             show: <#if column.isHideDefault()>false<#else>true</#if>,
-            util: '${column.getWidthUnit()}'
+            util: '${column.getWidthUnit()}',
+    <#--  BEGIN：是否支持行编辑  -->
+    <#if ctrl.isEnableRowEdit() && column.isEnableRowEdit()>
+            isEnableRowEdit: true,
+    <#else>
+            isEnableRowEdit: false,
+    </#if>
+    <#--  END：是否支持行编辑  -->
         },
   </#list>
-        </#if>
+</#if>
     ]
 
     /**
@@ -1092,6 +1108,16 @@ import { FormItemModel } from '@/model/form-detail';
                 }
             });
         }
+        if(AppCenterService && AppCenterService.getMessageCenter()){
+            this.appStateEvent = AppCenterService.getMessageCenter().subscribe(({ name, action, data }) =>{
+                if(!Object.is(name,"${ctrl.getPSAppDataEntity().getCodeName()}")){
+                    return;
+                }
+                if(Object.is(action,'appRefresh')){
+                    this.refresh([data]);
+                }
+            })
+        }
     }
 
     /**
@@ -1112,6 +1138,9 @@ import { FormItemModel } from '@/model/form-detail';
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
+        if(this.appStateEvent){
+            this.appStateEvent.unsubscribe();
+        }
         <#if destroyed_block??>
         ${destroyed_block}
         </#if>
@@ -1735,16 +1764,17 @@ import { FormItemModel } from '@/model/form-detail';
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public getCellClassName(args:{row: any, column: any, rowIndex: number, columnIndex:number}){
-        let hasRowEdit:any = {
-<#list ctrl.getPSDEGridColumns() as column>
-  <#if ctrl.isEnableRowEdit() && column.isEnableRowEdit()>
-          '${column.getName()?lower_case}':true,
-  <#else>
-          '${column.getName()?lower_case}':false,
-  </#if>
-</#list>
+        if(args.column.property){
+          let col = this.allColumns.find((item:any)=>{
+              return Object.is(args.column.property,item.name);
+          })
+          if(col !== undefined){
+              if(col.isEnableRowEdit && this.actualIsOpenEdit ){
+                  return 'edit-cell';
+              }
+          }
         }
-        return ( hasRowEdit[args.column.property] && this.actualIsOpenEdit ) ? "edit-cell" : "info-cell";
+        return 'info-cell';
     }
 
     /**

@CONTROL/表格/SERVICE.ts.ftl

@@ -75,6 +75,8 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+        data.page = data.page ? data.page : 0;
+        data.size = data.size ? data.size : 1000;
     <#list ctrl.getPSDEGridEditItems() as deItem>
     <#if deItem.getPSEditor()?? && deItem.getPSEditor().getPSAppDataEntity?? && deItem.getPSEditor().getPSAppDataEntity()?? && deItem.getPSEditor().getPSAppDEDataSet?? && deItem.getPSEditor().getPSAppDEDataSet()??>
     <#assign _appde = deItem.getPSEditor().getPSAppDataEntity()/>

@CONTROL/视图布局面板/@MACRO/WIZARD.vue.ftl

@@ -11,6 +11,9 @@
 <#if view.hasPSControl('wizardpanel')>
 ${P.getCtrlCode('wizardpanel', 'CONTROL.html').code}
 </#if>
+<#if view.hasPSControl('statewizardpanel')>
+${P.getCtrlCode('statewizardpanel', 'CONTROL.html').code}
+</#if>
 </@ibizindent>
         </div>
     </card>

@CONTROL/视图布局面板/应用首页视图/VIEW.less.ftl

@@ -89,6 +89,7 @@
           display: flex;
           align-items: center;
           height: 100%;
+          justify-content: center;
           >.menuicon{
             display: block;
             text-align: center;

@CONTROL/视图布局面板/应用首页视图/VIEW.vue.ftl

@@ -14,15 +14,15 @@
                 <div class="sider-top">
                     <div class="page-logo">
                     <#if view.getAppIconPath() != "">
-                        <img v-show="collapseChange" src="${view.getAppIconPath()}" height="16" @click="contextMenuDragVisiable=!contextMenuDragVisiable" />
+                        <img v-show="collapseChange" v-if="isEnableAppSwitch" src="${view.getAppIconPath()}" height="16" @click="contextMenuDragVisiable=!contextMenuDragVisiable" />
                         <#else>
-                        <span class="menuicon" @click="contextMenuDragVisiable=!contextMenuDragVisiable"><Icon type="md-menu" /></span>
+                        <span class="menuicon" v-if="isEnableAppSwitch" @click="contextMenuDragVisiable=!contextMenuDragVisiable"><Icon type="md-menu" /></span>
                     </#if>
                         <span v-show="!collapseChange" style="overflow-x: hidden;text-overflow: ellipsis;white-space: nowrap;display: block;text-align: center;font-weight: 300;font-size: 20px;">{{$t(model.srfCaption)}}</span>
                     </div>
                 </div>
                 ${P.getCtrlCode('appmenu', 'CONTROL.html').code}
-                <context-menu-drag :contextMenuDragVisiable="contextMenuDragVisiable"></context-menu-drag>
+                <context-menu-drag v-if="isEnableAppSwitch" :contextMenuDragVisiable="contextMenuDragVisiable"></context-menu-drag>
             </sider>
             <layout>
                 <header class="index_header">

@CONTROL/门户部件/CONTROL-BASE.vue.ftl

@@ -203,6 +203,7 @@ import { Environment } from '@/environments/environment';
         <#if viewUIAction.getPSUIAction?? && viewUIAction.getPSUIAction()??>
         <#assign uiaction = viewUIAction.getPSUIAction() />
         actionName:"${uiaction.getCaption()}",
+        icon:"<#if uiaction.getIconCls?? && uiaction.getIconCls()??>${uiaction.getIconCls()}</#if>",
         <#if uiaction.getPSAppCounter?? && uiaction.getPSAppCounter()??>
         <#assign counter = uiaction.getPSAppCounter() />
         counterService:this.${srfclassname('${counter.getCodeName()}')}counterservice,

@CONTROL/面板/CONTROL-BASE.vue#ITEM_FIELD.ftl

-<#assign selfContent>
 <#if !item.isHidden()>
+  <#assign selfContent>
 <div class="item-field">
     <#if item.isShowCaption()><span class="item-field-label <#if item.getLabelPSSysCss()??> ${item.getLabelPSSysCss().getCssName()}</#if>"<#if item.getLabelPSSysCss()??> style="${item.getLabelPSSysCss().getRawCssStyle()}"</#if>>${item.getCaption()}</span></#if>
     <div class="item-field-content">
     ${P.getEditorCode(item, "PANELEDITOR.vue").code}
     </div>
 </div>
-</#if>
-</#assign>
+  </#assign>
 
 <#ibizinclude>
 ./@MACRO/PLAYOUT.vue.ftl
 </#ibizinclude>
-<#if item.getParentLayoutMode()=='FLEX'>
+  <#if item.getParentLayoutMode()=='FLEX'>
 <div v-show="detailsModel.${item.name}.visible" style="${flexAttr}<#if item.getWidth() gt 0>width: ${item.getWidth()?c}px;</#if><#if item.getHeight() gt 0>height: ${item.getHeight()?c}px;</#if><#if item.getPSSysCss()??>${item.getPSSysCss().getRawCssStyle()}</#if>" class="app-layoutpanel-field <#if item.getPSSysCss?? && item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>">
     ${content}
 </div>
-<#else>
+  <#else>
 <i-col v-show="detailsModel.${item.name}.visible" ${tableAttr} style="${flexAttr}<#if item.getWidth() gt 0>width: ${item.getWidth()?c}px;</#if><#if item.getHeight() gt 0>height: ${item.getHeight()?c}px;</#if><#if item.getPSSysCss()??>${item.getPSSysCss().getRawCssStyle()}</#if>" class="app-layoutpanel-field<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>">
     ${content}
 </i-col>
+  </#if>
 </#if>
\ No newline at end of file

@EDITOR/地址框（支持选择、AC）/EDITOR.vue.ftl

@@ -10,6 +10,7 @@
     :localContext =<@getNavigateContext editor />
     :localParam =<@getNavigateParams editor />
     :service="service"
+    valueitem='${editor.getValueItemName()}' 
 <#if editor.getPSAppDataEntity?? && editor.getPSAppDataEntity()??>
     deMajorField='${editor.getPSAppDataEntity().getMajorPSAppDEField().getCodeName()?lower_case}'
     deKeyField='${editor.getPSAppDataEntity().getCodeName()?lower_case}'

@EDITOR/地址框（支持选择、AC）/GRIDEIDTOR.vue.ftl

@@ -10,6 +10,7 @@
     :localContext =<@getNavigateContext editor />
     :localParam =<@getNavigateParams editor />
     :service="service"
+    valueitem='${editor.getValueItemName()}' 
 <#if editor.getPSAppDataEntity?? && editor.getPSAppDataEntity()??>
     deMajorField='${editor.getPSAppDataEntity().getMajorPSAppDEField().getCodeName()?lower_case}'
     deKeyField='${editor.getPSAppDataEntity().getCodeName()?lower_case}'

@EDITOR/地址框（选择）/EDITOR.vue.ftl

@@ -10,6 +10,7 @@
     :localContext =<@getNavigateContext editor />
     :localParam =<@getNavigateParams editor />
     :service="service"
+    valueitem='${editor.getValueItemName()}' 
 <#if editor.getPSAppDataEntity?? && editor.getPSAppDataEntity()??>
     deMajorField='${editor.getPSAppDataEntity().getMajorPSAppDEField().getCodeName()?lower_case}'
     deKeyField='${editor.getPSAppDataEntity().getCodeName()?lower_case}'

@EDITOR/地址框（选择）/GRIDEIDTOR.vue.ftl

@@ -10,6 +10,7 @@
     :localContext =<@getNavigateContext editor />
     :localParam =<@getNavigateParams editor />
     :service="service"
+    valueitem='${editor.getValueItemName()}' 
 <#if editor.getPSAppDataEntity?? && editor.getPSAppDataEntity()??>
     deMajorField='${editor.getPSAppDataEntity().getMajorPSAppDEField().getCodeName()?lower_case}'
     deKeyField='${editor.getPSAppDataEntity().getCodeName()?lower_case}'

@EDITOR/多行输入框（10行）/EDITOR.vue.ftl

-<input-box v-model="data.${editor.name}" :autoSize="{minRows: 10}"  :disabled="detailsModel.${editor.name}.disabled" type='textarea' style="${editor.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if>></input-box>
+<input-box v-model="data.${editor.name}" :textareaId="this.$util.createUUID()"  :disabled="detailsModel.${editor.name}.disabled" type='textarea' textareaStyle="${editor.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if>></input-box>

@EDITOR/标签/PANELEDITOR.vue.ftl

-<span>{{data.${item.getName()?lower_case}}}</span>
\ No newline at end of file
+<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<app-span <#t>
+  :value="data.${editor.name?lower_case}" <#t>
+  name="${editor.name?lower_case}" <#t>
+  :data="data" <#t>
+  :context="context" <#t>
+  :viewparams="viewparams" <#t>
+  :localContext =<@getNavigateContext editor /> <#t>
+  :localParam =<@getNavigateParams editor /> <#t>
+<#if item.getPSCodeList?? && item.getPSCodeList()??>
+  <#assign codelist=item.getPSCodeList()>
+  tag='${codelist.codeName}' <#t>
+  codelistType='${codelist.getCodeListType()}' <#t>
+</#if> 
+  style="${item.getEditorCssStyle()}"> <#t>
+</app-span> <#lt>

@EDITOR/标签（格式化信息）/EDITOR.vue.ftl

-<app-span <#t>
-  name='${editor.name}' <#t>
-  :value="data.${editor.name}" <#t>
-<#if item.getPSCodeList?? && item.getPSCodeList()??>
-  <#assign codelist=item.getPSCodeList() />
-  tag='${codelist.codeName}' <#t>
-  codelistType='${codelist.getCodeListType()}' <#t>
-  <#if codelist.getOrMode?? && codelist.getOrMode()?has_content>
-    renderMode="${codelist.getOrMode()}" <#t>
-  </#if>
-  <#if codelist.valueSeparator?has_content>
-    valueSeparator="${codelist.valueSeparator}" <#t>
-  </#if>
-  <#if codelist.textSeparator?has_content>
-    textSeparator="${codelist.textSeparator}" <#t>
-  </#if>
-</#if>
-  :data="data" <#t>
-  :context="context" <#t>
-  :viewparams="viewparams" <#t>
-  :localContext =<@getNavigateContext editor /> <#t>
-  :localParam =<@getNavigateParams editor /> <#t>
-  style="${editor.getEditorCssStyle()}"><#t>
-</app-span><#lt>
\ No newline at end of file
+<span v-html="data.${item.getName()?lower_case}"></span>
\ No newline at end of file

@EDITOR/标签（格式化信息）/GRIDEIDTOR.vue.ftl

+<span v-html="row[column.property]"></span>
\ No newline at end of file

@LOGIC/@VIEWLOGIC/编辑/LOGIC.vue.ftl

@@ -14,6 +14,15 @@
      * @memberof ${srfclassname('${view.name}')}
      */
     public ${item.name}(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+    <#if item.getPSControlContainer().getViewType??>
+        if(!this.viewDefaultUsage){
+            if(Object.is(this.navModel,"route")){
+                this.initNavDataWithRoute(this.viewCacheData, false, true);
+            }else{
+                this.initNavDataWithTab(this.viewCacheData, false, true);
+            }
+        }
+    </#if>
     <#if viewlogic.getPSAppUILogicRefViews?? && viewlogic.getPSAppUILogicRefViews()??>
     <#list viewlogic.getPSAppUILogicRefViews() as appUILogicRefView>
     <#if appUILogicRefView_index == 0><#assign curOPenLogicRefView = appUILogicRefView /></#if>

@VIEW/@MACRO/GRID_VIEW-BASE.vue.ftl

@@ -282,18 +282,6 @@ if(this.formDruipart){
         this.onSearch($event);
     }
 </#if>
-<#if view.hasPSControl('searchbar')>
-
-    /**
-     * 搜索栏事件
-     *
-     * @param {*} $event
-     * @memberof ${srfclassname('${view.name}')}Base
-     */
-    public onSearchBarChange($event: any) {
-        console.log($event);
-    }
-</#if>
 <#ibizinclude>
 ./VIEW_BOTTOM-BASE.vue.ftl
 </#ibizinclude>

@VIEW/@MACRO/VIEW_CONTENT-BASE.vue.ftl

@@ -234,8 +234,8 @@
      *
      * @memberof ${srfclassname('${view.name}')}Base
      */
-    public initNavDataWithRoute(data:any = null, isNew:boolean = false){
-        if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false,  isAlways:boolean = false){
+        if( isAlways || (this.viewDefaultUsage && Object.is(this.navModel,"route")) ){
             this.navDataService.addNavData({id:'${srffilepath2(view.getCodeName())}',tag:this.viewtag,srfkey:isNew ? null : <#if appde??>this.context.${appde.getCodeName()?lower_case}<#else>null</#if>,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
         }
     }
@@ -245,8 +245,8 @@
      *
      * @memberof ${srfclassname('${view.name}')}Base
      */
-    public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true){
-        if(this.viewDefaultUsage && !Object.is(this.navModel,"route")){
+    public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true, isAlways:boolean = false){
+        if( isAlways || (this.viewDefaultUsage && !Object.is(this.navModel,"route")) ){
             this.navDataService.addNavDataByOnly({id:'${srffilepath2(view.getCodeName())}',tag:this.viewtag,srfkey:<#if appde??>this.context.${appde.getCodeName()?lower_case}<#else>null</#if>,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath},isOnlyAdd);
         }
     }

@VIEW/实体数据多项选择视图/VIEW-BASE.vue.ftl

@@ -132,9 +132,18 @@ if(this.viewparams.selectedData){
                     newSelections.push(this.viewSelections[index]);
                 }
             });
-            this.viewSelections = newSelections;
+            this.viewSelections = this.removeDuplicates([...newSelections,...this.viewSelections]);
         });
-        this.selectedData = JSON.stringify(this.viewSelections);
+    }
+
+    /**
+     * 去重
+     *
+     * @memberof ${srfclassname('${view.name}')}Base
+     */
+    public removeDuplicates(data:any):Array<any> {
+        const uniqueSet = new Set(data);
+        return [...uniqueSet];
     }
 
     /**

@VIEW/应用首页视图/VIEW-BASE.vue.ftl

@@ -44,6 +44,14 @@
      */
     public contextMenuDragVisiable: boolean = false;
 
+    /**
+     * 是否支持应用切换
+     *
+     * @type {boolean}
+     * @memberof ${srfclassname('${view.name}')}Base
+     */
+    public isEnableAppSwitch: boolean = <#if view.isEnableAppSwitch?? && view.isEnableAppSwitch()??>${view.isEnableAppSwitch()?c}<#else>false</#if>;
+
     <#if view.getViewStyle() != "STYLE2">
     /**
      * 初始化之前

APP/src/utilservice/%APP_UTIL%/%APP_UTIL%-util-service-base.ts.ftl

@@ -70,9 +70,9 @@ export default class ${srfclassname('${item.getCodeName()}')}UtilServiceBase ext
     */
    public initBasicParam(){
         <#if item.getModelIdPSAppDEField()??>this.modelIdField = "${item.getModelIdPSAppDEField().getCodeName()?lower_case}";</#if>
-        <#if item.getModelIdPSAppDEField()??>this.modelField = "${item.getModelPSAppDEField().getCodeName()?lower_case}";</#if>
-        <#if item.getModelIdPSAppDEField()??>this.appIdField = "${item.getAppIdPSAppDEField().getCodeName()?lower_case}";</#if>
-        <#if item.getModelIdPSAppDEField()??>this.userIdField = "${item.getUserIdPSAppDEField().getCodeName()?lower_case}";</#if>
+        <#if item.getModelPSAppDEField()??>this.modelField = "${item.getModelPSAppDEField().getCodeName()?lower_case}";</#if>
+        <#if item.getAppIdPSAppDEField()??>this.appIdField = "${item.getAppIdPSAppDEField().getCodeName()?lower_case}";</#if>
+        <#if item.getUserIdPSAppDEField()??>this.userIdField = "${item.getUserIdPSAppDEField().getCodeName()?lower_case}";</#if>
 <#if item.getStoagePSAppDataEntity()??>
 <#assign stoageDataEntity = item.getStoagePSAppDataEntity() />
         this.stoageEntityName ="${stoageDataEntity.getCodeName()?lower_case}";

APP/src/widgets/%DE_PKGPATH%/%CTRL_PKGPATH%-statewizardpanel/%CTRL_PKGPATH%-statewizardpanel-base.vue.ftl

+<#ibiztemplate>
+TARGET=PSAPPVIEWCTRL_STATEWIZARDPANEL
+</#ibiztemplate>
+${P.getCtrlCode('CONTROL-BASE.vue').code}
\ No newline at end of file

APP/src/widgets/%DE_PKGPATH%/%CTRL_PKGPATH%-statewizardpanel/%CTRL_PKGPATH%-statewizardpanel-model.ts.ftl

+<#ibiztemplate>
+TARGET=PSAPPVIEWCTRL_STATEWIZARDPANEL
+</#ibiztemplate>
+${P.getCtrlCode('MODEL.ts').code}
\ No newline at end of file

APP/src/widgets/%DE_PKGPATH%/%CTRL_PKGPATH%-statewizardpanel/%CTRL_PKGPATH%-statewizardpanel-service.ts.ftl

+<#ibiztemplate>
+TARGET=PSAPPVIEWCTRL_STATEWIZARDPANEL
+</#ibiztemplate>
+${P.getCtrlCode('SERVICE.ts').code}
\ No newline at end of file

APP/src/widgets/%DE_PKGPATH%/%CTRL_PKGPATH%-statewizardpanel/%CTRL_PKGPATH%-statewizardpanel.less.ftl

+<#ibiztemplate>
+TARGET=PSAPPVIEWCTRL_STATEWIZARDPANEL
+</#ibiztemplate>
+${P.getCtrlCode('CONTROL.less').code}
\ No newline at end of file

APP/src/widgets/%DE_PKGPATH%/%CTRL_PKGPATH%-statewizardpanel/%CTRL_PKGPATH%-statewizardpanel.vue.ftl

+<#ibiztemplate>
+TARGET=PSAPPVIEWCTRL_STATEWIZARDPANEL
+</#ibiztemplate>
+${P.getCtrlCode('CONTROL.vue').code}
\ No newline at end of file

CHANGELOG.md

+## v7.0.0-alpha.12 [2020-7-2]
+
+### Bug修复
+
+修复mpicker解析调整
+
+修复表格列class逻辑调整
+
+修复面板标签，隐藏表单项
+
+修复嵌入视图导航服务逻辑调整
+
+修复选择多数据视图选择数据异常
+
+修复多行输入十行 高度问题
+
+### 功能新增及优化
+
+#### 模板
+
+新增表单显示更多模式（658）
+
+新增首页应用切换器（658）
+
+新增状态向导面板（658）
+
+新增门户操作栏图标（654）
+
+优化应用级数据状态同步功能（654）
+
+#### 基础文件
+
+新增修改密码功能（654）
+
 ## v7.0.0-alpha.11 [2020-6-21]
 
 ### Bug修复