4月16号提交

@CONTROL/@MACRO/HTML/GRID.html.ftl

 <#--  content  -->
 <#assign content>
     :isSingleSelect="isSingleSelect"
+  <#if view.getViewType() == 'DEPICKUPGRIDVIEW'>
+    :selectedData="selectedData"
+  </#if>
     :showBusyIndicator="${ctrl.isShowBusyIndicator()?c}"
   <#if view.getViewType() == "DEGRIDVIEW" || view.getViewType() == "DEGRIDVIEW9">
     :isOpenEdit="${view.isRowEditDefault()?c}"
+    :gridRowActiveMode="gridRowActiveMode"
     @save="onSave"
   </#if>
     updateAction="<#if ctrl.getUpdatePSControlAction()?? && ctrl.getUpdatePSControlAction().getPSAppDEMethod()??>${ctrl.getUpdatePSControlAction().getPSAppDEMethod().getCodeName()}</#if>"

@CONTROL/分页视图面板/CONTROL-BASE.vue.ftl

@@ -40,7 +40,7 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected isActivied: boolean = false;
+    protected isActivied: boolean = true;
              
     /**
      * vue 生命周期
@@ -63,11 +63,15 @@
                 if (!Object.is(tag, this.name)) {
                     return;
                 }
-                if (!this.isActivied) {
+<#if view.getPSAppViewEngines()??>
+                this.$forceUpdate();
+<#else>
+                this.isActivied = false;
                 this.$nextTick(() => {
                     this.isActivied = true;
                 });
-                }
+</#if>
+
             });
         }
     }

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

@@ -2,8 +2,8 @@
 <#if ctrl.render??>
     ${ctrl.render.code}
 <#else>
-    <split class="app-list-exp-bar <#if ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>" v-model="split" @on-move-end="onSplitChange">
-        <div slot='left'>
+    <split id="${ctrl.getCodeName()?lower_case}" class="app-list-exp-bar <#if ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>" v-model="split" mode="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>" @on-move-end="onSplitChange">
+        <div slot='<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">left<#else>top</#if>'>
         <#if ctrl.isShowTitleBar()>
             <div class='list-exp-bar-header'>
                 <div><icon type='ios-home-outline'/><#if ctrl.getTitle() == ''>列表导航栏<#else>${ctrl.getTitle()}</#if></div>
@@ -38,11 +38,10 @@
                 </#if>
             </div>
         </div>
-        <div slot='right'>
+        <div slot='<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">right<#else>bottom</#if>'>
             <component 
               v-if="selection.view && !Object.is(this.selection.view.viewname, '')" 
               :is="selection.view.viewname"
-              :key="$util.createUUID()"
               class="viewcontainer2"
               :viewDefaultUsage="false"
               :viewdata="JSON.stringify(selection.data)">
@@ -61,7 +60,7 @@
      * 视图唯一标识
      *
      * @type {boolean}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     @Prop() protected viewUID!:string;
 
@@ -70,16 +69,41 @@
      * 
      * @protected
      * @type {(boolean)}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected isSingleSelect:boolean = true;
 
+    /**
+     * 呈现模式，可选值：horizontal或者vertical
+     * 
+     * @protected
+     * @type {(string)}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
+
+    /**
+     * 控件宽度
+     *
+     * @type {number}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
+
+    /**
+     * 控件高度
+     *
+     * @type {number}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
+
     /**
      * 搜素值
      * 
      * @protected
      * @type {(string)}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected searchText:string = "";
 
@@ -87,7 +111,7 @@
      * 分割宽度
      *
      * @type {number}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected split: number = 0.5;
 
@@ -98,7 +122,7 @@
      * 导航视图名称
      *
      * @type {string}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected navViewName: string = "<#if xDataControl.getNavPSAppView()??><#assign navPSAppView = xDataControl.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>";
 
@@ -106,7 +130,7 @@
      * 导航视图参数
      *
      * @type {string}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected navViewParam: string = '<#if xDataControl.getNavViewParamJO()??>${xDataControl.getNavViewParamJO()}</#if>';
 
@@ -114,7 +138,7 @@
      * 导航过滤项
      *
      * @type {string}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected navFilter: string = "<#if xDataControl.getNavFilter()??>${xDataControl.getNavFilter()}</#if>";
 </#if>
@@ -123,7 +147,7 @@
      * 显示处理提示
      *
      * @type {boolean}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     @Prop({ default: true }) protected showBusyIndicator!: boolean;
 
@@ -141,7 +165,7 @@
      * 获取多项数据
      *
      * @returns {any[]}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public getDatas(): any[] {
         return [];
@@ -151,7 +175,7 @@
      * 获取单项树
      *
      * @returns {*}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public getData(): any {
         return null;
@@ -161,14 +185,14 @@
      * 选中数据
      *
      * @type {*}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected selection: any = {};
 
     /**
      * split值变化事件
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public onSplitChange() {
         if(this.split){
@@ -179,7 +203,7 @@
     /**
     * Vue声明周期(组件初始化完毕)
     *
-    * @memberof ${srfclassname('${ctrl.codeName}')}
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
     public created() {
          this.afterCreated();     
@@ -188,7 +212,7 @@
     /**
     * 执行created后的逻辑
     *
-    * @memberof ${srfclassname('${ctrl.codeName}')}
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
     public afterCreated(){
         if (this.viewState) {
@@ -202,15 +226,45 @@
                 </#if>
             });
         }
+    }
+
+    /**
+    * 执行mounted后的逻辑
+    *
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
+    */
+    public afterMounted(){ 
         if(this.$store.getters.getViewSplit(this.viewUID)){
             this.split = this.$store.getters.getViewSplit(this.viewUID);
+        }else{
+            let containerWidth:number = (document.getElementById("${ctrl.getCodeName()?lower_case}") as any).offsetWidth;
+            let containerHeight:number = (document.getElementById("${ctrl.getCodeName()?lower_case}") as any).offsetHeight;
+            if(Object.is(this.showMode,'horizontal')){
+                if(this.ctrlWidth){
+                    this.split = this.ctrlWidth/containerWidth;
+                }
+            }else{
+                if(this.ctrlHeight){
+                    this.split = this.ctrlHeight/containerHeight;
+                }
             }
+            this.$store.commit("setViewSplit",{viewUID:this.viewUID,viewSplit:this.split}); 
+        }  
+    }
+
+    /**
+    * Vue声明周期(组件渲染完毕)
+    *
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
+    */
+    public mounted() {
+        this.afterMounted();     
     }
 
     /**
      * vue 生命周期
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected destroyed() {
         this.afterDestroy();
@@ -219,7 +273,7 @@
     /**
      * 执行destroyed后的逻辑
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected afterDestroy() {
         if (this.viewStateEvent) {
@@ -233,7 +287,7 @@
     /**
      * ${ctrl.name}的选中数据事件
      * 
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
         let data:any = {};
@@ -246,6 +300,7 @@
         <#if xDataControl.getPSAppDataEntity()??>
         <#assign curDataEntity = xDataControl.getPSAppDataEntity()/>
         Object.assign(data,{'${curDataEntity.getCodeName()?lower_case}':arg['${curDataEntity.getCodeName()?lower_case}']});
+        Object.assign(data,{srfparentdename:'${curDataEntity.getCodeName()}',srfparentkey:arg['${curDataEntity.getCodeName()?lower_case}']});
         </#if>
         </#if>
         if(this.context){
@@ -254,12 +309,13 @@
         this.selection = {};
         Object.assign(this.selection, { view: { viewname: this.navViewName }, data:data });
         this.$emit('selectionchange',args);
+        this.$forceUpdate();
     }
 
     /**
      * ${ctrl.name}的load完成事件
      * 
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected ${ctrl.name}_load(args:any, tag?: string, $event2?: any){
         this.$emit('load',args);
@@ -268,7 +324,7 @@
     /**
     * 执行搜索
     *
-    * @memberof ${srfclassname('${ctrl.codeName}')}
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
     protected onSearch($event:any) {
 <#if ctrl.getPSDEList()??>

@CONTROL/列表导航/CONTROL.less.ftl

@@ -67,6 +67,69 @@
             padding-right: 10px;
         }
     }
+    > .ivu-split-vertical{
+        > .ivu-split-pane {
+            > div {
+                height: 100%;
+                overflow: auto;
+                display: flex;
+                flex-direction: column;
+                .list-exp-bar-header {
+                    line-height: 50px;
+                    border-bottom: 1px solid #ddd;
+                    >div {
+                        font-size: 18px;
+                        i {
+                            font-size: 20px;
+                            margin-top: -2px;
+                        }
+                    } 
+                }
+                .container-header{
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
+                    .search-container {
+                        width: 30%;
+                        height: 48px;
+                        padding: 10px 10px 10px 0;
+                        min-width: 200px;
+                        max-width: 400px;
+                    }
+                    .toolbar-container{
+                        padding: 4px;
+                    }
+                }
+                .list-exp-bar-content {
+                    <#--  计算高度  -->
+                    <#if ctrl.isShowTitleBar() && ctrl.isEnableSearch()>
+                    height: calc(100% - 88px);
+                    <#elseif ctrl.isShowTitleBar() && !ctrl.isEnableSearch()>
+                    height: calc(100% - 40px);
+                    <#elseif !ctrl.isShowTitleBar() && ctrl.isEnableSearch()>
+                    height: calc(100% - 38px);
+                    <#else>
+                    height: 100%;
+                    </#if>
+                    overflow: auto;
+                    margin-bottom: 10px;
+                }
+                .list-exp-bar-content2 {
+                    height: 100%;
+                    overflow: auto;
+                    flex-grow: 1;
+                }
+            }
+        }
+        > .top-pane.ivu-split-pane {
+            > div {
+                padding-bottom: 10px;
+            }
+        }
+        > .bottom-pane.ivu-split-pane {
+            padding-top: 10px;
+        }        
+    }
 }
 
 <#ibizinclude>

@CONTROL/卡片视图导航/CONTROL-BASE.vue.ftl

@@ -2,8 +2,8 @@
 <#if ctrl.render??>
     ${ctrl.render.code}
 <#else>
-    <split class="app-dataview-exp-bar <#if ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>" v-model="split" @on-move-end="onSplitChange">
-        <div slot='left'>
+    <split id="${ctrl.getCodeName()?lower_case}" class="app-dataview-exp-bar <#if ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>" v-model="split" mode="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>" @on-move-end="onSplitChange">
+        <div slot='<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">left<#else>top</#if>'>
         <#if ctrl.isShowTitleBar()>
             <div class='dataview-exp-bar-header'>
                 <div><icon type='ios-home-outline'/><#if ctrl.getTitle() == ''>卡片视图导航栏<#else>${ctrl.getTitle()}</#if></div>
@@ -38,11 +38,10 @@
                 </#if>
             </div>
         </div>
-        <div slot='right'>
+        <div slot='<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">right<#else>bottom</#if>'>
             <component 
               v-if="selection.view && !Object.is(this.selection.view.viewname, '')" 
               :is="selection.view.viewname"
-              :key="$util.createUUID()"
               class="viewcontainer2"
               :viewDefaultUsage="false"
               :viewdata="JSON.stringify(selection.data)">
@@ -61,7 +60,7 @@
      * 视图唯一标识
      *
      * @type {boolean}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     @Prop() protected viewUID!:string;
 
@@ -70,16 +69,41 @@
      * 
      * @protected
      * @type {(boolean)}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected isSingleSelect:boolean = true;
 
+    /**
+     * 呈现模式，可选值：horizontal或者vertical
+     * 
+     * @protected
+     * @type {(string)}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
+
+    /**
+     * 控件宽度
+     *
+     * @type {number}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
+
+    /**
+     * 控件高度
+     *
+     * @type {number}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
+
     /**
      * 搜素值
      * 
      * @protected
      * @type {(string)}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected searchText:string = "";
 
@@ -87,7 +111,7 @@
      * 分割宽度
      *
      * @type {number}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected split: number = 0.5;
 
@@ -98,7 +122,7 @@
      * 导航视图名称
      *
      * @type {string}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected navViewName: string = "<#if xDataControl.getNavPSAppView()??><#assign navPSAppView = xDataControl.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>";
 
@@ -106,7 +130,7 @@
      * 导航视图参数
      *
      * @type {string}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected navViewParam: string = '<#if xDataControl.getNavViewParamJO()??>${xDataControl.getNavViewParamJO()}</#if>';
 
@@ -114,7 +138,7 @@
      * 导航过滤项
      *
      * @type {string}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected navFilter: string = "<#if xDataControl.getNavFilter()??>${xDataControl.getNavFilter()}</#if>";
 </#if>
@@ -123,7 +147,7 @@
      * 显示处理提示
      *
      * @type {boolean}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     @Prop({ default: true }) protected showBusyIndicator!: boolean;
 
@@ -141,7 +165,7 @@
      * 获取多项数据
      *
      * @returns {any[]}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public getDatas(): any[] {
         return [];
@@ -151,7 +175,7 @@
      * 获取单项树
      *
      * @returns {*}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public getData(): any {
         return null;
@@ -161,14 +185,14 @@
      * 选中数据
      *
      * @type {*}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected selection: any = {};
 
     /**
      * split值变化事件
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public onSplitChange() {
         if(this.split){
@@ -179,7 +203,7 @@
     /**
     * Vue声明周期(组件初始化完毕)
     *
-    * @memberof ${srfclassname('${ctrl.codeName}')}
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
     public created() {
          this.afterCreated();     
@@ -188,7 +212,7 @@
     /**
     * 执行created后的逻辑
     *
-    * @memberof ${srfclassname('${ctrl.codeName}')}
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
     public afterCreated(){
         if (this.viewState) {
@@ -202,15 +226,45 @@
                 </#if>
             });
         }
+    }
+
+    /**
+    * Vue声明周期(组件渲染完毕)
+    *
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
+    */
+    public mounted() {
+        this.afterMounted();     
+    }
+
+    /**
+    * 执行mounted后的逻辑
+    *
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
+    */
+    public afterMounted(){ 
         if(this.$store.getters.getViewSplit(this.viewUID)){
             this.split = this.$store.getters.getViewSplit(this.viewUID);
+        }else{
+            let containerWidth:number = (document.getElementById("${ctrl.getCodeName()?lower_case}") as any).offsetWidth;
+            let containerHeight:number = (document.getElementById("${ctrl.getCodeName()?lower_case}") as any).offsetHeight;
+            if(Object.is(this.showMode,'horizontal')){
+                if(this.ctrlWidth){
+                    this.split = this.ctrlWidth/containerWidth;
+                }
+            }else{
+                if(this.ctrlHeight){
+                    this.split = this.ctrlHeight/containerHeight;
+                }
+            }
+            this.$store.commit("setViewSplit",{viewUID:this.viewUID,viewSplit:this.split}); 
         }  
     }
 
     /**
      * vue 生命周期
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected destroyed() {
         this.afterDestroy();
@@ -219,7 +273,7 @@
     /**
      * 执行destroyed后的逻辑
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected afterDestroy() {
         if (this.viewStateEvent) {
@@ -237,7 +291,7 @@
      * @param {string} [tag]
      * @param {*} [$event2]
      * @returns {void}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
         let data:any = {};
@@ -250,6 +304,7 @@
         <#if xDataControl.getPSAppDataEntity()??>
         <#assign curDataEntity = xDataControl.getPSAppDataEntity()/>
         Object.assign(data,{'${curDataEntity.getCodeName()?lower_case}':arg['${curDataEntity.getCodeName()?lower_case}']});
+        Object.assign(data,{srfparentdename:'${curDataEntity.getCodeName()}',srfparentkey:arg['${curDataEntity.getCodeName()?lower_case}']});
         </#if>
         </#if>
         if(this.context){
@@ -258,6 +313,7 @@
         this.selection = {};
         Object.assign(this.selection, { view: { viewname: this.navViewName }, data:data });
         this.$emit('selectionchange',args);
+        this.$forceUpdate();
     }
 
     /**
@@ -267,7 +323,7 @@
      * @param {string} [tag]
      * @param {*} [$event2]
      * @returns {void}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected ${ctrl.name}_load(args: any[], tag?: string, $event2?: any): void {
         this.$emit('load',args);
@@ -276,7 +332,7 @@
     /**
     * 执行搜索
     *
-    * @memberof ${srfclassname('${ctrl.codeName}')}
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
     protected onSearch() {
         <#if ctrl.getPSDEDataView()??>

@CONTROL/卡片视图导航/CONTROL.less.ftl

@@ -67,6 +67,66 @@
             padding-right: 10px;
         }
     }
+    > .ivu-split-vertical{
+        > .ivu-split-pane {
+            > div {
+                height: 100%;
+                .dataview-exp-bar-header {
+                    line-height: 50px;
+                    border-bottom: 1px solid #ddd;
+                    >div {
+                        font-size: 18px;
+                        i {
+                            font-size: 20px;
+                            margin-top: -2px;
+                        }
+                    } 
+                }
+                .container-header{
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
+                    .search-container {
+                        width: 30%;
+                        height: 48px;
+                        padding: 10px 10px 10px 0;
+                        min-width: 200px;
+                        max-width: 400px;
+                    }
+                    .toolbar-container{
+                        padding: 4px;
+                    }
+                }
+                .dataview-exp-bar-content {
+                    <#--  计算高度  -->
+                    <#if ctrl.isShowTitleBar() && ctrl.isEnableSearch()>
+                    height: calc(100% - 88px);
+                    <#elseif ctrl.isShowTitleBar() && !ctrl.isEnableSearch()>
+                    height: calc(100% - 40px);
+                    <#elseif !ctrl.isShowTitleBar() && ctrl.isEnableSearch()>
+                    height: calc(100% - 38px);
+                    <#else>
+                    height: 100%;
+                    </#if>
+                    overflow: auto;
+                    margin-bottom: 10px;
+                }
+                .dataview-exp-bar-content2 {
+                    height: 100%;
+                    overflow: auto;
+                    flex-grow: 1;
+                }
+            }
+        }
+        > .top-pane.ivu-split-pane {
+            > div {
+                padding-bottom: 10px;
+            }
+        }
+        > .bottom-pane.ivu-split-pane {
+            padding-top: 10px;
+        }
+    }
 }
 
 <#ibizinclude>

@CONTROL/向导面板/CONTROL-BASE.vue.ftl

 <template>
     <layout class="app-wizard">
+<#if ctrl.getPSDEWizard?? && ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getPSDEWizardSteps?? && ctrl.getPSDEWizard().getPSDEWizardSteps()??>
+    <el-steps class="wizard-steps"  :active="wizardForms.indexOf(activeForm)" finish-status="success">
+    <#list ctrl.getPSDEWizard().getPSDEWizardSteps() as step>
+      <el-step title="${step.getTitle()}"></el-step>
+    </#list>
+    </el-steps>
+</#if>
         <i-content class="app-wizard-content">
 <#if ctrl.getPSDEEditForms()??>
   <#list ctrl.getPSDEEditForms() as form>
@@ -47,7 +54,7 @@
     @Prop() protected initAction!: string;
     
     /**
-     * 部件行为--remove
+     * 部件行为--finish
      *
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
@@ -69,7 +76,7 @@
       * @memberof ${srfclassname('${ctrl.codeName}')}
       */
     public getDatas(): any[] {
-        return [];
+        return [this.formParam];
     }
 
     /**
@@ -79,7 +86,7 @@
       * @memberof ${srfclassname('${ctrl.codeName}')}
       */
     public getData(): any {
-        return null;
+        return this.formParam;
     }
 
     /**
@@ -252,7 +259,7 @@
         let arg: any = {};
         Object.assign(arg, this.formParam);
         Object.assign(arg,{viewparams:this.viewparams});
-        const post: Promise<any> = this.service.finish(this.initAction, JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
+        const post: Promise<any> = this.service.finish(this.finishAction, JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
         post.then((response: any) => {
             if (response && response.status === 200) {
                 const data = response.data;
@@ -291,12 +298,7 @@
         Object.assign(this.formParam, args);
         if(Object.is(this.curState, 'NEXT')) {
             this.historyForms.push(name);
-            if(args.srfnextform) {
-                this.activeForm = '${ctrl.name}_form_' + args.srfnextform;
-                setTimeout(() => {
-                    this.formLoad();
-                }, 1);
-            } else if (this.getNextForm()) {
+            if (this.getNextForm()) {
                 this.activeForm = this.getNextForm();
                 setTimeout(() => {
                     this.formLoad();
@@ -304,8 +306,7 @@
             } else {
                 this.doFinish();
             }
-        }
-        if(Object.is(this.curState, 'FINISH')) {
+        }else if(Object.is(this.curState, 'FINISH')) {
             this.doFinish();
         }
     }
@@ -382,7 +383,7 @@
     }
 
     /**
-     * 是否启用
+     * 是否禁用
      *
      * @param {string} type
      * @memberof ${srfclassname('${ctrl.codeName}')}
@@ -399,3 +400,7 @@
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_BOTTOM-BASE.vue.ftl
 </#ibizinclude>
+
+<#ibizinclude>
+../@MACRO/CONTROL/CONTROL-BASE.style.ftl
+</#ibizinclude>
\ No newline at end of file

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

 .app-wizard {
     background: #fff;
     height: 100%;
+    .wizard-steps{
+      padding: 10px 50px;
+      border-bottom: 1px solid #ddd;
+      margin-bottom: 10px;
+      .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;
+      }
+    }
     .app-wizard-content{
         height: 100%;
         overflow-y: auto;

@CONTROL/工具栏/CONTROL.html#ITEM_DEUIACTION.ftl

@@ -6,7 +6,7 @@
 <#if item.getTooltip()?? && item.getTooltip() != ''>
 <tooltip :transfer="true" :max-width="600">
     <#if deuiaction.getUIActionTag() == 'ExportExcel'>
-    <app-export-excel :item="toolBarModels.${item.name}" @exportexcel="${ctrl.name}_click({ tag: '${item.name}' }, $event)"></app-export-excel>
+    <app-export-excel :item="toolBarModels.${item.name}" :caption="$t('${langbase}.${item.name}.caption')" @exportexcel="${ctrl.name}_click({ tag: '${item.name}' }, $event)"></app-export-excel>
     <#else>
     <@badge item>
         <i-button v-show="toolBarModels.${item.name}.visabled" :disabled="toolBarModels.${item.name}.disabled" class='<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' @click="${ctrl.name}_click({ tag: '${item.name}' }, $event)">
@@ -19,7 +19,7 @@
 </tooltip>
 <#else>
 <#if deuiaction.getUIActionTag() == 'ExportExcel'>
-<app-export-excel :item="toolBarModels.${item.name}" @exportexcel="${ctrl.name}_click({ tag: '${item.name}' }, $event)"></app-export-excel>
+<app-export-excel :item="toolBarModels.${item.name}" :caption="$t('${langbase}.${item.name}.caption')" @exportexcel="${ctrl.name}_click({ tag: '${item.name}' }, $event)"></app-export-excel>
 <#else>
 <@badge item>
     <i-button v-show="toolBarModels.${item.name}.visabled" :disabled="toolBarModels.${item.name}.disabled" class='<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' @click="${ctrl.name}_click({ tag: '${item.name}' }, $event)">

@CONTROL/应用菜单/CONTROL-BASE.vue.ftl

@@ -66,7 +66,7 @@
                         <template v-else>
                             <template v-if="item1.type =='MENUITEM'">
                                 <el-menu-item v-show="!item1.hidden" :index="item1.name" :key="item1.id">
-                                    <template v-if="item1.icon && item.icon != ''">
+                                    <template v-if="item1.icon && item1.icon != ''">
                                         <img :src="item1.icon" class='app-menu-icon' />
                                     </template>
                                     <template v-else-if="item1.iconcls && item1.iconcls != ''">
@@ -92,7 +92,7 @@
             <template v-else>
                 <template v-if="item0.type =='MENUITEM'">
                     <el-menu-item v-show="!item0.hidden" :index="item0.name" :key="item0.id">
-                        <template v-if="item0.icon && item.icon != ''">
+                        <template v-if="item0.icon && item0.icon != ''">
                             <img :src="item0.icon" class='app-menu-icon' />
                         </template>
                         <template v-else-if="item0.iconcls && item0.iconcls != ''">
@@ -512,7 +512,7 @@ ${P.getLogicCode(singleFuncs,"LOGIC.vue").code}
     private dataProcess(items: any[]): void {
         items.forEach((_item: any) => {
             if (_item.expanded) {
-                this.defaultOpeneds.push(_item.id);
+                this.defaultOpeneds.push(_item.name);
             }
             if (_item.items && _item.items.length > 0) {
                 this.dataProcess(_item.items)

@CONTROL/应用菜单/CONTROL.less.ftl

@@ -3,6 +3,10 @@
     overflow-y: auto;
     overflow-x: hidden;
     height: calc(100% - 58px);
+    .ivu-divider{
+      background-color: #b3b3b3;
+      height: 2px;
+    }
     > .el-menu {
         border-right: 0;
         .el-menu-item {

@CONTROL/应用菜单（快捷菜单）/CONTROL.less.ftl

@@ -2,8 +2,7 @@
 ../@MACRO/CSS/DEFAULT.less.ftl
 </#ibizinclude>
 /*** BEGIN:potal菜单 ***/
