update：同步安永环境代码

@CONTROL/多编辑视图面板/CONTROL-BASE.vue.ftl

@@ -3,25 +3,26 @@
     ${ctrl.render.code}
 <#else>
 <div class='items multieditviewpanel<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>'>
-     <div v-for="(item,index) in items" class='item' :key="index">
-     <#if ctrl.getEmbeddedPSAppView()??>
+    <#if ctrl.getEmbeddedPSAppView()??>
+    <div class="item" v-for="item in items" :key="item.id">
+        <span class="multieditviewpanel-delete" @click="handleRemove(item)"><i class="el-icon-delete"></i></span>
         <${srffilepath2(ctrl.getEmbeddedPSAppView().getCodeName())}      
-        class="viewcontainer2" 
-        :viewdata="JSON.stringify(item.viewdata)"
-        :viewparam="JSON.stringify(item.viewparam)"
-        :viewDefaultUsage="false" 
-        :panelState="panelState"  
-        @viewdataschange="viewDataChange"
-        @viewload="viewload"
-        @viewdirty="viewdirty(item,$event)">
+            class="viewcontainer2" 
+            :viewdata="JSON.stringify(item.viewdata)"
+            :viewparam="JSON.stringify(item.viewparam)"
+            :viewDefaultUsage="false" 
+            :panelState="panelState"  
+            @viewdataschange="viewDataChange"
+            @viewload="viewload"
+            @viewdirty="viewdirty(item,$event)">
         </${srffilepath2(ctrl.getEmbeddedPSAppView().getCodeName())}>
-        <divider />
-      </#if>
-     </div>
-    <div>
-    <i-button type="primary" @click="handleAdd" style="float: right;">
-        {{ $t('app.local.add')}}
-    </i-button>
+    </div>
+    <divider />
+    </#if>
+    <div class="multieditviewpanel-button">
+        <i-button type="primary" @click="handleAdd">
+            {{ $t('app.local.add')}}
+        </i-button>
     </div>
 </div>
 </#if>
@@ -300,11 +301,10 @@
         const [{ pathName, parameterName }] = this.parameters;
         datas.forEach((arg: any) => {
             let id: string = arg[parameterName] ? arg[parameterName] : this.$util.createUUID();
-
-            let item: any = { id: id, viewdata: {}, viewparam: {} };
+            let item: any = { id: id, viewdata: {}, viewparam: {}, data: {} };
             Object.assign(item.viewdata, this.$viewTool.getIndexViewParam());
             Object.assign(item.viewdata, this.context);
-
+            Object.assign(item.data, arg);
             // 关系应用实体参数
             this.deResParameters.forEach(({ pathName, parameterName }: { pathName: string, parameterName: string }) => {
                 if (this.context[parameterName] && !Object.is(this.context[parameterName], '')) {
@@ -392,6 +392,46 @@
         });
     }
 
+    /**
+     * 删除数据
+     *
+     * @param {*} item
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public handleRemove(item:any){
+        if (item.data.srfuf == "0") {
+                //删除items中已删除的项
+                let index = this.items.findIndex((value: any, index: any, arr: any) => {
+                    return value === item;
+                });
+                this.items.splice(index, 1);
+            } else {
+                // 原有的走接口删除
+                let tempContext: any = JSON.parse(JSON.stringify(this.context));
+                Object.assign(tempContext, { '${ctrl.getPSAppDataEntity().getCodeName()?lower_case}': item.data.${ctrl.getPSAppDataEntity().getCodeName()?lower_case} });
+                let arg: any = JSON.parse(JSON.stringify(this.viewparams));
+                Object.assign(arg, { '${ctrl.getPSAppDataEntity().getKeyPSAppDEField().getCodeName()?lower_case}': item.data.${ctrl.getPSAppDataEntity().getCodeName()?lower_case} });
+                const promice: Promise<any> = this.service.delete(this.removeAction, tempContext, arg, this.showBusyIndicator);
+                promice.then((response: any) => {
+                    if (!response.status || response.status !== 200) {
+                        if (response.data && response.data.message) {
+                            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                        }
+                        return;
+                    }
+                    //删除items中已删除的项
+                    let index = this.items.findIndex((value: any, index: any, arr: any) => {
+                        return value.data.${ctrl.getPSAppDataEntity().getCodeName()?lower_case} === item.data.${ctrl.getPSAppDataEntity().getCodeName()?lower_case};
+                    });
+                    this.items.splice(index, 1);
+                }).catch((response: any) => {
+                    if (response.data && response.data.message) {
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                    }
+                });
+            }
+    }
+
     /**
      * 设置视图脏值变化
      *
@@ -437,7 +477,7 @@
             if(Object.is($event.action,'remove')){
                 if ($event.data) {
                     let resultIndex = this.items.findIndex((value:any, index:any, arr:any) => {
-                        return value['viewdata']['orderdetailtestid'] === $event.data['orderdetailtestid'];
+                        return value['viewdata']['${ctrl.getPSAppDataEntity().getKeyPSAppDEField().getCodeName()?lower_case}'] === $event.data['${ctrl.getPSAppDataEntity().getKeyPSAppDEField().getCodeName()?lower_case}'];
                     });
                     if (resultIndex !== -1) {
                         this.items.splice(resultIndex, 1);

@CONTROL/多编辑视图面板/CONTROL.html.ftl

@@ -4,13 +4,13 @@
     :saveRefView="saveRefView" 
     @viewdatadirty="onViewDataDirty" 
     @drdatasaved="onDRDataSaved" 
-    updateAction="<#if ctrl.getUpdatePSControlAction()?? && ctrl.getUpdatePSControlAction().getPSAppDEMethod()??>${ctrl.getUpdatePSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
-    removeAction="<#if ctrl.getRemovePSControlAction()?? && ctrl.getRemovePSControlAction().getPSAppDEMethod()??>${ctrl.getRemovePSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
+    updateAction="<#if ctrl.getUpdatePSControlAction()?? && ctrl.getUpdatePSControlAction().getPSAppDEMethod()??>${ctrl.getUpdatePSControlAction().getPSAppDEMethod().getCodeName()}<#else><#if view.getTempMode?? && view.getTempMode()?? && view.getTempMode() == 2>UpdateTemp<#else>Update</#if></#if>"
+    removeAction="<#if ctrl.getRemovePSControlAction()?? && ctrl.getRemovePSControlAction().getPSAppDEMethod()??>${ctrl.getRemovePSControlAction().getPSAppDEMethod().getCodeName()}<#else><#if view.getTempMode?? && view.getTempMode()?? && view.getTempMode() == 2>RemoveTemp<#else>Remove</#if></#if>"
     <#--  loaddraftAction="<#if ctrl.getGetDraftPSControlAction()?? && ctrl.getGetDraftPSControlAction().getPSAppDEMethod()??>${ctrl.getGetDraftPSControlAction().getPSAppDEMethod().getCodeName()}</#if>"  -->
     loaddraftAction="<#if ctrl.getPSAppDataEntity?? && ctrl.getPSAppDataEntity()??><#if ctrl.getPSAppDataEntity().isEnableTempData()>GetDraftTemp<#else>GetDraft</#if></#if>"
-    loadAction="<#if ctrl.getGetPSControlAction()?? && ctrl.getGetPSControlAction().getPSAppDEMethod()??>${ctrl.getGetPSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
-    createAction="<#if ctrl.getCreatePSControlAction()?? && ctrl.getCreatePSControlAction().getPSAppDEMethod()??>${ctrl.getCreatePSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
-    fetchAction="<#if ctrl.getFetchPSControlAction()?? && ctrl.getFetchPSControlAction().getPSAppDEMethod()??>${ctrl.getFetchPSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
+    loadAction="<#if ctrl.getGetPSControlAction()?? && ctrl.getGetPSControlAction().getPSAppDEMethod()??>${ctrl.getGetPSControlAction().getPSAppDEMethod().getCodeName()}<#else><#if view.getTempMode?? && view.getTempMode()?? && view.getTempMode() == 2>GetTemp<#else>Get</#if></#if>"
+    createAction="<#if ctrl.getCreatePSControlAction()?? && ctrl.getCreatePSControlAction().getPSAppDEMethod()??>${ctrl.getCreatePSControlAction().getPSAppDEMethod().getCodeName()}<#else><#if view.getTempMode?? && view.getTempMode()?? && view.getTempMode() == 2>CreateTemp<#else>Create</#if></#if>"
+    fetchAction="<#if ctrl.getFetchPSControlAction()?? && ctrl.getFetchPSControlAction().getPSAppDEMethod()??>${ctrl.getFetchPSControlAction().getPSAppDEMethod().getCodeName()}<#else><#if view.getTempMode?? && view.getTempMode()?? && view.getTempMode() == 2>FetchTempDefault<#else>FetchDefault</#if></#if>"
 </#assign>
 <#ibizinclude>
 ../@MACRO/HTML/DEFAULT.html.ftl

@CONTROL/多编辑视图面板/CONTROL.less.ftl

@@ -6,4 +6,24 @@
     width: 100%;
     height: 100%;
     overflow: auto;
+    .item{
+        position: relative;
+        .multieditviewpanel-delete{
+            position: absolute;
+            right: 0;
+            top: 0;
+            z-index: 100;
+            font-size: 18px;
+            cursor: pointer;
+        }
+    }
+}
+.multieditviewpanel-button {
+    position: relative;
+    height: 40px;
+    button {
+        position: absolute;
+        bottom: 8px;
+        right: 2px;
+    }
 }
\ No newline at end of file

@CONTROL/多编辑视图面板/SERVICE.ts.ftl

@@ -59,7 +59,7 @@
                 if(response.data){
                     Object.assign(response.data,{srfuf:0});
                 }
-                this.handleResponse(action, response);       
+                this.handleResponse(action, response,true);        
                 resolve(response);
             }).catch(response => {
                 reject(response);
@@ -67,6 +67,35 @@
         });
     }
 
+    /**
+     * 删除数据
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Service
+     */
+     @Errorlog
+     public delete(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+         const {context:Context} = this.handleRequestData(action,context,data);
+         return new Promise((resolve: any, reject: any) => {
+             let result: Promise<any>;
+             const _appEntityService: any = this.appEntityService;
+             if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                 result = _appEntityService[action](Context,data, isloading);
+             } else {
+                 result = this.appEntityService.Remove(Context,data, isloading);
+             }
+             result.then((response) => {
+                 resolve(response);
+             }).catch(response => {
+                 reject(response);
+             });
+         });
+     }
+
 <#ibizinclude>
 ../@MACRO/SERVICE/SERVICE_BOTTOM.ts.ftl
 </#ibizinclude>
\ No newline at end of file

@CONTROL/日历部件/SERVICE.ts.ftl

@@ -106,10 +106,13 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
                     _data.push(..._response.data);
                 });
                 // 排序
