tony001 发布系统代码 [后台服务，演示应用]

app_Web/public/assets/json/view-config.json

@@ -2039,6 +2039,14 @@
         "viewname": "IBIZOrderState40EditView2",
         "viewtag": "e6b9fc2b5a23e89827909ccc050eb381"
     },
+    "ibizcustomerusr2pickupview_layout": {
+        "title": "客户实体数据选择视图(树视图)",
+        "caption": "客户",
+        "viewtype": "DEPICKUPVIEW",
+        "viewmodule": "Sample",
+        "viewname": "IBIZCustomerUsr2PickupView_layout",
+        "viewtag": "e7f12b95864b12114256d9c4dbbb559c"
+    },
     "ibizbookusr4listview_layout": {
         "title": "实体列表视图",
         "caption": "实体列表视图",

app_Web/src/locale/lanres/entities/ibizcustomer/ibizcustomer_BO_CN_base.ts

@@ -50,6 +50,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("客户",null),
 				title: commonLogic.appcommonhandle("客户数据多项选择视图",null),
 			},
+			usr2pickupview_layout: {
+				caption: commonLogic.appcommonhandle("客户",null),
+				title: commonLogic.appcommonhandle("客户实体数据选择视图(树视图)",null),
+			},
 			pickupview: {
 				caption: commonLogic.appcommonhandle("客户",null),
 				title: commonLogic.appcommonhandle("客户数据选择视图",null),

app_Web/src/locale/lanres/entities/ibizcustomer/ibizcustomer_en_US_base.ts

@@ -50,6 +50,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("客户",null),
 				title: commonLogic.appcommonhandle("客户数据多项选择视图",null),
 			},
+			usr2pickupview_layout: {
+				caption: commonLogic.appcommonhandle("客户",null),
+				title: commonLogic.appcommonhandle("客户实体数据选择视图(树视图)",null),
+			},
 			pickupview: {
 				caption: commonLogic.appcommonhandle("客户",null),
 				title: commonLogic.appcommonhandle("客户数据选择视图",null),

app_Web/src/locale/lanres/entities/ibizcustomer/ibizcustomer_zh_CN_base.ts

@@ -50,6 +50,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("客户",null),
 				title: commonLogic.appcommonhandle("客户数据多项选择视图",null),
 			},
+			usr2pickupview_layout: {
+				caption: commonLogic.appcommonhandle("客户",null),
+				title: commonLogic.appcommonhandle("客户实体数据选择视图(树视图)",null),
+			},
 			pickupview: {
 				caption: commonLogic.appcommonhandle("客户",null),
 				title: commonLogic.appcommonhandle("客户数据选择视图",null),

app_Web/src/mock/viewconfig/viewconfig.ts

@@ -2047,6 +2047,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "IBIZOrderState40EditView2",
             "viewtag": "e6b9fc2b5a23e89827909ccc050eb381"
         },