-.porlet{
-  >.app-app-menu{
+.app-app-menu{
   >.ivu-row{
     .ivu-card{
       .ivu-card-body{
@@ -28,5 +27,4 @@
       }
     }
   }
-  }
 }

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

+<#ibizinclude>
+../../@MACRO/LANG_FUN.ftl
+</#ibizinclude>
 <template>
     ${P.getPartCode(item,'FORM').code}
 </template>
@@ -483,7 +486,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
         <#--  END：是否应用实体视图  -->
         const view: any = {
             viewname: '${srffilepath2(dataview.getCodeName())}',
-            title: '${dataview.getTitle()}',
+            title: this.<@getViewLanguageTitle dataview />,
             height: ${dataview.getHeight()?c},
             width: ${dataview.getWidth()?c},
             <#if formdetail.getParamViewParamJO()??>

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

+<#-- 绘图X轴 -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+      <#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>,
+      name:<#if item.getCaption()??>'${item.getCaption()}'</#if>,
+      <#if item.getMinValue()??>min:${item.getMinValue()},</#if>
+      <#if item.getMaxValue()??>max:${item.getMaxValue()},</#if>
+      <#if item.getBaseOptionJOString()??>
+      ${item.getBaseOptionJOString()}
+      </#if>
+}
+</#if>
\ No newline at end of file

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

+<#-- 绘图Y轴 -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+      <#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>,
+      name:<#if item.getCaption()??>'${item.getCaption()}'</#if>,
+      <#if item.getMinValue()??>min:${item.getMinValue()},</#if>
+      <#if item.getMaxValue()??>max:${item.getMaxValue()},</#if>
+      <#if item.getBaseOptionJOString()??>
+      ${item.getBaseOptionJOString()}
+      </#if>
+}
+</#if>
\ No newline at end of file

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

