合并分支 'dev' 到 'master'

Dev

查看合并请求 !15

@CONTROL/@MACRO/FUNC/MACRO.ftl

@@ -22,6 +22,19 @@
   </#if>
 </#macro>
 
+<#--  获取快速搜索栏提示 Placeholder -->
+<#macro getSearchPlaceholder ctrl>
+  <#assign isdrawcComma = false />
+  <#if ctrl.getPSAppDataEntity?? && ctrl.getPSAppDataEntity()?? && ctrl.getPSAppDataEntity().getAllPSAppDEFields?? && ctrl.getPSAppDataEntity().getAllPSAppDEFields()??>
+    <#list ctrl.getPSAppDataEntity().getAllPSAppDEFields() as field>
+      <#if field.isEnableQuickSearch()>
+        <#if isdrawcComma>，<#else><#assign isdrawcComma = true /></#if><#t>
+        ${field.getPSDEField().getLogicName()}<#t>
+      </#if>
+    </#list>
+  </#if>
+</#macro>
+
 <#-- 获取导航上下文 -->
 <#macro getNavigateContext currentItem>
 {<#t>

@CONTROL/分页导航面板/CONTROL-BASE.vue.ftl

@@ -4,9 +4,9 @@
     ${ctrl.render.code}
 <#else>
   <div class='tabviewpanel<#if ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>' style="height:100%;">
-        <tabs :value="tabValue" :animated="false" class='tabexppanel' name='${ctrl.getCodeName()?lower_case}' @on-click="tabPanelClick">
+        <tabs :value="activiedTabViewPanel" :animated="false" class='tabexppanel' name='${ctrl.getCodeName()?lower_case}' @on-click="tabPanelClick">
         <#list ctrl.getPSControls() as tabviewpanel>
-        <tab-pane :index="${tabviewpanel_index}" name='${tabviewpanel.name}' tab='${ctrl.getCodeName()?lower_case}' class='<#if tabviewpanel.getPSSysCss?? && tabviewpanel.getPSSysCss()??>${tabviewpanel.getPSSysCss().getCssName()}</#if>'  v-if="computedAuthorizedPanel('${tabviewpanel.name}')"
+        <tab-pane :index="${tabviewpanel_index}" name='${tabviewpanel.name}' tab='${ctrl.getCodeName()?lower_case}' class='<#if tabviewpanel.getPSSysCss?? && tabviewpanel.getPSSysCss()??>${tabviewpanel.getPSSysCss().getCssName()}</#if>'  v-if="authResourceObject['${tabviewpanel.name}'].visabled"
             :label="(h) =>{
                 return h('div', [
                     <#if tabviewpanel.getPSSysImage()??>
@@ -58,6 +58,14 @@ import { Environment } from '@/environments/environment';
      */
     public appAuthService: ${appde.getCodeName()}AuthService = new ${appde.getCodeName()}AuthService();
 
+    /**
+     * 界面UI服务对象
+     *
+     * @type {${srfclassname('${appde.getCodeName()}')}UIService}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */  
+    public appUIService:${srfclassname('${appde.getCodeName()}')}UIService = new ${srfclassname('${appde.getCodeName()}')}UIService(this.$store);
+
     /**
      * 是否初始化
      *
@@ -120,13 +128,13 @@ import { Environment } from '@/environments/environment';
     public action:any = '';
 
     /**
-     * 分页面板统一资源存储对象
+     * 分页面板权限标识存储对象
      *
      * @public
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public authResourceObject:any = {<#list ctrl.getPSControls() as tabviewpanel>'${tabviewpanel.name}':<#if tabviewpanel.getEmbeddedPSAppDEView()?? && tabviewpanel.getEmbeddedPSAppDEView().getAccessKey()??>'${tabviewpanel.getEmbeddedPSAppDEView().getAccessKey()}'<#else>null</#if><#if tabviewpanel_has_next>,</#if></#list>};
+    public authResourceObject:any = {<#list ctrl.getPSControls() as tabviewpanel>'${tabviewpanel.name}':{resourcetag:<#if tabviewpanel.getEmbeddedPSAppDEView()?? && tabviewpanel.getEmbeddedPSAppDEView().getAccessKey()??>'${tabviewpanel.getEmbeddedPSAppDEView().getAccessKey()}'<#else>null</#if><#if tabviewpanel.getPSDEOPPriv?? && tabviewpanel.getPSDEOPPriv()??>,actiontarget: 'SINGLEKEY',noprivdisplaymode:2,dataaccaction:'${tabviewpanel.getPSDEOPPriv().getName()}'</#if>,visabled: true,disabled: false}<#if tabviewpanel_has_next>,</#if></#list>};
 
     /**
      * 被激活的分页面板
@@ -137,39 +145,45 @@ import { Environment } from '@/environments/environment';
     public activiedTabViewPanel: string = '<#list ctrl.getPSControls() as tabviewpanel><#if tabviewpanel_index==0>${tabviewpanel.name}</#if></#list>';
 
     /**
-     * 计算激活分页面板
+     * 计算分页面板权限
      *
-     * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public computedActiviedPanel(){
-        if(this.$store.getters['authresource/getEnablePermissionValid']){
-            if(Object.keys(this.authResourceObject).length >0){
-                let targetResult:Array<any> = [];
-                Object.keys(this.authResourceObject).forEach((item:any) =>{
-                    if(this.computedAuthorizedPanel(item)) 
-                        targetResult.push(item);
-                })
-                if(targetResult.length >0){
-                    this.activiedTabViewPanel = targetResult[0];
-                    this.tabPanelClick(targetResult[0]);
+    public computedAuthPanel(data:any){
+        if(!data || Object.keys(data).length === 0){
+            return;
+        }
+        if(this.authResourceObject && Object.keys(this.authResourceObject).length >0){
+            Object.keys(this.authResourceObject).forEach((key:string) =>{
+                if(this.authResourceObject[key] && this.authResourceObject[key]['dataaccaction']){
+                    let tempUIAction:any = Util.deepCopy(this.authResourceObject[key]);
+                    let result: any[] = ViewTool.calcActionItemAuthState(data,[tempUIAction],this.appUIService);
+                    this.authResourceObject[key].visabled = this.computedPanelWithResource(key,tempUIAction.visabled);
+                    this.authResourceObject[key].disabled = this.computedPanelWithResource(key,tempUIAction.disabled);
+                }
+            })
+            const keys:any = Object.keys(this.authResourceObject);
+            for(let i=0;i<keys.length;i++){
+                if(this.authResourceObject[keys[i]].visabled){
+                    this.tabPanelClick(keys[i]);
+                    return;
                 }
             }
         }
     }
 
     /**
-     * 计算分页面板是否显示
+     * 合入统一资源权限
      *
-     * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public computedAuthorizedPanel(name:string){
+    public computedPanelWithResource(name:string,mainState:boolean){
         if(!this.$store.getters['authresource/getEnablePermissionValid'])
-            return true;
+            return mainState === false?false:true;
         if(!this.authResourceObject[name]) 
-            return true;
-        return this.appAuthService.getResourcePermission(this.authResourceObject[name]);
+            return mainState === false?false:true;
+        const resourceAuth:boolean = this.appAuthService.getResourcePermission(this.authResourceObject[name]['resourcetag']);
+        return !resourceAuth?false:mainState?true:false;
     }
 
     /**
@@ -184,7 +198,6 @@ import { Environment } from '@/environments/environment';
     /**
      * vue 生命周期
      *
-     * @returns
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public created() {
@@ -204,15 +217,18 @@ import { Environment } from '@/environments/environment';
             Object.assign(this.context,{srfparentdename:'${appDataEntity.getCodeName()}',srfparentkey:this.context.${appDataEntity.getCodeName()?lower_case}})
         }
         </#if>
-        this.computedActiviedPanel();
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
                 if (!Object.is(tag, this.name)) {
                     return;
                 }
-                this.action = action;
-                this.viewState.next({ tag: this.activiedTabViewPanel, action: action, data: data });
-                this.$forceUpdate();
+                if(Object.is(action,'loadmodel')){
+                    this.computedAuthPanel(data);
+                }else{
+                    this.action = action;
+                    this.viewState.next({ tag: this.activiedTabViewPanel, action: action, data: data });
+                    this.$forceUpdate();
+                }
             });
         }
     }    
@@ -251,6 +267,7 @@ import { Environment } from '@/environments/environment';
         if (!$event) {
             return;
         }
+        this.isInit = [];
         this.isInit[$event] = true;
         if (!this.viewState) {
             return;

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

+<#ibizinclude>
+../@MACRO/CONTROL/LANGBASE.vue.ftl
+</#ibizinclude>
 <template>  
     <div :class="['app-list',<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()>'${singleCss.getCssName()}',</#if>this.items.length > 0 ? '' : 'app-list-empty' ]">
         <div v-if="items.length > 0">
@@ -37,7 +40,7 @@
                         </div>
                     </div>
                     <div v-else style="text-align: center;">
-                        {{ $t('app.commonWords.noData') }}
+                        {{ $t('<#if langbase??>${langbase}.nodata</#if>') }}
                     </div>
                 </el-collapse-item>
             </el-collapse>
@@ -48,7 +51,7 @@
             </template>
         </div>
         <div v-else>
-            {{ $t('app.commonWords.noData') }}
+            {{ $t('<#if langbase??>${langbase}.nodata</#if>') }}
         </div>
         <el-backtop target=".content-container .app-list"></el-backtop>
     </div>
@@ -405,6 +408,7 @@ import CodeListService from "@/codelist/codelist-service";
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public afterMounted () {
+        const loadMoreCallBack:any = this.throttle(this.loadMore,3000);
         this.$el.addEventListener('scroll', ()=> {
             if(this.$el.scrollHeight > this.$el.clientHeight) {
                 this.isScrollBar = true;
@@ -412,7 +416,7 @@ import CodeListService from "@/codelist/codelist-service";
                 this.isScrollBar = false;
             }
             if( this.$el.scrollTop +  this.$el.clientHeight  >=  this.$el.scrollHeight) {
-                this.loadMore();
+                loadMoreCallBack();
             }
         })
     }
@@ -437,8 +441,13 @@ import CodeListService from "@/codelist/codelist-service";
                 if (!Object.is(this.name, tag)) {
                     return;
                 }
-                if (Object.is(action,'load') || Object.is(action,'refresh')) {
-                    this.refresh(data)
+                if (Object.is(action,'load')) {
+                    this.curPage = 1;
+                    this.items = [];
+                    this.load(data);
+                }
+                if (Object.is(action,'refresh')) {
+                    this.refresh(data);
                 }
             });
         }
@@ -486,8 +495,7 @@ import CodeListService from "@/codelist/codelist-service";
     * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
     public loadMore(){
-        if(this.totalRecord>this.items.length)
-        {
+        if(this.totalRecord>this.items.length){
             this.curPage = ++this.curPage;
             this.isAddBehind = true;
             this.load({});
@@ -501,7 +509,7 @@ import CodeListService from "@/codelist/codelist-service";
      * @memberof Main
      */
     public refresh(args?: any) {
-        this.curPage = 1;
+        this.isAddBehind = true;
         this.load(args);
     }
 
@@ -548,13 +556,14 @@ import CodeListService from "@/codelist/codelist-service";
             if(!this.isAddBehind){
                 this.items = [];
             }
-            if (Object.keys(data).length > 0) {
+            if (data && data.length > 0) {
                 let datas = JSON.parse(JSON.stringify(data));
                 datas.map((item: any) => {
                     Object.assign(item, { isselected: false });
                 });
                 this.totalRecord = response.total;
                 this.items.push(...datas);
+                this.items = this.arrayNonRepeatfy(this.items);
             }
             this.isAddBehind = false;
             this.$emit('load', this.items);
@@ -582,6 +591,44 @@ import CodeListService from "@/codelist/codelist-service";
         });
     }
 
+    /**
+     * 列表数据去重
+     *
+     * @param {Array<any>} [arr]
+     * @returns {void}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public arrayNonRepeatfy(arr:Array<any>) {
+        let map = new Map();
+        let array = new Array();
+        for (let i = 0; i < arr.length; i++) {
+            map .set(arr[i].srfkey, arr[i]); 
+        }
+        map.forEach((value:any, key:string, map:any) => {
+            array.push(value);
+        });
+        return array ;
+    }
+
+    /**
+     * 节流
+     *
+     * @param {Array<any>} [arr]
+     * @returns {void}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public throttle(fn:any, wait:number){
+        let time = 0;
+        return () =>{
+          let now = Date.now()
+          let args = arguments;
+          if(now - time > wait){
+            fn.apply(this, args)
+            time = now;
+          }
+        }
+    }
+
     /**
      * 删除
      *

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

@@ -160,7 +160,7 @@ import  ${srfclassname('${appCounter.getCodeName()}')}CounterService  from '@/co
      * @type {(string)}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public placeholder="<@getQuickSearchPlaceholder view />";
+    public placeholder="<@getQuickSearchPlaceholder ctrl />";
 
     /**
      * 搜索值

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

@@ -161,7 +161,7 @@ import  ${srfclassname('${appCounter.getCodeName()}')}CounterService  from '@/co
      * @type {(string)}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public placeholder="<@getQuickSearchPlaceholder view />";
+    public placeholder="<@getQuickSearchPlaceholder ctrl />";
 
     /**
      * 搜素值

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

@@ -4,7 +4,7 @@ ${ctrl.render.code}
 <#else>
     <layout class="app-wizard<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if>">
 <#if ctrl.getPSDEWizard?? && ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getPSDEWizardSteps?? && ctrl.getPSDEWizard().getPSDEWizardSteps()??>
-    <el-steps class="wizard-steps"  :active="wizardForms.indexOf(activeForm)" finish-status="success">
+    <el-steps class="wizard-steps"  :active="wizardForms.indexOf(activeForm)" finish-status="success" align-center>
     <#list ctrl.getPSDEWizard().getPSDEWizardSteps() as step>
       <el-step title="${step.getTitle()}"></el-step>
     </#list>

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

@@ -2,18 +2,20 @@
 ${item.render.code}
 <#else>
 <app-rawitem
+    :viewparams="viewparams" 
+    :context="context"
     contentStyle="<#if item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>"
     sizeStyle="<#if item.getRawItemHeight() gt 0>height: ${item.getRawItemHeight()?c}px;</#if><#if item.getRawItemWidth() gt 0>width: ${item.getRawItemWidth()?c}px;</#if>"
     contentType="<#if item.getContentType?? && item.getContentType()??>${item.getContentType()}</#if>"
-    <#if item.getRawContent?? && item.getRawContent()??>
-    rawContent="${item.getRawContent()}"
-    </#if>
     <#if item.getHtmlContent?? && item.getHtmlContent()??>
-    htmlContent="${item.getHtmlContent()}"
+    :htmlContent='`${item.getHtmlContent()}`'
     </#if>
     <#if item.getPSSysImage?? && item.getPSSysImage()??>
     <#assign img=item.getPSSysImage()>
     <#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>
     imageClass="${img.getCssClass()}"</#if></#if>>
+    <#if item.getContentType?? && item.getContentType() == 'RAW'>
+        ${item.getRawContent()}
+    </#if>
 </app-rawitem>
 </#if>
\ No newline at end of file

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

@@ -581,9 +581,17 @@ ${P.getLogicCode(singleFuncs,"LOGIC.vue").code}
                     item.items.map((singleItem:any) =>{
                         if(!singleItem.hidden){
                             item.hidden = false;
+                        }else{
+                            if(singleItem.items && singleItem.items.length >0){
+                                singleItem.items.map((grandsonItem:any) =>{
+                                    if(!grandsonItem.hidden){
+                                        item.hidden = false;
+                                    }
+                                })
+                            }
                         }
-                        if(singleItem.items && singleItem.items.length >0){
-                            this.computeParentMenus(singleItem.items);
+                        if(item.items && item.items.length >0){
+                            this.computeParentMenus(item.items);
                         }
                     })
                 }

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

@@ -298,7 +298,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
      */
     public createDefault(){                    
 <#list ctrl.getAllPSDEFormDetails() as formdetail><#t>
-  <#if formdetail.getCreateDV?? && formdetail.getCreateDV()?? && formdetail.getCreateDV() !=""><#t>
+  <#if (formdetail.getCreateDV?? || formdetail.getCreateDVT??) && (formdetail.getCreateDV()?? || formdetail.getCreateDVT()??) && (formdetail.getCreateDV() !="" || formdetail.getCreateDVT() != "")><#t>
         if (this.data.hasOwnProperty('${formdetail.getCodeName()?lower_case}')) {
       <#if !(formdetail.getCreateDVT() == '')><#t>
       <#-- 网页请求 -->

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

+<#ibizinclude>
+../@MACRO/CONTROL/LANGBASE.vue.ftl
+</#ibizinclude>
 <template>
 <#if ctrl.render??>
     ${ctrl.render.code}
 <#else>
     <div class="app-data-chart<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>">
-        <div v-if="isNoData" class="chart-no-data"><i class="el-icon-data-analysis"></i>{{$t('app.commonWords.noData')}}</div>
-        <div v-else class="app-charts" :id="chartId" style="<#if ctrl.getWidth() gt 0>width: ${ctrl.getWidth()};</#if>height: <#if ctrl.getHeight() gt 0>${ctrl.getHeight()}px<#else>100%</#if>;padding: 6px 0;"></div>
+        <div v-show="isNoData" class="chart-no-data"><i class="el-icon-data-analysis"></i>{{$t('<#if langbase??>${langbase}.nodata</#if>')}}</div>
+        <div v-show="!isNoData" class="app-charts" :id="chartId" style="<#if ctrl.getWidth() gt 0>width: ${ctrl.getWidth()};</#if>height: <#if ctrl.getHeight() gt 0>${ctrl.getHeight()}px<#else>100%</#if>;padding: 6px 0;"></div>
   </div>
 </#if>
 </template>
@@ -297,7 +300,10 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
         Object.assign(arg, parentdata);
-        Object.assign(arg,{viewparams:this.viewparams,page:0,size:1000});
+        let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
+        Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
+        Object.assign(arg,{viewparams:tempViewParams});
+        Object.assign(arg,{page:0,size:1000});
         <#if ctrl.getPSDEDataSet()??>
         <#assign appDataSet = ctrl.getPSDEDataSet() />
         <#if appDataSet.getMajorSortDir()?? && appDataSet.getMajorSortPSDEField()??>

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

+<#ibizinclude>
+../@MACRO/CONTROL/LANGBASE.vue.ftl
+</#ibizinclude>
 <template>
 <#if ctrl.render??>
         ${ctrl.render.code}
 <#else>
     <div class="app-data-chart<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>">
-        <div v-if="isNoData" class="chart-no-data"><i class="el-icon-data-analysis"></i>{{$t('app.commonWords.noData')}}</div>
-        <div v-else class="app-charts" :id="chartId" style="<#if ctrl.getWidth() gt 0>width: ${ctrl.getWidth()};</#if>height: <#if ctrl.getHeight() gt 0>${ctrl.getHeight()}px<#else>100%</#if>;padding: 6px 0;"></div>
+        <div v-show="isNoData" class="chart-no-data"><i class="el-icon-data-analysis"></i>{{$t('<#if langbase??>${langbase}.nodata</#if>')}}</div>
+        <div v-show="!isNoData" class="app-charts" :id="chartId" style="<#if ctrl.getWidth() gt 0>width: ${ctrl.getWidth()};</#if>height: <#if ctrl.getHeight() gt 0>${ctrl.getHeight()}px<#else>100%</#if>;padding: 6px 0;"></div>
   </div>
 </#if>
 </template>
@@ -297,7 +300,10 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
         Object.assign(arg, parentdata);
-        Object.assign(arg,{viewparams:this.viewparams,page:0,size:1000});
+        let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
+        Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
+        Object.assign(arg,{viewparams:tempViewParams});
+        Object.assign(arg,{page:0,size:1000});
         <#if ctrl.getPSDEDataSet()??>
         <#assign appDataSet = ctrl.getPSDEDataSet() />
         <#if appDataSet.getMajorSortDir()?? && appDataSet.getMajorSortPSDEField()??>

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

+<#ibizinclude>
+../@MACRO/CONTROL/LANGBASE.vue.ftl
+</#ibizinclude>
 <template>
 <#if ctrl.render??><#t>
     ${ctrl.render.code}
@@ -85,13 +88,13 @@
                         </a>
                     </div>
                     <div v-else style="text-align: center;">
-                        {{ $t('app.commonWords.noData') }}
+                        {{ $t('<#if langbase??>${langbase}.nodata</#if>') }}
                     </div>
                 </el-collapse-item>
             </el-collapse>
         </#if>
         </row>
-        <div v-else class="app-data-empty">{{ $t('app.commonWords.noData') }}</div>
+        <div v-else class="app-data-empty">{{ $t('<#if langbase??>${langbase}.nodata</#if>') }}</div>
         <el-backtop target=".content-container .app-data-view"></el-backtop>
   </div>
 </#if>

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

@@ -134,7 +134,7 @@
      * @type {(string)}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public placeholder="<@getQuickSearchPlaceholder view />";
+    public placeholder="<@getQuickSearchPlaceholder ctrl />";
 
     /**
      * 搜素值

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

 <#ibizinclude>
 ../../@MACRO/LANG_FUN.ftl
 </#ibizinclude>
+<#ibizinclude>
+../@MACRO/CONTROL/LANGBASE.vue.ftl
+</#ibizinclude>
 <template>
 <#if ctrl.render??>
 ${ctrl.render.code}
@@ -24,36 +27,42 @@ ${ctrl.render.code}
     </#if>
       <context-menu-container>
 <#if ctrl.getCalendarStyle?? && ctrl.getCalendarStyle() == 'TIMELINE'>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(item, index) in events"
-            :key="item.title+index"
-            :color="item.color"
-            :timestamp="item.start" 
-            placement="top">
-            <context-menu :contextMenuStyle="{width: '100%'}" :data="item" :renderContent="renderContextMenu">
-                <el-card @click.native="onEventClick(item,true,$event)" :class="item.className">
-                <#if ctrl.getPSSysCalendarItems()?? >
-                <#list ctrl.getPSSysCalendarItems() as calendarItem>
-                    <div v<#if calendarItem_index != 0>-else</#if>-if="<#if calendarItem.getPSLayoutPanel()??>true<#else>false</#if> && item.itemType == '${calendarItem.getItemType()}'">
-                    <#if calendarItem.getPSLayoutPanel()??>
-                    <#assign panel = calendarItem.getPSLayoutPanel()>
-                    <@ibizindent blank=18>
-                    ${P.getCtrlCode(panel, 'CONTROL.html').code}
-                    </@ibizindent>
+        <template v-if="events.length >0">
+            <el-timeline>
+            <el-timeline-item
+                v-for="(item, index) in events"
+                :key="item.title+index"
+                :color="item.color"
+                :timestamp="item.start" 
+                placement="top">
+                <context-menu :contextMenuStyle="{width: '100%'}" :data="item" :renderContent="renderContextMenu">
+                    <el-card @click.native="onEventClick(item,true,$event)" :class="item.className">
+                    <#if ctrl.getPSSysCalendarItems()?? >
+                    <#list ctrl.getPSSysCalendarItems() as calendarItem>
+                        <div v<#if calendarItem_index != 0>-else</#if>-if="<#if calendarItem.getPSLayoutPanel()??>true<#else>false</#if> && item.itemType == '${calendarItem.getItemType()}'">
+                        <#if calendarItem.getPSLayoutPanel()??>
+                        <#assign panel = calendarItem.getPSLayoutPanel()>
+                        <@ibizindent blank=18>
+                        ${P.getCtrlCode(panel, 'CONTROL.html').code}
+                        </@ibizindent>
+                        </#if>
+                        </div>
+                    </#list>
+                        <div v-else>
+                            <h4>{{item.title}}</h4>
+                            <p>{{$t('app.calendar.from')}} {{item.start}} {{$t('app.calendar.to')}} {{item.end}}</p>
+                        </div>
                     </#if>
-                    </div>
-                </#list>
-                    <div v-else>
-                        <h4>{{item.title}}</h4>
-                        <p>{{$t('app.calendar.from')}} {{item.start}} {{$t('app.calendar.to')}} {{item.end}}</p>
-                    </div>
-                </#if>
-                </el-card>
-            </context-menu>
-          </el-timeline-item>
-        </el-timeline>
+                    </el-card>
+                </context-menu>
+            </el-timeline-item>
+            </el-timeline>
+        </template>
+        <template v-else>
+            <span class="app-data-empty">{{ $t('<#if langbase??>${langbase}.nodata</#if>') }}</span>
+        </template>
 <#else>
+        <template v-if="events.length >0">
         <div class="event-legends">
 <#if ctrl.getPSSysCalendarItems()??>
   <#list ctrl.getPSSysCalendarItems() as calendarItem>
@@ -86,6 +95,10 @@ ${ctrl.render.code}
           <modal v-model="modalVisible" width="250px" :title="$t('app.calendar.dateSelectModalTitle')" class-name='date-select-modal' @on-ok="gotoDate">
             <el-date-picker style="width: 200px;" v-model="selectedGotoDate" type="date"></el-date-picker>
           </modal>
+        </template>
+        <template v-else>
+            <span class="app-data-empty">{{ $t('<#if langbase??>${langbase}.nodata</#if>') }}</span>
+        </template>
 </#if>
       </context-menu-container>
     </div>

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

@@ -12,6 +12,12 @@
   .el-timeline{
     padding-left: 2px;
   }
+  .app-data-empty{
+    margin: 0 auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
   .event-legends{
     width: 100%;
     text-align: center;

@CONTROL/树表格（增强）/CONTROL-BASE.vue.ftl

@@ -21,6 +21,9 @@
         :highlight-current-row="isSingleSelect"
         @current-change="select"
         >
+        <template slot="empty">
+            {{$t('<#if langbase??>${langbase}.nodata</#if>')}}
+        </template>
         <#if ctrl.getPSDETreeColumns()??>
         <#list ctrl.getPSDETreeColumns() as column>
         <el-table-column show-overflow-tooltip prop="${column.getName()?lower_case}" label="${column.getCaption()}"<#if column.getWidthUnit()!='STAR'> :width="${column.getWidth()?c}" <#else> :min-width="${column.getWidth()?c}" </#if> :align="'${column.getAlign()?lower_case}'">
@@ -282,7 +285,23 @@
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public created() {
-        this.load();
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public afterCreated() {
+        this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
+            if (!Object.is(tag, this.name)) {
+                return;
+            }
+            if (Object.is('load', action)) {
+                this.load(data);
+            }
+        });
     }
 
     /**
@@ -331,7 +350,7 @@
      * 打开编辑数据
      *
      * @returns
-     * @memberof TreeTableBase
+     * @memberof  ${srfclassname('${ctrl.codeName}')}Base
      */
     public opendata(args: any) {
         if(this.selections.length === 0) {
@@ -352,6 +371,27 @@
         </#if>
     }
 
+    /**
+     * vue 生命周期
+     *
+     * @memberof  ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public destroyed() {
+        this.afterDestroy();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     *
+     * @memberof  ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public afterDestroy() {
+        if (this.viewStateEvent) {
+            this.viewStateEvent.unsubscribe();
+        }
+    }
+
+
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_BOTTOM-BASE.vue.ftl
 </#ibizinclude>

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

+<#ibizinclude>
+../@MACRO/CONTROL/LANGBASE.vue.ftl
+</#ibizinclude>
 <template>
 <#if ctrl.render??>
     ${ctrl.render.code}
@@ -24,6 +27,7 @@
             @check="onCheck"
             @current-change="selectionChange"
             :filter-node-method="filterNode"
+            :empty-text="$t('<#if langbase??>${langbase}.nodata</#if>')"
             >
                 <template slot-scope="{ node, data }">
                   <context-menu :ref='data.id'  :isBlocked="true" :contextMenuStyle="{width: '100%'}" :data="node" :renderContent="renderContextMenu" @showContext="showContext(data,$event)">
@@ -270,7 +274,7 @@ import UIService from '@/uiservice/ui-service';
                 <#if childCtrl.getControlType() == "CONTEXTMENU">
                     <#if childCtrl.getPSDEToolbarItems()??>
                         <#list childCtrl.getPSDEToolbarItems() as item>
-        ${childCtrl.getOwner().getNodeType()}_${item.name}: {name:'${item.name}',nodeOwner:'${childCtrl.getOwner().getNodeType()}',<#if item.getPSUIAction()??><#assign uiaction=item.getPSUIAction()>type: '${uiaction.getUIActionType()}', tag: '${uiaction.getUIActionTag()}'<#if (uiaction.getActionTarget()!="")>, actiontarget: '${uiaction.getActionTarget()}'</#if><#if uiaction.getNoPrivDisplayMode(view)??>, noprivdisplaymode:${uiaction.getNoPrivDisplayMode(view)}</#if><#if uiaction.getDataAccessAction()??>, dataaccaction:'${uiaction.getDataAccessAction()}'</#if>, visabled: true, disabled: false</#if>},
+        ${childCtrl.getOwner().getNodeType()}_${item.name}: {name:'${item.name}',nodeOwner:'${childCtrl.getOwner().getNodeType()}',<#if item.getPSUIAction?? && item.getPSUIAction()??><#assign uiaction=item.getPSUIAction()>type: '${uiaction.getUIActionType()}', tag: '${uiaction.getUIActionTag()}'<#if (uiaction.getActionTarget()!="")>, actiontarget: '${uiaction.getActionTarget()}'</#if><#if uiaction.getNoPrivDisplayMode(view)??>, noprivdisplaymode:${uiaction.getNoPrivDisplayMode(view)}</#if><#if uiaction.getDataAccessAction()??>, dataaccaction:'${uiaction.getDataAccessAction()}'</#if>, visabled: true, disabled: false</#if>},
                         </#list> 
                     </#if>
                 </#if>

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

@@ -135,7 +135,7 @@
      * @type {(string)}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public placeholder="<@getQuickSearchPlaceholder view />";
+    public placeholder="<@getQuickSearchPlaceholder ctrl />";
 
     /**
      * 过滤值
@@ -409,7 +409,7 @@
     public onDrViewDatasChange($event: any): void {
         <#if ctrl.getPSDETree()??>
         <#assign tree = ctrl.getPSDETree()/>
-        this.viewState.next({ tag: '${tree.name}', action: 'refresh_current' });
+        this.viewState.next({ tag: '${tree.name}', action: 'refresh_parent' });
         </#if>
     }
 

@CONTROL/流程导航栏/CONTROL-BASE.vue.ftl

@@ -94,7 +94,7 @@
      * @type {(string)}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public placeholder="<@getQuickSearchPlaceholder view />";
+    public placeholder="<@getQuickSearchPlaceholder ctrl />";
 
     /**
      * 过滤值

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

@@ -16,12 +16,12 @@
 <#if ctrl.render??>
     ${ctrl.render.code}
 <#else>
-    <layout class="app-wizard<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if>">
+    <layout class="app-state-wizard<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if>">
         <#if ctrl.getPSDEWizard?? && ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getPSDEWizardSteps?? && ctrl.getPSDEWizard().getPSDEWizardSteps()??>
         <div class="view-steps">
             <div class="background-box"></div>
             <div class="steps_icon" @click="handleClick('PRE')"><i class="el-icon-arrow-left"></i></div>
-            <el-steps class="wizard-steps"  :active="(wizardForms.indexOf(activeForm) + 1)" finish-status="success">
+            <el-steps class="wizard-steps"  :active="(wizardForms.indexOf(activeForm) + 1)" finish-status="success" align-center>
         <#list ctrl.getPSDEWizard().getPSDEWizardSteps() as step>
                 <el-step :class="{'app-active-step':activeForm==='<@getStepForm ctrlmodel=ctrl step=step />'?true:false}">
                     <template v-slot:title>
@@ -37,16 +37,16 @@
         <#if ctrl.getPSDEEditForms()??>
         <#list ctrl.getPSDEEditForms() as form>
         <#assign handler = form.getPSAjaxControlHandler() />
-        <el-popover v-model="stepVisiable['${form.getName()}']" ref="${form.getName()}_popover" popper-class="app-wizard-popover-container" placement="bottom-<#if form_has_next>start<#else>end</#if>" trigger="click">
-            <div class="app-wizard-container">
-                <div class="app-wizard-header">
-                    <div class="app-wizard-header-extra">
+        <el-popover v-model="stepVisiable['${form.getName()}']" ref="${form.getName()}_popover" popper-class="app-state-wizard-popover-container" placement="bottom-<#if form_has_next>start<#else>end</#if>" trigger="click">
+            <div class="app-state-wizard-container">
+                <div class="app-state-wizard-header">
+                    <div class="app-state-wizard-header-extra">
                         <Icon type="md-open" size="18" @click="handleOPen('${form.getName()}')"/>
                         <Icon type="md-close" size="18" @click="handleClose('${form.getName()}')"/>
                     </div>
                 </div>
                 <div class="popover-title">${form.getLogicName()}</div>
-                <div class="app-wizard-content">
+                <div class="app-state-wizard-content">
                     <view_${form.getName()}
                     :key="'${form.name}'" 
                     :viewState='wizardState'
@@ -64,14 +64,14 @@
                     ref='${form.name}'>
                     </view_${form.getName()}>
                 </div>
-                <div class="app-wizard-footer">
+                <div class="app-state-wizard-footer">
                     <i-button  v-if="isVisiable('${form.name}','PREV')" @click="onClickPrev('${form.name}')" ><Icon type="ios-arrow-back"></Icon></i-button>
                     <i-button  v-if="isVisiable('${form.name}','NEXT')" @click="onClickNext('${form.name}')" type="primary" long>{{$t('app.wizardPanel.next')}}</i-button>
                     <i-button  v-if="isVisiable('${form.name}','FINISH')" @click="onClickFinish('${form.name}')" type="primary" long>{{$t('app.wizardPanel.complete')}}</i-button>
                 </div>
             </div>
         </el-popover>
-        <drawer class="app-wizard-drawer" :closable="false"  :value="drawerOpenStatus.isOpen && drawerOpenStatus.formName == '${form.name}'"
+        <drawer class="app-state-wizard-drawer" :closable="false"  :value="drawerOpenStatus.isOpen && drawerOpenStatus.formName == '${form.name}'"
         :width="600"  title="${form.getLogicName()}" @on-visible-change="onVisibleChange($event)">
             <view_${form.getName()}
             :key="'${form.name}'" 

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

-.app-wizard {
+.app-state-wizard {
     background: #fff;
-    height: 100%;
     .view-steps{
       display: flex;
       padding: 0 20px;
@@ -73,30 +72,30 @@
       border-top: 2px solid rgb(225, 225, 225);
     }
 }
-.app-wizard-popover-container{
-  .app-wizard-container{
+.app-state-wizard-popover-container{
+  .app-state-wizard-container{
     width: 100%;
     .popover-title{
       position: absolute;
       top: 14px;
       left: 13px;
     }
-    .app-wizard-header{
+    .app-state-wizard-header{
       width: 100%;
       height: 30px;
       line-height: 22px;
       padding: 2px;
       border-bottom: 1px solid #ccc;
       margin-bottom: 10px;
-      .app-wizard-header-extra{
+      .app-state-wizard-header-extra{
         float: right;
       }
     }
-    .app-wizard-content{
+    .app-state-wizard-content{
       width: 100%;
       padding: 4px 0px;
     }
-    .app-wizard-footer{
+    .app-state-wizard-footer{
       display: flex;
     }
   }
@@ -104,7 +103,7 @@
 .el-popper[x-placement^=bottom] {
   margin-top: 0px;
 }
-.app-wizard-drawer{
+.app-state-wizard-drawer{
   .app-form {
     height: calc(100% - 51px);
   }

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

 <#ibizinclude>
 ../../@MACRO/LANG_FUN.ftl
 </#ibizinclude>
+<#ibizinclude>
+../@MACRO/CONTROL/LANGBASE.vue.ftl
+</#ibizinclude>
 <template>
 <#if ctrl.render??>
     ${ctrl.render.code}
 <#else>
-  <gantt-elastic :class="ganttClass<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>" :tasks="tasks" :options="getOptions(this.locale)" :dynamic-style="dynamicStyle" @taskList-item-dblclick="taskClick" @task-item-expand="taskItemExpand">
+<div class="app-gantt">
+  <gantt-elastic v-if="tasks.length >0" :class="ganttClass<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>" :tasks="tasks" :options="getOptions(this.locale)" :dynamic-style="dynamicStyle" @taskList-item-dblclick="taskClick" @task-item-expand="taskItemExpand">
   </gantt-elastic>
+  <div v-else class="app-data-empty">{{$t('<#if langbase??>${langbase}.nodata</#if>')}}</div>
+</div>
 </#if>
 </template>
 <#assign import_block>
@@ -356,8 +362,16 @@ GanttElastic,
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public afterCreated() {
         this.locale = this.$i18n.locale;
-        this.load();
         if(AppCenterService && AppCenterService.getMessageCenter()){
             this.appStateEvent = AppCenterService.getMessageCenter().subscribe(({ name, action, data }) =>{
                 if(!Object.is(name,"${ctrl.getPSAppDataEntity().getCodeName()}")){
@@ -368,7 +382,15 @@ GanttElastic,
                 }
             })
         }
-    }
+        this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
+            if (!Object.is(tag, this.name)) {
+                return;
+            }
+            if (Object.is('load', action)) {
+                this.load(data);
+            }
+        });
+    } 
 
     /**
      * 点击事件
@@ -402,6 +424,9 @@ GanttElastic,
         if(this.appStateEvent){
             this.appStateEvent.unsubscribe();
         }
+        if(this.viewStateEvent){
+            this.viewStateEvent.unsubscribe();
+        }
         <#if destroyed_block??>
         ${destroyed_block}
         </#if>

@CONTROL/甘特图部件/CONTROL.less.ftl

-.gantt {
+.app-gantt{
   height: 100%;
-  .gantt-elastic__main-view-container {
-    flex-grow: 1;
+  .gantt {
+    height: 100%;
+    .gantt-elastic__main-view-container {
+      flex-grow: 1;
+    }
+  }
+  .app-data-empty{
+    height: 100%;
+    margin: 0 auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
   }
 }
 <#ibizinclude>

@CONTROL/看板视图/CONTROL-BASE.vue.ftl

+<#ibizinclude>
+../@MACRO/CONTROL/LANGBASE.vue.ftl
+</#ibizinclude>
 <template>
 <#if ctrl.render??>
 ${ctrl.render.code}
 <#else>
     <div class="app-data-view-group<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>">
-        <template v-for="(group, index) of groups">
-            <#if ctrl.groupRender??>
-            ${ctrl.groupRender.code}
-            <#else>
-            <div :key="group + index" class="dataview-group-content" style="<#if ctrl.getGroupWidth() gt 0>width: ${ctrl.getGroupWidth()?c}px;<#else>flex-grow: 1;</#if>">
-                <div class="dataview-group-header<#if ctrl.getGroupPSSysCss()??> ${ctrl.getGroupPSSysCss().getCssName()}</#if>">
-                    {{ getGroupText(group.name) }}
-                    <#if ctrl.getGroupPSUIActionGroup()??>
-                    <Poptip trigger="hover" content="content" placement="bottom-end" style="float: right;">
-                        <Icon type="md-more" />
-                        <div slot="content" class="group-action">
-                            <#if ctrl.getGroupPSUIActionGroup().getPSUIActions()??>
-                            <#list ctrl.getGroupPSUIActionGroup().getPSUIActions() as action>
-                            <div class="group-action-item">
-                                <i-button long @click="uiAction('${action.getCodeName()}', $event)">
-                                <#if action.getPSSysImage()??>
-                                <#if action.getPSSysImage().getImagePath()?length gt 0>
-                                <img src="${action.getPSSysImage().getImagePath()}"/>
-                                <#else>
-                                <i class="${action.getPSSysImage().getCssClass()}"></i>
-                                </#if>
+        <template v-if="items.length > 0">
+            <template v-for="(group, index) of groups">
+                <#if ctrl.groupRender??>
+                ${ctrl.groupRender.code}
+                <#else>
+                <div :key="group + index" class="dataview-group-content" style="<#if ctrl.getGroupWidth() gt 0>width: ${ctrl.getGroupWidth()?c}px;<#else>flex-grow: 1;</#if>">
+                    <div class="dataview-group-header<#if ctrl.getGroupPSSysCss()??> ${ctrl.getGroupPSSysCss().getCssName()}</#if>">
+                        {{ getGroupText(group.name) }}
+                        <#if ctrl.getGroupPSUIActionGroup()??>
+                        <Poptip trigger="hover" content="content" placement="bottom-end" style="float: right;">
+                            <Icon type="md-more" />
+                            <div slot="content" class="group-action">
+                                <#if ctrl.getGroupPSUIActionGroup().getPSUIActions()??>
+                                <#list ctrl.getGroupPSUIActionGroup().getPSUIActions() as action>
+                                <div class="group-action-item">
+                                    <i-button long @click="uiAction('${action.getCodeName()}', $event)">
+                                    <#if action.getPSSysImage()??>
+                                    <#if action.getPSSysImage().getImagePath()?length gt 0>
+                                    <img src="${action.getPSSysImage().getImagePath()}"/>
+                                    <#else>
+                                    <i class="${action.getPSSysImage().getCssClass()}"></i>
+                                    </#if>
+                                    </#if>
+                                    ${action.getCaption()}
+                                    </i-button>
+                                </div>
+                                </#list>
                                 </#if>
-                                ${action.getCaption()}
-                                </i-button>
                             </div>
-                            </#list>
+                        </Poptip>
+                        </#if>
+                    </div>
+                    <draggable :list="group.items" group="${ctrl.name}" class="dataview-group-items" @change="onDragChange($event, group.name)">
+                        <div v-for="(item, i) in group.items" :key="i" :class="{'dataview-group-item': true, 'is-select': item.isselected}" @click="handleClick(item)" @dblclick="handleDblClick(item)">
+                            <#if ctrl.getItemPSLayoutPanel()??>
+                            <#assign panel = ctrl.getItemPSLayoutPanel()>
+                            <layout_${panel.getName()} name='${panel.name}' :inputData="item"></layout_${panel.getName()}>
+                            <#elseif ctrl.itemRender??>
+                            ${ctrl.itemRender.code}
+                            <#else>
+                            {{ item.srfmajortext }}
                             </#if>
                         </div>
-                    </Poptip>
-                    </#if>
+                    </draggable>
                 </div>
-                <draggable :list="group.items" group="${ctrl.name}" class="dataview-group-items" @change="onDragChange($event, group.name)">
-                    <div v-for="(item, i) in group.items" :key="i" :class="{'dataview-group-item': true, 'is-select': item.isselected}" @click="handleClick(item)" @dblclick="handleDblClick(item)">
-                        <#if ctrl.getItemPSLayoutPanel()??>
-                        <#assign panel = ctrl.getItemPSLayoutPanel()>
-                        <layout_${panel.getName()} name='${panel.name}' :inputData="item"></layout_${panel.getName()}>
-                        <#elseif ctrl.itemRender??>
-                        ${ctrl.itemRender.code}
-                        <#else>
-                        {{ item.srfmajortext }}
-                        </#if>
-                    </div>
-                </draggable>
-            </div>
-            </#if>
-        </template>
-        <#if ctrl.getGroupQuickPSDEToolbar()??>
-        <div class="quick-action">
-            <#if ctrl.getGroupQuickPSDEToolbar().getPSDEToolbarItems()??>
-            <#list ctrl.getGroupQuickPSDEToolbar().getPSDEToolbarItems() as toolbarItem>
-            <div class="quick-action-item" title="${toolbarItem.getCaption()}" @click="${ctrl.getGroupQuickPSDEToolbar().getName()}_click({tag: '${toolbarItem.getName()}'}, $event)">
-                <#if toolbarItem.getPSSysImage()??>
-                <#if toolbarItem.getPSSysImage().getImagePath()?length gt 0>
-                <img src="${toolbarItem.getPSSysImage().getImagePath()}"/>
-                <#else>
-                <i class="${toolbarItem.getPSSysImage().getCssClass()}"></i>
                 </#if>
-                <#else>
-                <i class="el-icon-menu"></i>
+            </template>
+        <#if ctrl.getGroupQuickPSDEToolbar()??>
+            <div class="quick-action">
+                <#if ctrl.getGroupQuickPSDEToolbar().getPSDEToolbarItems()??>
+                <#list ctrl.getGroupQuickPSDEToolbar().getPSDEToolbarItems() as toolbarItem>
+                <div class="quick-action-item" title="${toolbarItem.getCaption()}" @click="${ctrl.getGroupQuickPSDEToolbar().getName()}_click({tag: '${toolbarItem.getName()}'}, $event)">
+                    <#if toolbarItem.getPSSysImage()??>
+                    <#if toolbarItem.getPSSysImage().getImagePath()?length gt 0>
+                    <img src="${toolbarItem.getPSSysImage().getImagePath()}"/>
+                    <#else>
+                    <i class="${toolbarItem.getPSSysImage().getCssClass()}"></i>
+                    </#if>
+                    <#else>
+                    <i class="el-icon-menu"></i>
+                    </#if>
+                </div>
+                </#list>
                 </#if>
             </div>
-            </#list>
-            </#if>
-        </div>
         </#if>
+        </template>
+        <template v-else>
+            <span class="app-data-empty">{{ $t('<#if langbase??>${langbase}.nodata</#if>') }}</span>
+        </template>
   </div>
 </#if>
 </template>

@CONTROL/看板视图/CONTROL.less.ftl

@@ -52,6 +52,12 @@
       border-top-width: 1px;
     }
   }
+  .app-data-empty{
+    margin: 0 auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 }
 <#ibizinclude>
 ../@MACRO/CSS/DEFAULT.less.ftl

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

@@ -8,7 +8,19 @@ ${item.render.code}
   <@badge item>
     <i-button type="primary" :disabled="detailsModel.${item.getName()}.disabled"  @click="${item.getName()}_click($event)" class="app-form-button<#if item.getPSSysCss?? && item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>"
          style="<#if item.getHeight() gt 0>height: ${item.getHeight()?c}px;</#if><#if item.getWidth() gt 0>width: ${item.getWidth()?c}px;</#if>">
-        <#if item.getPSSysImage()??><#assign img=item.getPSSysImage()><#if img.getCssClass()?? && (img.getCssClass()?length gt 0)><i class="${img.getCssClass()}" style="margin-right: 2px;"></i></#if></#if>   
+        <#if item.getPSSysImage()??>
+          <#assign img=item.getPSSysImage()>
+          <#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>
+            <i class="${img.getCssClass()}" style="margin-right: 2px;"></i>
+          </#if>
+        <#else>
+          <#if item.getPSUIAction?? && item.getPSUIAction()?? && item.getPSUIAction().getPSSysImage?? && item.getPSUIAction().getPSSysImage()??>
+            <#assign img=item.getPSUIAction().getPSSysImage()>
+            <#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>
+              <menu-icon :item="{iconcls: '${img.getCssClass()}'}" />
+            </#if>
+          </#if>
+        </#if>  
         <#if item.isShowCaption()><span ><#if item.getCaptionItemName()?? && item.getCaptionItemName()?length gt 0>{{data.${item.getCaptionItemName()}}}<#else><#if langbase??>{{$t('${langbase}.details.${item.name}')}}<#else>${item.getCaption()}</#if></#if></span></#if>
     </i-button>
   </@badge>

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

@@ -2,18 +2,20 @@
 ${item.render.code}
 <#else>
 <app-rawitem
+    :viewparams="viewparams" 
+    :context="context"
     contentStyle="<#if item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>"
     sizeStyle="<#if item.getRawItemHeight() gt 0>height: ${item.getRawItemHeight()?c}px;</#if><#if item.getRawItemWidth() gt 0>width: ${item.getRawItemWidth()?c}px;</#if>"
     contentType="<#if item.getContentType?? && item.getContentType()??>${item.getContentType()}</#if>"
-    <#if item.getRawContent?? && item.getRawContent()??>
-    rawContent="${item.getRawContent()}"
-    </#if>
     <#if item.getHtmlContent?? && item.getHtmlContent()??>
-    htmlContent="${item.getHtmlContent()}"
+    :htmlContent='`${item.getHtmlContent()}`'
     </#if>
     <#if item.getPSSysImage?? && item.getPSSysImage()??>
     <#assign img=item.getPSSysImage()>
     <#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>
     imageClass="${img.getCssClass()}"</#if></#if>>
+    <#if item.getContentType?? && item.getContentType() == 'RAW'>
+        ${item.getRawContent()}
+    </#if>
 </app-rawitem>
 </#if>
\ No newline at end of file

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

 <#ibizinclude>
 ../@MACRO/CONTROL/LANGBASE.vue.ftl
 </#ibizinclude>
-<i-form :model="this.data" class='app-form<#if ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if><#if ctrl.isInfoFormMode?? && ctrl.isInfoFormMode()> info-form-mode</#if>' ref='${ctrl.name}'  id='${ctrl.getPSAppDataEntity().getCodeName()?lower_case}_${ctrl.getCodeName()?lower_case}' style="<#if ctrl.getFormWidth() gt 1>width: ${ctrl.getFormWidth()?c}px;</#if>">
+<i-form :model="this.data" class='app-form<#if ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if><#if ctrl.isInfoFormMode?? && ctrl.isInfoFormMode()> info-form-mode</#if>' ref='${ctrl.name}'  id='${ctrl.getPSAppDataEntity().getCodeName()?lower_case}_${ctrl.getCodeName()?lower_case}' style="<#if ctrl.getFormWidth() gt 1>width: ${ctrl.getFormWidth()?c}px;</#if>" @on-validate="formItemValidate">
     <input style="display:none;" />
     <row >
     <#if ctrl.isNoTabHeader()>

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

@@ -127,7 +127,7 @@
             </#if>
             <template <#if (ctrl.isEnableRowEdit() && item.isEnableRowEdit())>v-if="!actualIsOpenEdit"</#if>>
                 <#if item.getPSDEUIAction?? && item.getPSDEUIAction()??>
-                <a @click="uiAction(row, '${item.getPSDEUIAction().getUIActionTag()}', $event)">
+                <a v-show="row.${item.getPSDEUIAction().getUIActionTag()}.visabled" :disabled="row.${item.getPSDEUIAction().getUIActionTag()}.disabled" :style="{'display': 'block'}" @click="uiAction(row, '${item.getPSDEUIAction().getUIActionTag()}', $event)">
                 </#if>
                 <#if (item.render??)>
                 <#--  BEGIN：列绘制  -->
@@ -216,7 +216,7 @@
             </app-column-link >
           <#else>
             <#if item.getPSDEUIAction?? && item.getPSDEUIAction()??>
-            <a @click="uiAction(row, '${item.getPSDEUIAction().getUIActionTag()}', $event)">
+            <a v-show="row.${item.getPSDEUIAction().getUIActionTag()}.visabled" :disabled="row.${item.getPSDEUIAction().getUIActionTag()}.disabled" :style="{'display': 'block'}" @click="uiAction(row, '${item.getPSDEUIAction().getUIActionTag()}', $event)">
             </#if>
             <#if item.getValueFormat()?? && item.getValueFormat() != "%1$s">
             <app-format-data format="${item.getValueFormat()}" :data="row.${item.getName()?lower_case}"></app-format-data>

@CONTROL/表格/SERVICE.ts.ftl

@@ -236,7 +236,7 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
             result.then((response) => {
                 //处理返回数据，补充判断标识
                 if(response.data){
-                    Object.assign(response.data,{srfuf:0});
+                    Object.assign(response.data,{srfuf:'0'});
                 }
                 resolve(response);
             }).catch(response => {
@@ -445,7 +445,7 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
                     requestData[item.prop] = context[item.name];
                 }
             }else{
-                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0) || Object.is(data[item.name],"")) ){
+                if(item && item.isEditable && item.prop && item.name && data.hasOwnProperty(item.name)){
                     requestData[item.prop] = data[item.name];
                 }
             }

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

@@ -168,7 +168,7 @@ import  ${srfclassname('${appCounter.getCodeName()}')}CounterService  from '@/co
      * @type {(string)}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public placeholder="<@getQuickSearchPlaceholder view />";
+    public placeholder="<@getQuickSearchPlaceholder ctrl />";
 
     /**
      * 搜素值

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

@@ -12,6 +12,9 @@
         <#ibizinclude>
         ../@MACRO/View_Pos_Body_Msgs.vue.ftl
         </#ibizinclude>
+         <#if view.hasPSControl('statewizardpanel')>
+        ${P.getCtrlCode('statewizardpanel', 'CONTROL.html').code}
+        </#if>
         <#if view.hasPSControl('tabexppanel')>
         ${P.getCtrlCode('tabexppanel', 'CONTROL.html').code}
         </#if>

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

@@ -16,8 +16,19 @@
         <div class='content-container'>
 <#assign MDContent>
 <#comment><!--开始：快速搜索或工具栏存在--></#comment>
-<#if (view.isEnableQuickSearch() || view.hasPSControl('toolbar'))>
+<#if (view.isEnableQuickSearch() || view.hasPSControl('toolbar') || view.isEnableQuickGroup() || view.getQuickPSDESearchForm()??)>
 <row style="margin-bottom:6px;">
+    <#if view.isEnableQuickGroup()>
+    <div class="quick-group-container">
+        <app-quick-group :items="quickGroupModel" <#if appCounter??>:counterService="${appCounter.getCodeName()?lower_case}counterservice"</#if> @valuechange="quickGroupValueChange"></app-quick-group>
+    </div>
+    </#if>
+    <#if view.getQuickPSDESearchForm()??>
+    <div class="quick-search-container">
+    <#assign quickSearchForm = view.getQuickPSDESearchForm() />
+    ${P.getCtrlCode(quickSearchForm, 'CONTROL.html').code}
+    </div>
+    </#if>
     <#if view.isEnableQuickSearch()>
     <i-input<#if view.hasPSControl('searchform')><#if view.isExpandSearchForm??> v-show="!isExpandSearchForm"</#if></#if> v-model="query" search enter-button @on-search="onSearch($event)" class='pull-left' placeholder="<@getQuickSearchPlaceholder view />" style='max-width: 400px;margin-top:6px;' />
     </#if>

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

@@ -17,8 +17,19 @@
         <div class='content-container'>
 <#assign MDContent>
 <#comment><!--开始：快速搜索或工具栏存在--></#comment>
-<#if (view.isEnableQuickSearch() || view.hasPSControl('toolbar'))>
+<#if (view.isEnableQuickSearch() || view.hasPSControl('toolbar') || view.isEnableQuickGroup() || view.getQuickPSDESearchForm()??)>
 <row style="margin-bottom:6px;">
+    <#if view.isEnableQuickGroup()>
+    <div class="quick-group-container">
+        <app-quick-group :items="quickGroupModel" <#if appCounter??>:counterService="${appCounter.getCodeName()?lower_case}counterservice"</#if> @valuechange="quickGroupValueChange"></app-quick-group>
+    </div>
+    </#if>
+    <#if view.getQuickPSDESearchForm()??>
+    <div class="quick-search-container">
+    <#assign quickSearchForm = view.getQuickPSDESearchForm() />
+    ${P.getCtrlCode(quickSearchForm, 'CONTROL.html').code}
+    </div>
+    </#if>
     <#if view.isEnableQuickSearch()>
     <i-input<#if view.hasPSControl('searchform')><#if view.isExpandSearchForm??> v-show="!isExpandSearchForm"</#if></#if> v-model="query" search enter-button @on-search="onSearch($event)" class='pull-left' placeholder="<@getQuickSearchPlaceholder view />" style='max-width: 400px;margin-top:6px;' />
     </#if>

@CONTROL/视图布局面板/实体多项数据选择视图（左右关系）/VIEW.less.ftl

+<#ibizinclude>
+../@MACRO/DEFAULT.less.ftl
+</#ibizinclude>
+
+.pickup-view {
+    >.translate-contant {
+        overflow: auto;
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+        height: calc(100% - 64px);
+        .translate-buttons {
+            width: 80px;
+            display: flex;
+            align-items: center;
+            text-align: center;
+            button {
+                margin-bottom: 5px;
+            }
+        }
+        .left, .right {
+            width: 300px;
+        }
+        .right {
+            border: 1px solid #e9e9e9;
+            .mpicker-select {
+                font-family: helvetica, sans-serif;
+                font-size: 16px;
+                text-align: justify; 
+                word-spacing: -3.8pt;
+                line-height: 1.6;
+                font-weight: bold;
+                word-spacing: 10px;
+                height: 100%;
+                overflow: auto;
+            }
+            .mpicker-select > div {
+                padding: 3px 10px;
+                font-size: 14px;
+                color: rgba(0, 0, 0, 0.85);
+                font-weight: initial;
+                cursor: pointer;
+                min-height: 28px;
+                border: 1px solid #e9e9e9;
+                margin: 4px 4px;
+                transition: all .3s;
+            }
+            .mpicker-select > div:hover {
+                background: #ecf6fd;
+            }
+            .mpicker-select > .select{
+                color: #108ee9;
+                background: #ecf6fd;
+            }
+        }
+        .center{
+            width: calc(100% - 380px);
+            .pickupviewpanel {
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+    >.footer {
+        height: 64px;
+    }
+}
\ No newline at end of file

@CONTROL/视图布局面板/实体多项数据选择视图（左右关系）/VIEW.vue.ftl

+<div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
+    <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <card class='view-card view-no-caption <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :dis-hover="true" :padding="0" :bordered="false">
+<#--  BEGIN：视图顶部视图消息  -->
+<@ibizindent blank=8>
+<#ibizinclude>
+../@MACRO/View_Pos_Top_Msgs.vue.ftl
+</#ibizinclude>
+</@ibizindent>
+<#--  END：视图顶部视图消息  -->
+        <div class="content-container pickup-view">
+        <#--  BEGIN：视图内容区视图消息  -->
+        <@ibizindent blank=8>
+        <#ibizinclude>
+        ../@MACRO/View_Pos_Body_Msgs.vue.ftl
+        </#ibizinclude>
+        </@ibizindent>
+        <#--  END：视图内容区视图消息  -->
+            <div class="translate-contant">
+                <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 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"
+                            @click="onCLickRight">
+                            <i class="el-icon-arrow-right"></i>
+                        </i-button>
+                        <i-button type="primary" :title="this.containerModel.view_leftbtn.text"
+                            :disabled="this.containerModel.view_leftbtn.disabled"
+                            @click="onCLickLeft">
+                            <i class="el-icon-arrow-left"></i>
+                        </i-button>
+                        <i-button type="primary" :title="this.containerModel.view_allrightbtn.text"
+                            @click="onCLickAllRight">
+                            <i class="el-icon-d-arrow-right"></i>
+                        </i-button>
+                        <i-button type="primary" :title="this.containerModel.view_allleftbtn.text"
+                            @click="onCLickAllLeft">
+                            <i class="el-icon-d-arrow-left"></i>
+                        </i-button>
+                    </div>
+                </div>
+                <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>
+                        </div>
+                    </div>
+                </div>
+            </div>
+             <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;
+                    <i-button @click="onClickCancel">{{this.containerModel.view_cancelbtn.text}}</i-button>
+                </row>
+            </card>
+        </div>
+<#--  BEGIN：视图底部视图消息  -->
+<@ibizindent blank=8>
+<#ibizinclude>
+../@MACRO/View_Pos_Bottom_Msgs.vue.ftl
+</#ibizinclude>
+</@ibizindent>
+<#--  END：视图底部视图消息  -->
+    </card>
+</div>
\ No newline at end of file

@CONTROL/视图布局面板/实体多项数据选择视图（左右关系）/template.properties

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

@CONTROL/视图布局面板/实体工作流启动视图/VIEW.less.ftl

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

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

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

@CONTROL/视图布局面板/实体工作流启动视图/template.properties

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

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

 <div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card view-no-caption <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :dis-hover="true" :padding="0" :bordered="false">
-<#--  BEGIN：视图顶部视图消息  -->
-<@ibizindent blank=8>
-<#ibizinclude>
-../@MACRO/View_Pos_Top_Msgs.vue.ftl
-</#ibizinclude>
-</@ibizindent>
-<#--  END：视图顶部视图消息  -->
+        <#--  BEGIN：视图顶部视图消息  -->
+        <@ibizindent blank=8>
+        <#ibizinclude>
+        ../@MACRO/View_Pos_Top_Msgs.vue.ftl
+        </#ibizinclude>
+        </@ibizindent>
+        <#--  END：视图顶部视图消息  -->
         <div class="content-container pickup-view">
         <#--  BEGIN：视图内容区视图消息  -->
         <@ibizindent blank=8>
@@ -45,29 +45,29 @@
                             <i class="el-icon-d-arrow-left"></i>
                         </i-button>
                     </div>
-                </div>
-                <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>
+                    </div>
+                    <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>
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
-             <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;
-                    <i-button @click="onClickCancel">{{this.containerModel.view_cancelbtn.text}}</i-button>
-                </row>
-            </card>
+                <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;
+                        <i-button @click="onClickCancel">{{this.containerModel.view_cancelbtn.text}}</i-button>
+                    </row>
+                </card>   
         </div>
-<#--  BEGIN：视图底部视图消息  -->
-<@ibizindent blank=8>
-<#ibizinclude>
-../@MACRO/View_Pos_Bottom_Msgs.vue.ftl
-</#ibizinclude>
-</@ibizindent>
-<#--  END：视图底部视图消息  -->
+        <#--  BEGIN：视图底部视图消息  -->
+        <@ibizindent blank=8>
+        <#ibizinclude>
+        ../@MACRO/View_Pos_Bottom_Msgs.vue.ftl
+        </#ibizinclude>
+        </@ibizindent>
+        <#--  END：视图底部视图消息  -->
     </card>
 </div>
\ No newline at end of file

@CONTROL/视图布局面板/实体数据选择视图（左右关系）/VIEW.less.ftl

+<#ibizinclude>
+../@MACRO/DEFAULT.less.ftl
+</#ibizinclude>
+
+.pickup-view {
+    >.pickupviewpanel {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+        height: calc(100% - 64px);
+    }
+    >.footer {
+        height: 64px;
+    }
+}
\ No newline at end of file

@CONTROL/视图布局面板/实体数据选择视图（左右关系）/VIEW.vue.ftl

+<div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
+    <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <card class='view-card view-no-caption <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :dis-hover="true" :padding="0" :bordered="false">
+        <#--  BEGIN：视图顶部视图消息  -->
+        <@ibizindent blank=8>
+        <#ibizinclude>
+        ../@MACRO/View_Pos_Top_Msgs.vue.ftl
+        </#ibizinclude>
+        </@ibizindent>
+        <#--  END：视图顶部视图消息  -->
+        <div class="content-container pickup-view">
+        <#--  BEGIN：视图内容区视图消息  -->
+        <@ibizindent blank=8>
+        <#ibizinclude>
+        ../@MACRO/View_Pos_Body_Msgs.vue.ftl
+        </#ibizinclude>
+        </@ibizindent>
+        <#--  END：视图内容区视图消息  -->
+
+        </div>
+        <#--  BEGIN：视图底部视图消息  -->
+        <@ibizindent blank=8>
+        <#ibizinclude>
+        ../@MACRO/View_Pos_Bottom_Msgs.vue.ftl
+        </#ibizinclude>
+        </@ibizindent>
+        <#--  END：视图底部视图消息  -->
+    </card>
+</div>
\ No newline at end of file

@CONTROL/视图布局面板/实体数据选择视图（左右关系）/template.properties

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

@CONTROL/视图布局面板/实体树导航视图（IFrame）/VIEW.less.ftl

+.view-card {
+    >.ivu-card-extra {
+        top: 5px;
+        right: 0px;
+    }
+}
+<#ibizinclude>
+../@MACRO/DEFAULT.less.ftl
+</#ibizinclude>

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

+<div class='view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
+    <app-studioaction :viewTitle="$t(model.srfCaption)" 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>'  :dis-hover="true" :bordered="false">
+        <@ibizindent blank=8>
+          <#ibizinclude>
+          ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
+          </#ibizinclude>
+        </@ibizindent>
+
+            <#--  BEGIN：视图顶部视图消息  -->
+            <@ibizindent blank=12>
+              <#ibizinclude>
+              ../@MACRO/View_Pos_Top_Msgs.vue.ftl
+              </#ibizinclude>
+            </@ibizindent>
+            <#--  END：视图顶部视图消息  -->
+        <div class='content-container'>
+          <#--  BEGIN：视图内容区视图消息  -->
+          <@ibizindent blank=8>
+          <#ibizinclude>
+          ../@MACRO/View_Pos_Body_Msgs.vue.ftl
+          </#ibizinclude>
+          </@ibizindent>
+          <#--  END：视图内容区视图消息  -->
+            <#if view.hasPSControl('treeexpbar')>
+              <@ibizindent blank=12>
+                ${P.getCtrlCode('treeexpbar', 'CONTROL.html').code}<#t>
+              </@ibizindent>
+            </#if>
+        </div>
+            <#--  BEGIN：视图底部视图消息  -->
+            <@ibizindent blank=12>
+              <#ibizinclude>
+              ../@MACRO/View_Pos_Bottom_Msgs.vue.ftl
+              </#ibizinclude>
+            </@ibizindent>
+            <#--  END：视图底部视图消息  -->
+    </card>
+</div>
\ No newline at end of file

@CONTROL/视图布局面板/实体树导航视图（IFrame）/template.properties

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

@CONTROL/视图布局面板/实体表格视图（左右关系）/VIEW.less.ftl

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

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

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

@CONTROL/视图布局面板/实体表格视图（左右关系）/template.properties

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

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

+<#ibizinclude>
+../@MACRO/DEFAULT.less.ftl
+</#ibizinclude>
+.${srffilepath2(view.getCodeName())}{
+    display: block;
+}
\ No newline at end of file

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

+<div class='view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if> <#if view.getViewStyle() != 'DEFAULT'>${view.getViewStyle()}</#if>'>
+    <app-studioaction :viewTitle="$t(model.srfCaption)" 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>' dis-hover :bordered="false">
+        <#ibizinclude>
+        ../@MACRO/VIEW_CAPTION.vue.ftl
+        </#ibizinclude>       
+        <div class='content-container'>
+            <div class='view-top-messages'>
+            </div>
+            <div class='view-bottom-messages'>
+            </div>
+        </div>
+    </card>
+</div>
\ No newline at end of file

@CONTROL/视图布局面板/应用面板视图/template.properties

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

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

@@ -155,19 +155,21 @@
             ${ctrl.render.code}
         <#else>
             <app-rawitem
+                :viewparams="viewparams" 
+                :context="context"
                 contentStyle="<#if ctrl.getPSSysCss()??>${ctrl.getPSSysCss().getCssName()}</#if>"
                 sizeStyle="<#if ctrl.getRawItemHeight() gt 0>height: ${ctrl.getRawItemHeight()?c}px;</#if><#if ctrl.getRawItemWidth() gt 0>width: ${ctrl.getRawItemWidth()?c}px;</#if>"
                 contentType="<#if ctrl.getContentType?? && ctrl.getContentType()??>${ctrl.getContentType()}</#if>"
-                <#if ctrl.getRawContent?? && ctrl.getRawContent()??>
-                rawContent="${ctrl.getRawContent()}"
-                </#if>
                 <#if ctrl.getHtmlContent?? && ctrl.getHtmlContent()??>
-                htmlContent="${ctrl.getHtmlContent()}"
+                :htmlContent='`${ctrl.getHtmlContent()}`'
                 </#if>
                 <#if ctrl.getPSSysImage?? && ctrl.getPSSysImage()??>
                 <#assign img=ctrl.getPSSysImage()>
                 <#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>
                 imageClass="${img.getCssClass()}"</#if></#if>>
+                <#if ctrl.getContentType?? && ctrl.getContentType() == 'RAW'>
+                  ${ctrl.getRawContent()}
+                </#if>
             </app-rawitem>
         </#if>
         </div> 

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

@@ -3,20 +3,21 @@
 ${item.render.code}
 <#else>
 <app-rawitem
+    :viewparams="viewparams" 
+    :context="context"
     contentStyle="<#if item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>"
     sizeStyle="<#if item.getRawItemHeight() gt 0>height: ${item.getRawItemHeight()?c}px;</#if><#if item.getRawItemWidth() gt 0>width: ${item.getRawItemWidth()?c}px;</#if>"
     contentType="<#if item.getContentType?? && item.getContentType()??>${item.getContentType()}</#if>"
-    caption="<#if item.getCaption?? && item.getCaption()??>${item.getCaption()}</#if>"
-    <#if item.getRawContent?? && item.getRawContent()??>
-    rawContent="${item.getRawContent()}"
-    </#if>
     <#if item.getHtmlContent?? && item.getHtmlContent()??>
-    htmlContent="${item.getHtmlContent()}"
+    :htmlContent='`${item.getHtmlContent()}`'
     </#if>
     <#if item.getPSSysImage?? && item.getPSSysImage()??>
     <#assign img=item.getPSSysImage()>
     <#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>
     imageClass="${img.getCssClass()}"</#if></#if>>
+    <#if item.getContentType?? && item.getContentType() == 'RAW'>
+        ${item.getRawContent()}
+    </#if>
 </app-rawitem>
 </#if>
 </#assign>

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

@@ -5,6 +5,7 @@
 import { PanelDetailModel,PanelRawitemModel,PanelTabPanelModel,PanelTabPageModel,PanelFieldModel,PanelContainerModel,PanelControlModel,PanelUserControlModel,PanelButtonModel } from '@/model/panel-detail';
 import ${srfclassname('${ctrl.codeName}')}Model from './${srffilepath2(ctrl.codeName)}-${ctrl.getControlType()?lower_case}-model';
 import CodeListService from "@/codelist/codelist-service";
+import UIService from '@/uiservice/ui-service';
 </#assign>
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl
@@ -89,6 +90,14 @@ import CodeListService from "@/codelist/codelist-service";
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */  
     public appUIService:${srfclassname('${appde.getCodeName()}')}UIService = new ${srfclassname('${appde.getCodeName()}')}UIService(this.$store);
+    <#else>
+    /**
+     * 界面UI服务对象
+     *
+     * @type {UIService}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */  
+    public appUIService:UIService = new UIService(this.$store);
     </#if>
 
     /**

@EDITOR/@MACRO/GRID/DEFAULT.vue.ftl

-<#if item.render??> 
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <input-box 
-  :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
+  :disabled="getColumnDisabled(row,column.property)" 
   v-model="row[column.property]" 
   style="${item.getEditorCssStyle()}"
   type="text"

@EDITOR/@MACRO/PANEL/DEFAULT.vue.ftl

-<#if item.render??> 
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <input-box 
   v-model="data.${editor.getName()?lower_case}" 

@EDITOR/HTML编辑器/EDITOR.vue.ftl

-<#if item.render??> 
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <app-rich-text-editor :formState="formState" :value="data.${editor.name}" @change="(val) =>{this.data.${editor.name} =val}" :disabled="detailsModel.${editor.name}.disabled" :data="JSON.stringify(this.data)"  name="${editor.name}" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' <#if editor.getEditorHeight() gt 0> height={${editor.getEditorHeight()?c}}</#if> style="${editor.getEditorCssStyle()}"></app-rich-text-editor>
 </#if>
\ No newline at end of file

@EDITOR/HTML编辑器/PANELEDITOR.vue.ftl

-<#if item.render??> 
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <app-rich-text-editor :formState="formState" :value="data.${editor.name}" @change="(val) =>{this.data.${editor.name} =val;panelEditItemChange(data, '${editor.name?lower_case}', val)}" :disabled="detailsModel.${item.getCodeName()}.disabled" :data="JSON.stringify(this.data)"  name="${editor.name}" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' <#if editor.getEditorHeight() gt 0> height={${editor.getEditorHeight()?c}}</#if> style="${editor.getEditorCssStyle()}"></app-rich-text-editor>
 </#if>
\ No newline at end of file

@EDITOR/下拉列表框 (动态代码表国际化)/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
  <dropdown-list 
   v-model="row[column.property]" 
-  :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
+  :disabled="getColumnDisabled(row,column.property)" 
   :data="row" 
   :context="context"
   :viewparams="viewparams" 

@EDITOR/下拉列表框/EDITOR.vue.ftl

  <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
  <dropdown-list 
     v-model="data.${editor.name}" 

@EDITOR/下拉列表框/GRIDEIDTOR.vue.ftl

  <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
  <dropdown-list 
   v-model="row[column.property]" 
-  :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
+  :disabled="getColumnDisabled(row,column.property)" 
   :data="row" 
   :context="context"
   :viewparams="viewparams" 

@EDITOR/下拉列表框/PANELEDITOR.vue.ftl

  <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
  <dropdown-list 
   v-model="data.${editor.name?lower_case}" 

@EDITOR/下拉列表框（100宽度）/EDITOR.vue.ftl

  <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
  <dropdown-list 
   v-model="data.${editor.name}" 

@EDITOR/下拉列表框（100宽度）/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
  <dropdown-list 
   v-model="row[column.property]" 
-  :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
+  :disabled="getColumnDisabled(row,column.property)" 
   style="${item.getEditorCssStyle()}width: 100px;" 
   :data="row" 
   :context="context"

@EDITOR/下拉列表框（100宽度）/PANELEDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
  <dropdown-list 
   v-model="data.${editor.name?lower_case}" 

@EDITOR/下拉列表框（cron表达式）/GRIDEIDTOR.vue.ftl

 <dropdown-list-mpicker 
   v-model="row[column.property]" 
   :itemParam="<#if item.getEditorParam('ITEMPARAM','') != ''>${item.getEditorParam('ITEMPARAM','')}<#else>{}</#if>" 
-  :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1"  
+  :disabled="getColumnDisabled(row,column.property)"  
 <#if item.getPSCodeList()??>
   <#assign codelist=editor.getPSCodeList()>
   tag='${codelist.codeName}' 

@EDITOR/下拉列表框（多选穿梭框）/GRIDEIDTOR.vue.ftl

 <dropdown-list-mpicker 
   v-model="row[column.property]" 
   :itemParam="<#if item.getEditorParam('ITEMPARAM','') != ''>${item.getEditorParam('ITEMPARAM','')}<#else>{}</#if>" 
-  :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1"  
+  :disabled="getColumnDisabled(row,column.property)"  
 <#if item.getPSCodeList()??>
   <#assign codelist=editor.getPSCodeList()>
   tag='${codelist.codeName}' 

@EDITOR/下拉列表框（多选）/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <dropdown-list-mpicker 
   v-model="data.${editor.name}"

@EDITOR/下拉列表框（多选）/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <dropdown-list-mpicker 
   v-model="row[column.property]" 
@@ -9,7 +9,7 @@
   :viewparams="viewparams" 
   :localContext =<@getNavigateContext editor />
   :localParam =<@getNavigateParams editor />
-  :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1"  
+  :disabled="getColumnDisabled(row,column.property)"  
 <#if item.getPSCodeList()??>
   <#assign codelist=editor.getPSCodeList()>
   tag='${codelist.codeName}' 

@EDITOR/下拉列表框（多选）/PANELEDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <dropdown-list-mpicker 
   v-model="data.${editor.name?lower_case}" 

@EDITOR/代码编辑器/EDITOR.vue.ftl

-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <app-code-editor :code="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" @change="(val) =>{this.data.${editor.name} =val}" codetype="javascript" ></app-code-editor>
 </#if>
\ No newline at end of file

@EDITOR/单选项列表/EDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <app-radio-group 
   v-model="data.${editor.name}"

@EDITOR/单选项列表/GRIDEIDTOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <app-radio-group 
   v-model="row[column.property]" 
-  :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
+  :disabled="getColumnDisabled(row,column.property)" 
   name="${item.name}" 
   :data="row" 
   :context="context"

@EDITOR/单选项列表/PANELEDITOR.vue.ftl

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <app-radio-group 
   v-model="data.${editor.name?lower_case}" 

@EDITOR/图片控件/EDITOR.vue.ftl

-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
  <app-image-upload :multiple="true" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='${editor.name}' :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' style="${editor.getEditorCssStyle()}overflow: auto;"></app-image-upload>
  </#if>
\ No newline at end of file

@EDITOR/图片控件/GRIDEIDTOR.vue.ftl

-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <app-file-upload 
   :formState="viewState" 
@@ -8,7 +8,7 @@
   :data="JSON.stringify(row)" 
   :name='column.property' 
   :value="row[column.property]" 
-  :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
+  :disabled="getColumnDisabled(row,column.property)" 
   :rowPreview="true"
   :imageOnly="true"
   :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>'

@EDITOR/图片控件/PANELEDITOR.vue.ftl

-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <app-file-upload 
   :formState="viewState" 

@EDITOR/图片控件（单项）/EDITOR.vue.ftl

-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
  <app-image-upload :multiple="false" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='${editor.name}' :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' ></app-image-upload>
  </#if>
\ No newline at end of file

@EDITOR/图片控件（单项）/GRIDEIDTOR.vue.ftl

-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <app-file-upload 
   :formState="viewState" 
@@ -8,7 +8,7 @@
   :data="JSON.stringify(row)" 
   :name='column.property' 
   :value="row[column.property]" 
-  :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" 
+  :disabled="getColumnDisabled(row,column.property)" 
   :rowPreview="true"
   :imageOnly="true"
   :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>'

@EDITOR/图片控件（单项）/PANELEDITOR.vue.ftl

-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <app-file-upload 
   :formState="viewState" 

@EDITOR/图片控件（旋转预览）/EDITOR.vue.ftl

+<#if item.render??>
+    ${item.render.code}
+<#else>
+ <app-image-romate :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="this.data" name='${editor.name}' :disabled="detailsModel.${editor.name}.disabled" style="${editor.getEditorCssStyle()}"></app-image-romate>
+ </#if>
\ No newline at end of file

@EDITOR/图片控件（旋转预览）/template.properties

+EDITORTYPE=PICTURE#ROMATE
\ No newline at end of file

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

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <#if editor.getPickupPSAppView()??>
 <app-mpicker

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

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <#if editor.getPickupPSAppView()??>
 <app-mpicker
     :activeData="row"
-    :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1"
+    :disabled="getColumnDisabled(row,column.property)"
     :curvalue="row[column.property]"
     :name="column.property"
     :context="context"

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

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <#if editor.getPickupPSAppView()??>
 <app-mpicker

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

 <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <#if editor.getPickupPSAppView()??>
 <app-mpicker
     :activeData="row"
-    :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1"
+    :disabled="getColumnDisabled(row,column.property)"
     :curvalue="row[column.property]"
     :name="column.property"
     :context="context"

@EDITOR/多行输入框 （工作流审批意见控件时光轴样式）/GRIDEIDTOR.vue.ftl

 <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
-    <textarea class="ivu-input" :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea>
+    <textarea class="ivu-input" :disabled="getColumnDisabled(row,column.property)" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea>
 </div>
\ No newline at end of file

@EDITOR/多行输入框 （工作流审批意见控件）/GRIDEIDTOR.vue.ftl

 <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
-    <textarea class="ivu-input" :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea>
+    <textarea class="ivu-input" :disabled="getColumnDisabled(row,column.property)" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea>
 </div>
\ No newline at end of file

@EDITOR/多行输入框/EDITOR.vue.ftl

-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <input-box v-model="data.${editor.name}"  :disabled="detailsModel.${editor.name}.disabled" type='textarea' style="${editor.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if>></input-box>
 </#if>
\ No newline at end of file

@EDITOR/多行输入框/GRIDEIDTOR.vue.ftl

-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
-    <textarea class="ivu-input" :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea>
+    <textarea class="ivu-input" :disabled="getColumnDisabled(row,column.property)" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea>
 </div>
 </#if>
\ No newline at end of file

@EDITOR/多行输入框/PANELEDITOR.vue.ftl

-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
   <textarea 

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

-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <input-box v-model="data.${editor.name}" :textareaId="this.$util.createUUID()"  :disabled="detailsModel.${editor.name}.disabled" type='textarea' textareaStyle="${editor.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if>></input-box>
 </#if>
\ No newline at end of file

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

-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
-    <textarea class="ivu-input" rows="10" :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea>
+    <textarea class="ivu-input" rows="10" :disabled="getColumnDisabled(row,column.property)" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea>
 </div>
 </#if>
\ No newline at end of file

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

-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
   <textarea 

@EDITOR/密码框/EDITOR.vue.ftl

-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
 <i-input type="password" v-model="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" style="${editor.getEditorCssStyle()}"></i-input>
 </#if>
\ No newline at end of file

@EDITOR/密码框/GRIDEIDTOR.vue.ftl

-<#if item.render??>
-    ${item.render.code}
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
 <#else>
-<input-box type="password" :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" v-model="row[column.property]" style="${item.getEditorCssStyle()}" @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></input-box>
+<input-box type="password" :disabled="getColumnDisabled(row,column.property)" v-model="row[column.property]" style="${item.getEditorCssStyle()}" @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></input-box>
 </#if>
\ No newline at end of file