-                <#noparse>_data.sort((a:any, b:any)=>{
-                     let dateA = new Date(Date.parse(a.start.replace(/-/g, "/")));
-                     let dateB = new Date(Date.parse(b.start.replace(/-/g, "/")));
-                     return dateA > dateB ? 1 : -1 ;
+                <#noparse>_data.sort((a: any, b: any) => {
+                    if (a.start && b.start) {
+                        let dateA = new Date(Date.parse(a.start.replace(/-/g, "/")));
+                        let dateB = new Date(Date.parse(b.start.replace(/-/g, "/")));
+                        return dateA > dateB ? 1 : -1 ;
+                    }
+                    return 0;
                 });</#noparse>
                 let result = {status: 200, data: _data};
                 resolve(result);

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

@@ -11,9 +11,15 @@ ${item.render.code}
     :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>>
+        <#assign img=item.getPSSysImage()>
+        <#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>
+    imageClass="${img.getCssClass()}"
+        </#if>
+        <#if img.getImagePath?? && img.getImagePath()?? && img.getImagePath()?length gt 0>
+    imageSrc="{img.getImagePath()}"
+        </#if>
+    </#if>
+    >
     <#if item.getContentType?? && item.getContentType() == 'RAW'>
         ${item.getRawContent()}
     </#if>

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

@@ -890,7 +890,7 @@ import { Environment } from '@/environments/environment';
     public ${formdetail.getName()}_click($event: any): void {
         <#if formdetail.getPSUIAction?? && formdetail.getPSUIAction()??>
         <#assign uiaction = formdetail.getPSUIAction()>
-        this.${ctrl.name}_${formdetail.getName()}_click(null, null, $event);
+        this.${ctrl.name?lower_case}_${formdetail.getName()}_click(null, null, $event);
         </#if>
 
     }
@@ -996,7 +996,7 @@ import { Environment } from '@/environments/environment';
         <#if formdetail.getPSUIActionGroup()??>
         <#list formdetail.getPSUIActionGroup().getPSUIActionGroupDetails() as uadetails>
         if (Object.is(item.name, '${formdetail.getName()}_${uadetails.getName()}')) {
-            this.${ctrl.name}_${formdetail.getName()}_${uadetails.getName()}_click(null, null, $event.event);
+            this.${ctrl.name?lower_case}_${formdetail.getName()}_${uadetails.getName()}_click(null, null, $event.event);
         }
         </#list>
         </#if>
@@ -1182,6 +1182,16 @@ import { Environment } from '@/environments/environment';
                     return;
                 }
                 const data = response.data;
+<#if ctrl.getPSDEFormItems()??>
+                //  拷贝模式下主信息属性拼接 '-副本'
+                if (this.viewparams && (this.viewparams.copymode === true || this.viewparams.copymode === 'true')) {
+    <#list ctrl.getPSDEFormItems() as dataitem>
+        <#if dataitem.getPSAppDEField?? && dataitem.getPSAppDEField()?? && dataitem.getPSAppDEField().isMajorField() == true>
+                    data['${dataitem.getName()}'] = data['${dataitem.getName()}'] + '-副本';
+        </#if>
+    </#list>
+                }
+</#if>
                 this.onFormLoad(data,'load');
                 this.$emit('load', data);
                 this.$nextTick(() => {
@@ -1222,7 +1232,7 @@ import { Environment } from '@/environments/environment';
             if (!(await this.handleCtrlEvents('onbeforeloaddraft', { data: arg }))) {
                 return;
             }
-            const response: any = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)),{viewparams:viewparamResult}, this.showBusyIndicator);
+            const response: any = await this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)),{viewparams:viewparamResult}, this.showBusyIndicator);
             if (!response.status || response.status !== 200) {
                 if (!(await this.handleCtrlEvents('onloaddrafterror', { data: response.data ? response.data : arg }))) {
                     return;
@@ -1495,6 +1505,113 @@ import { Environment } from '@/environments/environment';
         })
     }
 