+<#-- 绘图网格start -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+<#if item.getBaseOptionJOString()??>
+${item.getBaseOptionJOString()}
+</#if>
+}
+</#if>
+<#-- 绘图网格end -->
\ No newline at end of file

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

+<#-- 柱状图序列start -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+    id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
+    name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
+    type:'bar',
+    xAxisIndex:${item.getIndex()},
+    yAxisIndex:${item.getIndex()},
+    datasetIndex:${item.getIndex()},
+    encode: {
+        <#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if>
+        x: [<#if chartSeriesEncode.getX()??><#list chartSeriesEncode.getX() as xValue>'${xValue?lower_case}'<#if xValue_has_next>,</#if></#list></#if>],      
+        y: [<#if chartSeriesEncode.getY()??><#list chartSeriesEncode.getY() as yValue>'${yValue?lower_case}'<#if yValue_has_next>,</#if></#list></#if>]
+    }<#if item.getBaseOptionJOString()??>,
+    ${item.getBaseOptionJOString()}
+    </#if>
+}
+</#if>
+<#-- 柱状图序列end -->
\ No newline at end of file

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

+<#-- 折线图序列start -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+    id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
+    name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
+    type:'funnel',
+    datasetIndex:${item.getIndex()},
+    <#compress><#if item.getLeft()?? && item.getLeft() != "">left:"${item.getLeft()}",</#if>
+    <#if item.getTop()?? && item.getTop() != 0>top:"${item.getTop()}",</#if>
+    <#if item.getBottom()?? && item.getBottom() != 0>bottom:"${item.getBottom()}",</#if>
+    <#if item.getRight()?? && item.getRight() != "">right:"${item.getRight()}",</#if>
+    <#if item.getWidth()?? && item.getWidth() != "">width:"${item.getWidth()}",</#if>
+    <#if item.getHeight()?? && item.getHeight() != "">height:"${item.getHeight()}",</#if>
+    <#if item.getMinValue()?? && item.getMinValue() != 0 >min:"${item.getMinValue()}",</#if>
+    <#if item.getMaxValue()?? && item.getMaxValue() != 0 >max:"${item.getMaxSize()}",</#if>
+    <#if item.getMinSize()?? && item.getMinSize() != "">minSize:"${item.getMinSize()}",</#if>
+    <#if item.getMaxSize()?? && item.getMaxSize() != "">maxSize: "${item.getMaxSize()}",</#if>
+    <#if item.getFunnelAlign()?? && item.getFunnelAlign() != "">funnelAlign:"${item.getFunnelAlign()}",</#if></#compress>
+    seriesLayoutBy:"${item.getSeriesLayoutBy()}",
+    encode:{
+        <#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if>
+        itemName:"<#if chartSeriesEncode.getCategory()??>${chartSeriesEncode.getCategory()?lower_case}<#else>${item.getCatalogField()?lower_case}</#if>",
+        value:"<#if chartSeriesEncode.getValue()??>${chartSeriesEncode.getValue()?lower_case}<#else>${item.getValueField()?lower_case}</#if>"
+    }<#if item.getBaseOptionJOString()??>,
+    ${item.getBaseOptionJOString()}
+    </#if>
+}
+</#if>
+<#-- 折线图序列end -->
\ No newline at end of file

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

