2020.7.5 Merge

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

@@ -223,13 +223,21 @@ import { Environment } from '@/environments/environment';
     @Prop() mode: any;
 
     /**
-     * 当前菜单是否在默认视图上
+     * 应用起始页面
      *
-     * @type {*}
+     * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     @Prop({ default: false }) isDefaultPage?: boolean;
 
+    /**
+     * 空白视图模式
+     *
+     * @type {boolean}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    @Prop({ default: false }) isBlankMode?:boolean;
+
     /**
      * 默认打开视图
      *
@@ -345,7 +353,7 @@ import { Environment } from '@/environments/environment';
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public doMenuSelect(): void {
-        if (!this.isDefaultPage) {
+        if (!this.isDefaultPage || this.isBlankMode) {
             return;
         }
         const appFuncs: any[] = this.menuMode.getAppFuncs();
@@ -389,7 +397,7 @@ import { Environment } from '@/environments/environment';
     public computeMenuSelect(items: any[], appfunctag: string): boolean {
         const appFuncs: any[] = this.menuMode.getAppFuncs();
         return items.some((item: any) => {
-            if (Object.is(appfunctag, '') && !Object.is(item.appfunctag, '')) {
+            if (Object.is(appfunctag, '') && !Object.is(item.appfunctag, '') && item.opendefault) {
                 const appfunc = appFuncs.find((_appfunc: any) => Object.is(_appfunc.appfunctag, item.appfunctag));
                 if (appfunc.routepath) {
                     this.defaultActive = item.name;
@@ -397,7 +405,7 @@ import { Environment } from '@/environments/environment';
                     return true;
                 }
             }
-            if (Object.is(item.appfunctag, appfunctag)) {
+            if (Object.is(item.appfunctag, appfunctag) && item.opendefault) {
                 this.setHideSideBar(item);
                 this.defaultActive = item.name;
                 return true;

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

@@ -8,6 +8,7 @@
     viewtag="${srffilepath2(view.getCodeName())}"
     :selectTheme="selectTheme"  
     :isDefaultPage="isDefaultPage"  
+    :isBlankMode="isBlankMode"
     :defPSAppView="defPSAppView" 
   </#if>
 </#assign>

@CONTROL/搜索栏/CONTROL-BASE.vue.ftl

@@ -18,15 +18,30 @@
             <i-input v-model="query" placeholder="<#if ctrl.getPSSearchBarQuickSearchs()??><#list ctrl.getPSSearchBarQuickSearchs() as search><#if search_index gt 0>,</#if><#if search.getPSDEField()??>${search.getPSDEField().getLogicName()}</#if></#list></#if>" style="<#if ctrl.getQuickSearchWidth() gt 0>width: ${ctrl.getQuickSearchWidth()?c}px;</#if>"></i-input>
             </#if>  -->
             <div class="search-bar-action">
+                <el-select size="small" v-if="historyItems.length > 0" v-model="selectItem" @change="onFilterChange">
+                    <el-option v-for="item in historyItems" :key="item.value" :label="item.name" :value="item.value"></el-option>
+                </el-select>
                 <i-button type="primary" @click="onSearch">搜索</i-button>
                 <i-button @click="onReset">重置</i-button>
-                <i-button @click="onSave"><i class="fa fa-floppy-o" aria-hidden="true"></i></i-button>
+                <Poptip ref="propip" trigger="hover" placement="top-end" title="存储自定义查询" :width="250" @on-popper-show="openPoper">
+                    <i-button><i class="fa fa-floppy-o" aria-hidden="true"></i></i-button>
+                    <template slot="content">
+                        <div>
+                            <i-input v-model="saveItemName" placeholder="名称"></i-input>
+                            <div class="save-action">
+                                <i-button @click="onCancel">取消</i-button>
+                                <i-button type="primary" @click="onOk">保存</i-button>
+                            </div>
+                        </div>
+                    </template>
+                </Poptip>
             </div>
         </div>
     </div>
 </template>
 <#assign import_block>
 import FilterTree from '@components/filter-tree/filter-tree.vue';
+import moment from 'moment';
 </#assign>
 
 <#assign component_block>
@@ -106,6 +121,30 @@ FilterTree,
      */
     public utilServiceName: string = "<#if app.getPSAppFilterStorageUtil?? && app.getPSAppFilterStorageUtil()??>${app.getPSAppFilterStorageUtil().getCodeName()?lower_case}</#if>";
 