+        "ibizcustomerusr2pickupview_layout": {
+            "title": "客户实体数据选择视图(树视图)",
+            "caption": "客户",
+            "viewtype": "DEPICKUPVIEW",
+            "viewmodule": "Sample",
+            "viewname": "IBIZCustomerUsr2PickupView_layout",
+            "viewtag": "e7f12b95864b12114256d9c4dbbb559c"
+        },
         "ibizbookusr4listview_layout": {
             "title": "实体列表视图",
             "caption": "实体列表视图",

app_Web/src/pages/sample/ibizbookoption-view-layout/ibizbookoption-view-layout-base.vue

@@ -27,18 +27,8 @@
 </view_form>
             </app-ctrl-pos>
         </template>
-        <template #container_grid1>
-    <app-simpleflex-container name="container_grid1" :layoutModelDetails="layoutModelDetails">
-        <template #container2>
-    <app-simpleflex-container name="container2" :layoutModelDetails="layoutModelDetails">
-    </app-simpleflex-container>
-        </template>
-        <template #container3>
-    <app-simpleflex-container name="container3" :layoutModelDetails="layoutModelDetails">
-        <template #container_grid2>
-    <app-simpleflex-container name="container_grid2" :layoutModelDetails="layoutModelDetails">
-        <template #container4>
-    <app-simpleflex-container name="container4" :layoutModelDetails="layoutModelDetails">
+        <template #container1>
+    <app-standard-container name="container1" :layoutModelDetails="layoutModelDetails">
         <template #button_openview2>
         <app-preset-button
             name="button_openview2" 
@@ -48,20 +38,10 @@
             @itemClick="handleButtonClick">
         </app-preset-button>
         </template>
-    </app-simpleflex-container>
-        </template>
-        <template #container5>
-    <app-simpleflex-container name="container5" :layoutModelDetails="layoutModelDetails">
         <template #button_openview1>
         <app-login-button class="app-reset-button" name="button_openview1"  :model="layoutModelDetails.button_openview1" defaultStyle='success' @itemClick="handleButtonClick" />
         </template>
-    </app-simpleflex-container>
-        </template>
-    </app-simpleflex-container>
-        </template>
-    </app-simpleflex-container>
-        </template>
-    </app-simpleflex-container>
+    </app-standard-container>
         </template>
     </app-standard-container>
     </div>
@@ -305,15 +285,10 @@ export default class IBIZBOOKOptionView_layoutBase extends Vue {
      */
     public layoutItems:any = {
         form:{ name: 'form', caption: 'FORM', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this },
-        container2:{ name: 'container2', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:9, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:[] , dataRegionType: 'INHERIT' },
-        button_openview2:{ name: 'button_openview2', caption: '确认', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container4', panel: this , buttonStyle: 'DEFAULT', iconAlign: '', predefinedType: 'DATA_SAVECHANGES', renderMode: '', },
-        container4:{ name: 'container4', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:6, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid2', panel: this , details:['button_openview2'] , dataRegionType: 'INHERIT' },
-        button_openview1:{ name: 'button_openview1', caption: '取消', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container5', panel: this , buttonStyle: 'DEFAULT', iconAlign: '', predefinedType: 'DATA_CANCELCHANGES', renderMode: '', },
-        container5:{ name: 'container5', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:6, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid2', panel: this , details:['button_openview1'] , dataRegionType: 'INHERIT' },
-        container_grid2:{ name: 'container_grid2', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container3', panel: this , details:['container4','container5'] , dataRegionType: 'INHERIT' },
-        container3:{ name: 'container3', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:3, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['container_grid2'] , dataRegionType: 'INHERIT' },
-        container_grid1:{ name: 'container_grid1', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container2','container3'] , dataRegionType: 'INHERIT' },
-        page_container:{ name: 'page_container', caption: '分组标题', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['form','container_grid1'] , dataRegionType: 'INHERIT' }
+        button_openview2:{ name: 'button_openview2', caption: '确认', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , buttonStyle: 'DEFAULT', iconAlign: '', predefinedType: 'DATA_SAVECHANGES', renderMode: '', },
+        button_openview1:{ name: 'button_openview1', caption: '取消', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , buttonStyle: 'DEFAULT', iconAlign: '', predefinedType: 'DATA_CANCELCHANGES', renderMode: '', },
+        container1:{ name: 'container1', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:60, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'flex-end',dir:'row',vAlign:''}, parentName: 'page_container', panel: this , details:['button_openview2','button_openview1'] , dataRegionType: 'INHERIT' },
+        page_container:{ name: 'page_container', caption: '分组标题', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['form','container1'] , dataRegionType: 'INHERIT' }
     };
     
     /**
@@ -340,15 +315,10 @@ export default class IBIZBOOKOptionView_layoutBase extends Vue {
      */
     public layoutModelDetails:any = {
         form:new PanelCtrlPosModel({ name: 'form', caption: 'FORM', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this }),
-        container2:new PanelContainerModel({ name: 'container2', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:9, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:[] , dataRegionType: 'INHERIT' }),
-        button_openview2:new PanelButtonModel({ name: 'button_openview2', caption: '确认', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container4', panel: this , buttonStyle: 'DEFAULT', iconAlign: '', predefinedType: 'DATA_SAVECHANGES', renderMode: '', }),
-        container4:new PanelContainerModel({ name: 'container4', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:6, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid2', panel: this , details:['button_openview2'] , dataRegionType: 'INHERIT' }),
-        button_openview1:new PanelButtonModel({ name: 'button_openview1', caption: '取消', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container5', panel: this , buttonStyle: 'DEFAULT', iconAlign: '', predefinedType: 'DATA_CANCELCHANGES', renderMode: '', }),
-        container5:new PanelContainerModel({ name: 'container5', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:6, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid2', panel: this , details:['button_openview1'] , dataRegionType: 'INHERIT' }),
-        container_grid2:new PanelContainerModel({ name: 'container_grid2', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container3', panel: this , details:['container4','container5'] , dataRegionType: 'INHERIT' }),
-        container3:new PanelContainerModel({ name: 'container3', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:3, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['container_grid2'] , dataRegionType: 'INHERIT' }),
-        container_grid1:new PanelContainerModel({ name: 'container_grid1', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container2','container3'] , dataRegionType: 'INHERIT' }),
-        page_container:new PanelContainerModel({ name: 'page_container', caption: '分组标题', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['form','container_grid1'] , dataRegionType: 'INHERIT' })
+        button_openview2:new PanelButtonModel({ name: 'button_openview2', caption: '确认', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , buttonStyle: 'DEFAULT', iconAlign: '', predefinedType: 'DATA_SAVECHANGES', renderMode: '', }),
+        button_openview1:new PanelButtonModel({ name: 'button_openview1', caption: '取消', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , buttonStyle: 'DEFAULT', iconAlign: '', predefinedType: 'DATA_CANCELCHANGES', renderMode: '', }),
+        container1:new PanelContainerModel({ name: 'container1', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:60, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'flex-end',dir:'row',vAlign:''}, parentName: 'page_container', panel: this , details:['button_openview2','button_openview1'] , dataRegionType: 'INHERIT' }),
+        page_container:new PanelContainerModel({ name: 'page_container', caption: '分组标题', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['form','container1'] , dataRegionType: 'INHERIT' })
     };
 
     /**

app_Web/src/pages/sample/ibizcustomer-usr2-pickup-view-layout/ibizcustomer-usr2-pickup-view-layout-base.vue

+<template>
+<div class="view-container depickupview ibizcustomer-usr2-pickup-view-layout">
+    <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibizcustomerusr2pickupview_layout"></app-studioaction>
+    <card class='view-card view-no-caption  view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
+        <div class="content-container pickup-view">
+            <view_pickupviewpanel 
+                :viewState="viewState"  
+                :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+                :context="JSON.parse(JSON.stringify(context))" 
+                :isSingleSelect="isSingleSelect"
+                :selectedData="selectedData"
+                :isShowButton="isShowButton"
+                name="pickupviewpanel"  
+                ref='pickupviewpanel' 
+                @selectionchange="pickupviewpanel_selectionchange($event)"  
+                @load="pickupviewpanel_load($event)"  
+                @activated="pickupviewpanel_activated($event)"  
+                @closeview="closeView($event)">
+            </view_pickupviewpanel>
+            <card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer">
+                <row :style="{ textAlign: 'right' }">
+                    <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk">{{this.containerModel.view_okbtn.text}}</i-button>
+                        &nbsp;&nbsp;
+                    <i-button @click="onClickCancel">{{this.containerModel.view_cancelbtn.text}}</i-button>
+                </row>
+            </card>
+        </div>
+    </card>
+</div>
+</template>
+
+
+<script lang='tsx'>
+import { Vue, Component, Prop, Provide, Emit, Watch,Inject } from 'vue-property-decorator';
+import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
+import { Subject,Subscription } from 'rxjs';
+import IBIZCustomerService from '@/service/ibizcustomer/ibizcustomer-service';
+import IBIZCustomerAuthService from '@/authservice/ibizcustomer/ibizcustomer-auth-service';
+
+import PickupViewEngine from '@engine/view/pickup-view-engine';
+
+import IBIZCustomerUIService from '@/uiservice/ibizcustomer/ibizcustomer-ui-service';
+
+
+@Component({
+    components: {
+    },
+})
+export default class IBIZCustomerUsr2PickupView_layoutBase extends Vue {
+
+    /**
+     * 实体服务对象
+     *
+     * @type {IBIZCustomerService}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public appEntityService: IBIZCustomerService = new IBIZCustomerService;
+
+    /**
+     * 实体UI服务对象
+     *
+     * @type IBIZCustomerUIService
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public appUIService: IBIZCustomerUIService = new IBIZCustomerUIService();
+    
+    /**
+     * 数据变化
+     *
+     * @param {*} val
+     * @returns {*}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    @Emit() 
+    public viewDatasChange(val: any):any {
+        return val;
+    }
+
+    /**
+     * 传入视图上下文
+     *
+     * @type {string}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    @Prop() public viewdata!: string;
+
+    /**
+     * 传入视图参数
+     *
+     * @type {string}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    @Prop() public viewparam!: string;
+
+    /**
+     * 视图默认使用
+     *
+     * @type {boolean}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    @Prop({ default: true }) public viewDefaultUsage!: boolean;
+
+    /**
+     * 视图默认使用
+     *
+     * @type {string}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    @Inject({from:'navModel',default: 'tab'})
+    public navModel!:string;
+
+	/**
+	 * 视图标识
+	 *
+	 * @type {string}
+	 * @memberof IBIZCustomerUsr2PickupView_layoutBase
+	 */
+	public viewtag: string = 'e7f12b95864b12114256d9c4dbbb559c';
+
+    /**
+	 * 视图类型
+	 *
+	 * @type {string}
+	 * @memberof IBIZCustomerUsr2PickupView_layoutBase
+	 */
+	public viewType: string = 'DEPICKUPVIEW';
+
+	/**
+	 * 自定义视图导航上下文集合
+	 *
+	 * @type {*}
+	 * @memberof IBIZCustomerUsr2PickupView_layoutBase
+	 */
+    public customViewNavContexts:any ={
+    };
+
+	/**
+	 * 自定义视图导航参数集合
+	 *
+	 * @type {*}
+	 * @memberof IBIZCustomerUsr2PickupView_layoutBase
+	 */
+    public customViewParams:any ={
+    };
+
+    /**
+     * 视图模型数据
+     *
+     * @type {*}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public model: any = {
+        srfCaption: 'entities.ibizcustomer.views.usr2pickupview_layout.caption',
+        srfTitle: 'entities.ibizcustomer.views.usr2pickupview_layout.title',
+        srfSubTitle: 'entities.ibizcustomer.views.usr2pickupview_layout.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 视图参数变化
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    @Watch('viewparam',{immediate: true, deep: true})
+    onParamData(newVal: any, oldVal: any) {
+        if(newVal){
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
+                Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
+            }
+            if(this.viewparams.selectedData){
+                this.selectedData = JSON.stringify(this.viewparams.selectedData);
+            }
+
+        } 
+    }
+
+    /**
+     * 处理应用上下文变化
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    @Watch('viewdata')
+    onViewData(newVal: any, oldVal: any) {
+        const _this: any = this;
+        
+        if (!Object.is(newVal, oldVal) && _this.engine) {
+            this.$nextTick(()=>{
+              _this.parseViewParam();
+              _this.engine.load();
+            });
+        } else if(!Object.is(newVal, oldVal) && _this.refresh && _this.refresh instanceof Function) {
+            _this.refresh();
+        }
+    }
+
+    /**
+     * 容器模型
+     *
+     * @type {*}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public containerModel: any = {
+        view_pickupviewpanel: { name: 'pickupviewpanel', type: 'PICKUPVIEWPANEL' },
+        view_okbtn: { name: 'okbtn', type: 'button', text: '确定', disabled: true },
+        view_cancelbtn: { name: 'cancelbtn', type: 'button', text: '取消', disabled: false },
+        view_leftbtn: { name: 'leftbtn', type: 'button', text: '左移', disabled: true },
+        view_rightbtn: { name: 'rightbtn', type: 'button', text: '右移', disabled: true },
+        view_allleftbtn: { name: 'allleftbtn', type: 'button', text: '全部左移', disabled: true },
+        view_allrightbtn: { name: 'allrightbtn', type: 'button', text: '全部右移', disabled: true },
+    };
+
+    /**
+     *  计数器刷新
+     *
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public counterRefresh(){
+        const _this:any =this;
+        if(_this.counterServiceArray && _this.counterServiceArray.length >0){
+            _this.counterServiceArray.forEach((item:any) =>{
+                if(item.refreshData && item.refreshData instanceof Function){
+                    item.refreshData();
+                }
+            })
+        }
+    }
+
+    /**
+     * 视图状态订阅对象
+     *
+     * @public
+     * @type {Subject<{action: string, data: any}>}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public viewState: Subject<ViewState> = new Subject();
+
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public engine: PickupViewEngine = new PickupViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            pickupviewpanel: this.$refs.pickupviewpanel,
+            keyPSDEField: 'ibizcustomer',
+            majorPSDEField: 'ibizcustomername',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public  navDataService = NavDataService.getInstance();
+
+    /**
+    * 导航服务事件
+    *
+    * @public
+    * @type {(Subscription | undefined)}
+    * @memberof IBIZCustomerUsr2PickupView_layoutBase
+    */
+    public serviceStateEvent: Subscription | undefined;
+
+    /**
+     * 门户部件状态对象
+     *
+     * @type {*}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    @Prop() public portletState?: any;
+
+   /**
+   * 门户部件状态事件
+   *
+   * @public
+   * @type {(Subscription | undefined)}
+   * @memberof IBIZCustomerUsr2PickupView_layoutBase
+   */
+    public portletStateEvent: Subscription | undefined;
+
+    /**
+    * 门户部件状态事件
+    *
+    * @public
+    * @type {(Subscription | undefined)}
+    * @memberof IBIZCustomerUsr2PickupView_layoutBase
+    */
+    public formDruipartEvent: Subscription | undefined;
+
+    /**
+     * 应用上下文
+     *
+     * @type {*}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public context:any = {};
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public viewparams:any = {};
+
+    /**
+     * 视图缓存数据
+     *
+     * @type {*}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public viewCacheData:any;
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */    
+    public counterServiceArray:Array<any> = [];
+
+    /**
+     * 解析视图参数
+     *
+     * @public
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public parseViewParam(inputvalue:any = null): void {
+        for(let key in this.context){
+            delete this.context[key];
+        }
+        if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+            Object.assign(this.context,this.$store.getters.getAppData().context);
+        }
+        if (!this.viewDefaultUsage && this.viewdata && !Object.is(this.viewdata, '')) {
+            if(typeof this.viewdata == 'string') {
+                Object.assign(this.context, JSON.parse(this.viewdata));
+            }
+            if(this.context && this.context.srfparentdename){
+                Object.assign(this.viewparams,{srfparentdename:this.context.srfparentdename});
+            }
+            if(this.context && this.context.srfparentkey){
+                Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
+            }
+            this.handleCustomViewData();
+            return;
+        }
+        const path = (this.$route.matched[this.$route.matched.length - 1]).path;
+        const keys: Array<any> = [];
+        const curReg = this.$pathToRegExp.pathToRegexp(path, keys);
+        const matchArray = curReg.exec(this.$route.path);
+        let tempValue: Object = {};
+        keys.forEach((item: any, index: number) => {
+            if(matchArray[index + 1]){
+                Object.defineProperty(tempValue, item.name, {
+                    enumerable: true,
+                    value: decodeURIComponent(matchArray[index + 1])
+                });
+            }
+        });
+        this.$viewTool.formatRouteParams(tempValue,this.$route,this.context,this.viewparams);
+        if(inputvalue){
+            Object.assign(this.context,{'ibizcustomer':inputvalue});
+        }
+        //初始化视图唯一标识
+        Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
+        this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavDataWithRoute();
+    }
+
+    /**
+     * 处理自定义视图数据
+     *
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+	public handleCustomViewData(){
+		if(Object.keys(this.customViewNavContexts).length > 0){
+			Object.keys(this.customViewNavContexts).forEach((item:any) =>{
+				let tempContext:any = {};
+				let curNavContext:any = this.customViewNavContexts[item];
+				this.handleCustomDataLogic(curNavContext,tempContext,item);
+				Object.assign(this.context,tempContext);
+			})
+		}
+		if(Object.keys(this.customViewParams).length > 0){
+			Object.keys(this.customViewParams).forEach((item:any) =>{
+				let tempParam:any = {};
+				let curNavParam:any = this.customViewParams[item];
+				this.handleCustomDataLogic(curNavParam,tempParam,item);
+				Object.assign(this.viewparams,tempParam);
+			})
+		}
+	}
+
+    /**
+     * 处理自定义视图数据逻辑
+     *
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+	public handleCustomDataLogic(curNavData:any,tempData:any,item:string){
+		// 直接值直接赋值
+		if(curNavData.isRawValue){
+			if(Object.is(curNavData.value,"null") || Object.is(curNavData.value,"")){
+                Object.defineProperty(tempData, item.toLowerCase(), {
+                    value: null,
+                    writable : true,
+                    enumerable : true,
+                    configurable : true
+                });
+            }else{
+                Object.defineProperty(tempData, item.toLowerCase(), {
+                    value: curNavData.value,
+                    writable : true,
+                    enumerable : true,
+                    configurable : true
+                });
+            }
+		}else{
+			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
+			if(this.context[(curNavData.value).toLowerCase()] != null){
+				Object.defineProperty(tempData, item.toLowerCase(), {
+					value: this.context[(curNavData.value).toLowerCase()],
+					writable : true,
+					enumerable : true,
+					configurable : true
+				});
+			}else{
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
+					Object.defineProperty(tempData, item.toLowerCase(), {
+						value: this.viewparams[(curNavData.value).toLowerCase()],
+						writable : true,
+						enumerable : true,
+						configurable : true
+					});
+				}else{
+					Object.defineProperty(tempData, item.toLowerCase(), {
+						value: null,
+						writable : true,
+						enumerable : true,
+						configurable : true
+					});
+				}
+			}
+		}
+	}
+
+    /**
+     * 初始化导航数据(路由模式)
+     *
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false,  isAlways:boolean = false){
+        if( isAlways || (this.viewDefaultUsage && Object.is(this.navModel,"route")) ){
+            this.navDataService.addNavData({id:'ibizcustomer-usr2-pickup-view-layout',tag:this.viewtag,srfkey:isNew ? null : this.context.ibizcustomer,title:this.$t(this.model.srfCaption),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+
+    /**
+     * 初始化导航数据(分页模式)
+     *
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true, isAlways:boolean = false){
+        if( isAlways || (this.viewDefaultUsage && !Object.is(this.navModel,"route")) ){
+            this.navDataService.addNavDataByOnly({id:'ibizcustomer-usr2-pickup-view-layout',tag:this.viewtag,srfkey:this.context.ibizcustomer,title:this.$t(this.model.srfCaption),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath},isOnlyAdd);
+        }
+    }
+	
+
+    /**
+     * Vue声明周期
+     *
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */    
+    public afterCreated(){
+        let _this:any = this;
+        const secondtag = _this.$util.createUUID();
+        _this.$store.commit('viewaction/createdView', { viewtag: _this.viewtag, secondtag: secondtag });
+        _this.viewtag = secondtag;
+        _this.parseViewParam();
+        _this.serviceStateEvent = _this.navDataService.serviceState.subscribe(({ action,name, data }:{ action:string,name:any,data:any }) => {
+            if(!Object.is(name,'ibizcustomer-usr2-pickup-view-layout')){
+                return;
+            }
+            if (Object.is(action, 'viewrefresh')) {
+                _this.$nextTick(()=>{
+                    _this.parseViewParam(data);
+                    if(_this.engine){
+                        _this.engine.load();
+                    }
+                }); 
+            }
+        });
+        if(_this.portletState){
+            _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
+                if(!Object.is(res.name,'IBIZCustomerUsr2PickupView_layout')){
+                    return;
+                }
+                if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
+                    _this.refresh();
+                }
+            })
+        }
+        
+    }
+
+    /**
+     * 销毁之前
+     *
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public beforeDestroy() {
+        this.$store.commit('viewaction/removeView', this.viewtag);
+
+        let _this: any = this
+        if (_this.serviceStateEvent) {
+            _this.serviceStateEvent.unsubscribe();
+        }
+        if (_this.portletStateEvent) {
+            _this.portletStateEvent.unsubscribe();
+        }
+        if (_this.engine) {
+            _this.engine.destroy();
+        }
+    }
+
+    /**
+     * Vue声明周期(组件初始化完毕)
+     *
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public mounted() {
+        this.afterMounted();
+    }
+
+    /**
+     * 执行mounted后的逻辑
+     * 
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public afterMounted(){
+        const _this: any = this;
+        _this.engineInit();
+        if (_this.loadModel && _this.loadModel instanceof Function) {
+            _this.loadModel();
+        }
+        if(this.viewparams.selectedData){
+            this.engine.onCtrlEvent('pickupviewpanel', 'selectionchange', this.viewparams.selectedData);
+        }
+
+    }
+
+
+    /**
+     * pickupviewpanel 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public pickupviewpanel_selectionchange($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('pickupviewpanel', 'selectionchange', $event);
+    }
+
+
+    /**
+     * pickupviewpanel 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public pickupviewpanel_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
+    }
+
+
+    /**
+     * pickupviewpanel 部件 activated 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public pickupviewpanel_activated($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
+    }
+
+
+
+
+    /**
+     * 关闭视图
+     *
+     * @param {any[]} args
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public closeView(args: any[]): void {
+        let _view: any = this;
+        if (_view.viewdata) {
+            _view.$emit('viewdataschange', Array.isArray(args)?args:[args]);
+            _view.$emit('close', Array.isArray(args)?args:[args]);
+        } else if (_view.$tabPageExp) {
+            _view.$tabPageExp.onClose(_view.$route.fullPath);
+        }
+    }
+
+    /**
+     * 销毁视图回调
+     *
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+            if(Object.is(this.navModel,"tab")){
+                this.navDataService.removeNavDataByTag(this.viewtag);
+            }
+        }
+        if (this.serviceStateEvent) {
+            this.serviceStateEvent.unsubscribe();
+        }
+        // 销毁计数器定时器
+        if(this.counterServiceArray && this.counterServiceArray.length >0){
+            this.counterServiceArray.forEach((item:any) =>{
+                if(item.destroyCounter && item.destroyCounter instanceof Function){
+                    item.destroyCounter();
+                }
+            })
+        }
+        if(this.portletStateEvent){
+            this.portletStateEvent.unsubscribe();
+        }
+        if (this.formDruipartEvent) {
+            this.formDruipartEvent.unsubscribe();
+        }
+        this.viewState.complete();
+    }
+    /**
+     * 选中数据的字符串
+     *
+     * @type {string}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public selectedData: string = "";
+
+    /**
+     * 视图选中数据
+     *
+     * @type {any[]}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public viewSelections:any[] = [];
+
+    /**
+     * 是否显示按钮
+     *
+     * @type {boolean}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    @Prop({default: true}) public isShowButton!: boolean;
+
+    /**
+     * 是否单选
+     *
+     * @type {boolean}
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public isSingleSelect: boolean = true;
+
+    /**
+     * 确定
+     *
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public onClickOk(): void {
+        this.$emit('viewdataschange', this.viewSelections);
+        this.$emit('close', null);
+    }
+
+    /**
+     * 取消
+     *
+     * @memberof IBIZCustomerUsr2PickupView_layoutBase
+     */
+    public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
+        this.$emit('close', null);
+    }
+
+}
+</script>
+
+<style lang='less'>
+@import './ibizcustomer-usr2-pickup-view-layout.less';
+</style>
\ No newline at end of file

app_Web/src/pages/sample/ibizcustomer-usr2-pickup-view-layout/ibizcustomer-usr2-pickup-view-layout.less

+.ibizcustomer-usr2-pickup-view-layout{
+    position: relative;
+}
+
+
+
+.pickup-view {
+    >.pickupviewpanel {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+        height: calc(100% - 64px);
+    }
+    >.footer {
+        height: 64px;
+    }
+}

app_Web/src/pages/sample/ibizcustomer-usr2-pickup-view-layout/ibizcustomer-usr2-pickup-view-layout.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBIZCustomerUsr2PickupView_layoutBase from './ibizcustomer-usr2-pickup-view-layout-base.vue';
+
+import view_pickupviewpanel from '@widgets/ibizcustomer/usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel/usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel.vue';
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class IBIZCustomerUsr2PickupView_layout extends IBIZCustomerUsr2PickupView_layoutBase {
+
+}
+</script>
\ No newline at end of file

app_Web/src/pages/sample/ibizorder-data-view-exp-view-layout/ibizorder-data-view-exp-view-layout-base.vue

@@ -284,7 +284,7 @@ export default class IBIZOrderDataViewExpView_layoutBase extends Vue {
         container1:{ name: 'container1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:6, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['view_pagecaption'] , dataRegionType: 'INHERIT' },
         toolbar:{ name: 'toolbar', caption: 'TOOLBAR', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_2', panel: this },
         container_2:{ name: 'container_2', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['toolbar'] , dataRegionType: 'INHERIT' },
-        container_grid1:{ name: 'container_grid1', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container1','container_2'] , dataRegionType: 'INHERIT' },
+        container_grid1:{ name: 'container_grid1', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:100, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container1','container_2'] , dataRegionType: 'INHERIT' },
         dataviewexpbar:{ name: 'dataviewexpbar', caption: '', isShowCaption: false, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this },
         container2:{ name: 'container2', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:3, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid2', panel: this , details:['dataviewexpbar'] , dataRegionType: 'INHERIT' },
         nav_pos1:{ name: 'nav_pos1', caption: '导航区占位', isShowCaption: true, sysCss: '', itemType: 'RAWITEM', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container3', panel: this , viewType: 'DEDATAVIEWEXPVIEW', predefinedType: 'NAV_POS', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', },
@@ -320,7 +320,7 @@ export default class IBIZOrderDataViewExpView_layoutBase extends Vue {
         container1:new PanelContainerModel({ name: 'container1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:6, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['view_pagecaption'] , dataRegionType: 'INHERIT' }),
         toolbar:new PanelCtrlPosModel({ name: 'toolbar', caption: 'TOOLBAR', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_2', panel: this }),
         container_2:new PanelContainerModel({ name: 'container_2', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['toolbar'] , dataRegionType: 'INHERIT' }),
-        container_grid1:new PanelContainerModel({ name: 'container_grid1', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container1','container_2'] , dataRegionType: 'INHERIT' }),
+        container_grid1:new PanelContainerModel({ name: 'container_grid1', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:100, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container1','container_2'] , dataRegionType: 'INHERIT' }),
         dataviewexpbar:new PanelCtrlPosModel({ name: 'dataviewexpbar', caption: '', isShowCaption: false, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this }),
         container2:new PanelContainerModel({ name: 'container2', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:3, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid2', panel: this , details:['dataviewexpbar'] , dataRegionType: 'INHERIT' }),
         nav_pos1:new PanelRawitemModel({ name: 'nav_pos1', caption: '导航区占位', isShowCaption: true, sysCss: '', itemType: 'RAWITEM', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container3', panel: this , viewType: 'DEDATAVIEWEXPVIEW', predefinedType: 'NAV_POS', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', }),

app_Web/src/pages/sample/ibizorder-data-view-exp-view/ibizorder-data-view-exp-view-base.vue

@@ -284,7 +284,7 @@ export default class IBIZOrderDataViewExpViewBase extends Vue {
         container1:{ name: 'container1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:6, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['view_pagecaption'] , dataRegionType: 'INHERIT' },
         toolbar:{ name: 'toolbar', caption: 'TOOLBAR', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_2', panel: this },
         container_2:{ name: 'container_2', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['toolbar'] , dataRegionType: 'INHERIT' },
-        container_grid1:{ name: 'container_grid1', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container1','container_2'] , dataRegionType: 'INHERIT' },
+        container_grid1:{ name: 'container_grid1', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:100, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container1','container_2'] , dataRegionType: 'INHERIT' },
         dataviewexpbar:{ name: 'dataviewexpbar', caption: '', isShowCaption: false, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this },
         container2:{ name: 'container2', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:3, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid2', panel: this , details:['dataviewexpbar'] , dataRegionType: 'INHERIT' },
         nav_pos1:{ name: 'nav_pos1', caption: '导航区占位', isShowCaption: true, sysCss: '', itemType: 'RAWITEM', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container3', panel: this , viewType: 'DEDATAVIEWEXPVIEW', predefinedType: 'NAV_POS', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', },
@@ -320,7 +320,7 @@ export default class IBIZOrderDataViewExpViewBase extends Vue {
         container1:new PanelContainerModel({ name: 'container1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:6, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['view_pagecaption'] , dataRegionType: 'INHERIT' }),
         toolbar:new PanelCtrlPosModel({ name: 'toolbar', caption: 'TOOLBAR', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_2', panel: this }),
         container_2:new PanelContainerModel({ name: 'container_2', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['toolbar'] , dataRegionType: 'INHERIT' }),
-        container_grid1:new PanelContainerModel({ name: 'container_grid1', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container1','container_2'] , dataRegionType: 'INHERIT' }),
+        container_grid1:new PanelContainerModel({ name: 'container_grid1', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:100, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container1','container_2'] , dataRegionType: 'INHERIT' }),
         dataviewexpbar:new PanelCtrlPosModel({ name: 'dataviewexpbar', caption: '', isShowCaption: false, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this }),
         container2:new PanelContainerModel({ name: 'container2', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:3, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid2', panel: this , details:['dataviewexpbar'] , dataRegionType: 'INHERIT' }),
         nav_pos1:new PanelRawitemModel({ name: 'nav_pos1', caption: '导航区占位', isShowCaption: true, sysCss: '', itemType: 'RAWITEM', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container3', panel: this , viewType: 'DEDATAVIEWEXPVIEW', predefinedType: 'NAV_POS', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', }),

app_Web/src/pages/sample/index/page-register.ts

@@ -165,6 +165,7 @@ export const PageComponents = {
         Vue.component('ibizorder-detail-grid-view9', () => import('@pages/sample/ibizorder-detail-grid-view9/ibizorder-detail-grid-view9.vue'));
         Vue.component('ibizorder-detail-sgrid-view9', () => import('@pages/sample/ibizorder-detail-sgrid-view9/ibizorder-detail-sgrid-view9.vue'));
         Vue.component('ibizorder-detail-sgrid-view', () => import('@pages/sample/ibizorder-detail-sgrid-view/ibizorder-detail-sgrid-view.vue'));
+        Vue.component('ibizcustomer-usr2-pickup-view-layout', () => import('@pages/sample/ibizcustomer-usr2-pickup-view-layout/ibizcustomer-usr2-pickup-view-layout.vue'));
         Vue.component('ibizcustomer-usr2-pickup-view', () => import('@pages/sample/ibizcustomer-usr2-pickup-view/ibizcustomer-usr2-pickup-view.vue'));
         Vue.component('ibizcustomer-usr2-mpickup-view', () => import('@pages/sample/ibizcustomer-usr2-mpickup-view/ibizcustomer-usr2-mpickup-view.vue'));
         Vue.component('ibizcustomer-mpickup-view', () => import('@pages/sample/ibizcustomer-mpickup-view/ibizcustomer-mpickup-view.vue'));

app_Web/src/pages/sample/index/router.ts

@@ -2551,6 +2551,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/sample/ibizorder-detail-sgrid-view/ibizorder-detail-sgrid-view.vue'),
                 },
+                {
+                    path: 'ibizcustomers/:ibizcustomer?/usr2pickupview_layout/:usr2pickupview_layout?',
+                    meta: {
+                        caption: 'entities.ibizcustomer.views.usr2pickupview_layout.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'ibizcustomers', parameterName: 'ibizcustomer' },
+                            { pathName: 'usr2pickupview_layout', parameterName: 'usr2pickupview_layout' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sample/ibizcustomer-usr2-pickup-view-layout/ibizcustomer-usr2-pickup-view-layout.vue'),
+                },
                 {
                     path: 'ibizcustomers/:ibizcustomer?/usr2pickupview/:usr2pickupview?',
                     meta: {
@@ -5928,6 +5942,19 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizorder-state40-edit-view2/ibizorder-state40-edit-view2.vue'),
     },
+    {
+        path: '/ibizcustomers/:ibizcustomer?/usr2pickupview_layout/:usr2pickupview_layout?',
+        meta: {
+            caption: 'entities.ibizcustomer.views.usr2pickupview_layout.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizcustomers', parameterName: 'ibizcustomer' },
+                { pathName: 'usr2pickupview_layout', parameterName: 'usr2pickupview_layout' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizcustomer-usr2-pickup-view-layout/ibizcustomer-usr2-pickup-view-layout.vue'),
+    },
     {
         path: '/ibizbooks/:ibizbook?/usr4listview_layout/:usr4listview_layout?',
         meta: {

app_Web/src/pages/ungroup/app-index-view/router.ts

@@ -2736,6 +2736,19 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizorder-state40-edit-view2/ibizorder-state40-edit-view2.vue'),
     },
+    {
+        path: '/ibizcustomers/:ibizcustomer?/usr2pickupview_layout/:usr2pickupview_layout?',
+        meta: {
+            caption: 'entities.ibizcustomer.views.usr2pickupview_layout.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizcustomers', parameterName: 'ibizcustomer' },
+                { pathName: 'usr2pickupview_layout', parameterName: 'usr2pickupview_layout' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizcustomer-usr2-pickup-view-layout/ibizcustomer-usr2-pickup-view-layout.vue'),
+    },
     {
         path: '/ibizbooks/:ibizbook?/usr4listview_layout/:usr4listview_layout?',
         meta: {

app_Web/src/store/modules/view-action/state.ts

@@ -415,6 +415,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                'e7f12b95864b12114256d9c4dbbb559c',
                 '2dd50b1b88cf8062b625ee8b0b4fa9d7',
                 '3177e05ee25b4c215c2ce87547fcdc8c',
                 'f083dd992abed44bf15a9930b45c3895',
@@ -2076,6 +2077,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                'e7f12b95864b12114256d9c4dbbb559c',
                 '2dd50b1b88cf8062b625ee8b0b4fa9d7',
                 '3177e05ee25b4c215c2ce87547fcdc8c',
                 'f083dd992abed44bf15a9930b45c3895',
@@ -2094,6 +2096,16 @@ export const viewstate: any = {
                 '6bc6e690dc5abfc6d89703e4459c785c',
             ],
         },
+        {
+            viewtag: 'e7f12b95864b12114256d9c4dbbb559c',
+            viewmodule: 'Sample',
+            viewname: 'IBIZCustomerUsr2PickupView_layout',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '6a079bac1a6eeb580654cd04e6b1a8b8',
+            ],
+        },
         {
             viewtag: 'e7f8129ccc696b1cf45a18d0961705da',
             viewmodule: 'Sample',

app_Web/src/uiservice/ibizcustomer/ibizcustomer-ui-service-base.ts

@@ -105,6 +105,7 @@ export default class IBIZCustomerUIServiceBase extends UIService {
         this.allViewMap.set(':',{viewname:'pickuptreeview',srfappde:'ibizcustomers',component:'ibizcustomer-pickup-tree-view'});
         this.allViewMap.set(':',{viewname:'mediatesteditview',srfappde:'ibizcustomers',component:'ibizcustomer-media-test-edit-view'});
         this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'ibizcustomers',component:'ibizcustomer-mpickup-view'});
+        this.allViewMap.set(':',{viewname:'usr2pickupview_layout',srfappde:'ibizcustomers',component:'ibizcustomer-usr2-pickup-view-layout'});
         this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'ibizcustomers',component:'ibizcustomer-pickup-view'});
     }
 

app_Web/src/widgets/ibizappeditor/default-searchform/default-searchform-base.vue

@@ -590,7 +590,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -626,7 +626,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue

@@ -663,7 +663,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -699,7 +699,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/inter-func-form-2-form/inter-func-form-2-form-base.vue

@@ -20,7 +20,7 @@
   valueitem='borrowerid' 
   :value="data.borrower"
   editortype="pickup-no-ac" 
-  :pickupView="{ viewname: 'ibizcustomer-usr2-pickup-view', title: $t('entities.ibizcustomer.views.usr2pickupview.title'), deResParameters: [], parameters: [{ pathName: 'ibizcustomers', parameterName: 'ibizcustomer' }, { pathName: 'usr2pickupview', parameterName: 'usr2pickupview' } ], placement:'' }"
+  :pickupView="{ viewname: 'ibizcustomer-usr2-pickup-view-layout', title: $t('entities.ibizcustomer.views.usr2pickupview_layout.title'), deResParameters: [], parameters: [{ pathName: 'ibizcustomers', parameterName: 'ibizcustomer' }, { pathName: 'usr2pickupview_layout', parameterName: 'usr2pickupview_layout' } ], placement:'' }"
   style=""  
   @formitemvaluechange="onFormItemValueChange">
 </app-picker>

app_Web/src/widgets/ibizbook/quicksearchform-searchform/quicksearchform-searchform-base.vue

@@ -621,7 +621,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -657,7 +657,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizcustomer/usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel/usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel-base.vue

+<template>
+    <div class='pickupviewpanel'>
+        <component 
+          v-if="inited && view.viewname && !Object.is(view.viewname, '')" 
+          :is="view.viewname"
+          class="viewcontainer3"
+          :viewdata="viewdata"
+          :viewparam="viewparam"
+          :viewDefaultUsage="false"
+          :isSingleSelect="isSingleSelect"
+          :selectedData="selectedData"
+          :isShowButton="isShowButton"
+          @viewdataschange="onViewDatasChange"
+          @viewdatasactivated="viewDatasActivated"
+          @viewload="onViewLoad">
+        </component>
+    </div>
+</template>
+
+<script lang='tsx'>
+import { Vue, Component, Prop, Provide, Emit, Watch, Model,Inject } from 'vue-property-decorator';
+import { CreateElement } from 'vue';
+import { Subject, Subscription } from 'rxjs';
+import { ControlInterface } from '@/interface/control';
+import { UIActionTool,Util,ViewTool } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
+import AppCenterService from "@service/app/app-center-service";
+import IBIZCustomerEntityService from '@/service/ibizcustomer/ibizcustomer-service';
+import Usr2PickupView_layoutpickupviewpanelService from './usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel-service';
+import IBIZCustomerUIService from '@/uiservice/ibizcustomer/ibizcustomer-ui-service';
+import Usr2PickupView_layoutpickupviewpanelModel from './usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel-model';
+
+
+@Component({
+    components: {
+      
+    }
+})
+export default class Usr2PickupView_layoutpickupviewpanelBase extends Vue implements ControlInterface {
+
+    /**
+     * 名称
+     *
+     * @type {string}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    @Prop() public name?: string;
+
+    /**
+     * 视图通讯对象
+     *
+     * @type {Subject<ViewState>}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    @Prop() public viewState!: Subject<ViewState>;
+
+    /**
+     * 应用上下文
+     *
+     * @type {*}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    @Prop() public context!: any;
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    @Prop() public viewparams!: any;
+
+    /**
+     * 视图状态事件
+     *
+     * @public
+     * @type {(Subscription | undefined)}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public viewStateEvent: Subscription | undefined;
+
+    /**
+     * 获取部件类型
+     *
+     * @returns {string}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public getControlType(): string {
+        return 'PICKUPVIEWPANEL'
+    }
+
+
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {Usr2PickupView_layoutpickupviewpanelService}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public service: Usr2PickupView_layoutpickupviewpanelService = new Usr2PickupView_layoutpickupviewpanelService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {IBIZCustomerService}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public appEntityService: IBIZCustomerEntityService = new IBIZCustomerEntityService({ $store: this.$store });
+    
+
+
+    /**
+     * 转化数据
+     *
+     * @param {any} args
+     * @memberof  Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public transformData(args: any) {
+        let _this: any = this;
+        if(_this.service && _this.service.handleRequestData instanceof Function && _this.service.handleRequestData('transform',_this.context,args)){
+            return _this.service.handleRequestData('transform',_this.context,args)['data'];
+        }
+    }
+
+    /**
+     * 关闭视图
+     *
+     * @param {any} args
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public closeView(args: any): void {
+        let _this: any = this;
+        _this.$emit('closeview', [args]);
+    }
+
+    /**
+     *  计数器刷新
+     *
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public counterRefresh(){
+        const _this:any =this;
+        if(_this.counterServiceArray && _this.counterServiceArray.length >0){
+            _this.counterServiceArray.forEach((item:any) =>{
+                if(item.refreshData && item.refreshData instanceof Function){
+                    item.refreshData();
+                }
+            })
+        }
+    }
+
+
+
+
+    /**
+     * 选中数据字符串
+     *
+     * @type {string}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    @Prop() public selectedData?: string;
+
+    /**
+     * 获取多项数据
+     *
+     * @returns {any[]}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public getDatas(): any[] {
+        return [];
+    }
+
+    /**
+     * 获取单项树
+     *
+     * @returns {*}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public getData(): any {
+        return {};
+    }
+
+    /**
+     * 视图名称
+     *
+     * @type {*}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public view: any = {
+        viewname: 'ibizcustomer-pickup-tree-view',
+        data: {},
+    }
+
+    /**
+     * 局部上下文
+     *
+     * @type {*}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public localContext: any = null;
+
+    /**
+     * 局部视图参数
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public localViewParam: any = null;
+
+    /**
+     * 视图数据
+     *
+     * @type {*}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public viewdata: string  = JSON.stringify(this.context);
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewparam: string  = JSON.stringify(this.viewparams);
+
+    /**
+     * 是否显示按钮
+     *
+     * @type {boolean}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    @Prop({default: true}) public isShowButton!: boolean;
+
+    /**
+     * 是否单选
+     *
+     * @type {boolean}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    @Prop() public isSingleSelect?: boolean;
+
+    /**
+     * 初始化完成
+     *
+     * @type {boolean}
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public inited: boolean = false;
+
+    /**
+     * 视图数据变化
+     *
+     * @param {*} $event
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public onViewDatasChange($event: any): void {
+        if($event.length>0){
+          $event.forEach((item:any,index:any) => {
+              let srfmajortext = item.srfmajortext?item.srfmajortext:item['ibizcustomername'];
+              if(srfmajortext){
+                Object.assign($event[index],{srfmajortext: srfmajortext});
+              }
+          });
+        }
+        this.$emit('selectionchange', $event);
+    }
+
+    /**
+     * 视图数据被激活
+     *
+     * @param {*} $event
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public viewDatasActivated($event: any): void {
+        this.$emit('activated', $event);
+    }
+
+    /**
+     * 视图加载完成
+     *
+     * @param {*} $event
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public onViewLoad($event: any): void {
+        this.$emit('load', $event);
+    }
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     *  @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */    
+    public afterCreated(){
+        this.initNavParam();
+        if (this.viewState) {
+            this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
+                if (!Object.is(tag, this.name)) {
+                    return;
+                }
+                if (Object.is('load', action)) {
+                    this.viewdata = JSON.stringify(this.context);
+                    this.viewparam = JSON.stringify(Object.assign(data, this.viewparams));
+                    this.inited = true;
+                }
+            });
+        }
+    }
+
+    /**
+     * 初始化导航参数
+     *
+     *  @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */  
+    public initNavParam(){
+        if(this.localContext && Object.keys(this.localContext).length >0){
+            let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
+            Object.assign(this.context,_context);
+        }
+        if(this.localViewParam && Object.keys(this.localViewParam).length >0){
+            let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
+            Object.assign(this.viewparams,_param);
+        }
+        this.viewdata = JSON.stringify(this.context);
+        this.viewparam = JSON.stringify(this.viewparams);
+    }
+
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public destroyed() {
+        this.afterDestroy();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     *
+     * @memberof Usr2PickupView_layoutpickupviewpanelBase
+     */
+    public afterDestroy() {
+        if (this.viewStateEvent) {
+            this.viewStateEvent.unsubscribe();
+        }
+    }
+
+}
+</script>
+
+<style lang='less'>
+@import './usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel.less';
+</style>
\ No newline at end of file

app_Web/src/widgets/ibizcustomer/usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel/usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel-model.ts

+/**
+ * Usr2PickupView_layoutpickupviewpanel 部件模型
+ *
+ * @export
+ * @class Usr2PickupView_layoutpickupviewpanelModel
+ */
+export default class Usr2PickupView_layoutpickupviewpanelModel {
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof Usr2PickupView_layoutpickupviewpanelModel
+    */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'createman',
+      },
+      {
+        name: 'sn',
+      },
+      {
+        name: 'updatedate',
+      },
+      {
+        name: 'createdate',
+      },
+      {
+        name: 'customeruid',
+      },
+      {
+        name: 'ibizcustomer',
+        prop: 'ibizcustomerid',
+      },
+      {
+        name: 'address',
+      },
+      {
+        name: 'ibizcustomername',
+      },
+      {
+        name: 'updateman',
+      },
+    ]
+  }
+
+
+}
\ No newline at end of file

app_Web/src/widgets/ibizcustomer/usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel/usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel-service.ts

+import { Http } from '@/utils';
+import ControlService from '@/widgets/control-service';
+
+/**
+ * Usr2PickupView_layoutpickupviewpanel 部件服务对象
+ *
+ * @export
+ * @class Usr2PickupView_layoutpickupviewpanelService
+ */
+export default class Usr2PickupView_layoutpickupviewpanelService extends ControlService {
+}
\ No newline at end of file

app_Web/src/widgets/ibizcustomer/usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel/usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel.less

+// this is less
+.pickupviewpanel{
+  width: 100%;
+}
\ No newline at end of file

app_Web/src/widgets/ibizcustomer/usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel/usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import Usr2PickupView_layoutpickupviewpanelBase from './usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel-base.vue';
+
+ 
+@Component({
+    components: {
+         
+    }
+})
+export default class Usr2PickupView_layoutpickupviewpanel extends Usr2PickupView_layoutpickupviewpanelBase {
+
+}
+</script>
\ No newline at end of file

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZCustomer.json

@@ -1161,6 +1161,12 @@
     "name" : "客户实体选择树视图（部件视图）",
     "realModelSubType" : "DEPICKUPTREEVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr2PickupView_layout",
+    "logicName" : "客户实体数据选择视图(树视图)（布局面板）",
+    "name" : "客户实体数据选择视图(树视图)（布局面板）",
+    "realModelSubType" : "DEPICKUPVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "MPickupView",
     "logicName" : "客户实体数据多项选择视图",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSFORMS/InterFuncForm_2.json

@@ -215,7 +215,7 @@
           "name" : "borrower",
           "getPickupPSAppView" : {
             "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerUsr2PickupView.json",
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerUsr2PickupView_layout.json",
             "viewType" : "DEPICKUPVIEW"
           },
           "valueItemName" : "borrowerid",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json

@@ -11,51 +11,51 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
   },
   "getPSDETreeColumns" : [ {
-    "caption" : "归还日期",
-    "codeName" : "returntime",
+    "caption" : "作者",
+    "codeName" : "author",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "returntime",
-    "name" : "returntime",
+    "dataItemName" : "author",
+    "name" : "author",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "出版社",
-    "codeName" : "press",
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "press",
-    "name" : "press",
+    "dataItemName" : "ibizbookname",
+    "name" : "ibizbookname",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "借出日期",
-    "codeName" : "lendouttime",
+    "caption" : "归还日期",
+    "codeName" : "returntime",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "lendouttime",
-    "name" : "lendouttime",
+    "dataItemName" : "returntime",
+    "name" : "returntime",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "作者",
-    "codeName" : "author",
+    "caption" : "出版社",
+    "codeName" : "press",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "author",
-    "name" : "author",
+    "dataItemName" : "press",
+    "name" : "press",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
+    "caption" : "借出日期",
+    "codeName" : "lendouttime",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "name" : "ibizbookname",
+    "dataItemName" : "lendouttime",
+    "name" : "lendouttime",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json

@@ -19,21 +19,21 @@
     }
   } ],
   "getPSDETreeColumns" : [ {
-    "caption" : "作者",
-    "codeName" : "author",
+    "caption" : "图书描述",
+    "codeName" : "subtext",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "author",
-    "name" : "author",
+    "dataItemName" : "subtext",
+    "name" : "subtext",
     "width" : 50,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "图书描述",
-    "codeName" : "subtext",
+    "caption" : "作者",
+    "codeName" : "author",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "subtext",
-    "name" : "subtext",
+    "dataItemName" : "author",
+    "name" : "author",
     "width" : 50,
     "widthUnit" : "px",
     "enableExpand" : false,

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKGanttView.json

@@ -34,51 +34,51 @@
       "id" : "GANTT"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "归还日期",
-      "codeName" : "returntime",
+      "caption" : "作者",
+      "codeName" : "author",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "returntime",
-      "name" : "returntime",
+      "dataItemName" : "author",
+      "name" : "author",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "出版社",
-      "codeName" : "press",
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "press",
-      "name" : "press",
+      "dataItemName" : "ibizbookname",
+      "name" : "ibizbookname",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "借出日期",
-      "codeName" : "lendouttime",
+      "caption" : "归还日期",
+      "codeName" : "returntime",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "lendouttime",
-      "name" : "lendouttime",
+      "dataItemName" : "returntime",
+      "name" : "returntime",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "作者",
-      "codeName" : "author",
+      "caption" : "出版社",
+      "codeName" : "press",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
-      "name" : "author",
+      "dataItemName" : "press",
+      "name" : "press",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
+      "caption" : "借出日期",
+      "codeName" : "lendouttime",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "name" : "ibizbookname",
+      "dataItemName" : "lendouttime",
+      "name" : "lendouttime",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKOptionView_layout.json

@@ -98,64 +98,22 @@
         },
         "showCaption" : true
       }, {
-        "caption" : "栅格容器",
+        "caption" : "容器",
+        "contentHeight" : 60.0,
+        "height" : 60.0,
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container_grid1",
+        "name" : "container1",
         "getPSLayout" : {
-          "layout" : "SIMPLEFLEX"
-        },
-        "getPSLayoutPos" : {
-          "grow" : -1,
+          "align" : "flex-end",
+          "dir" : "row",
           "layout" : "FLEX"
         },
-        "getPSPanelItems" : [ {
-          "caption" : "面板容器",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container2",
-          "getPSLayout" : {
-            "layout" : "SIMPLEFLEX"
-          },
-          "getPSLayoutPos" : {
-            "grow" : 9,
-            "layout" : "SIMPLEFLEX"
-          }
-        }, {
-          "caption" : "面板容器",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container3",
-          "getPSLayout" : {
-            "layout" : "SIMPLEFLEX"
-          },
-          "getPSLayoutPos" : {
-            "grow" : 3,
-            "layout" : "SIMPLEFLEX"
-          },
-          "getPSPanelItems" : [ {
-            "caption" : "栅格容器",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "CONTAINER",
-            "name" : "container_grid2",
-            "getPSLayout" : {
-              "layout" : "SIMPLEFLEX"
-            },
         "getPSLayoutPos" : {
           "grow" : -1,
-              "layout" : "SIMPLEFLEX"
-            },
-            "getPSPanelItems" : [ {
-              "caption" : "面板容器",
-              "itemStyle" : "DEFAULT",
-              "itemType" : "CONTAINER",
-              "name" : "container4",
-              "getPSLayout" : {
-                "layout" : "SIMPLEFLEX"
-              },
-              "getPSLayoutPos" : {
-                "grow" : 6,
-                "layout" : "SIMPLEFLEX"
+          "height" : 60,
+          "heightMode" : "PX",
+          "layout" : "FLEX"
         },
         "getPSPanelItems" : [ {
           "actionType" : "UIACTION",
@@ -171,7 +129,7 @@
           "getPSLayoutPos" : {
             "grow" : -1,
             "heightMode" : "FULL",
-                  "layout" : "SIMPLEFLEX"
+            "layout" : "FLEX"
           },
           "getPSUIAction" : {
             "caption" : "确认",
@@ -190,20 +148,7 @@
           },
           "tooltip" : "确认",
           "showCaption" : true
-              } ]
         }, {
-              "caption" : "面板容器",
-              "itemStyle" : "DEFAULT",
-              "itemType" : "CONTAINER",
-              "name" : "container5",
-              "getPSLayout" : {
-                "layout" : "SIMPLEFLEX"
-              },
-              "getPSLayoutPos" : {
-                "grow" : 6,
-                "layout" : "SIMPLEFLEX"
-              },
-              "getPSPanelItems" : [ {
           "actionType" : "UIACTION",
           "buttonStyle" : "DEFAULT",
           "caption" : "取消",
@@ -217,7 +162,7 @@
           "getPSLayoutPos" : {
             "grow" : -1,
             "heightMode" : "FULL",
-                  "layout" : "SIMPLEFLEX"
+            "layout" : "FLEX"
           },
           "getPSUIAction" : {
             "caption" : "取消",
@@ -238,9 +183,6 @@
           "showCaption" : true
         } ]
       } ]
-          } ]
-        } ]
-      } ]
     } ],
     "layoutBodyOnly" : true,
     "layoutPanel" : true,

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKTreeGridExView.json

@@ -75,21 +75,21 @@
       "id" : "TREEGRIDEX"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "作者",
-      "codeName" : "author",
+      "caption" : "图书描述",
+      "codeName" : "subtext",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
-      "name" : "author",
+      "dataItemName" : "subtext",
+      "name" : "subtext",
       "width" : 50,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "图书描述",
-      "codeName" : "subtext",
+      "caption" : "作者",
+      "codeName" : "author",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "subtext",
-      "name" : "subtext",
+      "dataItemName" : "author",
+      "name" : "author",
       "width" : 50,
       "widthUnit" : "px",
       "enableExpand" : false,

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr2EditView.json

@@ -774,7 +774,7 @@
               "name" : "borrower",
               "getPickupPSAppView" : {
                 "modelref" : true,
-                "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerUsr2PickupView.json",
+                "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerUsr2PickupView_layout.json",
                 "viewType" : "DEPICKUPVIEW"
               },
               "valueItemName" : "borrowerid",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr2EditView_layout.json

@@ -774,7 +774,7 @@
               "name" : "borrower",
               "getPickupPSAppView" : {
                 "modelref" : true,
-                "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerUsr2PickupView.json",
+                "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerUsr2PickupView_layout.json",
                 "viewType" : "DEPICKUPVIEW"
               },
               "valueItemName" : "borrowerid",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerUsr2PickupView_layout.json

+{
+  "accUserMode" : 2,
+  "getCapPSLanguageRes" : {
+    "lanResTag" : "DE.LNAME.IBIZCUSTOMER"
+  },
+  "caption" : "客户",
+  "codeName" : "IBIZCustomerUsr2PickupView_layout",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerUsr2PickupView_layout.json",
+  "name" : "IBIZCustomerUsr2PickupView_layout",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+  },
+  "getPSAppViewEngines" : [ {
+    "engineCat" : "VIEW",
+    "engineType" : "PickupView",
+    "name" : "engine",
+    "getPSUIEngineParams" : [ {
+      "ctrlName" : "pickupviewpanel",
+      "name" : "PICKUPVIEWPANEL",
+      "paramType" : "CTRL"
+    } ]
+  } ],
+  "getPSControls" : [ {
+    "codeName" : "Usr2PickupView_layoutpickupviewpanel",
+    "controlType" : "PICKUPVIEWPANEL",
+    "getEmbeddedPSAppDEView" : {
+      "accUserMode" : 2,
+      "getCapPSLanguageRes" : {
+        "lanResTag" : "DE.LNAME.IBIZCUSTOMER"
+      },
+      "caption" : "客户",
+      "codeName" : "IBIZCustomerPickupTreeView",
+      "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerPickupTreeView.json",
+      "height" : 500,
+      "mDCtrlActiveMode" : 2,
+      "name" : "IBIZCustomerPickupTreeView",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+      },
+      "getPSAppViewEngines" : [ {
+        "engineCat" : "VIEW",
+        "engineType" : "PickupTreeView",
+        "name" : "engine",
+        "getPSUIEngineParams" : [ {
+          "ctrlName" : "tree",
+          "name" : "TREE",
+          "paramType" : "CTRL"
+        } ]
+      } ],
+      "getPSControls" : [ {
+        "codeName" : "Usr",
+        "controlType" : "TREEVIEW",
+        "getCreatePSControlAction" : {
+          "modelref" : true,
+          "id" : "create"
+        },
+        "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer/PSTREEVIEWS/Usr.json",
+        "getFetchPSControlAction" : {
+          "modelref" : true,
+          "id" : "fetch"
+        },
+        "getGetPSControlAction" : {
+          "modelref" : true,
+          "id" : "load"
+        },
+        "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
+        "logicName" : "选择树",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+        },
+        "getPSControlHandler" : {
+          "getPSHandlerActions" : [ {
+            "actionName" : "Get",
+            "actionType" : "DEACTION",
+            "dataAccessAction" : "READ",
+            "name" : "load",
+            "getPSAppDEMethod" : {
+              "modelref" : true,
+              "id" : "Get"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+            }
+          }, {
+            "actionName" : "Create",
+            "actionType" : "DEACTION",
+            "dataAccessAction" : "CREATE",
+            "name" : "create",
+            "getPSAppDEMethod" : {
+              "modelref" : true,
+              "id" : "Create"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+            }
+          }, {
+            "actionName" : "Update",
+            "actionType" : "DEACTION",
+            "dataAccessAction" : "UPDATE",
+            "name" : "update",
+            "getPSAppDEMethod" : {
+              "modelref" : true,
+              "id" : "Update"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+            }
+          }, {
+            "actionName" : "Remove",
+            "actionType" : "DEACTION",
+            "dataAccessAction" : "DELETE",
+            "name" : "remove",
+            "getPSAppDEMethod" : {
+              "modelref" : true,
+              "id" : "Remove"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+            }
+          }, {
+            "actionType" : "DEDATASET",
+            "name" : "fetch",
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+            }
+          } ],
+          "userDRAction" : "READ",
+          "enableDEFieldPrivilege" : false,
+          "id" : "树视图处理器"
+        },
+        "getPSControlLogics" : [ {
+          "eventNames" : "SELECTIONCHANGE;LOAD",
+          "logicTag" : "tree",
+          "logicType" : "APPVIEWENGINE",
+          "name" : "engine_tree",
+          "getPSAppViewEngine" : {
+            "modelref" : true,
+            "id" : "engine"
+          }
+        } ],
+        "getPSControlParam" : {
+          "autoLoad" : true,
+          "showBusyIndicator" : true,
+          "id" : "TREE"
+        },
+        "getPSDETreeNodeRSs" : [ {
+          "getChildPSDETreeNode" : {
+            "modelref" : true,
+            "id" : "personname"
+          },
+          "name" : "默认根节点 - 客户名称",
+          "getParentPSDETreeNode" : {
+            "modelref" : true,
+            "id" : "ROOT"
+          },
+          "parentValueLevel" : 1,
+          "searchMode" : 3
+        }, {
+          "getChildPSDETreeNode" : {
+            "modelref" : true,
+            "id" : "persondata"
+          },
+          "name" : "客户名称 - 客户数据",
+          "getParentPSDETreeNode" : {
+            "modelref" : true,
+            "id" : "personname"
+          },
+          "parentValueLevel" : 1,
+          "searchMode" : 3
+        } ],
+        "getPSDETreeNodes" : [ {
+          "counterMode" : 0,
+          "name" : "默认根节点",
+          "nodeType" : "ROOT",
+          "nodeValue" : "root",
+          "text" : "默认根节点",
+          "treeNodeType" : "STATIC",
+          "hasPSDETreeNodeRSs" : true,
+          "appendPNodeId" : false,
+          "disableSelect" : false,
+          "enableCheck" : false,
+          "enableEditData" : false,
+          "enableNewData" : false,
+          "enableQuickCreate" : false,
+          "enableQuickSearch" : false,
+          "enableRemoveData" : false,
+          "enableViewData" : false,
+          "expandFirstOnly" : false,
+          "expanded" : false,
+          "rootNode" : true,
+          "selectFirstOnly" : false,
+          "selected" : false,
+          "id" : "ROOT"
+        }, {
+          "counterMode" : 0,
+          "name" : "客户名称",
+          "nodeType" : "personname",
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+          },
+          "text" : "客户名称",
+          "treeNodeType" : "STATIC",
+          "hasPSDETreeNodeRSs" : true,
+          "appendPNodeId" : false,
+          "disableSelect" : false,
+          "enableCheck" : false,
+          "enableEditData" : false,
+          "enableNewData" : false,
+          "enableQuickCreate" : false,
+          "enableQuickSearch" : false,
+          "enableRemoveData" : false,
+          "enableViewData" : false,
+          "expandFirstOnly" : false,
+          "expanded" : false,
+          "rootNode" : false,
+          "selectFirstOnly" : false,
+          "selected" : false,
+          "id" : "personname"
+        }, {
+          "counterMode" : 0,
+          "getIdPSAppDEField" : {
+            "name" : "IBIZCUSTOMERID",
+            "codeName" : "IBIZCustomerId"
+          },
+          "maxSize" : -1,
+          "name" : "客户数据",
+          "nodeType" : "persondata",
+          "getPSAppDEDataSet" : {
+            "modelref" : true,
+            "id" : "FetchDefault"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+          },
+          "getTextPSAppDEField" : {
+            "name" : "IBIZCUSTOMERNAME",
+            "codeName" : "IBIZCustomerName"
+          },
+          "treeNodeType" : "DE",
+          "hasPSDETreeNodeRSs" : false,
+          "appendPNodeId" : false,
+          "disableSelect" : false,
+          "enableCheck" : false,
+          "enableEditData" : false,
+          "enableNewData" : false,
+          "enableQuickCreate" : false,
+          "enableQuickSearch" : false,
+          "enableRemoveData" : false,
+          "enableViewData" : false,
+          "expandFirstOnly" : false,
+          "expanded" : false,
+          "rootNode" : false,
+          "selectFirstOnly" : false,
+          "selected" : false,
+          "id" : "persondata"
+        } ],
+        "getRemovePSControlAction" : {
+          "modelref" : true,
+          "id" : "remove"
+        },
+        "treeGridMode" : 0,
+        "getUpdatePSControlAction" : {
+          "modelref" : true,
+          "id" : "update"
+        },
+        "enableRootSelect" : false,
+        "outputIconDefault" : true,
+        "rootVisible" : false,
+        "name" : "tree",
+        "modelid" : "9315d1e615ea222d35c5444c302d3a77",
+        "modeltype" : "PSDETREEVIEW"
+      } ],
+      "getPSDEViewCodeName" : "PickupTreeView",
+      "getPSDEViewId" : "702f3e21fa6fff77cb54ea007059d37f",
+      "getPSViewLayoutPanel" : {
+        "codeName" : "Layoutpanel",
+        "controlStyle" : "APPDEPICKUPTREEVIEW",
+        "controlType" : "VIEWLAYOUTPANEL",
+        "name" : "layoutpanel",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+        },
+        "getPSControlParam" : { },
+        "layoutBodyOnly" : true,
+        "layoutPanel" : true,
+        "useDefaultLayout" : true
+      },
+      "title" : "客户选择树视图",
+      "viewStyle" : "DEFAULT",
+      "viewType" : "DEPICKUPTREEVIEW",
+      "width" : 500,
+      "xDataControlName" : "tree",
+      "enableDP" : true,
+      "enableFilter" : false,
+      "expandSearchForm" : true,
+      "pickupMode" : true,
+      "modelid" : "6a079bac1a6eeb580654cd04e6b1a8b8",
+      "modeltype" : "PSAPPDEVIEW"
+    },
+    "hookEventNames" : [ "SELECTIONCHANGE", "LOAD", "ACTIVATED" ],
+    "name" : "pickupviewpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+    },
+    "getPSControlLogics" : [ {
+      "eventNames" : "SELECTIONCHANGE;LOAD;ACTIVATED",
+      "logicTag" : "pickupviewpanel",
+      "logicType" : "APPVIEWENGINE",
+      "name" : "engine_pickupviewpanel",
+      "getPSAppViewEngine" : {
+        "modelref" : true,
+        "id" : "engine"
+      }
+    } ],
+    "getPSControlParam" : {
+      "id" : "PICKUPVIEWPANEL"
+    }
+  } ],
+  "getPSDEViewCodeName" : "Usr2PickupView_layout",
+  "getPSDEViewId" : "77A182D2-AD26-4B9C-A10C-D30A863D3131",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlStyle" : "APPDEPICKUPVIEW",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+    },
+    "getPSControlParam" : { },
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : true
+  },
+  "title" : "客户实体数据选择视图(树视图)",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "DEPICKUPVIEW",
+  "enableDP" : true,
+  "showCaptionBar" : false,
+  "modelid" : "e7f12b95864b12114256d9c4dbbb559c",
+  "modeltype" : "PSAPPDEVIEW"
+}
\ No newline at end of file

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderDataViewExpView.json

@@ -47,6 +47,8 @@
       },
       "getPSPanelItems" : [ {
         "caption" : "栅格容器",
+        "contentHeight" : 100.0,
+        "height" : 100.0,
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
         "name" : "container_grid1",
@@ -55,6 +57,8 @@
         },
         "getPSLayoutPos" : {
           "grow" : -1,
+          "height" : 100,
+          "heightMode" : "PX",
           "layout" : "FLEX"
         },
         "getPSPanelItems" : [ {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderDataViewExpView_layout.json

@@ -47,6 +47,8 @@
       },
       "getPSPanelItems" : [ {
         "caption" : "栅格容器",
+        "contentHeight" : 100.0,
+        "height" : 100.0,
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
         "name" : "container_grid1",
@@ -55,6 +57,8 @@
         },
         "getPSLayoutPos" : {
           "grow" : -1,
+          "height" : 100,
+          "heightMode" : "PX",
           "layout" : "FLEX"
         },
         "getPSPanelItems" : [ {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderSEditView3_layout.json

@@ -24,7 +24,7 @@
   "getPSDEViewCodeName" : "SEditView3_layout",
   "getPSDEViewId" : "23CE50EF-DA4E-4DCD-AF6E-DEEE4FFF92FA",
   "getPSViewLayoutPanel" : {
-    "codeName" : "Usr1104161602",
+    "codeName" : "Usr1104911800",
     "controlType" : "VIEWLAYOUTPANEL",
     "layoutMode" : "FLEX",
     "logicName" : "SEditView3_layoutDEEDITVIEW3",
@@ -41,7 +41,7 @@
     "layoutPanel" : true,
     "useDefaultLayout" : false,
     "viewProxyMode" : true,
-    "modelid" : "6BE4FC30-0100-4BBC-B78F-8DAE8FE88EC4",
+    "modelid" : "AFF04197-567A-4ADF-915A-79B60A85F4BA",
     "modeltype" : "PSSYSVIEWLAYOUTPANEL",
     "getPSAppViewEngines" : [ {
       "engineCat" : "VIEW",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderSEditView4_layout.json

@@ -24,7 +24,7 @@
   "getPSDEViewCodeName" : "SEditView4_layout",
   "getPSDEViewId" : "1340DA40-8B5C-4371-9FF0-55FE75766F22",
   "getPSViewLayoutPanel" : {
-    "codeName" : "Usr1104166060",
+    "codeName" : "Usr1104994820",
     "controlType" : "VIEWLAYOUTPANEL",
     "layoutMode" : "FLEX",
     "logicName" : "SEditView4_layoutDEEDITVIEW4",
@@ -41,7 +41,7 @@
     "layoutPanel" : true,
     "useDefaultLayout" : false,
     "viewProxyMode" : true,
-    "modelid" : "EEB05E3C-E77C-48DD-9816-C72EB9926CCD",
+    "modelid" : "665ADFF3-5947-463A-AB7F-5E9610B32C65",
     "modeltype" : "PSSYSVIEWLAYOUTPANEL",
     "getPSAppViewEngines" : [ {
       "engineCat" : "VIEW",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSSYSAPP.json

@@ -14644,6 +14644,12 @@
     "viewType" : "DEEDITVIEW2",
     "resource" : "IBIZOrder",
     "view" : "State40EditView2"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerUsr2PickupView_layout.json",
+    "viewType" : "DEPICKUPVIEW",
+    "resource" : "IBIZCustomer",
+    "view" : "Usr2PickupView_layout"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr4ListView_layout.json",

demo-core/src/main/resources/liquibase/h2_table.xml

@@ -172,7 +172,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-189-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-202-7">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -278,7 +278,7 @@
 
 
     <!--输出实体[IBIZCUSTOMER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-65-10">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-72-10">
         <createTable tableName="T_IBIZCUSTOMER">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -340,7 +340,7 @@
 
 
     <!--输出实体[IBIZORDER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-227-14">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-243-14">
         <createTable tableName="T_IBIZORDER">
                 <column name="TP" remarks="" type="TEXT(1048576)">
                 </column>

demo-core/src/main/resources/liquibase/view.xml

@@ -19,7 +19,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZCUSTOMER]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizcustomer-65-4" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizcustomer-72-4" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZCUSTOMER">
                <![CDATA[ SELECT t1.[ADDRESS], t1.[CREATEDATE], t1.[CREATEMAN], t1.[CUSTOMERUID], t1.[IBIZCUSTOMERID], t1.[IBIZCUSTOMERNAME], t1.[SN], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZCUSTOMER] t1  ]]>
          </createView>
@@ -37,7 +37,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZORDER]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-227-8" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-243-8" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZORDER">
                <![CDATA[ SELECT t1.[AMOUNT], t1.[CREATEDATE], t1.[CREATEMAN], t1.[DETAILNUM], t1.[IBIZCUSTOMERID], t11.[IBIZCUSTOMERNAME], t1.[IBIZORDERID], t1.[IBIZORDERNAME], t1.[MEMO], t1.[ORDERSTATE], t1.[ORDERTIME], t1.[ORDERTYPE], t1.[ORDERUID], t1.[UPDATEDATE], t1.[UPDATEMAN], t1.[WFINSTANCEID], t1.[WFSTATE], t1.[WFSTEP] FROM [T_IBIZORDER] t1  LEFT JOIN T_IBIZCUSTOMER t11 ON t1.IBIZCUSTOMERID = t11.IBIZCUSTOMERID  ]]>
          </createView>