+    /**
+     * 保存草稿
+     *
+     * @param {*} [opt={}]
+     * @param {boolean} [showResultInfo] 
+     * @param {boolean} [ifStateNext] formState是否下发通知
+     * @returns {Promise<any>}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public saveDraft(opt: any = {}, showResultInfo?: boolean, ifStateNext: boolean = true): Promise<any> {
+        return new Promise((resolve: any, reject: any) => {
+            showResultInfo = showResultInfo === undefined ? true : false;
+            const arg: any = { ...opt };
+            const data = this.getValues();
+            Object.assign(arg, this.context);
+            Object.assign(arg, data);
+            Object.assign(arg, { srfmajortext:data[this.majorMessageField] });
+            if(this.viewparams && this.viewparams.copymode){
+                data.srfuf = '0';
+            }
+            const action: any = 'SaveDraft'
+            Object.assign(arg, { viewparams: this.viewparams });
+            this.handleCtrlEvents('onbeforesave', { data: arg }).then((beforeSaveResult: boolean) => {
+                if (!beforeSaveResult) {
+                    return;
+                }
+                const post: Promise<any> = this.service.update(action, JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
+                post.then((response: any) => {
+                    if (!response.status || response.status !== 200) {
+                        this.handleCtrlEvents('onsaverror', { data: response && response.data ? response.data : arg }).then((saveErrorResult: boolean) => {
+                            //  保存失败处理
+                        })
+                        if (response.data) {
+                            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                        }
+                        return;
+                    }
+                    this.handleCtrlEvents('onsavesuccess', { data: response.data }).then((saveSuccessResult: boolean) => {
+                        if (!saveSuccessResult) {
+                            return;
+                        }
+                        this.viewparams.copymode = false;
+                        const data = response.data;
+                        this.onFormLoad(data,'save');
+                        this.$emit('save', data);
+                        <#if ctrl.getControlType() == 'FORM'>
+                        AppCenterService.notifyMessage({name:"${ctrl.getPSAppDataEntity().getCodeName()}",action:'appRefresh',data:data});
+                        </#if>
+                        this.$nextTick(() => {
+                            this.formState.next({ type: 'save', data: data });
+                        });
+                        <#if ctrl.getFormFuncMode()?lower_case != 'wizardform'>
+                        if (showResultInfo) {
+                            this.$Notice.success({ title: '', desc: (data.srfmajortext ? data.srfmajortext : '') + '&nbsp;'+ (this.$t('app.formpage.savesuccess') as string) });
+                        }
+                        </#if>
+                        resolve(response);
+                    })
+                }).catch((response: any) => {
+                    this.handleCtrlEvents('onsaveerror', { data: response && response.data ? response.data : {} }).then((saveErrorResult: boolean) => {
+                        if (!saveErrorResult) {
+                            return;
+                        }
+                        if (response && response.status && response.data) {
+                            if (response.data.errorKey) {
+                                if(Object.is(response.data.errorKey, "versionCheck")) {
+                                    this.$Modal.confirm({
+                                        title: (this.$t('app.formpage.saveerror') as string),
+                                        content: (this.$t('app.formpage.savecontent') as string),
+                                        onOk: () => {
+                                            this.refresh([]);
+                                        },
+                                        onCancel: () => { }
+                                    });
+                                } else if(Object.is(response.data.errorKey, 'DupCheck')) {
+                                    let errorProp: string = response.data.message.match(/\[[a-zA-Z]*\]/)[0];
+                                    let name: string = this.service.getNameByProp(errorProp.substr(1, errorProp.length-2));
+                                    if(name) {
+                                        this.$Notice.error({
+                                            title: (this.$t('app.commonWords.createFailed') as string),
+                                            desc: this.detailsModel[name].caption + " : " + arg[name] + (this.$t('app.commonWords.isExist') as string) + '!',
+                                        });
+                                    } else {
+                                        this.$Notice.error({
+                                            title: (this.$t('app.commonWords.createFailed') as string),
+                                            desc: response.data.message,
+                                        })
+                                    }
+                                } else {
+                                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                                }
+                            } else {
+                                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                                reject(response);
+                            }
+                            return;
+                        } else {
+                            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.sysException') as string) });
+                            reject(response);
+                        }    
+                        reject(response);
+                    })
+                });
+            })
+        })
+    }
+
     /**
     * 删除
     *

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

@@ -73,7 +73,7 @@
         <@getColumnHeader item 8 />
         <template slot-scope="scope">
             <div style="text-align: center;">
-  <#if item.getPSDEUIActionGroup().getPSDEUIActions()??>
+  <#if item.getPSDEUIActionGroup?? && item.getPSDEUIActionGroup()?? && item.getPSDEUIActionGroup().getPSDEUIActions?? && item.getPSDEUIActionGroup().getPSDEUIActions()??>
     <#list item.getPSDEUIActionGroup().getPSUIActionGroupDetails() as uiactionDetail>
       <#if uiactionDetail.getPSUIAction?? && uiactionDetail.getPSUIAction()??>
         <#assign uiaction = uiactionDetail.getPSUIAction() />

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

@@ -30,11 +30,7 @@ ${ctrl.render.code}
         :tree-props="{children: 'children', hasChildren: 'children?true:false'}"
         row-key="groupById"
         </#if>
-        <#if ctrl.isEnablePagingBar()>
-        max-height="items.length > 0 ? 'calc(100%-50px)' : '100%'"
-        <#else>
         max-height="100%"
-        </#if>
         @row-click="rowClick($event)"  
         @cell-click="cellClick" 
         @select-all="selectAll($event)"  
@@ -442,7 +438,7 @@ ${gridColumn.getName()}
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public actualIsOpenEdit: boolean = this.isOpenEdit;
+    public actualIsOpenEdit: boolean = false;
 
     /**
      * 总条数
@@ -908,6 +904,9 @@ ${gridColumn.getName()}
             <#if ctrl.isEnableGroup()>
             this.group();
             </#if>
+            this.$nextTick(() => {
+                this.resetGridLayout();
+            })
             return response;
         } catch (response: any) {
             //  加载失败
@@ -925,6 +924,33 @@ ${gridColumn.getName()}
         }
     }
 
+    /**
+     * 重置表格布局（适配element高度变化）
+     *
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public resetGridLayout() {
+        const grid = (this.$refs.multipleTable as any).$el;
+        if (!grid) {
+            return;
+        }
+        const headerHeight = grid.querySelector('.el-table__header-wrapper').scrollHeight || null;
+        //  头部高度为60时不作处理（默认已适配60px）
+        if (headerHeight == 60) {
+            return;
+        }
+        //  设置内容区高度
+        const body = grid.querySelector('.el-table__body-wrapper');
+        if (headerHeight && body) {
+            <#noparse>body.style.setProperty('height', `calc(100% - ${headerHeight}px)`);</#noparse>
+        }
+        //  设置固定列内容区高度
+        const fixBody = grid.querySelector('.el-table__fixed-right .el-table__fixed-body-wrapper');
+        if (headerHeight && fixBody) {
+            <#noparse>fixBody.style.setProperty('height', `calc(100% - ${headerHeight}px)`);</#noparse>
+        }
+    }
+
     /**
      * 删除
      *
@@ -1087,10 +1113,11 @@ ${gridColumn.getName()}
             importId:'${dataImport.getCodeName()}',
             serviceName:'${dataImport.getPSAppDataEntity().getCodeName()?lower_case}',
             appDeLogicName:'${dataImport.getPSAppDataEntity().getLogicName()}',
+            ignoreError: <#if dataImport.isIgnoreError?? && dataImport.isIgnoreError()>true<#else>false</#if>,
             importData:{
             <#if dataImport.getPSDEDataImportItems()??>
             <#list dataImport.getPSDEDataImportItems() as dataImportItem>
-            "${dataImportItem.getName()}":{<#if dataImportItem.getPSCodeList()??><#assign codelist = dataImportItem.getPSCodeList()/>"codelist":{"type":"${codelist.getCodeListType()}","tag":"${codelist.getCodeName()}","isnumber":${codelist.isCodeItemValueNumber()?c}},</#if>"headername":"${dataImportItem.getCaption()}","isuniqueitem":${dataImportItem.isUniqueItem()?c},<#if dataImportItem.getPSAppDEField()??><#assign appDeField = dataImportItem.getPSDEField()/>"name":"${appDeField.getCodeName()?lower_case}","order":<#if appDeField.getImportOrder()??>${appDeField.getImportOrder()?c}</#if></#if>}<#if dataImportItem_has_next>,</#if>
+                "${dataImportItem.getName()}":{<#if dataImportItem.getPSCodeList()??><#assign codelist = dataImportItem.getPSCodeList()/>"codelist":{"type":"${codelist.getCodeListType()}","tag":"${codelist.getCodeName()}","isnumber":${codelist.isCodeItemValueNumber()?c}},</#if>"headername":"${dataImportItem.getCaption()}","isuniqueitem":${dataImportItem.isUniqueItem()?c},<#if dataImportItem.getPSAppDEField()??><#assign appDeField = dataImportItem.getPSDEField()/>"name":"${appDeField.getCodeName()?lower_case}","order":<#if appDeField.getImportOrder()??>${appDeField.getImportOrder()?c}</#if></#if>}<#if dataImportItem_has_next>,</#if>
             </#list>
             </#if>
             }
@@ -1103,8 +1130,8 @@ ${gridColumn.getName()}
         const view:any ={
             viewname: 'app-data-upload',
             title: this.$t("app.utilview.importview"),
-            width: 900,
-            height: 700
+            width: 650,
+            height: 500
         }
         let container: Subject<any> = this.$appmodal.openModal(view, JSON.parse(JSON.stringify(this.context)), importDataModel);
         container.subscribe((result: any) => {
@@ -1396,7 +1423,8 @@ ${gridColumn.getName()}
      *
      *  @memberof ${srfclassname('${ctrl.codeName}')}Base
      */    