+    /**
+     * 历史记录
+     *
+     * @type {string}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected historyItems: any[] = [];
+
+    /**
+     * 选中记录
+     *
+     * @type {string}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected selectItem: any = null;
+
+    /**
+     * 存储项名称
+     *
+     * @type {string}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    protected saveItemName: string = '';
+
     /**
      * 获取多项数据
      *
@@ -266,10 +305,18 @@ FilterTree,
      * @return {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public onSave() {
+    public onSave(name?: string) {
+        let time = moment();
+        this.historyItems.push({
+            name: (name ? name : time.format('YYYY-MM-DD HH:mm:ss')),
+            value: time.unix().toString(),
+            data: JSON.parse(JSON.stringify(this.filterItems))
+        })
+        this.selectItem = time.unix().toString();
+
         let param: any = {};
 		Object.assign(param, {
-            model: this.filterItems,
+            model: JSON.parse(JSON.stringify(this.historyItems)),
             appdeName: this.appdeName,
             modelid: this.modelId,
             utilServiceName: this.utilServiceName,
@@ -311,15 +358,59 @@ FilterTree,
         let post = this.service.loadModel(this.utilServiceName, this.context, param);
 		post.then((response: any) => {
 			if(response.status == 200) {
-                this.filterItems = response.data;
-                this.$nextTick(() => {
-                    this.onSearch();
-                })
+                this.historyItems = response.data;
 			}
 		}).catch((response: any) => {
 			console.log(response);
 		});
     }
+
+    /**
+     * 改变过滤条件
+     *
+     * @return {*}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public onFilterChange(evt: any) {
+        let item: any = this.historyItems.find((item: any) => Object.is(evt, item.value));
+        if(item) {
+            this.filterItems = JSON.parse(JSON.stringify(item.data));
+        }
+    }
+
+    /**
+     * 打开弹框
+     *
+     * @return {*}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public openPoper() {
+        this.saveItemName = '';
+    }
+
+    /**
+     * 确定
+     *
+     * @return {*}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public onOk() {
+        let propip: any = this.$refs.propip;
+        propip.handleMouseleave();
+        this.onSave(this.saveItemName);
+    }
+
+    /**
+     * 取消设置
+     *
+     * @return {*}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public onCancel() {
+        let propip: any = this.$refs.propip;
+        propip.handleMouseleave();
+        this.onSave();
+    }
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_BOTTOM-BASE.vue.ftl
 </#ibizinclude>

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

@@ -2,8 +2,17 @@
     height: 32px;
     .search-bar-action {
         float: right;
-        > .ivu-btn {
+        display: flex;
+        align-items: center;
+        > * {
             margin-left: 5px;
+            .save-action {
+                text-align: right;
+                margin-top: 10px;
+                > * {
+                    margin-left: 5px;
+                }
+            }
         }
     }
 }

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

@@ -8,6 +8,7 @@
 <#assign import_block>
 import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
+import schema from 'async-validator';
 </#assign>
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl
@@ -371,7 +372,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
      * @param {{ name: string, newVal: any, oldVal: any }} { name, newVal, oldVal }
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public formLogic({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
+    public async formLogic({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }){
         <#if P.getPartCode(item,'FORM_LOGIC').code?length gt 0>
         ${P.getPartCode(item,'FORM_LOGIC').code}
         </#if>
@@ -382,13 +383,34 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 
         if(Object.is(name, '${formitem.name}')){
             const details: string[] = [<#list itemUpdate.getPSDEFIUpdateDetails() as detail><#if detail_index gt 0>, </#if>'${detail.getPSDEFormDetailName()?lower_case}'</#list>];
-            this.updateFormItems('${itemUpdate.getPSAppDEMethod().getCodeName()}', this.data, details, ${itemUpdate.isShowBusyIndicator()?c});
+            if(await this.checkItem('${formitem.name}')){
+                this.updateFormItems('${itemUpdate.getPSAppDEMethod().getCodeName()}', this.data, details, ${itemUpdate.isShowBusyIndicator()?c});
+            }
         }
         </#if>
         </#list>
         </#if>
     }
 
+    /**
+     * 表单项检查逻辑
+     *
+     * @public
+     * @param name 属性名
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public checkItem(name:string):Promise<any> {
+        return new Promise((resolve, reject) => {
+                var validator = new schema({[name]:this.rules[name]});
+                validator.validate({[name]:this.data[name]}).then(()=>{
+                    resolve(true);
+                })
+                .catch(() => {
+                    resolve(false);
+                });;
+        })
+    }
+
     /**
      * 表单值变化
      *

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

-<#if view.isBlankMode()>
+<#--  <#if view.isBlankMode()>
 <div class="index_view ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
     <app-keep-alive :routerList="getRouterList">
         <router-view :key="getRouterViewKey"></router-view>
     </app-keep-alive>
 </div>
-<#else>
+<#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>
@@ -78,4 +78,4 @@
     </layout>
 </div>
 </#if>
-</#if>
+<#--  </#if>  -->

@EDITOR/单位（仅含指定单位及其下级单位单选）/EDITOR.vue.ftl

-<app-org-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>" :multiple="<#if item.getEditorParam('multiple','') != ''>${item.getEditorParam('multiple','')}<#else>false</#if>" style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-org-select>
\ No newline at end of file
+<app-org-select :data="data" :disabled="detailsModel.${editor.name}.disabled" :context="JSON.parse(JSON.stringify(context))" :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>" :multiple="<#if item.getEditorParam('multiple','') != ''>${item.getEditorParam('multiple','')}<#else>false</#if>" style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-org-select>
\ No newline at end of file

@EDITOR/单位（仅含指定单位及其下级单位多选）/EDITOR.vue.ftl

-<app-org-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>" :multiple="<#if item.getEditorParam('multiple','') != ''>${item.getEditorParam('multiple','')}<#else>false</#if>" style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-org-select>
\ No newline at end of file
+<app-org-select :data="data" :disabled="detailsModel.${editor.name}.disabled" :context="JSON.parse(JSON.stringify(context))" :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>" :multiple="<#if item.getEditorParam('multiple','') != ''>${item.getEditorParam('multiple','')}<#else>false</#if>" style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-org-select>
\ No newline at end of file

@EDITOR/单位（全部单位单选）/EDITOR.vue.ftl

-<app-org-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>" :multiple="<#if item.getEditorParam('multiple','') != ''>${item.getEditorParam('multiple','')}<#else>false</#if>" style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-org-select>
\ No newline at end of file
+<app-org-select :data="data" :disabled="detailsModel.${editor.name}.disabled" :context="JSON.parse(JSON.stringify(context))" :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>" :multiple="<#if item.getEditorParam('multiple','') != ''>${item.getEditorParam('multiple','')}<#else>false</#if>" style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-org-select>
\ No newline at end of file

@EDITOR/单位（全部单位多选）/EDITOR.vue.ftl

-<app-org-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>" :multiple="<#if item.getEditorParam('multiple','') != ''>${item.getEditorParam('multiple','')}<#else>false</#if>" style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-org-select>
\ No newline at end of file
+<app-org-select :data="data" :disabled="detailsModel.${editor.name}.disabled" :context="JSON.parse(JSON.stringify(context))" :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>" :multiple="<#if item.getEditorParam('multiple','') != ''>${item.getEditorParam('multiple','')}<#else>false</#if>" style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-org-select>
\ No newline at end of file

@EDITOR/部门（指定单位内的部门单选）/EDITOR.vue.ftl

-<app-department-select :data="data" :context="JSON.parse(JSON.stringify(context))" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}<#else>/ibzorganizations/${orgid}/ibzdepartments/picker</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>"  :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" :multiple=<#if item.getEditorParam('multiple','') != ''>"${item.getEditorParam('multiple','')}"<#else>"false"</#if> style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-department-select>
\ No newline at end of file
+<app-department-select :data="data" :disabled="detailsModel.${editor.name}.disabled" :context="JSON.parse(JSON.stringify(context))" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}<#else>/ibzorganizations/${orgid}/ibzdepartments/picker</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>"  :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" :multiple=<#if item.getEditorParam('multiple','') != ''>"${item.getEditorParam('multiple','')}"<#else>"false"</#if> style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-department-select>
\ No newline at end of file

@EDITOR/部门（指定单位内的部门多选）/EDITOR.vue.ftl

-<app-department-select :data="data" :context="JSON.parse(JSON.stringify(context))" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}<#else>/ibzorganizations/${orgid}/ibzdepartments/picker</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>"  :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" :multiple=<#if item.getEditorParam('multiple','') != ''>"${item.getEditorParam('multiple','')}"<#else>"false"</#if> style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-department-select>
\ No newline at end of file
+<app-department-select :data="data" :disabled="detailsModel.${editor.name}.disabled" :context="JSON.parse(JSON.stringify(context))" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}<#else>/ibzorganizations/${orgid}/ibzdepartments/picker</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>"  :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" :multiple=<#if item.getEditorParam('multiple','') != ''>"${item.getEditorParam('multiple','')}"<#else>"false"</#if> style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-department-select>
\ No newline at end of file

@EDITOR/部门（指定单位及其下级单位的所有部门单选)/EDITOR.vue.ftl

-<app-department-select :data="data" :context="JSON.parse(JSON.stringify(context))" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}<#else>/ibzorganizations/${orgid}/ibzdepartments/picker</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>"  :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" :multiple=<#if item.getEditorParam('multiple','') != ''>"${item.getEditorParam('multiple','')}"<#else>"false"</#if> style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-department-select>
\ No newline at end of file
+<app-department-select :data="data" :disabled="detailsModel.${editor.name}.disabled" :context="JSON.parse(JSON.stringify(context))" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}<#else>/ibzorganizations/${orgid}/ibzdepartments/picker</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>"  :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" :multiple=<#if item.getEditorParam('multiple','') != ''>"${item.getEditorParam('multiple','')}"<#else>"false"</#if> style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-department-select>
\ No newline at end of file

@EDITOR/部门（指定单位及其下级单位的所有部门多选)/EDITOR.vue.ftl

-<app-department-select :data="data" :context="JSON.parse(JSON.stringify(context))" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}<#else>/ibzorganizations/${orgid}/ibzdepartments/picker</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>"  :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" :multiple=<#if item.getEditorParam('multiple','') != ''>"${item.getEditorParam('multiple','')}"<#else>"false"</#if> style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-department-select>
\ No newline at end of file
+<app-department-select :data="data" :disabled="detailsModel.${editor.name}.disabled" :context="JSON.parse(JSON.stringify(context))" url="<#if item.getEditorParam('url','') != ''>${item.getEditorParam('url','')}<#else>/ibzorganizations/${orgid}/ibzdepartments/picker</#if>" filter="<#if item.getEditorParam('filter','') != ''>${item.getEditorParam('filter','')}<#else>srforgid</#if>"  :fillMap="<#if item.getEditorParam('fillMap','') != ''>${item.getEditorParam('fillMap','')}<#else>{'id':'${editor.getValueItemName()}','label':'${editor.name}'}</#if>" :multiple=<#if item.getEditorParam('multiple','') != ''>"${item.getEditorParam('multiple','')}"<#else>"false"</#if> style="${editor.getEditorCssStyle()}" @select-change="onFormItemValueChange"></app-department-select>
\ No newline at end of file

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

@@ -154,6 +154,14 @@
      */
     public isDefaultPage: boolean = ${view.isDefaultPage()?c};
 