+<#-- 折线图序列start -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+    id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
+    name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
+    type:'line',
+    xAxisIndex:${item.getIndex()},
+    yAxisIndex:${item.getIndex()},
+    datasetIndex:${item.getIndex()},
+    encode: {
+        <#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if>
+        x: [<#if chartSeriesEncode.getX()??><#list chartSeriesEncode.getX() as xValue>'${xValue?lower_case}'<#if xValue_has_next>,</#if></#list></#if>],      
+        y: [<#if chartSeriesEncode.getY()??><#list chartSeriesEncode.getY() as yValue>'${yValue?lower_case}'<#if yValue_has_next>,</#if></#list></#if>]
+    }<#if item.getBaseOptionJOString()??>,
+    ${item.getBaseOptionJOString()}
+    </#if>
+}
+</#if>
+<#-- 折线图序列end -->
\ No newline at end of file

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

+<#-- 折线图序列start -->
+<#if item.render??>
+${item.render.code}
+<#else>
+{
+    id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
+    name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
+    type:'pie',
+    datasetIndex:${item.getIndex()},
+    <#compress><#if item.getLeft()?? && item.getLeft() != "">left:"${item.getLeft()}",</#if>
+    <#if item.getTop()?? && item.getTop() != 0>top:"${item.getTop()}",</#if>
+    <#if item.getBottom()?? && item.getBottom() != 0>bottom:"${item.getBottom()}",</#if>
+    <#if item.getRight()?? && item.getRight() != "">right:"${item.getRight()}",</#if>
+    <#if item.getWidth()?? && item.getWidth() != "">width:"${item.getWidth()}",</#if>
+    <#if item.getHeight()?? && item.getHeight() != "">height:"${item.getHeight()}",</#if></#compress>
+    seriesLayoutBy:"${item.getSeriesLayoutBy()}",
+    encode:{
+        <#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if>
+        itemName:"<#if chartSeriesEncode.getCategory()??>${chartSeriesEncode.getCategory()?lower_case}<#else>${item.getCatalogField()?lower_case}</#if>",
+        value:"<#if chartSeriesEncode.getValue()??>${chartSeriesEncode.getValue()?lower_case}<#else>${item.getValueField()?lower_case}</#if>"
+    }<#if item.getBaseOptionJOString()??>,
+    ${item.getBaseOptionJOString()}
+    </#if>
+}
+</#if>
+<#-- 折线图序列end -->
\ No newline at end of file

@CONTROL/数据图表 (新)/CONTROL.html.ftl

+<#assign content>
+    fetchAction="<#if ctrl.getFetchPSControlAction()?? && ctrl.getFetchPSControlAction().getPSAppDEMethod()??>${ctrl.getFetchPSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
+    :showBusyIndicator="${ctrl.isShowBusyIndicator()?c}" 
+</#assign>
+<#ibizinclude>
+../@MACRO/HTML/DEFAULT.html.ftl
+</#ibizinclude>
\ No newline at end of file

@CONTROL/数据图表 (新)/CONTROL.less.ftl

+<#ibizinclude>
+../@MACRO/CSS/DEFAULT.less.ftl
+</#ibizinclude>
+.app-data-chart {
+    width: 100%;
+    height: 100%;
+}
\ No newline at end of file

@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.getCodeName()}')}${srfclassname('${ctrl.name}')}Mode
+	 */
+	public getDataItems(): any[] {
+		return [
+      {
+        name:'query',
+        prop:'query'
+      },
+		]
+	}
+
+<#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 search(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
+        return new Promise((resolve: any, reject: any) => {
+            const _appEntityService: any = this.appEntityService;
+            let result: Promise<any>;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            }else{
+                result =_appEntityService.FetchDefault(Context,Data, isloading);
+            }
+            result.then((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=CHART#NEW
\ No newline at end of file

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

@@ -5,7 +5,7 @@
         <#else><#t>
         <row v-if="items.length > 0" :gutter="20" type="flex" justify="start">
             <a v-for="(item,index) in items" :key="index" :href = "item.starturl">
-                <i-col <#if ctrl.getCardColLG() gt 0> lg={${ctrl.getCardColLG()?c}}</#if><#if ctrl.getCardColMD() gt 0> md={${ctrl.getCardColMD()?c}}</#if><#if ctrl.getCardColSM() gt 0> sm={${ctrl.getCardColSM()?c}}</#if><#if ctrl.getCardColXS() gt 0> xs={${ctrl.getCardColXS()?c}}</#if> style="<#if ctrl.getCardHeight() gt 0>height: ${ctrl.getCardHeight()?c}<#else>min-height: 170</#if>px;<#if ctrl.getCardWidth() gt 0> width: ${ctrl.getCardWidth()?c}px;</#if>margin-bottom: 10px;">
+                <i-col <#if ctrl.getCardColLG() gt 0> :lg="${ctrl.getCardColLG()?c}"</#if><#if ctrl.getCardColMD() gt 0> :md="${ctrl.getCardColMD()?c}"</#if><#if ctrl.getCardColSM() gt 0> :sm="${ctrl.getCardColSM()?c}"</#if><#if ctrl.getCardColXS() gt 0> :xs="${ctrl.getCardColXS()?c}"</#if> style="<#if ctrl.getCardHeight() gt 0>height: ${ctrl.getCardHeight()?c}<#else>min-height: 170</#if>px;<#if ctrl.getCardWidth() gt 0> width: ${ctrl.getCardWidth()?c}px;</#if>margin-bottom: 10px;">
                     <div :class="[ item.isselected === true ? 'isselected' : false, 'single-card-data' ]" @click="handleClick(item)" @dblclick="handleDblClick(item)">
                         <#if ctrl.getItemPSLayoutPanel()??>
                         <#assign panel = ctrl.getItemPSLayoutPanel()>

@CONTROL/日历导航/CONTROL-BASE.vue.ftl

@@ -2,8 +2,8 @@
 <#if ctrl.render??>
     ${ctrl.render.code}
 <#else>
-    <split class="app-calendar-exp-bar <#if ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>" v-model="split" @on-move-end="onSplitChange">
-        <div slot='left'>
+    <split id="${ctrl.getCodeName()?lower_case}" class="app-calendar-exp-bar <#if ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>" v-model="split" mode="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>" @on-move-end="onSplitChange">
+        <div slot='<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">left<#else>top</#if>'>
         <#if ctrl.isShowTitleBar()>
             <div class='calendar-exp-bar-header'>
                 <div><icon type='ios-home-outline'/><#if ctrl.getTitle() == ''>列表导航栏<#else>${ctrl.getTitle()}</#if></div>
@@ -38,11 +38,10 @@
                 </#if>
             </div>
         </div>
-        <div slot='right'>
+        <div slot='<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">right<#else>bottom</#if>'>
             <component 
               v-if="selection.view && !Object.is(this.selection.view.viewname, '')" 
               :is="selection.view.viewname"
-              :key="$util.createUUID()"
               class="viewcontainer2"
               :viewDefaultUsage="false"
               :viewdata="JSON.stringify(selection.data)">
@@ -61,7 +60,7 @@
      * 视图唯一标识
      *
      * @type {boolean}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     @Prop() protected viewUID!:string;
 
@@ -70,16 +69,41 @@
      * 
      * @protected
      * @type {(boolean)}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected isSingleSelect:boolean = true;
 
+    /**
+     * 呈现模式，可选值：horizontal或者vertical
+     * 
+     * @protected
+     * @type {(string)}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
+
+    /**
+     * 控件宽度
+     *
+     * @type {number}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
+
+    /**
+     * 控件高度
+     *
+     * @type {number}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
+
     /**
      * 搜素值
      * 
      * @protected
      * @type {(string)}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected searchText:string = "";
 
@@ -87,7 +111,7 @@
      * 分割宽度
      *
      * @type {number}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected split: number = 0.5;
 
@@ -98,7 +122,7 @@
      * 导航视图名称
      *
      * @type {string}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected navViewName: any = {
 <#if xDataControl.getPSSysCalendarItems()??>
@@ -112,7 +136,7 @@
      * 导航视图参数
      *
      * @type {string}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected navViewParam: any = {
 <#if xDataControl.getPSSysCalendarItems()??>
@@ -126,7 +150,7 @@
      * 导航过滤项
      *
      * @type {string}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
 </#if>
     protected navFilter: any = {
@@ -141,7 +165,7 @@
      * 显示处理提示
      *
      * @type {boolean}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     @Prop({ default: true }) protected showBusyIndicator!: boolean;
 
@@ -159,7 +183,7 @@
      * 获取多项数据
      *
      * @returns {any[]}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public getDatas(): any[] {
         return [];
@@ -169,7 +193,7 @@
      * 获取单项树
      *
      * @returns {*}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public getData(): any {
         return null;
@@ -179,16 +203,27 @@
      * 选中数据
      *
      * @type {*}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected selection: any = {};
 
     /**
      * split值变化事件
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public onSplitChange() {
+        <#if ctrl.getXDataPSControl()??>
+        <#assign xDataControl = ctrl.getXDataPSControl() />
+        if(this.$refs.${xDataControl.getName()}){
+            const calendarContainer:any = this.$refs.${xDataControl.getName()};
+            if(calendarContainer.$refs.calendar){
+                const appCalendar: any = calendarContainer.$refs.calendar;
+                const api = appCalendar.getApi();
+                api.updateSize();
+            }
+        }
+        </#if>
         if(this.split){
           this.$store.commit("setViewSplit",{viewUID:this.viewUID,viewSplit:this.split});
         }
@@ -197,7 +232,7 @@
     /**
     * Vue声明周期(组件初始化完毕)
     *
-    * @memberof ${srfclassname('${ctrl.codeName}')}
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
     public created() {
          this.afterCreated();     
@@ -206,7 +241,7 @@
     /**
     * 执行created后的逻辑
     *
-    * @memberof ${srfclassname('${ctrl.codeName}')}
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
     public afterCreated(){
         if (this.viewState) {
@@ -220,15 +255,45 @@
                 </#if>
             });
         }  
+    }
+    
+    /**
+    * Vue声明周期(组件渲染完毕)
+    *
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
+    */
+    public mounted() {
+        this.afterMounted();     
+    }
+
+    /**
+    * 执行mounted后的逻辑
+    *
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
+    */
+    public afterMounted(){ 
         if(this.$store.getters.getViewSplit(this.viewUID)){
             this.split = this.$store.getters.getViewSplit(this.viewUID);
+        }else{
+            let containerWidth:number = (document.getElementById("${ctrl.getCodeName()?lower_case}") as any).offsetWidth;
+            let containerHeight:number = (document.getElementById("${ctrl.getCodeName()?lower_case}") as any).offsetHeight;
+            if(Object.is(this.showMode,'horizontal')){
+                if(this.ctrlWidth){
+                    this.split = this.ctrlWidth/containerWidth;
+                }
+            }else{
+                if(this.ctrlHeight){
+                    this.split = this.ctrlHeight/containerHeight;
+                }
+            }
+            this.$store.commit("setViewSplit",{viewUID:this.viewUID,viewSplit:this.split}); 
         }  
     }
  
     /**
      * vue 生命周期
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected destroyed() {
         this.afterDestroy();
@@ -237,7 +302,7 @@
     /**
      * 执行destroyed后的逻辑
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected afterDestroy() {
         if (this.viewStateEvent) {
@@ -251,7 +316,7 @@
     /**
      * ${ctrl.name}的选中数据事件
      * 
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
         let data:any = {};
@@ -266,6 +331,7 @@
       <#assign _appde = calendarItem.getPSAppDataEntity() />
             case "${calendarItem.getItemType()}":
                 Object.assign(data,{ ${_appde.getCodeName()?lower_case} : arg.${_appde.getCodeName()?lower_case}});
+                Object.assign(data,{srfparentdename:'${_appde.getCodeName()}',srfparentkey:arg['${_appde.getCodeName()?lower_case}']});
                 break;
     </#if>
   </#list>
@@ -277,12 +343,13 @@
         this.selection = {};
         Object.assign(this.selection, { view: { viewname: this.navViewName[arg.itemType] }, data:data });
         this.$emit('selectionchange',args);
+        this.$forceUpdate();
     }
 
     /**
      * ${ctrl.name}的load完成事件
      * 
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected ${ctrl.name}_load(args:any, tag?: string, $event2?: any){
         this.$emit('load',args);
@@ -291,7 +358,7 @@
     /**
     * 执行搜索
     *
-    * @memberof ${srfclassname('${ctrl.codeName}')}
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
     protected onSearch($event:any) {
         <#if ctrl.getXDataPSControl()??>

@CONTROL/日历导航/CONTROL.less.ftl

@@ -67,6 +67,69 @@
             padding-right: 10px;
         }
     }
+    > .ivu-split-vertical{
+        > .ivu-split-pane {
+            > div {
+                height: 100%;
+                overflow: auto;
+                display: flex;
+                flex-direction: column;
+                .calendar-exp-bar-header {
+                    line-height: 50px;
+                    border-bottom: 1px solid #ddd;
+                    >div {
+                        font-size: 18px;
+                        i {
+                            font-size: 20px;
+                            margin-top: -2px;
+                        }
+                    } 
+                }
+                .container-header{
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
+                    .search-container {
+                        width: 30%;
+                        height: 48px;
+                        padding: 10px 10px 10px 0;
+                        min-width: 200px;
+                        max-width: 400px;
+                    }
+                    .toolbar-container{
+                        padding: 4px;
+                    }
+                }
+                .calendar-exp-bar-content {
+                    <#--  计算高度  -->
+                    <#if ctrl.isShowTitleBar() && ctrl.isEnableSearch()>
+                    height: calc(100% - 88px);
+                    <#elseif ctrl.isShowTitleBar() && !ctrl.isEnableSearch()>
+                    height: calc(100% - 40px);
+                    <#elseif !ctrl.isShowTitleBar() && ctrl.isEnableSearch()>
+                    height: calc(100% - 38px);
+                    <#else>
+                    height: 100%;
+                    </#if>
+                    overflow: auto;
+                    margin-bottom: 10px;
+                }
+                .calendar-exp-bar-content2 {
+                    height: 100%;
+                    overflow: auto;
+                    flex-grow: 1;
+                }
+            }
+        }
+        > .top-pane.ivu-split-pane {
+            > div {
+                padding-bottom: 10px;
+            }
+        }
+        > .bottom-pane.ivu-split-pane {
+            padding-top: 10px;
+        }  
+    }
 }
 
 <#ibizinclude>

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

+<#ibizinclude>
+../../@MACRO/LANG_FUN.ftl
+</#ibizinclude>
 <template>
-    <div class='calendar'>
+    <div :class='calendarClass'>
 <#if ctrl.getCalendarStyle?? && ctrl.getCalendarStyle() == 'TIMELINE'>
         <el-timeline>
           <el-timeline-item
@@ -17,7 +20,7 @@
 <#else>
         <FullCalendar
           ref="calendar"
-          locale="zh-cn"
+          :locale="$i18n.locale"
           height="parent"
           :firstDay="1"
           :eventLimit="true"
@@ -73,6 +76,24 @@ FullCalendar,
      */
     @Prop() protected loadAction!: string;
 
+    /**
+     * 日历部件样式名
+     *
+     * @protected
+     * @type {any[]}
+     * @memberof ${srfclassname('${ctrl.codeName}')}
+     */
+    protected calendarClass: string = "calendar";
+
+    /**
+     * 选中事件element元素
+     *
+     * @protected
+     * @type {any[]}
+     * @memberof ${srfclassname('${ctrl.codeName}')}
+     */
+    protected selectedEventElement:any;
+
     /**
      * 引用插件集合
      *
@@ -123,7 +144,7 @@ FullCalendar,
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
     protected events: any[] = [];
-<#--  
+
     /**
      * 日历样式类型
      *
@@ -131,7 +152,7 @@ FullCalendar,
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected calendarType: string = "${ctrl.getCalendarStyle()}";  -->
+    protected calendarType: string = "${ctrl.getCalendarStyle()}";
 
     /**
      * 搜索获取日程事件
@@ -155,19 +176,25 @@ FullCalendar,
                 }
                 return;
             }
+            // 默认选中第一项
             this.events = response.data;
+            if(this.isSelectFirstDefault){
+                // 模拟$event数据
+                let tempEvent = JSON.parse(JSON.stringify(this.events[0]));
+                tempEvent._def = {};
+                tempEvent._def.extendedProps = JSON.parse(JSON.stringify(this.events[0]));
+                this.onEventClick({event:tempEvent});
+                this.events[0].className = "select-first-event";
+                this.calendarClass = "calendar select-first-calendar";
+            }
             if(successCallback){
                 successCallback(this.events);
             }
+            // 刷新日历的大小（仅fullcalendar组件使用）
+            if(!Object.is(this.calendarType,"TIMELINE")){
                 let appCalendar: any = this.$refs.calendar;
                 let api = appCalendar.getApi();
                 api.updateSize();
-            if(this.isSelectFirstDefault){
-                // 模拟$event数据
-                let tempEvent = JSON.parse(JSON.stringify(this.events[0]));
-                tempEvent._def = {};
-                tempEvent._def.extendedProps = JSON.parse(JSON.stringify(this.events[0]));
-                this.onEventClick({event:tempEvent})
             }
         }, (response: any) => {
             if (response && response.status === 401) {
@@ -204,7 +231,7 @@ FullCalendar,
                     viewname: '${srffilepath2(editview.getCodeName())}', 
                     height: ${editview.getHeight()?c}, 
                     width: ${editview.getWidth()?c},
-                    title: '${editview.title}', 
+                    title: this.<@getViewLanguageTitle editview />,
                     placement: '${editview.getOpenMode()}',
                     deResParameters: <#rt>
     <#if editview.isPSDEView()>
@@ -244,6 +271,14 @@ FullCalendar,
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
     protected onEventClick($event: any) {
+        if($event.el){
+            this.calendarClass = "calendar";
+            if(this.selectedEventElement){
+                this.selectedEventElement.classList.remove("selected-event");
+            }
+            this.selectedEventElement = $event.el;
+            this.selectedEventElement.classList.add("selected-event");
+        }
         let _this = this;
         let view: any = {};
         let _context: any = Object.assign({},this.context);
@@ -261,6 +296,7 @@ FullCalendar,
   </#list>
 </#if>
         }
+        // 导航栏中不需要打开视图，只要抛出选中数据
         if(this.isSelectFirstDefault){
             _context.itemType = itemType;
             this.selections = [_context];
@@ -295,9 +331,13 @@ FullCalendar,
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
     protected refresh() {
+        if(Object.is(this.calendarType,"TIMELINE")){
+            this.searchEvents();
+        } else {
             let calendarApi = (this.$refs.calendar as any).getApi();
             calendarApi.refetchEvents();
         }
+    }
 
     /**
      * 日程拖动事件

@CONTROL/日历部件/CONTROL.less.ftl

@@ -11,4 +11,64 @@
   .timeline{
     padding-left: 2px;
   }
+  // 选中样式
+  .selected-event{
+    border: 2px solid #ff8711 !important;
+  }
+  .selected-event:before {
+    content: '';
+    display: block;
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    border: 9px solid #ff8711;
+    border-top-color: transparent;
+    border-left-color: transparent;
+    color: #fff;
+  }
+  .selected-event:after {
+    content: '';
+    display: block;
+    width: 4px;
+    height: 11px;
+    position: absolute;
+    right: 1px;
+    bottom: 0px;
+    border: 2px solid #fff;
+    border-top-color: transparent;
+    border-left-color: transparent;
+    -webkit-transform: rotate(45deg);
+    transform: rotate(45deg);
+  }
+}
+// 默认第一项选中样式
+.select-first-calendar{
+  .select-first-event{
+    border: 2px solid #ff8711 !important;
+  }
+  .select-first-event:before {
+    content: '';
+    display: block;
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    border: 9px solid #ff8711;
+    border-top-color: transparent;
+    border-left-color: transparent;
+    color: #fff;
+  }
+  .select-first-event:after {
+    content: '';
+    display: block;
+    width: 4px;
+    height: 11px;
+    position: absolute;
+    right: 1px;
+    bottom: 0px;
+    border: 2px solid #fff;
+    border-top-color: transparent;
+    border-left-color: transparent;
+    -webkit-transform: rotate(45deg);
+    transform: rotate(45deg);
+  }
 }
\ No newline at end of file

@CONTROL/树视图/CONTROL.html.ftl

@@ -10,6 +10,11 @@
     </#if>
   <#if view.getViewType() == 'DETREEEXPVIEW'>
     :isSelectFirstDefault="true"
+    :isBranchAvailable="true"
+  </#if>
+  <#if view.getViewType() == 'DEPICKUPTREEVIEW'>
+    :isSingleSelect="isSingleSelect"
+    :selectedData="selectedData"
   </#if>
 </#assign>
 <#ibizinclude>

@CONTROL/树视图/SERVICE.ts.ftl

@@ -176,8 +176,8 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
         return new Promise((resolve:any,reject:any) =>{
     <#if node.getTreeNodeType() == 'STATIC'>
             let treeNode: any = {};
-            Object.assign(treeNode, { text: '${node.getText()?j_string}' });
-
+            Object.assign(treeNode, { text: '${appde.getCodeName()?lower_case}.${ctrl.getCodeName()?lower_case}_${ctrl.getControlType()?lower_case}.nodes.${node.getNodeType()?lower_case}' });
+            Object.assign(treeNode, { isUseLangRes: true });
     <#if node.isEnableQuickSearch()>
             if (treeNode.srfnodefilter) {
                 if (treeNode.text().toUpperCase().indexOf(filter.srfnodefilter.toUpperCase()) === -1) {
@@ -222,7 +222,7 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
 
             </#if>
             <#if node.isDisableSelect()>
-            Object.assign(treeNode, { disableselect: true });
+            Object.assign(treeNode, { disabled: true });
 
             </#if>
             <#if node.isExpanded()>
@@ -238,6 +238,9 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
             <#if node.isSelected()>
             Object.assign(treeNode, { selected: true });
             </#if>
+            <#if node.getNavFilter()??>
+            Object.assign(treeNode, { navfilter: "${node.getNavFilter()}" });
+            </#if>
             list.push(treeNode);
             resolve(list);
         });
@@ -257,7 +260,12 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
                 let bFirst:boolean = true;
                 codeListIems.forEach((item:any) => {
                     let treeNode: any = {};
+                    <#if node.getPSCodeList().getCodeListType() == 'STATIC'>
+                    Object.assign(treeNode, { text: 'codelist.${node.getPSCodeList().codeName}.'+item.value });
+                    Object.assign(treeNode, { isUseLangRes: true });
+                    <#else>
                     Object.assign(treeNode, { text: item.text });
+                    </#if>
                     <#if node.isEnableQuickSearch()>
                     if(filter.srfnodefilter){
                         if(treeNode.getText().toUpperCase().indexOf(filter.getSrfnodefilter().toUpperCase())==-1)
@@ -285,7 +293,7 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
                     Object.assign(treeNode, { enablecheck: true });
                     </#if>
                     <#if node.isDisableSelect()>
-                    Object.assign(treeNode, { disableselect: true });
+                    Object.assign(treeNode, { disabled: true });
                     </#if>
                     <#if node.isExpanded()>
                     <#if node.isExpandFirstOnly()>
@@ -304,6 +312,9 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
                     <#if node.isSelected()>
                     Object.assign(treeNode, { selected: true });
                     </#if>
+                    <#if node.getNavFilter()??>
+                    Object.assign(treeNode, { navfilter: "${node.getNavFilter()}" });
+                    </#if>
                     list.push(treeNode);
                     bFirst = false;
                     resolve(list);
@@ -326,13 +337,13 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
     <#if noders.getParentFilter()?? && noders.getParentFilter()?length gt 0>
     <#assign pickupfield=noders.getParentFilter()>
 
-            if (Object.is(filter.nodetype, this.TREENODE_${noders.getParentPSDETreeNode().getNodeType()?upper_case})) {
+            if (Object.is(filter.strNodeType, this.TREENODE_${noders.getParentPSDETreeNode().getNodeType()?upper_case})) {
                 Object.assign(searchFilter, { n_${pickupfield?lower_case}_eq: filter.nodeid<#if noders.getParentValueLevel() gt 1>${noders.getParentValueLevel()?c}</#if> });
             }
 
     <#elseif noders.getParentPSDER1N()??>
     <#assign pickupfield=noders.getParentPSDER1N().getPSPickupDEField()>
-            if (Object.is(filter.nodetype, this.TREENODE_${noders.getParentPSDETreeNode().getNodeType()?upper_case})) {
+            if (Object.is(filter.strNodeType, this.TREENODE_${noders.getParentPSDETreeNode().getNodeType()?upper_case})) {
                 Object.assign(searchFilter, { n_${pickupfield.getName()?lower_case}_eq: filter.nodeid<#if noders.getParentValueLevel() gt 1>${noders.getParentValueLevel()?c}</#if> });
             }
 
@@ -340,7 +351,8 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
     </#if>
     </#list>
             Object.assign(searchFilter, { total: false });
-            Object.assign(searchFilter, {nodeid: filter.nodeid});
+            <#-- nodeid 是前台专用的 -->
+            <#--  Object.assign(searchFilter, {nodeid: filter.nodeid});  -->
     <#if node.isEnableQuickSearch()>
             Object.assign(searchFilter, { query: filter.srfnodefilter });
     <#else>
@@ -352,7 +364,8 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
                 this.search${srfclassname(node.getNodeType()?lower_case)}(context, searchFilter, filter).then((records:any) =>{
                     if(records && records.length >0){
                         records.forEach((entity: any) => {
-                        let treeNode: any = {}
+                        let treeNode: any = {};
+                        Object.assign(treeNode,{srfparentdename:'${node.getPSAppDataEntity().getCodeName()}',srfparentkey:entity.${node.getPSAppDataEntity().getKeyPSAppDEField().codeName?lower_case}});
                         let strId: string = entity.${node.getPSAppDataEntity().getKeyPSAppDEField().codeName?lower_case};
                         <#if node.getTextPSDEField()??>
                         let strText: string = entity.${node.getTextPSDEField().codeName?lower_case};
@@ -384,7 +397,7 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
                         Object.assign(treeNode, { enablecheck: true });
                         </#if>
                         <#if node.isDisableSelect()>
-                        Object.assign(treeNode, { disableselect: true });
+                        Object.assign(treeNode, { disabled: true });
                         </#if>
                         <#if node.isExpanded()>
                         <#if node.isExpandFirstOnly()>
@@ -419,6 +432,9 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
                         <#if node.isSelected()>
                         Object.assign(treeNode, { selected: true });
                         </#if>
+                        <#if node.getNavFilter()??>
+                        Object.assign(treeNode, { navfilter: "${node.getNavFilter()}" });
+                        </#if>
                         list.push(treeNode);
                         resolve(list);
                         bFirst = false;
@@ -453,8 +469,11 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
                 Object.assign(searchFilter,{page:0});
             }
             if(!searchFilter.size){
-                Object.assign(searchFilter,{size:9999});
+                Object.assign(searchFilter,{size:1000});
             }
+            <#if node.getSortField?? && node.getSortField()?? && node.getSortDir?? && node.getSortDir()??>
+            Object.assign(searchFilter,{sort: '${node.getSortField()?lower_case},${node.getSortDir()?lower_case}'})
+            </#if>
             <#if appde?? && appde.getId() != node.getPSAppDataEntity().getId()>
             const _appEntityService: any = this.${node.getPSAppDataEntity().codeName?lower_case}Service;
             <#else>

@CONTROL/树视图导航栏/CONTROL-BASE.vue.ftl

@@ -2,11 +2,11 @@
 <#if ctrl.render??>
     ${ctrl.render.code}
 <#else>
-    <split class='app-tree-exp-bar' v-model="split" @on-move-end="onSplitChange">
+    <split id="${ctrl.getCodeName()?lower_case}" class='app-tree-exp-bar' v-model="split" mode="horizontal" @on-move-end="onSplitChange">
         <div slot='left'>
 <#if ctrl.isShowTitleBar()>
             <div class='tree-exp-bar-header'>
-                <div><icon type='ios-home-outline'/><#if ctrl.getTitle() == ''>树视图导航栏<#else>${ctrl.getTitle()}</#if></div>
+                <div><#if ctrl.getTitle() == ''>树视图导航栏<#else>${ctrl.getTitle()}</#if></div>
             </div>
 </#if>
 <#if ctrl.isEnableSearch()>
@@ -30,10 +30,10 @@
             <component 
               v-if="selection.view && !Object.is(this.selection.view.viewname, '')" 
               :is="selection.view.viewname"
-              :key="$util.createUUID()"
               class="viewcontainer2"
               :viewDefaultUsage="false"
-              :viewdata="JSON.stringify(selection.data)"
+              :viewdata="JSON.stringify(selection.context)"
+              :viewparam="JSON.stringify(selection.viewparam)"
               @viewdataschange="onViewDatasChange"
               @viewdatasactivated="viewDatasActivated"
               @viewload="onViewLoad">
@@ -50,7 +50,7 @@
      * 视图唯一标识
      *
      * @type {boolean}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     @Prop() protected viewUID!:string;
 
@@ -58,7 +58,7 @@
      * 获取多项数据
      *
      * @returns {any[]}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public getDatas(): any[] {
         return [];
@@ -68,27 +68,33 @@
      * 获取单项树
      *
      * @returns {*}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public getData(): any {
         return {};
     }
 
-
     /**
      * 选中数据
      *
      * @type {*}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected selection: any = {};
 
+    /**
+     * 控件宽度
+     *
+     * @type {number}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
 
     /**
      * 过滤值
      *
      * @type {string}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected srfnodefilter: string = '';
 
@@ -97,7 +103,7 @@
      *
      * @private
      * @type {boolean}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     private istLoadDefaultRefView: boolean = false;
 
@@ -105,14 +111,14 @@
      * 分割宽度
      *
      * @type {number}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected split: number = 0.2;
 
     /**
      * split值变化事件
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public onSplitChange() {
         if(this.split){
@@ -125,7 +131,7 @@
      *
      * @param {*} [arg={}]
      * @returns {*}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected getExpItemView(arg: any = {}): any {
         let expmode = arg.nodetype.toUpperCase();
@@ -156,7 +162,7 @@
      * @param {string} [tag]
      * @param {*} [$event2]
      * @returns {void}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
         if (args.length === 0) {
@@ -171,19 +177,34 @@
         if (!refview) {
             return;
         }
-        const deKeyField = refview.deKeyField;
-        const parentdata: any = { [deKeyField]: arg.srfkey };
-        <#--  // 多选数据处理
-        arg.id.split(';').forEach((value: string, index: number) => {
-            if (index > 0) {
-                const key = index + 1 === 1 ? 'srfparentkey' : 'srfparentkey' + (index + 1);
-                Object.assign(parentdata, { [key]: value })
+        let tempViewparam:any = {};
+        if(arg && arg.navfilter){
+           Object.defineProperty(tempViewparam, arg.navfilter, {
+            value : arg.srfkey,
+            writable : true,
+            enumerable : true,
+            configurable : true
+            })
+        }
+        let tempContext:any ={};
+        if(arg.srfparentdename){
+            Object.assign(tempContext,{srfparentdename:arg.srfparentdename});
         }
-        });  -->
-        Object.assign(parentdata, refview.parentdata);
+        if(arg.srfparentkey){
+            Object.assign(tempContext,{srfparentkey:arg.srfparentkey});
+        }
+        Object.assign(tempContext,this.context);
+        Object.defineProperty(tempContext, refview.deKeyField, {
+            value : arg.srfkey,
+            writable : true,
+            enumerable : true,
+            configurable : true
+        });
         this.selection = {};
-        Object.assign(this.selection, { view: { viewname: refview.viewname }, data: parentdata });
+        Object.assign(this.selection, { view: { viewname: refview.viewname } });
+        Object.assign(this.selection,{'viewparam':tempViewparam,'context':tempContext});
         this.$emit('selectionchange',args);
+        this.$forceUpdate();
     }
 
     /**
@@ -193,7 +214,7 @@
      * @param {string} [tag]
      * @param {*} [$event2]
      * @returns {void}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected ${ctrl.name}_load(args: any[], tag?: string, $event2?: any): void {
         this.$emit('load',args);
@@ -202,7 +223,7 @@
     /**
      * 执行搜索
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected onSearch(): void {
         <#if ctrl.getPSDETree()??>
@@ -215,7 +236,7 @@
     /**
      * vue 声明周期
      *
-     * @memberof @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected created() {
         this.afterCreated();
@@ -224,7 +245,7 @@
     /**
      * 执行created后的逻辑
      *
-     *  @memberof ${srfclassname('${ctrl.codeName}')}
+     *  @memberof ${srfclassname('${ctrl.codeName}')}Base
      */    
     protected afterCreated(){
         if (this.viewState) {
@@ -239,15 +260,39 @@
                 </#if>
             });
         }
+    }
+
+    /**
+    * Vue声明周期(组件渲染完毕)
+    *
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
+    */
+    public mounted() {
+        this.afterMounted();     
+    }
+
+    /**
+    * 执行mounted后的逻辑
+    *
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
+    */
+    public afterMounted(){ 
         if(this.$store.getters.getViewSplit(this.viewUID)){
             this.split = this.$store.getters.getViewSplit(this.viewUID);
+        }else{
+            let containerWidth:number = (document.getElementById("${ctrl.getCodeName()?lower_case}") as any).offsetWidth;
+            if(this.ctrlWidth){
+                    this.split = this.ctrlWidth/containerWidth;
             }
+            this.$store.commit("setViewSplit",{viewUID:this.viewUID,viewSplit:this.split}); 
         }  
+    }
+
 
     /**
      * vue 生命周期
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected destroyed() {
         this.afterDestroy();
@@ -256,7 +301,7 @@
     /**
      * 执行destroyed后的逻辑
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected afterDestroy() {
         if (this.viewStateEvent) {
@@ -271,7 +316,7 @@
      * 视图数据变化
      *
      * @param {*} $event
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected onViewDatasChange($event: any): void {
         this.$emit('selectionchange', $event);
@@ -281,7 +326,7 @@
      * 视图数据被激活
      *
      * @param {*} $event
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected viewDatasActivated($event: any): void {
         this.$emit('activated', $event);
@@ -291,7 +336,7 @@
      * 视图数据加载完成
      *
      * @param {*} $event
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected onViewLoad($event: any): void {
         this.$emit('load', $event);

@CONTROL/树视图导航栏/CONTROL.less.ftl

@@ -15,6 +15,7 @@
                     border-bottom: 1px solid #ddd;
                     >div {
                         font-size: 18px;
+                        padding-left: 8px;
                         i {
                             font-size: 20px;
                             margin-top: -2px;
@@ -22,8 +23,11 @@
                     } 
                 }
                 .search-content {
+                    width: 30%;
                     height: 48px;
                     padding: 10px 10px 10px 0;
+                    min-width: 200px;
+                    max-width: 400px;
                 }
                 .tree-exp-content {
                 <#--  计算高度  -->
@@ -52,6 +56,9 @@
                 padding-left: 10px;
             }
         }
+        > .left-pane.ivu-split-pane {
+            padding-right: 10px;
+        }
     }
 }
 

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

-<div :style="{height:${item.getContentHeight()}px;}"><iframe src='${item.getIFrameUrl()}'></iframe></div>
+<div style="height:${item.getContentHeight()}px"><iframe src='${item.getIFrameUrl()}'></iframe></div>

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

 <#if item.render??>
 ${item.render.code}
 <#else>
-<div class="<#if item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>" :style="{<#if item.getRawContentHeight() gt 0>height: ${item.getRawContentHeight()?c}px;</#if><#if item.getRawContentWidth() gt 0>width: ${item.getRawContentWidth()?c}px;</#if>}">
+<div class="<#if item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>" style="<#if item.getRawContentHeight() gt 0>height: ${item.getRawContentHeight()?c}px;</#if><#if item.getRawContentWidth() gt 0>width: ${item.getRawContentWidth()?c}px;</#if>">
     ${item.getRawContent()}
 </div>
 </#if>
\ No newline at end of file

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

+<#ibizinclude>
+../../@MACRO/LANG_FUN.ftl
+</#ibizinclude>
 <template>
     ${P.getPartCode(item,'FORM').code}
 </template>
@@ -371,6 +374,13 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
     private onFormLoad(data: any = {},action:string): void {
+<#if de??>
+        if(Object.is(action,"save") || Object.is(action,"autoSave"))
+        // 更新context的实体主键
+        if(data.${appde.getCodeName()?lower_case}){
+            Object.assign(this.context,{${appde.getCodeName()?lower_case}:data.${appde.getCodeName()?lower_case}})
+        }
+</#if>
         this.setFormEnableCond(data);
         this.fillForm(data,action);
         <#if ctrl.getControlType() == 'FORM'>
@@ -583,7 +593,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
         <#--  END：是否应用实体视图  -->
         const view: any = {
             viewname: '${srffilepath2(dataview.getCodeName())}',
-            title: '${dataview.getTitle()}',
+            title: this.<@getViewLanguageTitle dataview />,
             height: ${dataview.getHeight()?c},
             width: ${dataview.getWidth()?c},
             <#if formdetail.getParamViewParamJO()??>

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

 <#ibizinclude>
 ../@MACRO/CONTROL/LANGBASE.vue.ftl
 </#ibizinclude>
+<#ibizinclude>
+../../@MACRO/LANG_FUN.ftl
+</#ibizinclude>
 <template v-if="getColumnState('${item.getName()?lower_case}')">
 <#if item.getColumnType() == 'GROUPGRIDCOLUMN' && item.getPSDEGridColumns()??>
 <#--  BEGIN：分组列  -->
@@ -38,7 +41,7 @@
                     <span>${item.render.code}</span>
               <#--  END：列绘制  -->
               <#else>
-            <template v-if="isOpenEdit">
+            <template v-if="actualIsOpenEdit">
                 <i-form style="height:100%;" :model="row">
                     <app-form-item :name="column.property" :itemRules="rules[column.property]">
                         ${P.getEditorCode(item, "GRIDEIDTOR.vue").code}
@@ -48,7 +51,7 @@
               </#if>
             <#--  END：行编辑  -->
             </#if>
-            <template <#if (ctrl.isEnableRowEdit() && item.isEnableRowEdit())>v-if="!isOpenEdit"</#if>>
+            <template <#if (ctrl.isEnableRowEdit() && item.isEnableRowEdit())>v-if="!actualIsOpenEdit"</#if>>
                 <#if (item.render??)>
                 <#--  BEGIN：列绘制  -->
                     <span>${item.render.code}</span>
@@ -68,14 +71,49 @@
                 <#--  END：前端绘制代码表  -->
                 <#else>
                 <#--  BEGIN：常规显示  -->
+                  <#if item.isEnableLinkView()>
+                  <#-- 支持链接视图-->
+                  <#if item.getLinkPSAppView()??>
+                  <#assign dataview = item.getLinkPSAppView() />
+                  <#assign appLinkView>
+                    viewname: '${srffilepath2(dataview.getCodeName())}', height: ${dataview.getHeight()?c},width: ${dataview.getWidth()?c},title: <@getViewLanguageTitle dataview />
+                  </#assign>
+                  </#if>
+                  <app-column-link :data="row" :linkview="{<#if appLinkView??>${appLinkView}</#if>}" valueitem="<#if item.getLinkValueItem()??>${item.getLinkValueItem()}</#if>">
+                    <#if item.getPSDEGridEditItem()?? && item.getPSDEGridEditItem().getPSEditorType?? && item.getPSDEGridEditItem().getPSEditorType()??>
+                    <app-span editorType="${item.getPSDEGridEditItem().getPSEditorType().getStandardPSEditorType()}" :data="row.${item.getName()?lower_case}"></app-span>
+                     <#else>
+                    <span>{{row.${item.getName()?lower_case}}}</span>
+                    </#if>
+                  </app-column-link>
+                  <#else>
+                  <#-- 不支持链接视图 -->
+                  <#if item.getPSDEGridEditItem()?? && item.getPSDEGridEditItem().getPSEditorType?? && item.getPSDEGridEditItem().getPSEditorType()??>
+                  <app-span editorType="${item.getPSDEGridEditItem().getPSEditorType().getStandardPSEditorType()}" :data="row.${item.getName()?lower_case}"></app-span>
+                  <#else>
                   <span>{{row.${item.getName()?lower_case}}}</span>
+                  </#if>
+                  </#if>
                 <#--  END：常规显示  -->
                 </#if>
             </template>
         <#--  END：列绘制、前端绘制代码表、行编辑  -->
         <#else>
         <#--  BEGIN：常规显示  -->
+            <#if item.isEnableLinkView()>
+            <#-- 支持链接视图-->
+            <#if item.getLinkPSAppView()??>
+            <#assign dataview = item.getLinkPSAppView() />
+            <#assign appLinkView>
+            viewname: '${srffilepath2(dataview.getCodeName())}', height: ${dataview.getHeight()?c},width: ${dataview.getWidth()?c},title: <@getViewLanguageTitle dataview />
+            </#assign>
+            </#if>
+            <app-column-link :data="row" :linkview="{<#if appLinkView??>${appLinkView}</#if>}" valueitem="<#if item.getLinkValueItem()??>${item.getLinkValueItem()}</#if>">
                 <span>{{row.${item.getName()?lower_case}}}</span>
+            </app-column-link>
+            <#else>
+            <span>{{row.${item.getName()?lower_case}}}</span>
+            </#if>
         <#--  END：常规显示  -->
          </#if>
         </template>

@CONTROL/表格/CONTROL.less.ftl

@@ -2,6 +2,22 @@
     flex-grow: 1;
     height: 100%;
     overflow: auto;
+    .el-table__body-wrapper::-webkit-scrollbar {
+      /*滚动条整体样式*/
+      width : 10px !important;  /*高宽分别对应横竖滚动条的尺寸*/
+      height: 10px !important;
+    }
+    .el-table__body-wrapper::-webkit-scrollbar-thumb {
+      /*滚动条颜色*/
+      border-radius   : 10px !important;
+      background-color: #cecece !important;
+    }
+    .el-table__body-wrapper::-webkit-scrollbar-track {
+      /*滚动条里面轨道*/
+      box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
+      background   : #ededed !important;
+      border-radius: 10px !important;
+    }
     .el-table {
       .el-tooltip{
         .ivu-form-item{
@@ -27,7 +43,7 @@
         }
     }
     .el-table__body-wrapper{
-      height: 100% !important;
+      height: calc(100% - 83px) !important;
     }
     .el-table__empty-block{
       height: auto !important;

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

@@ -2,8 +2,8 @@
 <#if ctrl.render??>
     ${ctrl.render.code}
 <#else>
-    <split class="app-grid-exp-bar <#if ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>" v-model="split" @on-move-end="onSplitChange">
-        <div slot='left'>
+    <split id="${ctrl.getCodeName()?lower_case}" class="app-grid-exp-bar <#if ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>" v-model="split" mode="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>" @on-move-end="onSplitChange">
+        <div slot='<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">left<#else>top</#if>'>
         <#if ctrl.isShowTitleBar()>
             <div class='grid-exp-bar-header'>
                 <div><icon type='ios-home-outline'/><#if ctrl.getTitle() == ''>表格导航栏<#else>${ctrl.getTitle()}</#if></div>
@@ -38,11 +38,10 @@
                 </#if>
             </div>
         </div>
-        <div slot='right'>
+        <div slot='<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">right<#else>bottom</#if>'>
             <component 
               v-if="selection.view && !Object.is(this.selection.view.viewname, '')" 
               :is="selection.view.viewname"
-              :key="$util.createUUID()"
               class="viewcontainer2"
               :viewDefaultUsage="false"
               :viewdata="JSON.stringify(selection.data)">
@@ -64,7 +63,7 @@
      * 打开新建数据视图
      *
      * @type {any}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     @Prop() protected newdata: any;
     </#if>
@@ -73,7 +72,7 @@
      * 打开编辑数据视图
      *
      * @type {any}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     @Prop() protected opendata: any;
     </#if>
@@ -83,8 +82,8 @@
     /**
      * 视图唯一标识
      *
-     * @type {boolean}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @type {string}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     @Prop() protected viewUID!:string;
 
@@ -93,15 +92,40 @@
      * 
      * @protected
      * @type {(boolean)}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected isSingleSelect:boolean = true;
 
+    /**
+     * 呈现模式，可选值：horizontal或者vertical
+     * 
+     * @protected
+     * @type {(string)}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
+
+    /**
+     * 控件宽度
+     *
+     * @type {number}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
+
+    /**
+     * 控件高度
+     *
+     * @type {number}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
+
     /**
      * 选中数据
      *
      * @type {*}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected selection: any = {};
 
@@ -110,7 +134,7 @@
      * 
      * @protected
      * @type {(string)}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected searchText:string = "";
 
@@ -118,7 +142,7 @@
      * 分割宽度
      *
      * @type {number}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected split: number = 0.5;
 <#if ctrl.getXDataPSControl()??>
@@ -128,7 +152,7 @@
      * 导航视图名称
      *
      * @type {string}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected navViewName: string = "<#if xDataControl.getNavPSAppView()??><#assign navPSAppView = xDataControl.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>";
 
@@ -136,7 +160,7 @@
      * 导航视图参数
      *
      * @type {string}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected navViewParam: string = '<#if xDataControl.getNavViewParamJO()??>${xDataControl.getNavViewParamJO()}</#if>';
 
@@ -144,7 +168,7 @@
      * 导航过滤项
      *
      * @type {string}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected navFilter: string = "<#if xDataControl.getNavFilter()??>${xDataControl.getNavFilter()}</#if>";
 </#if>
@@ -170,7 +194,7 @@
     /**
      * split值变化事件
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public onSplitChange() {
         if(this.split){
@@ -182,7 +206,7 @@
      * 获取多项数据
      *
      * @returns {any[]}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public getDatas(): any[] {
         return [];
@@ -192,7 +216,7 @@
      * 获取单项树
      *
      * @returns {*}
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public getData(): any {
         return null;
@@ -201,7 +225,7 @@
     /**
     * Vue声明周期(组件初始化完毕)
     *
-    * @memberof ${srfclassname('${ctrl.codeName}')}
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
     public created() {
          this.afterCreated();     
@@ -210,7 +234,7 @@
     /**
     * 执行created后的逻辑
     *
-    * @memberof ${srfclassname('${ctrl.codeName}')}
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
     public afterCreated(){
         if (this.viewState) {
@@ -224,15 +248,45 @@
                 </#if>
             });
         } 
+    }
+
+    /**
+    * Vue声明周期(组件渲染完毕)
+    *
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
+    */
+    public mounted() {
+        this.afterMounted();     
+    }
+
+    /**
+    * 执行mounted后的逻辑
+    *
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
+    */
+    public afterMounted(){ 
         if(this.$store.getters.getViewSplit(this.viewUID)){
             this.split = this.$store.getters.getViewSplit(this.viewUID);
+        }else{
+            let containerWidth:number = (document.getElementById("${ctrl.getCodeName()?lower_case}") as any).offsetWidth;
+            let containerHeight:number = (document.getElementById("${ctrl.getCodeName()?lower_case}") as any).offsetHeight;
+            if(Object.is(this.showMode,'horizontal')){
+                if(this.ctrlWidth){
+                    this.split = this.ctrlWidth/containerWidth;
+                }
+            }else{
+                if(this.ctrlHeight){
+                    this.split = this.ctrlHeight/containerHeight;
+                }
+            }
+            this.$store.commit("setViewSplit",{viewUID:this.viewUID,viewSplit:this.split});
         }  
     }
 
     /**
      * vue 生命周期
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected destroyed() {
         this.afterDestroy();
@@ -241,7 +295,7 @@
     /**
      * 执行destroyed后的逻辑
      *
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected afterDestroy() {
         if (this.viewStateEvent) {
@@ -255,7 +309,7 @@
     /**
     * 执行搜索
     *
-    * @memberof ${srfclassname('${ctrl.codeName}')}
+    * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
     protected onSearch($event:any) {
         <#if ctrl.getXDataPSControl()??>
@@ -269,7 +323,7 @@
     /**
      * ${ctrl.name}的选中数据事件
      * 
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
         let data:any = {};
@@ -282,6 +336,7 @@
         <#if xDataControl.getPSAppDataEntity()??>
         <#assign curDataEntity = xDataControl.getPSAppDataEntity()/>
         Object.assign(data,{'${curDataEntity.getCodeName()?lower_case}':arg['${curDataEntity.getCodeName()?lower_case}']});
+        Object.assign(data,{srfparentdename:'${curDataEntity.getCodeName()}',srfparentkey:arg['${curDataEntity.getCodeName()?lower_case}']});
         </#if>
         </#if>
         if(this.context){
@@ -290,12 +345,13 @@
         this.selection = {};
         Object.assign(this.selection, { view: { viewname: this.navViewName }, data:data });
         this.$emit('selectionchange',args);
+        this.$forceUpdate();
     }
 
     /**
      * ${ctrl.name}的load完成事件
      * 
-     * @memberof ${srfclassname('${ctrl.codeName}')}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     protected ${ctrl.name}_load(args:any, tag?: string, $event2?: any){
         this.$emit('load',args);

@CONTROL/表格导航/CONTROL.less.ftl

@@ -52,7 +52,16 @@
                     margin-bottom: 10px;
                 }
                 .grid-exp-bar-content2 {
+                    <#--  计算高度  -->
+                    <#if ctrl.isShowTitleBar() && ctrl.isEnableSearch()>
+                    height: calc(100% - 88px);
+                    <#elseif ctrl.isShowTitleBar() && !ctrl.isEnableSearch()>
+                    height: calc(100% - 40px);
+                    <#elseif !ctrl.isShowTitleBar() && ctrl.isEnableSearch()>
+                    height: calc(100% - 38px);
+                    <#else>
                     height: 100%;
+                    </#if>
                     overflow: auto;
                     flex-grow: 1;
                 }
@@ -67,6 +76,75 @@
             padding-right: 10px;
         }
     }
+    > .ivu-split-vertical{
+        > .ivu-split-pane {
+            > div {
+                height: 100%;
+                .grid-exp-bar-header {
+                    line-height: 50px;
+                    border-bottom: 1px solid #ddd;
+                    >div {
+                        font-size: 18px;
+                        i {
+                            font-size: 20px;
+                            margin-top: -2px;
+                        }
+                    } 
+                }
+                .container-header{
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
+                    .search-container {
+                        width: 30%;
+                        height: 48px;
+                        padding: 10px 10px 10px 0;
+                        min-width: 200px;
+                        max-width: 400px;
+                    }
+                    .toolbar-container{
+                        padding: 4px;
+                    }
+                }
+                .grid-exp-bar-content {
+                    <#--  计算高度  -->
+                    <#if ctrl.isShowTitleBar() && ctrl.isEnableSearch()>
+                    height: calc(100% - 88px);
+                    <#elseif ctrl.isShowTitleBar() && !ctrl.isEnableSearch()>
+                    height: calc(100% - 40px);
+                    <#elseif !ctrl.isShowTitleBar() && ctrl.isEnableSearch()>
+                    height: calc(100% - 38px);
+                    <#else>
+                    height: 100%;
+                    </#if>
+                    overflow: auto;
+                    margin-bottom: 10px;
+                }
+                .grid-exp-bar-content2 {
+                    <#--  计算高度  -->
+                    <#if ctrl.isShowTitleBar() && ctrl.isEnableSearch()>
+                    height: calc(100% - 88px);
+                    <#elseif ctrl.isShowTitleBar() && !ctrl.isEnableSearch()>
+                    height: calc(100% - 40px);
+                    <#elseif !ctrl.isShowTitleBar() && ctrl.isEnableSearch()>
+                    height: calc(100% - 38px);
+                    <#else>
+                    height: 100%;
+                    </#if>
+                    overflow: auto;
+                    flex-grow: 1;
+                }
+            }
+        }
+        > .top-pane.ivu-split-pane {
+            > div {
+                padding-bottom: 10px;
+            }
+        }
+        > .bottom-pane.ivu-split-pane {
+            padding-top: 10px;
+        }
+    }
 }
 
 <#ibizinclude>

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

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' :disHover="true" :padding="0" :bordered="false">
-        <#if view.isShowCaptionBar()>
-        <p slot="title">
-            ${view.getCaption()}
-        </p>
-        </#if>
+
+    <#ibizinclude>
+    ./VIEW_CAPTION.vue.ftl
+    </#ibizinclude>
+
 <#if view.hasPSControl('toolbar')>
 <#assign toolbarCtrl = view.getPSControl('toolbar')>
 <@ibizindent blank=8>

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

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' :disHover="true" :padding="0" :bordered="false">
-        <#if view.isShowCaptionBar()>
-        <p slot="title">
-            ${view.getCaption()}
-        </p>
-        </#if>
+
+    <#ibizinclude>
+    ./VIEW_CAPTION.vue.ftl
+    </#ibizinclude>
+
 <#if view.hasPSControl('toolbar')>
 <#assign toolbarCtrl = view.getPSControl('toolbar')>
 <@ibizindent blank=8>

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

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :bordered="false">
 
     <#ibizinclude>

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

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card' :dis-hover="true" :bordered="false">
 
     <#ibizinclude>
     ./VIEW_CAPTION_DATAINFO.vue.ftl
     </#ibizinclude>
+
 <#if view.hasPSControl('toolbar')>
 <@ibizindent blank=8>
         <p slot="extra" v-show="Object.is(this.selection.id, 'form')">

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

@@ -33,7 +33,7 @@ ${P.getCtrlCode('grid', 'CONTROL.html').code}
   </#if>
 </#assign>
 <div class='view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>'  :dis-hover="true" :bordered="false">
         <@ibizindent blank=8>
           <#ibizinclude>

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

@@ -9,6 +9,6 @@
     <span class='caption-image'><img src='${viewimg.getImagePath()}'/></span>
     </#if>
     </#if>
-    <span class='caption-info'>{{$t(model.srfCaption)}}</span>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
 </p>
 </#if>
\ No newline at end of file

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

@@ -10,7 +10,7 @@
     <span class='caption-image'><img src='${viewimg.getImagePath()}'/></span>
     </#if>
     </#if>
-    <span class='caption-info'>{{$t(model.srfCaption)}}</span>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
 </#if>
 </p>
 </#if>
\ No newline at end of file

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

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' :dis-hover='true' :padding='0' :bordered='false'>
-        <#if view.isShowCaptionBar()>
-        <p slot="title">
-            ${view.getCaption()}
-        </p>
-        </#if>
+
+    <#ibizinclude>
+    ./VIEW_CAPTION_DATAINFO.vue.ftl
+    </#ibizinclude>
+
         <div class="content-container">
 <@ibizindent blank=12>
 <#if view.hasPSControl('wizardpanel')>

@CONTROL/视图布局面板/实体HTML视图/VIEW.less.ftl

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

@CONTROL/视图布局面板/实体HTML视图/VIEW.vue.ftl

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

@CONTROL/视图布局面板/实体HTML视图/template.properties

+CTRLTYPE=VIEWLAYOUTPANEL#APPDEHTMLVIEW
\ No newline at end of file

@CONTROL/视图布局面板/实体全局流程数据重定向视图/VIEW.vue.ftl

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
 </div>
\ No newline at end of file

@CONTROL/视图布局面板/实体分页导航视图/VIEW.vue.ftl

 <div class='view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>'  :dis-hover="true" :bordered="false">
     <#ibizinclude>
     ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl

@CONTROL/视图布局面板/实体列表导航视图/VIEW.vue.ftl

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card' :dis-hover="true" :bordered="false">
 
     <#ibizinclude>

@CONTROL/视图布局面板/实体列表视图/VIEW.vue.ftl

 <div class='view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>'  :bordered="false" :dis-hover="true" >
     
     <#ibizinclude>

@CONTROL/视图布局面板/实体列表视图（部件视图）/VIEW.vue.ftl

 <div class='view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card view-no-caption'  :bordered="false" :dis-hover="true" >
         <div class='content-container'>
 <#assign MDContent>

@CONTROL/视图布局面板/实体卡片视图导航视图/VIEW.vue.ftl

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card' :dis-hover="true" :bordered="false">
 
     <#ibizinclude>

@CONTROL/视图布局面板/实体图表视图 （部件视图）/VIEW.vue.ftl

 <div class='view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>'  :bordered="false" :dis-hover="true" >
     
     <#ibizinclude>

@CONTROL/视图布局面板/实体图表视图/VIEW.vue.ftl

 <div class='view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>'  :bordered="false" :dis-hover="true" >
     
     <#ibizinclude>

@CONTROL/视图布局面板/实体工作流代理应用启动视图/VIEW.vue.ftl

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' :disHover="true" :padding="0" :bordered="false">
         <div class="content-container">
             <iframe :src="iframeUrl" height="100%" width="100%" seamless="seamless" frameborder="0" scrolling="auto"></iframe>

@CONTROL/视图布局面板/实体工作流代理数据视图/VIEW.vue.ftl

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' :disHover="true" :padding="0" :bordered="false">
         <div class="content-container">
             <iframe :src="iframeUrl" height="100%" width="100%" seamless="seamless" frameborder="0" scrolling="auto"></iframe>

@CONTROL/视图布局面板/实体工作流操作视图/VIEW.vue.ftl

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' dis-hover :padding="0" :bordered="false">
         <@ibizindent blank=8>
         <#ibizinclude>

@CONTROL/视图布局面板/实体工作流视图（嵌入视图）/VIEW.less.ftl

+.view-card {
+    >.ivu-card-extra {
+        top: 5px;
+        right: 0px;
+    }
+}
+
+<#ibizinclude>
+../@MACRO/DEFAULT.less.ftl
+</#ibizinclude>
\ No newline at end of file

@CONTROL/视图布局面板/实体工作流视图（嵌入视图）/VIEW.vue.ftl

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

@CONTROL/视图布局面板/实体工作流视图（嵌入视图）/template.properties

+CTRLTYPE=VIEWLAYOUTPANEL#APPDEWFEDITVIEW9
\ No newline at end of file

@CONTROL/视图布局面板/实体数据多项选择视图/VIEW.less.ftl

@@ -6,7 +6,7 @@
     >.translate-contant {
         flex-grow: 1;
         display: flex;
-        justify-content: end;
+        justify-content: flex-end;
         height: calc(100% - 64px);
         .translate-buttons {
             width: 80px;

@CONTROL/视图布局面板/实体数据多项选择视图/VIEW.vue.ftl

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">
             <div class="translate-contant">
-                <div class="center">
+                <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
                 <#if view.hasPSControl('pickupviewpanel')>
                     <@ibizindent blank=20>
                         ${P.getCtrlCode('pickupviewpanel', 'CONTROL.html').code}<#t>
                     </@ibizindent>
                 </#if>
                 </div>
-                <div class="translate-buttons">
+                <div v-if="isShowButton" class="translate-buttons">
                     <div class="buttons">
                         <i-button type="primary" :title="this.containerModel.view_rightbtn.text"
                             :disabled="this.containerModel.view_rightbtn.disabled"
@@ -32,7 +32,7 @@
                         </i-button>
                     </div>
                 </div>
-                <div class="right">
+                <div v-if="isShowButton" class="right">
                     <div class="mpicker-select">
                         <div v-for="(item, index) in viewSelections" :key="index" :class="item._select ? 'select' : ''" @click="selectionsClick(item)" @dblclick="selectionsDBLClick(item)">
                             <span>{{item.srfmajortext}}</span>
@@ -40,7 +40,7 @@
                     </div>
                 </div>
             </div>
-             <card :dis-hover="true" :bordered="false" class="footer">
+             <card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer">
                 <row :style="{ textAlign: 'right' }">
                     <i-button type="primary"  :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk">{{this.containerModel.view_okbtn.text}}</i-button>
                         &nbsp;&nbsp;

@CONTROL/视图布局面板/实体数据视图/VIEW.vue.ftl

 <div class='view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>'  :dis-hover="true" :bordered="false">
 <@ibizindent blank=8>
 <#ibizinclude>

@CONTROL/视图布局面板/实体数据视图（部件视图）/VIEW.vue.ftl

 <div class='view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card view-no-caption'  :dis-hover="true" :bordered="false">
         <div class='content-container'>
 <#assign MDContent>

@CONTROL/视图布局面板/实体数据选择视图/VIEW.less.ftl

@@ -6,7 +6,7 @@
     >.pickupviewpanel {
         flex-grow: 1;
         display: flex;
-        justify-content: end;
+        justify-content: flex-end;
         height: calc(100% - 64px);
     }
     >.footer {

@CONTROL/视图布局面板/实体数据选择视图/VIEW.vue.ftl

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">
             <#if view.hasPSControl('pickupviewpanel')>
@@ -7,7 +7,7 @@
                     ${P.getCtrlCode('pickupviewpanel', 'CONTROL.html').code}<#t>
                 </@ibizindent>
             </#if>
-            <card v-if="ifShowButtons" :dis-hover="true" :bordered="false" class="footer">
+            <card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer">
                 <row :style="{ textAlign: 'right' }">
                     <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk">{{this.containerModel.view_okbtn.text}}</i-button>
                         &nbsp;&nbsp;

@CONTROL/视图布局面板/实体数据重定向视图/VIEW.vue.ftl

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
 </div>
\ No newline at end of file

@CONTROL/视图布局面板/实体日历导航视图/VIEW.vue.ftl

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card' :dis-hover="true" :bordered="false">
 
     <#ibizinclude>

@CONTROL/视图布局面板/实体树导航视图/VIEW.vue.ftl

 <div class='view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>'  :dis-hover="true" :bordered="false">
         <@ibizindent blank=8>
           <#ibizinclude>

@CONTROL/视图布局面板/实体树视图/VIEW.vue.ftl

 <div class='view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
-        <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+        <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
         <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' :dis-hover="true" :bordered="false">
 
-        <#if view.isShowCaptionBar() || view.hasPSControl('toolbar')>
-        <p slot='title'>
-            <#if view.getPSSysImage()??>
-            <#assign viewimg = view.getPSSysImage()/>
-            <#if viewimg.getImagePath() !=  "">
-            <span class='caption-image'><i class='${viewimg.getCssClass()}'></i></span>
-            <#else>
-            <span class='caption-image'><img src='${viewimg.getImagePath()}'/></span>
-            </#if>
-            </#if>
-            <span class='caption-info'>{{$t(model.srfCaption)}}</span>
-        </p>
-        </#if>
+        <#ibizinclude>
+        ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
+        </#ibizinclude>
 
 <#if view.hasPSControl('toolbar')>
 <@ibizindent blank=8>

@CONTROL/视图布局面板/实体树视图（部件视图）/VIEW.vue.ftl

 <div class='view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>    
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>    
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' :dis-hover="true" :bordered="false">
     <div class='content-container'>
         <div class='view-top-messages'>

@CONTROL/视图布局面板/实体编辑视图（上下关系）/VIEW.vue.ftl

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' :disHover="true" :padding="0" :bordered="false">
-        <#if view.isShowCaptionBar()>
-        <p slot="title">
-            ${view.getCaption()}
-        </p>
-        </#if>
+
+    <#ibizinclude>
+    ../@MACRO/VIEW_CAPTION.vue.ftl
+    </#ibizinclude>
+
 <#if view.hasPSControl('toolbar')>
 <#assign toolbarCtrl = view.getPSControl('toolbar')>
 <@ibizindent blank=8>

@CONTROL/视图布局面板/实体编辑视图（左右关系）/VIEW.vue.ftl

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card' :dis-hover="true" :bordered="false">
 
     <#ibizinclude>

@CONTROL/视图布局面板/实体表格导航视图/VIEW.vue.ftl

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card' :dis-hover="true" :bordered="false">
 
     <#ibizinclude>

@CONTROL/视图布局面板/实体选择树视图（部件视图）/VIEW.vue.ftl

     <div class='view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
-        <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+        <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
         <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' :dis-hover="true" :bordered="false">
             <#--  不带数据信息标题  -->
             <#if view.isShowCaptionBar()>
-            <p v-if="ifShowButtons" slot='title'>
+            <p v-if="isShowButton" slot='title'>
                 <#if view.getPSSysImage()??>
                 <#assign viewimg = view.getPSSysImage()/>
                 <#if viewimg.getImagePath() !=  "">
@@ -12,7 +12,7 @@
                 <span class='caption-image'><img src='${viewimg.getImagePath()}'/></span>
                 </#if>
                 </#if>
-                <span class='caption-info'>{{$t(model.srfCaption)}}</span>
+                <span class='caption-info'>{{$t(model.srfTitle)}}</span>
             </p>
             </#if>
             <div class='content-container'>
@@ -30,13 +30,6 @@
                 </div>
                 </#if>
                 </@ibizindent>
-                <card v-if="ifShowButtons" :dis-hover="true" :bordered="false" class="footer">
-                    <row :style="{ textAlign: 'right' }">
-                        <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true"  @click="onClickOk">确定</i-button>
-                            &nbsp;&nbsp;
-                        <i-button @click="onClickCancel">取消</i-button>
-                    </row>
-                </card>
             </div>
         </card>
     </div>
\ No newline at end of file

@CONTROL/视图布局面板/实体选择表格视图/VIEW.vue.ftl

 <div class='view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card view-no-caption' :dis-hover="true" :bordered="false">
         <div class='content-container pickup-grid-view'>
             <@ibizindent blank=12>

@CONTROL/视图布局面板/实体选项操作视图/VIEW.vue.ftl

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' dis-hover :padding="0" :bordered="false">
         <@ibizindent blank=8>
         <#ibizinclude>

@CONTROL/视图布局面板/应用全局数据重定向视图/VIEW.vue.ftl

 <div class="app-redirect-view ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
 </div>
\ No newline at end of file

@CONTROL/视图布局面板/应用全局流程工作重定向视图/VIEW.vue.ftl

 <div class="app-wfredirect-view ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
 </div>
\ No newline at end of file

@CONTROL/视图布局面板/应用图片上传视图/VIEW.vue.ftl

 <div class="${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
 </div>
\ No newline at end of file

@CONTROL/视图布局面板/应用文件上传视图/VIEW.vue.ftl

 <div class="${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
 </div>
\ No newline at end of file

@CONTROL/视图布局面板/应用注销视图/VIEW.vue.ftl

 <div class="app-logout-view ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <img class="logout-bg" src="/assets/img/logout_bg.png"/>
     <div class="logout-container">
         尊敬的客户您好，您已成功退出系统，将在 <a>{{this.countdown}}</a> 秒后跳转至<a @click="gotoLoginView">登录页</a>！

@CONTROL/视图布局面板/应用流程跟踪视图/VIEW.vue.ftl

 <div class='view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card' dis-hover :bordered="false">
         <#ibizinclude>
         ../@MACRO/VIEW_CAPTION.vue.ftl

@CONTROL/视图布局面板/应用登录视图/VIEW.vue.ftl

 <div class="app-login-view ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <img class="login-bg" src="/assets/img/login_bg.png"/>
     <div class="login-container">
-        <div class="login-title">登 录</div>
+        <div class="login-title">{{$t(model.srfTitle)}}</div>
         <i-form class="login-form">
             <form-item>
                 <i-input type="text" v-model="formData.loginname" placeholder="用户名" clearable>

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

 <div class='view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card' dis-hover :bordered="false">
         <#ibizinclude>
         ../@MACRO/VIEW_CAPTION.vue.ftl

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

@@ -13,6 +13,10 @@
         display: flex;
         align-items: center;
         justify-content: space-between;
+        .page-logo{
+          display: flex;
+          align-items: center;
+        }
         .header-left{
             display: flex;
             align-items: center;

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

@@ -7,24 +7,21 @@
 <#else>
 <#if view.getMainMenuAlign()=="LEFT" || view.getMainMenuAlign()=="">
 <div class="index_view ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction viewTitle="${view.getTitle()}" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <layout :class="themeClasses" :style="themeStyle">
         <header class="index_header">
+            <div class="header-left" >
                 <div class="page-logo">
                     <#if view.getAppIconPath() != "">
-                    <img src="${view.getAppIconPath()}" height="22">
+                        <img src="${view.getAppIconPath()}" height="32">
                         <#else>
-                    <img src="../../../assets/img/logo2.png" height="22" />
+                        <img src="../../../assets/img/logo.png" height="32" />
                     </#if>
-                <span style="display: inline-block;margin-left: 10px;font-size: 22px;">${view.getCaption()}</span>
+                    <span style="display: inline-block;margin-left: 10px;font-size: 22px;">{{$t(model.srfTitle)}}</span>
                 </div>
-            <div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
-                <div>
-                    <icon type="md-notifications-outline" style="font-size: 25px;margin: 0 10px;" />
-                </div>
-                <div>
-                    <icon type="ios-mail-open-outline" style="font-size: 25px;margin: 0 10px;" />
             </div>
+            <div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
+                <app-header-menus />
                 <app-lang style='font-size: 15px;padding: 0 10px;'></app-lang>
                 <app-orgsector></app-orgsector>
                 <app-user></app-user>
@@ -62,20 +59,15 @@
         <header class="index_header" >
             <div class="header-left">
                 <div class="page-logo">
-                    <img src="../../../assets/img/logo2.png" height="22" />
-                    <span style="display: inline-block;margin-left: 10px;font-size: 22px;">首页</span>
+                    <img src="../../../assets/img/logo.png" height="32" />
+                    <span style="display: inline-block;margin-left: 10px;font-size: 22px;">{{$t(model.srfTitle)}}</span>
                 </div>
                 <div style="margin-left: 50px;">
                 ${P.getCtrlCode('appmenu', 'CONTROL.html').code}
                 </div>
             </div>
             <div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
-                <div>
-                    <icon type="md-notifications-outline" style="font-size: 25px;margin: 0 10px;" />
-                </div>
-                <div>
-                    <icon type="ios-mail-open-outline" style="font-size: 25px;margin: 0 10px;" />
-                </div>
+                <app-header-menus />
                 <app-lang style='font-size: 15px;padding: 0 10px;'></app-lang>
                 <app-orgsector></app-orgsector>
                 <app-user></app-user>

@CONTROL/选择视图面板/CONTROL-BASE.vue.ftl

@@ -8,11 +8,11 @@
           :viewparam="viewparam"
           :viewDefaultUsage="false"
           :isSingleSelect="isSingleSelect"
-          :ifShowButtons="ifShowButtons"
+          :selectedData="selectedData"
+          :isShowButton="isShowButton"
           @viewdataschange="onViewDatasChange"
           @viewdatasactivated="viewDatasActivated"
-          @viewload="onViewLoad"
-          :key="this.$util.createUUID()">
+          @viewload="onViewLoad">
         </component>
     </div>
 </template>
@@ -23,6 +23,13 @@ import ${srfclassname('${ctrl.codeName}')}Model from './${srffilepath2(ctrl.code
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl
 </#ibizinclude>
+    /**
+     * 选中数据字符串
+     *
+     * @type {string}
+     * @memberof ${srfclassname('${ctrl.codeName}')}
+     */
+    @Prop() protected selectedData?: string;
 
     /**
      * 获取多项数据
@@ -77,7 +84,7 @@ import ${srfclassname('${ctrl.codeName}')}Model from './${srffilepath2(ctrl.code
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop({default: true}) protected ifShowButtons!: boolean;
+    @Prop({default: true}) protected isShowButton!: boolean;
 
     /**
      * 是否单选

@CONTROL/选择视图面板/CONTROL.html.ftl

 <#--  content  -->
 <#assign content>
     :isSingleSelect="isSingleSelect"
-    :ifShowButtons="ifShowButtons"
+    :selectedData="selectedData"
+    :isShowButton="isShowButton"
 </#assign>
 <#ibizinclude>
 ../@MACRO/HTML/DEFAULT.html.ftl