-    public afterCreated(){
+    public afterCreated() {
+        this.actualIsOpenEdit = this.isOpenEdit;
         this.setColState();
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {

@CONTROL/表格/CONTROL.less.ftl

 // 基于 @CONTROL/表格/CONTROL.less.ftl 生成
 .grid {
-    flex-grow: 1;
+  flex-grow: 1;
+  height: 100%;
+  overflow: auto;
+
+  .el-table__body-wrapper::-webkit-scrollbar {
+    /*滚动条整体样式*/
+    width: 10px !important;
+    /*高宽分别对应横竖滚动条的尺寸*/
+    height: 10px !important;
+  }
+
+  .el-table__body-wrapper::-webkit-scrollbar-thumb {
+    /*滚动条颜色*/
+    border-radius: 10px !important;
+    background-color: #cecece !important;
+  }
+
+  .el-table__body-wrapper::-webkit-scrollbar-track {
+    /*滚动条里面轨道*/
+    box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
+    background: #ededed !important;
+    border-radius: 10px !important;
+  }
+
+  /*表格文字过长省略*/
+  .el-table th>.cell,
+  .el-table td>.cell {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all;
+  }
+
+  .el-table-column--selection .cell {
+    padding-left: 10px;
+    padding-right: 10px;
+
+    .el-checkbox {
+      margin-right: 0;
+    }
+  }
+
+  .app-column-link,
+  .app-format-data {
+    display: inline;
+  }
+  .el-table {
     height: 100%;
-    overflow: auto;
-    .el-table__body-wrapper::-webkit-scrollbar {
-      /*滚动条整体样式*/
-      width : 10px !important;  /*高宽分别对应横竖滚动条的尺寸*/
-      height: 10px !important;
-    }
-    .el-table__body-wrapper::-webkit-scrollbar-thumb {
-      /*滚动条颜色*/
-      border-radius   : 10px !important;
-      background-color: #cecece !important;
-    }
-    .el-table__body-wrapper::-webkit-scrollbar-track {
-      /*滚动条里面轨道*/
-      box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
-      background   : #ededed !important;
-      border-radius: 10px !important;
-    }
-    /*表格文字过长省略*/
-    .el-table th>.cell, .el-table td>.cell{
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      overflow: hidden;
-      word-break: break-all;
-    }
-    .el-table-column--selection .cell {
-        padding-left: 0px;
-        padding-right: 0px;
-    }
-    .app-column-link, .app-format-data{
-      display: inline;
-    }
-    .el-table {
-      height: 100%;
-      display:flex;
-      flex-direction: column;
-      justify-content: flex-start;
-      .el-table__row{
-        .grid-uiaction-divider {
-          padding:0 10px 0 10px;
-          border-left: 1px #b3b3b3 solid;
-        }
-        .grid-first-uiaction {
-          padding:0 10px 0 10px;
-        }
+    border-left: none;
+
+    // 去除表格右侧边框
+    &::after {
+      width: 0;
+    }
+
+    .el-table__row {
+      .grid-uiaction-divider {
+        padding: 0 10px 0 10px;
+        border-left: 1px #b3b3b3 solid;
       }
-      .quick-toolbar{
-          display: inline-block;
-          button{
-            background: #ebf3fb;
-            color: #2575ca;
-            border: 0;
-        }
+
+      .grid-first-uiaction {
+        padding: 0 10px 0 10px;
       }
-      .el-tooltip{
-        .ivu-form-item{
-          margin-bottom: unset !important;
-        }
+    }
+
+    //  表格头最小高度为45px
+    .el-table__header-wrapper,
+    .el-table__fixed-header-wrapper {
+      min-height: 60px;
+      height: auto;
+
+      .el-table__header {
+        height: 100%;
       }
-      .el-table__body .edit-cell{
-        padding:0;
-        .app-form-item{
-          margin-top: 20px;
-          margin-bottom: 20px;
-        }
+    }
+
+    //  表格内容最大高度为100% - 45px
+    .el-table__body-wrapper,
+    .el-table__fixed-body-wrapper {
+      max-height: calc(100% - 60px);
+
+      .el-table__body {
+        height: 100%;
       }
-      .el-table__header-wrapper{
-        min-height: 45px;
-        max-height: 100px;
-        height: auto;
+    }
+
+    //  解决滚动到底时错位问题
+    .el-table__fixed-body-wrapper .el-table__body {
+      padding-bottom: 10px; // 滚动条宽度
+    }
+
+    .quick-toolbar {
+      display: inline-block;
+
+      button {
+        background: #ebf3fb;
+        color: #2575ca;
+        border: 0;
       }
-      .el-table__footer-wrapper{
-        min-height: 45px;
-        max-height: 100px;
-        height: auto;
+    }
+
+    .el-tooltip {
+      .ivu-form-item {
+        margin-bottom: unset !important;
       }
     }
-    .grid-pagination {
-        height: 50px;
-        padding: 6px 0px;
-        .page-button {
-            button  {
-                padding: 0;
-                font-size: 16px;
-                min-width: 32px;
-                height: 32px;
-                margin-right: 4px;
-            }
-        }
-        .page-column {
-            position: absolute;
-            left: 0;
-        }
-        .batch-toolbar{
-            position: absolute;
-            left: 105px;
-          >.toolbar-container{
-              button  {
-                  font-size: 16px;
-                  min-width: 32px;
-                  height: 32px;
-                  margin-right: 4px;
-                  margin-top: 0;
-                  margin-bottom: 0;
-              }
-          }
+
+    .el-table__body .edit-cell {
+      padding: 0;
+
+      .app-form-item {
+        margin-top: 20px;
+        margin-bottom: 20px;
+      }
+    }
+  }
+
+  .grid-pagination {
+    height: 50px;
+    padding: 6px 0px;
+
+    .page-button {
+      button {
+        padding: 0;
+        font-size: 16px;
+        min-width: 32px;
+        height: 32px;
+        margin-right: 4px;
+      }
+    }
+
+    .page-column {
+      position: absolute;
+      left: 0;
+    }
+
+    .batch-toolbar {
+      position: absolute;
+      left: 105px;
+
+      >.toolbar-container {
+        button {
+          font-size: 16px;
+          min-width: 32px;
+          height: 32px;
+          margin-right: 4px;
+          margin-top: 0;
+          margin-bottom: 0;
         }
+      }
     }
+  }
 }
-.ivu-modal-content{
-    .footer{
-        .ivu-row{
-            text-align: right;
-        }
+
+.ivu-modal-content {
+  .footer {
+    .ivu-row {
+      text-align: right;
     }
+  }
 }
+
 .cell-indeterminate {
   >div>label {
     >span {
@@ -124,6 +170,7 @@
         background-color: #409eff;
         border-color: #409eff;
       }
+
       .el-checkbox__inner:before {
         content: "";
         position: absolute;
@@ -136,11 +183,13 @@
         top: 5px;
       }
     }
+
     >span.is-checked {
       .el-checkbox__inner {
         background-color: #409eff;
         border-color: #409eff;
       }
+
       .el-checkbox__inner:after {
         border: 0px;
       }
@@ -155,6 +204,7 @@
         background-color: #409eff;
         border-color: #409eff;
       }
+
       .el-checkbox__inner:after {
         box-sizing: content-box;
         content: "";

@CONTROL/表格（透视表）/CONTROL-BASE.vue#COLUMN.ftl

@@ -73,7 +73,7 @@
         <@getColumnHeader item 8 />
         <template slot-scope="scope">
             <div style="text-align: center;">
-  <#if item.getPSDEUIActionGroup().getPSDEUIActions()??>
+  <#if item.getPSDEUIActionGroup?? && item.getPSDEUIActionGroup()?? && item.getPSDEUIActionGroup().getPSDEUIActions?? && item.getPSDEUIActionGroup().getPSDEUIActions()??>
     <#list item.getPSDEUIActionGroup().getPSUIActionGroupDetails() as uiactionDetail>
       <#if uiactionDetail.getPSUIAction?? && uiactionDetail.getPSUIAction()??>
         <#assign uiaction = uiactionDetail.getPSUIAction() />

@CONTROL/视图布局面板/@MACRO/DATA_PANEL.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()?lower_case}</#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>' :disHover="true" :padding="0" :bordered="false">
 
     <#ibizinclude>

@CONTROL/视图布局面板/@MACRO/DEFAULT.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>' :disHover="true" :padding="0" :bordered="false">
 
     <#ibizinclude>

@CONTROL/视图布局面板/@MACRO/EDIT.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>' :disHover="true" :bordered="false">
 
     <#ibizinclude>

@CONTROL/视图布局面板/@MACRO/EDIT3.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">
 
 <#if view.hasPSControl('toolbar')>

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

@@ -68,7 +68,6 @@ ${P.getCtrlCode('grid', 'CONTROL.html').code}
   </#if>
 </#assign>
 <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>'  :dis-hover="true" :bordered="false">
         <@ibizindent blank=8>
           <#ibizinclude>

@CONTROL/视图布局面板/@MACRO/WIZARD.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' :padding='0' :bordered='false'>
 
     <#ibizinclude>

@CONTROL/视图布局面板/实体HTML视图/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>' :disHover="true" :padding="0" :bordered="false">
 
     <#ibizinclude>

@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>
 </div>
\ 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<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>'  :dis-hover="true" :bordered="false">
     <#ibizinclude>
     ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl

@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<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>'  :dis-hover="true" :bordered="false">
     <#ibizinclude>
     ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl

@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<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :dis-hover="true" :bordered="false">
     <#ibizinclude>
     ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl

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

 <#ibizinclude>../../@MACRO/FUNC/MACRO.ftl</#ibizinclude>
 <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>'  :bordered="false" :dis-hover="true" >
     
     <#ibizinclude>

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

 <#ibizinclude>../../@MACRO/FUNC/MACRO.ftl</#ibizinclude>
 <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>'  :bordered="false" :dis-hover="true" >
     
 <#--  BEGIN：视图顶部视图消息  -->

@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 <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :dis-hover="true" :bordered="false">
     <#ibizinclude>
     ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl

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

 <#ibizinclude>../../@MACRO/FUNC/MACRO.ftl</#ibizinclude>
 <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>'  :bordered="false" :dis-hover="true" >
     
     <#ibizinclude>

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

 <#ibizinclude>../../@MACRO/FUNC/MACRO.ftl</#ibizinclude>
 <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>'  :bordered="false" :dis-hover="true" >
     
     <#ibizinclude>

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

@@ -48,7 +48,6 @@ ${P.getCtrlCode('map', 'CONTROL.html').code}
   </#if>
 </#assign>
 <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.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if>'  :dis-hover="true" :bordered="false">
         <@ibizindent blank=8>
           <#ibizinclude>

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

@@ -45,7 +45,6 @@ ${P.getCtrlCode('map', 'CONTROL.html').code}
   </#if>
 </#assign>
 <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.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if>'  :dis-hover="true" :bordered="false">
         <@ibizindent blank=8>
           <#ibizinclude>

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

 <div class="view-container ${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>

@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 <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
         <div class="content-container">
             <iframe :src="iframeUrl" height="100%" width="100%" seamless="seamless" frameborder="0" scrolling="auto"></iframe>

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

 <div class="view-container ${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>' :disHover="true" :padding="0" :bordered="false">
         <div class="content-container">
             <iframe :src="iframeUrl" height="100%" width="100%" seamless="seamless" frameborder="0" scrolling="auto"></iframe>

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

 <div class="view-container ${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 view-no-toolbar' :disHover="true" :padding="0" :bordered="false">
     <div class="content-container">
     <component 

@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 <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
     <#ibizinclude>
         ../@MACRO/VIEW_CAPTION.vue.ftl

@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 view-no-toolbar' :disHover="true" :padding="0" :bordered="false">
     <div class="content-container">
     <component 

@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 <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
     <#ibizinclude>
     ../@MACRO/VIEW_CAPTION.vue.ftl

@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 <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
             <#ibizinclude>
             ../@MACRO/VIEW_CAPTION.vue.ftl

@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/视图布局面板/实体工作流操作视图/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 :padding="0" :bordered="false">
         <@ibizindent blank=8>
         <#ibizinclude>

@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>

@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()?lower_case}</#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>' :disHover="true" :padding="0" :bordered="false">
 
     <#ibizinclude>

@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()?lower_case}</#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>' :disHover="true" :padding="0" :bordered="false">
 
     <#ibizinclude>

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

 <#ibizinclude>../../@MACRO/FUNC/MACRO.ftl</#ibizinclude>
 <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>

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

 <#ibizinclude>../../@MACRO/FUNC/MACRO.ftl</#ibizinclude>
 <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">
 <#--  BEGIN：视图顶部视图消息  -->
 <@ibizindent blank=8>

@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>

@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>' :disHover="true" :padding="0" :bordered="false">
 <#if view.hasPSControl('toolbar')>
   <#assign toolbarCtrl = view.getPSControl('toolbar')>

@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>

@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>
 </div>
\ 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 <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :dis-hover="true" :bordered="false">
     <#ibizinclude>
     ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl

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

 <#ibizinclude>../../@MACRO/FUNC/MACRO.ftl</#ibizinclude>
 <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>'  :bordered="false" :dis-hover="true" >
     
     <#ibizinclude>

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

 <#ibizinclude>../../@MACRO/FUNC/MACRO.ftl</#ibizinclude>
 <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>'  :bordered="false" :dis-hover="true" >
     
 <#--  BEGIN：视图顶部视图消息  -->

@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 <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>'  :dis-hover="true" :bordered="false">
         <@ibizindent blank=8>
           <#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>

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

@@ -31,7 +31,6 @@
     </#if>
 </#assign>
 <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>'  :dis-hover="true" :bordered="false">
         <@ibizindent blank=8>
           <#ibizinclude>

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

 <#ibizinclude>../../@MACRO/FUNC/MACRO.ftl</#ibizinclude>
 <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">
         <#ibizinclude>
         ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl

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

 <#ibizinclude>../../@MACRO/FUNC/MACRO.ftl</#ibizinclude>
-<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>    
+<div class='view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>   
     <card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :dis-hover="true" :bordered="false">
 <#--  BEGIN：视图顶部视图消息  -->
 <@ibizindent blank=8>

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

 <#ibizinclude>../../@MACRO/FUNC/MACRO.ftl</#ibizinclude>
 <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>

@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>' :disHover="true" :padding="0" :bordered="false">
 <#if view.hasPSControl('toolbar')>
   <#assign toolbarCtrl = view.getPSControl('toolbar')>

@CONTROL/视图布局面板/实体编辑视图 (可查看可编辑)/VIEW.less.ftl

+.view-card {
+    >.ivu-card-extra {
+        top: 5px;
+        right: 0px;
+    }
+}
+.${srffilepath2(view.getCodeName())} {
+    .view-footer {
+        text-align: center;
+        height: 42px;
+    }
+}
+<#if view.hasPSControl('toolbar')>
+.view-container.${srffilepath2(view.getCodeName())} > .view-card > .ivu-card-body > .content-container {
+    height: calc(100% - 42px);
+}
+</#if>
+
+<#ibizinclude>
+../@MACRO/DEFAULT.less.ftl
+</#ibizinclude>
\ No newline at end of file

@CONTROL/视图布局面板/实体编辑视图 (可查看可编辑)/VIEW.vue.ftl

+<#macro getFormHtml childCtrl>
+<view_${childCtrl.getName()}
+    v-show="<#if childCtrl.getUserTag?? && childCtrl.getUserTag()?? && childCtrl.getUserTag() == 'VIEW'>!editMode<#else>editMode</#if>"
+    :viewState="viewState"  
+    :viewparams="viewparams" 
+    :context="context"
+    :pViewCtx="viewCtx"
+    :autosave="${childCtrl.isEnableAutoSave()?c}" 
+    :viewtag="viewtag" 
+    :showBusyIndicator="${childCtrl.isShowBusyIndicator()?c}"  
+    updateAction="<#if childCtrl.getUpdatePSControlAction()?? && childCtrl.getUpdatePSControlAction().getPSAppDEMethod()??>${childCtrl.getUpdatePSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
+    removeAction="<#if childCtrl.getRemovePSControlAction()?? && childCtrl.getRemovePSControlAction().getPSAppDEMethod()??>${childCtrl.getRemovePSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
+    loaddraftAction="<#if childCtrl.getGetDraftPSControlAction()?? && childCtrl.getGetDraftPSControlAction().getPSAppDEMethod()??>${childCtrl.getGetDraftPSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
+    loadAction="<#if childCtrl.getGetPSControlAction()?? && childCtrl.getGetPSControlAction().getPSAppDEMethod()??>${childCtrl.getGetPSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
+    createAction="<#if childCtrl.getCreatePSControlAction()?? && childCtrl.getCreatePSControlAction().getPSAppDEMethod()??>${childCtrl.getCreatePSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
+    WFSubmitAction="<#if childCtrl.getWFSubmitPSControlAction()?? && childCtrl.getWFSubmitPSControlAction().getPSAppDEMethod()??>${childCtrl.getWFSubmitPSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
+    WFStartAction="<#if childCtrl.getWFStartPSControlAction()?? && childCtrl.getWFStartPSControlAction().getPSAppDEMethod()??>${childCtrl.getWFStartPSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
+    style="<#if childCtrl.getWidth()?? && childCtrl.getWidth() gt 0>width: ${childCtrl.getWidth()?c}px</#if><#if childCtrl.getHeight() gt 0>height: ${childCtrl.getHeight()?c}px</#if>" 
+    name="${childCtrl.name}"  
+    ref='${childCtrl.name}' 
+    @load="formLoadFinish($event)"
+    @save="formSaveFinish($event)"
+    @remove="formSaveFinish($event)"
+    @closeview="closeView($event)">
+</view_${childCtrl.getName()}>
+</#macro>
+<div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
+    <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :bordered="false">
+
+<#if view.isShowCaptionBar()>
+    <div slot='title' class="header-container">
+    <#if view.isShowCaptionBar()>
+      	<#if view.getPSSysImage()??>
+      		<#assign viewimg = view.getPSSysImage()/>
+    		<#if viewimg.getImagePath() !=  ''>
+        <span class='caption-image'><i class='${viewimg.getCssClass()}'></i></span>
+    		<#else>
+        <span class='caption-image'><img src='${viewimg.getImagePath()}'/></span>
+    		</#if>
+    	</#if>
+        <span class='caption-info'>{{$t(model.srfCaption)}}</span>
+  	</#if>
+    </div>
+</#if>
+
+<#--  BEGIN：视图顶部视图消息  -->
+<@ibizindent blank=8>
+<#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：视图内容区视图消息  -->
+<#list view.getPSControls() as childCtrl>
+    <#if childCtrl.getControlType() == 'FORM'>
+       <@getFormHtml childCtrl=childCtrl/>
+    </#if>
+</#list>
+        </div>
+<#--  BEGIN：视图底部视图消息  -->
+<@ibizindent blank=8>
+<#ibizinclude>
+../@MACRO/View_Pos_Bottom_Msgs.vue.ftl
+</#ibizinclude>
+</@ibizindent>
+<#--  END：视图底部视图消息  -->
+<#if view.hasPSControl('toolbar')>
+        <div class="view-footer">
+    <#list view.getPSControls() as childCtrl>
+        <#if childCtrl.getControlType() == 'TOOLBAR'>
+	    <template v-if="<#if childCtrl.getUserTag?? && childCtrl.getUserTag()?? && childCtrl.getUserTag() == 'VIEW'>!editMode<#else>editMode</#if>">
+		<@ibizindent blank=4>
+		${P.getCtrlCode(childCtrl, 'CONTROL.html').code}<#t>
+		</@ibizindent>
+	    </template>
+        </#if>
+    </#list>
+        </div>
+</#if>
+    </card>
+</div>
\ No newline at end of file

@CONTROL/视图布局面板/实体编辑视图 (可查看可编辑)/template.properties

+CTRLTYPE=VIEWLAYOUTPANEL#VIEWANDEDIT
\ 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 <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
 
     <#ibizinclude>

@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<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :dis-hover="true" :bordered="false">
 <#--  BEGIN：视图顶部视图消息  -->
 <@ibizindent blank=8>

@CONTROL/视图布局面板/实体编辑视图（底部工具栏）/VIEW.less.ftl

-<#ibizinclude>
-../@MACRO/DEFAULT.less.ftl
-</#ibizinclude>
\ 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<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :bordered="false">
-
-<#--  带数据信息标题  -->
-<#if view.isShowCaptionBar() || view.hasPSControl('toolbar')>
-<div slot='title' class="header-container">
-  <#if view.isShowCaptionBar()>
-    <#if view.getPSSysImage()??>
-    <#assign viewimg = view.getPSSysImage()/>
-    <#if viewimg.getImagePath() !=  ''>
-    <span class='caption-image'><i class='${viewimg.getCssClass()}'></i></span>
-    <#else>
-    <span class='caption-image'><img src='${viewimg.getImagePath()}'/></span>
-    </#if>
-    </#if>
-    <span class='caption-info'>{{$t(model.srfCaption)}}</span>
-  </#if>
-</div>
-</#if>
-<#--  BEGIN：视图顶部视图消息  -->
-<@ibizindent blank=8>
-<#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('form')>
-<@ibizindent blank=8>
-${P.getCtrlCode('form', 'CONTROL.html').code}
-</@ibizindent>
-</#if>
-<#if view.hasPSControl('toolbar')>
-      <@ibizindent blank=4>
-      ${P.getCtrlCode('toolbar', 'CONTROL.html').code}<#t>
-      </@ibizindent>
-  </#if>
-        </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#BOTTOMBTN
\ 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>' :disHover="true" :padding="0" :bordered="false">
 <#if view.hasPSControl('toolbar')>
   <#assign toolbarCtrl = view.getPSControl('toolbar')>

@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<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :dis-hover="true" :bordered="false">
     <#ibizinclude>
     ../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl

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

 <#ibizinclude>../../@MACRO/FUNC/MACRO.ftl</#ibizinclude>
     <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" :bordered="false">
             <div class='content-container'>
             <#--  搜索框: BEGIN  -->

@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" :bordered="false">
 <#--  BEGIN：视图顶部视图消息  -->
 <@ibizindent blank=8>

@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 <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' dis-hover :padding="0" :bordered="false">
         <@ibizindent blank=8>
         <#ibizinclude>

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

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

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

 <div class="view-container ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
      <card class='view-card ' :dis-hover="true" :bordered="false">
         <img src="@/assets/img/redirect.svg" />
         <div class="context">页面跳转中~</div>

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

 <div class="${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/视图布局面板/应用数据导入视图/VIEW.vue.ftl

 <div class="${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/视图布局面板/应用文件上传视图/VIEW.vue.ftl

 <div class="${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/视图布局面板/应用注销视图/VIEW.vue.ftl

 <div class="app-logout-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>
     <img class="logout-bg" src="/assets/img/logout_bg.png"/>
     <div class="logout-container">
        {{ $t('app.viewLayoutPanel.appLogoutView.prompt1') }} <a>{{this.countdown}}</a> {{ $t('app.viewLayoutPanel.appLogoutView.prompt2') }} <a @click="gotoLoginView">{{ $t('app.viewLayoutPanel.appLogoutView.loginpage') }}</a>！

@CONTROL/视图布局面板/应用流程处理记录视图/VIEW.vue.ftl

 <div class="${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>{{$t('app.viewLayoutPanel.appWfstepTraceView.title')}}</div>
 </div>
\ No newline at end of file

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

 <div class="app-login-view ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction
-      :viewTitle="$t(model.srfCaption)"
-      viewName="apploginview"
-    ></app-studioaction>
     <img class="login-bg" src="/assets/img/background.png" />
     <div class="login-container">
       <div class="login-title">{{appTitle}}</div>

@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

@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()?lower_case}</#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">    
         <div class='content-container'>
             <div class='view-top-messages'>

@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

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

@@ -73,6 +73,9 @@
         height:calc(100vh - 50px);
         overflow-x: hidden;
         overflow-y: hidden;
+        .ibiz-page-tag + .app-view-layout {
+            height: calc(100% - 65px) !important;
+        }
     }
     >.ivu-layout {
         >.ivu-layout {

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

@@ -7,7 +7,6 @@
 <#else>  -->
 <#if view.getMainMenuAlign()=="LEFT" || view.getMainMenuAlign()=="">
 <div class="index_view ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
-    <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
     <layout :class="themeClasses" :style="themeStyle">
         <layout id="movebox">
             <sider class="index_sider" :width="collapseChange ? 64 : 200" hide-trigger v-model="collapseChange" id= "left_move">
@@ -35,7 +34,6 @@
                         </div>
                     </div>
                     <div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
-                        <app-header-menus />
                         <app-lang style='font-size: 15px;padding: 0 10px;'></app-lang>
                         <app-orgsector></app-orgsector>
                         <app-user></app-user>
@@ -69,7 +67,6 @@
                 </div>
             </div>
             <div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
-                <app-header-menus />
                 <app-lang style='font-size: 15px;padding: 0 10px;'></app-lang>
                 <app-orgsector></app-orgsector>
                 <app-user></app-user>

@LOGIC/@UIACTION/前台调用/LOGIC.vue.ftl

@@ -198,6 +198,7 @@ ${front_block}
             importId: '${item.getPSAppDEDataImport().codeName}',
             serviceName: '${item.getPSAppDataEntity().codeName}',
             appDeLogicName: '${item.getPSAppDataEntity().logicName}',
+            ignoreError: <#if item.getPSAppDEDataImport().isIgnoreError?? && item.getPSAppDEDataImport().isIgnoreError()>true<#else>false</#if>,
                     <#if item.getPSAppDEDataImport().getPSDEDataImportItems?? && item.getPSAppDEDataImport().getPSDEDataImportItems()??>
             importData: {
                         <#list item.getPSAppDEDataImport().getPSDEDataImportItems() as importItem>

@LOGIC/@UIACTION/后台调用/LOGIC.vue.ftl

@@ -201,6 +201,7 @@ ${backend_block}
                     </#if>
                     <#--  后续界面行为  -->
                     <#if item.getNextPSUIAction?? && item.getNextPSUIAction()??>
+                        <#assign nextPSUIAction = item.getNextPSUIAction()/>
                 let { data: result } = response;
                 if (response && Array.isArray(response) && response.length > 0) {
                     result = [];

@LOGIC/@UIACTION/系统预置/sys/保存变更/LOGIC.vue.ftl

+    /**
+     * ${item.getCaption()}
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof ${srfclassname('${view.name}')}Base
+     */
+    public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.$Notice.error({ title: '错误', desc: '保存变更未支持' });
+    }
\ No newline at end of file

@LOGIC/@UIACTION/系统预置/sys/保存变更/template.properties

+LOGICTYPE=SYS#SAVECHANGES
\ No newline at end of file

@LOGIC/@UIACTION/系统预置/sys/其他/LOGIC.vue.ftl

+<#assign keyPSDEField>${de.getCodeName()?lower_case}</#assign>
+    /**
+     * ${item.getCaption()}
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof ${srfclassname('${view.name}')}Base
+     */
+    public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        if (actionContext) {
+            actionContext.editMode = true;
+            if (actionContext.formLoad instanceof Function) {
+                actionContext.formLoad();
+            }
+        }
+    }
\ No newline at end of file

@LOGIC/@UIACTION/系统预置/sys/其他/template.properties

+LOGICTYPE=SYS#Other
\ No newline at end of file

@LOGIC/@VIEWLOGIC/部件事件/LOGIC.vue.ftl

@@ -51,29 +51,42 @@
           datas = [params];
         }
         // 界面行为
-        <#if item.getPSAppViewUIAction().getPSUIAction()??>
+    <#if item.getPSAppViewUIAction().getPSUIAction()??>
         <#assign uiaction = item.getPSAppViewUIAction().getPSUIAction()/>
         <#-- 属于应用实体的界面行为走UI服务start -->
         <#if uiaction.getPSAppDataEntity?? && uiaction.getPSAppDataEntity()??>
-        <#assign curAppEntity = uiaction.getPSAppDataEntity() />
-        <#if uiaction.getPSAppWFVer?? && uiaction.getPSAppWFVer()??>
+			<#assign curAppEntity = uiaction.getPSAppDataEntity() />
+			<#if item.getPSControlContainer()?? && item.getPSControlContainer().getPSAppDataEntity()??>
+        		<#assign appDataEntity = item.getPSControlContainer().getPSAppDataEntity()/>
+        	</#if>
+			<#if uiaction.getPSAppWFVer?? && uiaction.getPSAppWFVer()??>
+				<#if appDataEntity?? && appDataEntity.getCodeName() == uiaction.getPSAppWFVer().getCodeName()>
         const curUIService:${srfclassname('${uiaction.getPSAppWFVer().getCodeName()}')}WFUIService = new ${srfclassname('${uiaction.getPSAppWFVer().getCodeName()}')}WFUIService();
-        <#else>
+        curUIService.${uiaction.getFullCodeName()}(datas,contextJO, paramJO, $event, xData,this,<#if appDataEntity??>"${appDataEntity.getCodeName()}"<#else>null</#if>);
+				<#else>
+		window.uiServiceRegister.getService('${uiaction.getPSAppWFVer().getCodeName()?lower_case}').then((curUIService: any) => {
+        	curUIService.${uiaction.getFullCodeName()}(datas,contextJO, paramJO, $event, xData,this,<#if appDataEntity??>"${appDataEntity.getCodeName()}"<#else>null</#if>);
+		})
+				</#if>
+        	<#else>
+				<#if appDataEntity?? && appDataEntity.getCodeName() == curAppEntity.codeName>
         const curUIService:${srfclassname('${curAppEntity.getCodeName()}')}UIService  = new ${srfclassname('${curAppEntity.getCodeName()}')}UIService();
-        </#if>
-        <#if item.getPSControlContainer()?? && item.getPSControlContainer().getPSAppDataEntity()??>
-        <#assign appDataEntity = item.getPSControlContainer().getPSAppDataEntity()/>
         curUIService.${uiaction.getFullCodeName()}(datas,contextJO, paramJO,  $event, xData,this,<#if appDataEntity??>"${appDataEntity.getCodeName()}"<#else>null</#if>);
-        </#if>
+				<#else>
+		window.uiServiceRegister.getService('${curAppEntity.getCodeName()?lower_case}').then((curUIService: any) => {
+        	curUIService.${uiaction.getFullCodeName()}(datas,contextJO, paramJO, $event, xData,this,<#if appDataEntity??>"${appDataEntity.getCodeName()}"<#else>null</#if>);
+		})
+				</#if>
+        	</#if>
         <#else>
-        <#if item.getPSControlContainer()?? && item.getPSControlContainer().getPSAppDataEntity()??>
-        <#assign appDataEntity = item.getPSControlContainer().getPSAppDataEntity()/>
+			<#if item.getPSControlContainer()?? && item.getPSControlContainer().getPSAppDataEntity()??>
+			<#assign appDataEntity = item.getPSControlContainer().getPSAppDataEntity()/>
         this.${uiaction.getFullCodeName()}(datas, contextJO,paramJO,  $event, xData,this,"${appDataEntity.getCodeName()}");
-        <#else>
+        	<#else>
         this.${uiaction.getFullCodeName()}(datas, contextJO,paramJO,  $event, xData,this,undefined);
-        </#if>
+        	</#if>
         </#if>
         <#-- 属于应用实体的界面行为走UI服务end -->
-        </#if>
-        </#if>
+    </#if>
+</#if>
     }
\ No newline at end of file

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

@@ -78,13 +78,13 @@
      */
     @Prop() public portletState?: any;
 
-   /**
-   * 门户部件状态事件
-   *
-   * @public
-   * @type {(Subscription | undefined)}
-   * @memberof ${srfclassname('${view.name}')}Base
-   */
+    /**
+     * 门户部件状态事件
+     *
+     * @public
+     * @type {(Subscription | undefined)}
+     * @memberof ${srfclassname('${view.name}')}Base
+     */
     public portletStateEvent: Subscription | undefined;
 
     /**
@@ -428,6 +428,9 @@
         if (_this.engine) {
             _this.engine.destroy();
         }
+<#if before_destroy_block??>
+        ${before_destroy_block}
+</#if>
     }
 
     /**

@VIEW/实体HTML视图/VIEW.less.ftl

@@ -10,5 +10,15 @@ ${P.getLayoutCode().code}
 }
 <#if view.getPSViewLayoutPanel()??>
 <@panelStyle panel = view.getPSViewLayoutPanel() />
+    <#if view.getPSViewLayoutPanel().getPSSysCss?? && view.getPSViewLayoutPanel().getPSSysCss()??>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?? && view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?length gt 0>
+.${view.getPSViewLayoutPanel().getPSSysCss().getCssName()} {
+    ${view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()}
+}
+        </#if>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()??>
+${view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()}
+        </#if>
+    </#if>
 </#if>
 </#if>
\ No newline at end of file

@VIEW/实体全局流程数据重定向视图/VIEW.less.ftl

@@ -10,5 +10,15 @@ ${P.getLayoutCode().code}
 }
 <#if view.getPSViewLayoutPanel()??>
 <@panelStyle panel = view.getPSViewLayoutPanel() />
+    <#if view.getPSViewLayoutPanel().getPSSysCss?? && view.getPSViewLayoutPanel().getPSSysCss()??>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?? && view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?length gt 0>
+.${view.getPSViewLayoutPanel().getPSSysCss().getCssName()} {
+    ${view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()}
+}
+        </#if>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()??>
+${view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()}
+        </#if>
+    </#if>
 </#if>
 </#if>
\ No newline at end of file

@VIEW/实体分页导航视图/VIEW.less.ftl

@@ -10,5 +10,15 @@ ${P.getLayoutCode().code}
 }
 <#if view.getPSViewLayoutPanel()??>
 <@panelStyle panel = view.getPSViewLayoutPanel() />
+    <#if view.getPSViewLayoutPanel().getPSSysCss?? && view.getPSViewLayoutPanel().getPSSysCss()??>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?? && view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?length gt 0>
+.${view.getPSViewLayoutPanel().getPSSysCss().getCssName()} {
+    ${view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()}
+}
+        </#if>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()??>
+${view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()}
+        </#if>
+    </#if>
 </#if>
 </#if>
\ No newline at end of file

@VIEW/实体分页搜索视图/VIEW.less.ftl

@@ -10,5 +10,15 @@ ${P.getLayoutCode().code}
 }
 <#if view.getPSViewLayoutPanel()??>
 <@panelStyle panel = view.getPSViewLayoutPanel() />
+    <#if view.getPSViewLayoutPanel().getPSSysCss?? && view.getPSViewLayoutPanel().getPSSysCss()??>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?? && view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?length gt 0>
+.${view.getPSViewLayoutPanel().getPSSysCss().getCssName()} {
+    ${view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()}
+}
+        </#if>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()??>
+${view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()}
+        </#if>
+    </#if>
 </#if>
 </#if>
\ No newline at end of file

@VIEW/实体分页搜索视图（部件视图）/VIEW.less.ftl

@@ -10,5 +10,15 @@ ${P.getLayoutCode().code}
 }
 <#if view.getPSViewLayoutPanel()??>
 <@panelStyle panel = view.getPSViewLayoutPanel() />
+    <#if view.getPSViewLayoutPanel().getPSSysCss?? && view.getPSViewLayoutPanel().getPSSysCss()??>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?? && view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?length gt 0>
+.${view.getPSViewLayoutPanel().getPSSysCss().getCssName()} {
+    ${view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()}
+}
+        </#if>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()??>
+${view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()}
+        </#if>
+    </#if>
 </#if>
 </#if>
\ No newline at end of file

@VIEW/实体分页表单视图（嵌入）/VIEW.less.ftl

@@ -10,5 +10,15 @@ ${P.getLayoutCode().code}
 }
 <#if view.getPSViewLayoutPanel()??>
 <@panelStyle panel = view.getPSViewLayoutPanel() />
+    <#if view.getPSViewLayoutPanel().getPSSysCss?? && view.getPSViewLayoutPanel().getPSSysCss()??>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?? && view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?length gt 0>
+.${view.getPSViewLayoutPanel().getPSSysCss().getCssName()} {
+    ${view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()}
+}
+        </#if>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()??>
+${view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()}
+        </#if>
+    </#if>
 </#if>
 </#if>
\ No newline at end of file

@VIEW/实体列表导航视图/VIEW.less.ftl

@@ -10,5 +10,15 @@ ${P.getLayoutCode().code}
 }
 <#if view.getPSViewLayoutPanel()??>
 <@panelStyle panel = view.getPSViewLayoutPanel() />
+    <#if view.getPSViewLayoutPanel().getPSSysCss?? && view.getPSViewLayoutPanel().getPSSysCss()??>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?? && view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?length gt 0>
+.${view.getPSViewLayoutPanel().getPSSysCss().getCssName()} {
+    ${view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()}
+}
+        </#if>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()??>
+${view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()}
+        </#if>
+    </#if>
 </#if>
 </#if>
\ No newline at end of file

@VIEW/实体列表视图/VIEW.less.ftl

@@ -10,5 +10,15 @@ ${P.getLayoutCode().code}
 }
 <#if view.getPSViewLayoutPanel()??>
 <@panelStyle panel = view.getPSViewLayoutPanel() />
+    <#if view.getPSViewLayoutPanel().getPSSysCss?? && view.getPSViewLayoutPanel().getPSSysCss()??>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?? && view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()?length gt 0>
+.${view.getPSViewLayoutPanel().getPSSysCss().getCssName()} {
+    ${view.getPSViewLayoutPanel().getPSSysCss().getRawCssStyle()}
+}
+        </#if>
+        <#if view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()??>
+${view.getPSViewLayoutPanel().getPSSysCss().getCssStyle()}
+        </#if>
+    </#if>
 </#if>
 </#if>
\ No newline at end of file