+    /**
+     * 空白视图模式
+     *
+     * @type {boolean}
+     * @memberof ${srfclassname('${view.name}')}Base
+     */
+    public isBlankMode:boolean = ${view.isBlankMode()?c};
+
     /**
      * 获取样式
      *

APP/src/service/%DE_PKGPATH%/%APP_DELOGIC%-logic-base.ts.ftl

@@ -23,11 +23,23 @@ import { Verify } from '@/utils/verify/verify';
 <#-- 源参数 -->
 <#if logicparam.getSrcPSDELogicParam()??><#assign srcParam = logicparam.getSrcPSDELogicParam() /></#if>
 <#-- 源参数属性名称 -->
-<#if logicparam.getSrcFieldName()??><#assign srcFieldParam = logicparam.getSrcFieldName()?lower_case /></#if>
+<#if logicparam.getSrcFieldName()??>
+<#assign srcFieldParamName = logicparam.getSrcFieldName() />
+<#if srcParam.getParamPSAppDataEntity().getPSAppDEField(srcFieldParamName,true)??>
+<#assign srcFieldParam=srfcaseformat(srcParam.getParamPSAppDataEntity().getPSAppDEField(srcFieldParamName,true).getCodeName()?lower_case,'l_u2lC') />
+<#else>
+<#assign srcFieldParam= logicparam.getSrcFieldName()?lower_case />
+</#if>
+</#if>
 <#-- 目标参数 -->
 <#assign dstParam = logicparam.getDstPSDELogicParam() />
 <#-- 目标参数属性名称 -->
-<#assign dstFieldParam = logicparam.getDstFieldName()?lower_case />
+<#assign dstFieldParamName = logicparam.getDstFieldName() />
+<#if dstParam.getParamPSAppDataEntity().getPSAppDEField(dstFieldParamName,true)??>
+<#assign dstFieldParam=srfcaseformat(dstParam.getParamPSAppDataEntity().getPSAppDEField(dstFieldParamName,true).getCodeName()?lower_case,'l_u2lC') />
+<#else>
+<#assign dstFieldParam= logicparam.getDstPSDELogicParam()?lower_case />
+</#if>
 <#-- 源逻辑参数 -->
     let tempDstParam${logicparam_index}Context:any = this.paramsMap.get('${dstParam.getCodeName()}').context?this.paramsMap.get('${dstParam.getCodeName()}').context:{};
     let tempDstParam${logicparam_index}Data:any = this.paramsMap.get('${dstParam.getCodeName()}').data?this.paramsMap.get('${dstParam.getCodeName()}').data:{};