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

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

@@ -1759,6 +1759,14 @@
         "viewname": "IBIZBOOKUpdateDefaultGridView",
         "viewtag": "d54cede78592924ae6725eb401e369b9"
     },
+    "ibizordertestcleditview2": {
+        "title": "测试视图布局面板",
+        "caption": "订单",
+        "viewtype": "DEEDITVIEW2",
+        "viewmodule": "Sample",
+        "viewname": "IBIZOrderTestCLEditView2",
+        "viewtag": "D6D7779F-95C9-48C0-B2E1-ED4C20E5E157"
+    },
     "ibizorderodsp_d30_wfgridview": {
         "title": "订单工作流表格视图(订单审批:已通过)",
         "caption": "订单",

app_Web/src/components/layout-element/media/app-field-image-dynamic/app-field-image-dynamic.vue

 <template>
-    <div :class="{'app-field-image-dynamic':true,[cssClass]:cssClass?true:false}">
+    <div :class="{'app-field-image-dynamic':true,[`${cssClass}`]:cssClass?true:false}">
         <img :style="cssStyle" :src="imgUrl" />
     </div>
 </template>
@@ -32,7 +32,7 @@ export default class AppFieldImageDynamic extends Vue {
      * @type {string}
      * @memberof AppRawItemImage
      */
-     @Prop({default:''}) public cssClass: string;
+     @Prop({default:''}) public cssClass?: string;
 
     /**
      * 动态图片路径

app_Web/src/components/layout-element/media/app-rawitem-carousel/app-rawitem-carousel.vue

@@ -24,7 +24,7 @@ export default class AppCarousel extends Vue {
      * @type {*}
      * @memberof AppPresetCarousel
      */
-     @Prop() public contextData?: any;
+     @Prop() public data?: any;
 
     /**
      * @description 轮播图数据

app_Web/src/components/layout-element/media/app-rawitem-image/app-rawitem-image.vue

@@ -17,6 +17,14 @@ export default class AppRawItemImage extends Vue {
      */
     @Prop() public cssStyle: any;
 
+    /**
+     * 样式表
+     *
+     * @type {string}
+     * @memberof AppRawItemImage
+     */
+     @Prop() public cssClass: any;
+
     /**
      * 图片地址
      *

app_Web/src/components/layout-element/media/app-rawitem-video/app-rawitem-video.vue

 <template>
     <div class="app-rawitem-video">
-        <video 
-            :src="playerParams.url" 
-            :autoplay="playerParams.autoplay" 
-            :controls="playerParams.controls" 
-            :loop="playerParams.loop" 
-            :muted="playerParams.volume">
+        <video :src="playerParams.url" :autoplay="playerParams.autoplay" :controls="playerParams.controls"
+            :loop="playerParams.loop" :muted="playerParams.volume">
         </video>
     </div>
 </template>
@@ -30,23 +26,33 @@ export default class AppVideo extends Vue {
         id: this.uuid,
         height: '100%',
         width: '100%',
-        url:"",
-        volume:0.8,
-        autoplay:false,
-        loop:false,
-        controls:false
-    };    
+        url: "",
+        volume: 0.8,
+        autoplay: false,
+        loop: false,
+        controls: false
+    };
+
 
     /**
      * 生命周期
      */
     public mounted() {
-        if (this.videoParmas) {
-            this.playerParams.url = this.videoParmas.path;
-            this.playerParams.volume = this.videoParmas.mute ? 0 : 0.8;
-            this.playerParams.autoplay = this.videoParmas.autoplay ? true : false;
-            this.playerParams.loop = this.videoParmas.replay ? true : false;
-            this.playerParams.controls = this.videoParmas.showcontrols ? true : false
+        this.handleStaticVideo();
+    }
+
+    /**
+     * 处理静态视频播放
+     *
+     * @memberof AppPresetRawitem
+     */
+    protected handleStaticVideo() {
+        if (this.videoParmas && this.videoParmas.length > 0) {
+            const rawParams:any = {};
+            this.videoParmas.forEach((param: any) => {
+                rawParams[param.key] = param.value;
+            })
+            Object.assign(this.playerParams,rawParams);
         }
     }
 }

app_Web/src/locale/lang/BO-CN-base.ts

@@ -370,6 +370,7 @@ function getAppLocale(){
                     menuitem125: commonLogic.appcommonhandle("测试表单自定义布局多媒体",null),
                     menuitem126: commonLogic.appcommonhandle("自定义导航",null),
                     menuitem130: commonLogic.appcommonhandle("布局面板组件测试",null),
+                    menuitem131: commonLogic.appcommonhandle("编辑视图（左右关系）",null),
                 },
             },
             formpage:{

app_Web/src/locale/lang/en-US-base.ts

@@ -370,6 +370,7 @@ function getAppLocale(){
                     menuitem125: commonLogic.appcommonhandle("测试表单自定义布局多媒体",null),
                     menuitem126: commonLogic.appcommonhandle("自定义导航",null),
                     menuitem130: commonLogic.appcommonhandle("布局面板组件测试",null),
+                    menuitem131: commonLogic.appcommonhandle("编辑视图（左右关系）",null),
                 },
             },
             formpage:{

app_Web/src/locale/lang/zh-CN-base.ts

@@ -370,6 +370,7 @@ function getAppLocale(){
                     menuitem125: commonLogic.appcommonhandle("测试表单自定义布局多媒体",null),
                     menuitem126: commonLogic.appcommonhandle("自定义导航",null),
                     menuitem130: commonLogic.appcommonhandle("布局面板组件测试",null),
+                    menuitem131: commonLogic.appcommonhandle("编辑视图（左右关系）",null),
                 },
             },
             formpage:{

app_Web/src/locale/lanres/entities/ibizorder/ibizorder_BO_CN_base.ts

@@ -251,6 +251,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("订单",null),
 				title: commonLogic.appcommonhandle("订单编辑视图",null),
 			},
+			testcleditview2: {
+				caption: commonLogic.appcommonhandle("订单",null),
+				title: commonLogic.appcommonhandle("测试视图布局面板",null),
+			},
 			odsp_d30_wfgridview: {
 				caption: commonLogic.appcommonhandle("订单",null),
 				title: commonLogic.appcommonhandle("订单工作流表格视图(订单审批:已通过)",null),
@@ -1756,6 +1760,36 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("编辑",null),
 			},
 		},
+		testcleditview2toolbar_toolbar: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("新建",null),
+				tip: commonLogic.appcommonhandle("新建",null),
+			},
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("保存",null),
+				tip: commonLogic.appcommonhandle("保存",null),
+			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem9_saveandstart: {
+				caption: commonLogic.appcommonhandle("开始流程",null),
+				tip: commonLogic.appcommonhandle("开始流程",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem15: {
+				caption: commonLogic.appcommonhandle("打印",null),
+				tip: commonLogic.appcommonhandle("打印",null),
+			},
+		},
 		sf3gridviewtoolbar_toolbar: {
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("新建",null),

app_Web/src/locale/lanres/entities/ibizorder/ibizorder_en_US_base.ts

@@ -251,6 +251,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("订单",null),
 				title: commonLogic.appcommonhandle("订单编辑视图",null),
 			},
+			testcleditview2: {
+				caption: commonLogic.appcommonhandle("订单",null),
+				title: commonLogic.appcommonhandle("测试视图布局面板",null),
+			},
 			odsp_d30_wfgridview: {
 				caption: commonLogic.appcommonhandle("订单",null),
 				title: commonLogic.appcommonhandle("订单工作流表格视图(订单审批:已通过)",null),
@@ -1756,6 +1760,36 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("Edit {0}",null),
 			},
 		},
+		testcleditview2toolbar_toolbar: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("New",null),
+				tip: commonLogic.appcommonhandle("New",null),
+			},
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("Save",null),
+				tip: commonLogic.appcommonhandle("Save",null),
+			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem9_saveandstart: {
+				caption: commonLogic.appcommonhandle("开始流程",null),
+				tip: commonLogic.appcommonhandle("开始流程",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem15: {
+				caption: commonLogic.appcommonhandle("Print",null),
+				tip: commonLogic.appcommonhandle("Print",null),
+			},
+		},
 		sf3gridviewtoolbar_toolbar: {
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("New",null),

app_Web/src/locale/lanres/entities/ibizorder/ibizorder_zh_CN_base.ts

@@ -251,6 +251,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("订单",null),
 				title: commonLogic.appcommonhandle("订单编辑视图",null),
 			},
+			testcleditview2: {
+				caption: commonLogic.appcommonhandle("订单",null),
+				title: commonLogic.appcommonhandle("测试视图布局面板",null),
+			},
 			odsp_d30_wfgridview: {
 				caption: commonLogic.appcommonhandle("订单",null),
 				title: commonLogic.appcommonhandle("订单工作流表格视图(订单审批:已通过)",null),
@@ -1756,6 +1760,36 @@ function getLocaleResourceBase(){
 				tip: commonLogic.appcommonhandle("编辑",null),
 			},
 		},
+		testcleditview2toolbar_toolbar: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("新建",null),
+				tip: commonLogic.appcommonhandle("新建",null),
+			},
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("保存",null),
+				tip: commonLogic.appcommonhandle("保存",null),
+			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem9_saveandstart: {
+				caption: commonLogic.appcommonhandle("开始流程",null),
+				tip: commonLogic.appcommonhandle("开始流程",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem15: {
+				caption: commonLogic.appcommonhandle("打印",null),
+				tip: commonLogic.appcommonhandle("打印",null),
+			},
+		},
 		sf3gridviewtoolbar_toolbar: {
 			tbitem3: {
 				caption: commonLogic.appcommonhandle("新建",null),

app_Web/src/mock/viewconfig/viewconfig.ts

@@ -1767,6 +1767,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "IBIZBOOKUpdateDefaultGridView",
             "viewtag": "d54cede78592924ae6725eb401e369b9"
         },
+        "ibizordertestcleditview2": {
+            "title": "测试视图布局面板",
+            "caption": "订单",
+            "viewtype": "DEEDITVIEW2",
+            "viewmodule": "Sample",
+            "viewname": "IBIZOrderTestCLEditView2",
+            "viewtag": "D6D7779F-95C9-48C0-B2E1-ED4C20E5E157"
+        },
         "ibizorderodsp_d30_wfgridview": {
             "title": "订单工作流表格视图(订单审批:已通过)",
             "caption": "订单",

app_Web/src/pages/sample/ibizorder-sedit-view2/ibizorder-sedit-view2-base.vue

@@ -48,12 +48,13 @@
     </div>
       </template>
 </div>
-        <layout class="content-container edit-view2">
-            <sider class="edit-view2-drbar" :width="240">
-                <div :class="{'edit-view2-drbar__caption': true, 'is-active': !(drItem && drItem.id && drItem.id !== 'form')}" @click="drBarChange">
-                    <span>订单</span>
-                </div>
-                                <view_drbar 
+        <div class="content-container">
+            <layout class="edit-view2">
+                <sider class="edit-view2-drbar" :width="240">
+                    <div :class="{'edit-view2-drbar__caption': true, 'is-active': !(drItem && drItem.id && drItem.id !== 'form')}" @click="drBarChange">
+                        <span>订单</span>
+                    </div>
+                                    <view_drbar 
             :viewState="viewState"
             loadAction='get'  
             name='drbar' 
@@ -65,10 +66,10 @@
             @selectionchange="drbar_selectionchange($event)"
             @closeview="closeView($event)">
         </view_drbar>
-            </sider>
-            <content class="edit-view2-content" :style="{ width: 'calc(100% - 241px)' }">
-                <div class="edit-view2-content__form" :style="drItem && drItem.id && drItem.id !== 'form' ? 'display: none' : ''">
-                                <view_form 
+                </sider>
+                <content class="edit-view2-content" :style="{ width: 'calc(100% - 241px)' }">
+                    <div class="edit-view2-content__form" :style="drItem && drItem.id && drItem.id !== 'form' ? 'display: none' : ''">
+                                    <view_form 
             :viewState="viewState"  
             :viewparams="viewparams" 
             :context="context" 
@@ -90,17 +91,18 @@
             @remove="form_remove($event)"  
             @closeview="closeView($event)">
         </view_form>
-                </div>
-                <component
-                    class="view-container2"
-                    v-if="drItem && drItem.id && drItem.id !== 'form'"
-                    :is="drItem.drView"
-                    :viewDefaultUsage="false"
-                    :viewdata="JSON.stringify(drItem.srfnavdata.context)"
-                    :viewparam="JSON.stringify(drItem.srfnavdata.viewparams)">
-                </component>
-            </content>
-        </layout>
+                    </div>
+                    <component
+                        class="view-container2"
+                        v-if="drItem && drItem.id && drItem.id !== 'form'"
+                        :is="drItem.drView"
+                        :viewDefaultUsage="false"
+                        :viewdata="JSON.stringify(drItem.srfnavdata.context)"
+                        :viewparam="JSON.stringify(drItem.srfnavdata.viewparams)">
+                    </component>
+                </content>
+            </layout>
+        </div>
     </card>
 </div>
 </template>
@@ -1205,6 +1207,12 @@ export default class IBIZOrderSEditView2Base extends Vue {
      */
     public formData:any = {};
 
+    /**
+     * 关系栏变化
+     *
+     * @type {*}
+     * @memberof IBIZOrderSEditView2Base
+     */
     public drBarChange() {
         if (this.engine) {
             this.engine.drBarSelectionChange({ id: 'form' });

app_Web/src/pages/sample/ibizorder-sedit-view2/ibizorder-sedit-view2.less

-.view-card {
-    >.ivu-card-extra {
-        top: 5px;
-        right: 0px;
-    }
-}
-
-.edit-view2 {
-    flex-direction: row !important;
-    overflow: auto;
-    .view-form {
-        overflow: auto;
-    }
-}
-
-.ibizorder-sedit-view2{
-    > .view-card > .ivu-card-body{
-        display: flex;
-        flex-direction: column;
-    }
-}
-
+.view-card {
+    >.ivu-card-extra {
+        top: 5px;
+        right: 0px;
+    }
+}
+.edit-view2-drbar__caption {
+    height: 40px;
+    line-height: 40px;
+    padding-left: 20px;
+    background: #fff;
+    color: #303133;
+    border-left: 3px solid #fff;
+}
+
+.edit-view2-drbar__caption.is-active {
+    background: #e9e9e9;
+    color: #666666;
+    border-left: 3px solid #3fd5c0;
+}
+
+.edit-view2-drbar {
+    .app-dr-bar {
+        height: calc(100% - 40px);
+        padding: 0;
+    }
+}
+
 .ibizorder-sedit-view2{
     position: relative;
 }

app_Web/src/pages/sample/ibizorder-state10-edit-view2/ibizorder-state10-edit-view2-base.vue

@@ -46,12 +46,13 @@
     </div>
       </template>
 </div>
-        <layout class="content-container edit-view2">
-            <sider class="edit-view2-drbar" :width="240">
-                <div :class="{'edit-view2-drbar__caption': true, 'is-active': !(drItem && drItem.id && drItem.id !== 'form')}" @click="drBarChange">
-                    <span>订单</span>
-                </div>
-                                <view_drbar 
+        <div class="content-container">
+            <layout class="edit-view2">
+                <sider class="edit-view2-drbar" :width="240">
+                    <div :class="{'edit-view2-drbar__caption': true, 'is-active': !(drItem && drItem.id && drItem.id !== 'form')}" @click="drBarChange">
+                        <span>订单</span>
+                    </div>
+                                    <view_drbar 
             :viewState="viewState"
             loadAction='get'  
             name='drbar' 
@@ -63,10 +64,10 @@
             @selectionchange="drbar_selectionchange($event)"
             @closeview="closeView($event)">
         </view_drbar>
-            </sider>
-            <content class="edit-view2-content" :style="{ width: 'calc(100% - 241px)' }">
-                <div class="edit-view2-content__form" :style="drItem && drItem.id && drItem.id !== 'form' ? 'display: none' : ''">
-                                <view_form 
+                </sider>
+                <content class="edit-view2-content" :style="{ width: 'calc(100% - 241px)' }">
+                    <div class="edit-view2-content__form" :style="drItem && drItem.id && drItem.id !== 'form' ? 'display: none' : ''">
+                                    <view_form 
             :viewState="viewState"  
             :viewparams="viewparams" 
             :context="context" 
@@ -88,17 +89,18 @@
             @remove="form_remove($event)"  
             @closeview="closeView($event)">
         </view_form>
-                </div>
-                <component
-                    class="view-container2"
-                    v-if="drItem && drItem.id && drItem.id !== 'form'"
-                    :is="drItem.drView"
-                    :viewDefaultUsage="false"
-                    :viewdata="JSON.stringify(drItem.srfnavdata.context)"
-                    :viewparam="JSON.stringify(drItem.srfnavdata.viewparams)">
-                </component>
-            </content>
-        </layout>
+                    </div>
+                    <component
+                        class="view-container2"
+                        v-if="drItem && drItem.id && drItem.id !== 'form'"
+                        :is="drItem.drView"
+                        :viewDefaultUsage="false"
+                        :viewdata="JSON.stringify(drItem.srfnavdata.context)"
+                        :viewparam="JSON.stringify(drItem.srfnavdata.viewparams)">
+                    </component>
+                </content>
+            </layout>
+        </div>
     </card>
 </div>
 </template>
@@ -1202,6 +1204,12 @@ export default class IBIZOrderState10EditView2Base extends Vue {
      */
     public formData:any = {};
 
+    /**
+     * 关系栏变化
+     *
+     * @type {*}
+     * @memberof IBIZOrderState10EditView2Base
+     */
     public drBarChange() {
         if (this.engine) {
             this.engine.drBarSelectionChange({ id: 'form' });

app_Web/src/pages/sample/ibizorder-state10-edit-view2/ibizorder-state10-edit-view2.less

-.view-card {
-    >.ivu-card-extra {
-        top: 5px;
-        right: 0px;
-    }
-}
-
-.edit-view2 {
-    flex-direction: row !important;
-    overflow: auto;
-    .view-form {
-        overflow: auto;
-    }
-}
-
-.ibizorder-state10-edit-view2{
-    > .view-card > .ivu-card-body{
-        display: flex;
-        flex-direction: column;
-    }
-}
-
+.view-card {
+    >.ivu-card-extra {
+        top: 5px;
+        right: 0px;
+    }
+}
+.edit-view2-drbar__caption {
+    height: 40px;
+    line-height: 40px;
+    padding-left: 20px;
+    background: #fff;
+    color: #303133;
+    border-left: 3px solid #fff;
+}
+
+.edit-view2-drbar__caption.is-active {
+    background: #e9e9e9;
+    color: #666666;
+    border-left: 3px solid #3fd5c0;
+}
+
+.edit-view2-drbar {
+    .app-dr-bar {
+        height: calc(100% - 40px);
+        padding: 0;
+    }
+}
+
 .ibizorder-state10-edit-view2{
     position: relative;
 }

app_Web/src/pages/sample/ibizorder-state30-edit-view2/ibizorder-state30-edit-view2-base.vue

@@ -46,12 +46,13 @@
     </div>
       </template>
 </div>
-        <layout class="content-container edit-view2">
-            <sider class="edit-view2-drbar" :width="240">
-                <div :class="{'edit-view2-drbar__caption': true, 'is-active': !(drItem && drItem.id && drItem.id !== 'form')}" @click="drBarChange">
-                    <span>订单</span>
-                </div>
-                                <view_drbar 
+        <div class="content-container">
+            <layout class="edit-view2">
+                <sider class="edit-view2-drbar" :width="240">
+                    <div :class="{'edit-view2-drbar__caption': true, 'is-active': !(drItem && drItem.id && drItem.id !== 'form')}" @click="drBarChange">
+                        <span>订单</span>
+                    </div>
+                                    <view_drbar 
             :viewState="viewState"
             loadAction='get'  
             name='drbar' 
@@ -63,10 +64,10 @@
             @selectionchange="drbar_selectionchange($event)"
             @closeview="closeView($event)">
         </view_drbar>
-            </sider>
-            <content class="edit-view2-content" :style="{ width: 'calc(100% - 241px)' }">
-                <div class="edit-view2-content__form" :style="drItem && drItem.id && drItem.id !== 'form' ? 'display: none' : ''">
-                                <view_form 
+                </sider>
+                <content class="edit-view2-content" :style="{ width: 'calc(100% - 241px)' }">
+                    <div class="edit-view2-content__form" :style="drItem && drItem.id && drItem.id !== 'form' ? 'display: none' : ''">
+                                    <view_form 
             :viewState="viewState"  
             :viewparams="viewparams" 
             :context="context" 
@@ -88,17 +89,18 @@
             @remove="form_remove($event)"  
             @closeview="closeView($event)">
         </view_form>
-                </div>
-                <component
-                    class="view-container2"
-                    v-if="drItem && drItem.id && drItem.id !== 'form'"
-                    :is="drItem.drView"
-                    :viewDefaultUsage="false"
-                    :viewdata="JSON.stringify(drItem.srfnavdata.context)"
-                    :viewparam="JSON.stringify(drItem.srfnavdata.viewparams)">
-                </component>
-            </content>
-        </layout>
+                    </div>
+                    <component
+                        class="view-container2"
+                        v-if="drItem && drItem.id && drItem.id !== 'form'"
+                        :is="drItem.drView"
+                        :viewDefaultUsage="false"
+                        :viewdata="JSON.stringify(drItem.srfnavdata.context)"
+                        :viewparam="JSON.stringify(drItem.srfnavdata.viewparams)">
+                    </component>
+                </content>
+            </layout>
+        </div>
     </card>
 </div>
 </template>
@@ -1202,6 +1204,12 @@ export default class IBIZOrderState30EditView2Base extends Vue {
      */
     public formData:any = {};
 
+    /**
+     * 关系栏变化
+     *
+     * @type {*}
+     * @memberof IBIZOrderState30EditView2Base
+     */
     public drBarChange() {
         if (this.engine) {
             this.engine.drBarSelectionChange({ id: 'form' });

app_Web/src/pages/sample/ibizorder-state30-edit-view2/ibizorder-state30-edit-view2.less

-.view-card {
-    >.ivu-card-extra {
-        top: 5px;
-        right: 0px;
-    }
-}
-
-.edit-view2 {
-    flex-direction: row !important;
-    overflow: auto;
-    .view-form {
-        overflow: auto;
-    }
-}
-
-.ibizorder-state30-edit-view2{
-    > .view-card > .ivu-card-body{
-        display: flex;
-        flex-direction: column;
-    }
-}
-
+.view-card {
+    >.ivu-card-extra {
+        top: 5px;
+        right: 0px;
+    }
+}
+.edit-view2-drbar__caption {
+    height: 40px;
+    line-height: 40px;
+    padding-left: 20px;
+    background: #fff;
+    color: #303133;
+    border-left: 3px solid #fff;
+}
+
+.edit-view2-drbar__caption.is-active {
+    background: #e9e9e9;
+    color: #666666;
+    border-left: 3px solid #3fd5c0;
+}
+
+.edit-view2-drbar {
+    .app-dr-bar {
+        height: calc(100% - 40px);
+        padding: 0;
+    }
+}
+
 .ibizorder-state30-edit-view2{
     position: relative;
 }

app_Web/src/pages/sample/ibizorder-state40-edit-view2/ibizorder-state40-edit-view2-base.vue

@@ -46,12 +46,13 @@
     </div>
       </template>
 </div>
-        <layout class="content-container edit-view2">
-            <sider class="edit-view2-drbar" :width="240">
-                <div :class="{'edit-view2-drbar__caption': true, 'is-active': !(drItem && drItem.id && drItem.id !== 'form')}" @click="drBarChange">
-                    <span>订单</span>
-                </div>
-                                <view_drbar 
+        <div class="content-container">
+            <layout class="edit-view2">
+                <sider class="edit-view2-drbar" :width="240">
+                    <div :class="{'edit-view2-drbar__caption': true, 'is-active': !(drItem && drItem.id && drItem.id !== 'form')}" @click="drBarChange">
+                        <span>订单</span>
+                    </div>
+                                    <view_drbar 
             :viewState="viewState"
             loadAction='get'  
             name='drbar' 
@@ -63,10 +64,10 @@
             @selectionchange="drbar_selectionchange($event)"
             @closeview="closeView($event)">
         </view_drbar>
-            </sider>
-            <content class="edit-view2-content" :style="{ width: 'calc(100% - 241px)' }">
-                <div class="edit-view2-content__form" :style="drItem && drItem.id && drItem.id !== 'form' ? 'display: none' : ''">
-                                <view_form 
+                </sider>
+                <content class="edit-view2-content" :style="{ width: 'calc(100% - 241px)' }">
+                    <div class="edit-view2-content__form" :style="drItem && drItem.id && drItem.id !== 'form' ? 'display: none' : ''">
+                                    <view_form 
             :viewState="viewState"  
             :viewparams="viewparams" 
             :context="context" 
@@ -88,17 +89,18 @@
             @remove="form_remove($event)"  
             @closeview="closeView($event)">
         </view_form>
-                </div>
-                <component
-                    class="view-container2"
-                    v-if="drItem && drItem.id && drItem.id !== 'form'"
-                    :is="drItem.drView"
-                    :viewDefaultUsage="false"
-                    :viewdata="JSON.stringify(drItem.srfnavdata.context)"
-                    :viewparam="JSON.stringify(drItem.srfnavdata.viewparams)">
-                </component>
-            </content>
-        </layout>
+                    </div>
+                    <component
+                        class="view-container2"
+                        v-if="drItem && drItem.id && drItem.id !== 'form'"
+                        :is="drItem.drView"
+                        :viewDefaultUsage="false"
+                        :viewdata="JSON.stringify(drItem.srfnavdata.context)"
+                        :viewparam="JSON.stringify(drItem.srfnavdata.viewparams)">
+                    </component>
+                </content>
+            </layout>
+        </div>
     </card>
 </div>
 </template>
@@ -1202,6 +1204,12 @@ export default class IBIZOrderState40EditView2Base extends Vue {
      */
     public formData:any = {};
 
+    /**
+     * 关系栏变化
+     *
+     * @type {*}
+     * @memberof IBIZOrderState40EditView2Base
+     */
     public drBarChange() {
         if (this.engine) {
             this.engine.drBarSelectionChange({ id: 'form' });

app_Web/src/pages/sample/ibizorder-state40-edit-view2/ibizorder-state40-edit-view2.less

-.view-card {
-    >.ivu-card-extra {
-        top: 5px;
-        right: 0px;
-    }
-}
-
-.edit-view2 {
-    flex-direction: row !important;
-    overflow: auto;
-    .view-form {
-        overflow: auto;
-    }
-}
-
-.ibizorder-state40-edit-view2{
-    > .view-card > .ivu-card-body{
-        display: flex;
-        flex-direction: column;
-    }
-}
-
+.view-card {
+    >.ivu-card-extra {
+        top: 5px;
+        right: 0px;
+    }
+}
+.edit-view2-drbar__caption {
+    height: 40px;
+    line-height: 40px;
+    padding-left: 20px;
+    background: #fff;
+    color: #303133;
+    border-left: 3px solid #fff;
+}
+
+.edit-view2-drbar__caption.is-active {
+    background: #e9e9e9;
+    color: #666666;
+    border-left: 3px solid #3fd5c0;
+}
+
+.edit-view2-drbar {
+    .app-dr-bar {
+        height: calc(100% - 40px);
+        padding: 0;
+    }
+}
+
 .ibizorder-state40-edit-view2{
     position: relative;
 }

app_Web/src/pages/sample/ibizorder-test-cledit-view2/ibizorder-test-cledit-view2.less

+.ibizorder-test-cledit-view2 {
+    display: block;
+}

app_Web/src/pages/sample/ibizorder-test-cledit-view2/ibizorder-test-cledit-view2.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBIZOrderTestCLEditView2Base from './ibizorder-test-cledit-view2-base.vue';
+
+import view_form from '@widgets/ibizorder/sform-form/sform-form.vue';
+import view_drbar from '@widgets/ibizorder/default-drbar/default-drbar.vue';
+@Component({
+    components: {
+        view_form, 
+        view_drbar, 
+    },
+    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 IBIZOrderTestCLEditView2 extends IBIZOrderTestCLEditView2Base {
+
+}
+</script>
\ No newline at end of file

app_Web/src/pages/sample/ibizorder-test-custom-layout-panel-grid-exp-view/ibizorder-test-custom-layout-panel-grid-exp-view-base.vue

@@ -269,13 +269,13 @@ export default class IBIZOrderTestCustomLayoutPanelGridExpViewBase extends Vue {
      */
     public layoutModelDetails:any = {
         view_pagecaption:new PanelFieldModel({ name: 'view_pagecaption', caption: '页面标题', isShowCaption: false, sysCss: '', itemType: 'FIELD', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this , fieldState: '0', }),
-        container2:new PanelContainerModel({ name: 'container2', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'TABLE_24COL', 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 , details:['view_pagecaption']}),
+        container2:new PanelContainerModel({ name: 'container2', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'TABLE_24COL', 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 , details:['view_pagecaption'] , dataRegionType:INHERIT }),
         nav_pos1:new PanelRawitemModel({ name: 'nav_pos1', caption: '导航区占位', isShowCaption: true, sysCss: '', itemType: 'RAWITEM', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_main1', panel: this , viewType: 'DEGRIDEXPVIEW', predefinedType: 'NAV_POS', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', }),
-        container_scroll_main1:new PanelContainerModel({ name: 'container_scroll_main1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['nav_pos1']}),
+        container_scroll_main1:new PanelContainerModel({ name: 'container_scroll_main1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['nav_pos1'] , dataRegionType:INHERIT }),
         gridexpbar:new PanelCtrlPosModel({ name: 'gridexpbar', caption: '表格导航栏', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_left1', panel: this }),
-        container_scroll_left1:new PanelContainerModel({ name: 'container_scroll_left1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'WEST', layoutHeight:0, heightMode:'', layoutWidth:200, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['gridexpbar']}),
-        container_scroll1:new PanelContainerModel({ name: 'container_scroll1', caption: '滚动条容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', 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:['container_scroll_main1','container_scroll_left1']}),
-        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:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'column',vAlign:''}, panel: this , details:['container2','container_scroll1']})
+        container_scroll_left1:new PanelContainerModel({ name: 'container_scroll_left1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'WEST', layoutHeight:0, heightMode:'', layoutWidth:200, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['gridexpbar'] , dataRegionType:INHERIT }),
+        container_scroll1:new PanelContainerModel({ name: 'container_scroll1', caption: '滚动条容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', 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:['container_scroll_main1','container_scroll_left1'] , 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:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'column',vAlign:''}, panel: this , details:['container2','container_scroll1'] , dataRegionType:INHERIT })
     };
 
     /**
@@ -301,6 +301,8 @@ export default class IBIZOrderTestCustomLayoutPanelGridExpViewBase extends Vue {
 
     }
 
+
+
     /**
      * 视图引擎
      *

app_Web/src/pages/sample/ibizorder-usr2-grid-view/ibizorder-usr2-grid-view-base.vue

@@ -342,16 +342,16 @@ export default class IBIZOrderUsr2GridViewBase extends Vue {
      */
     public layoutModelDetails:any = {
         view_pagecaption:new PanelFieldModel({ name: 'view_pagecaption', caption: '页面标题', isShowCaption: false, sysCss: '', itemType: 'FIELD', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'LEFT', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , fieldState: '0', }),
-        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']}),
+        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 }),
         quicksearchbar:new PanelCtrlPosModel({ name: 'quicksearchbar', caption: 'QUICKSEARCHBAR', 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: '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_grid1', panel: this , details:['quicksearchbar']}),
+        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_grid1', panel: this , details:['quicksearchbar'] , 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']}),
-        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','container2','container_2']}),
+        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','container2','container_2'] , dataRegionType:INHERIT }),
         searchform:new PanelCtrlPosModel({ name: 'searchform', caption: 'SEARCHFORM', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:80, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container4', panel: this }),
         grid:new PanelCtrlPosModel({ name: 'grid', caption: 'GRID', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:100, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container4', panel: this }),
-        container4:new PanelContainerModel({ name: 'container4', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:100, heightMode:'PERCENTAGE', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['searchform','grid']}),
-        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:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'column',vAlign:''}, panel: this , details:['container_grid1','container4']})
+        container4:new PanelContainerModel({ name: 'container4', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:100, heightMode:'PERCENTAGE', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['searchform','grid'] , 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:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'column',vAlign:''}, panel: this , details:['container_grid1','container4'] , dataRegionType:INHERIT })
     };
 
     /**
@@ -380,6 +380,8 @@ export default class IBIZOrderUsr2GridViewBase extends Vue {
 
 
 
+
+
     /**
      * 视图引擎
      *

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

@@ -107,6 +107,7 @@ export const PageComponents = {
         Vue.component('ibizorder-usr2-grid-view', () => import('@pages/sample/ibizorder-usr2-grid-view/ibizorder-usr2-grid-view.vue'));
         Vue.component('ibizcustomer-media-test-edit-view', () => import('@pages/sample/ibizcustomer-media-test-edit-view/ibizcustomer-media-test-edit-view.vue'));
         Vue.component('ibizorder-test-custom-layout-panel-grid-exp-view', () => import('@pages/sample/ibizorder-test-custom-layout-panel-grid-exp-view/ibizorder-test-custom-layout-panel-grid-exp-view.vue'));
+        Vue.component('ibizorder-test-cledit-view2', () => import('@pages/sample/ibizorder-test-cledit-view2/ibizorder-test-cledit-view2.vue'));
         Vue.component('ibizappviewgrid-view', () => import('@pages/sample/ibizappviewgrid-view/ibizappviewgrid-view.vue'));
         Vue.component('ibizappviewlist-view', () => import('@pages/sample/ibizappviewlist-view/ibizappviewlist-view.vue'));
         Vue.component('ibizappctrlgrid-view', () => import('@pages/sample/ibizappctrlgrid-view/ibizappctrlgrid-view.vue'));

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

@@ -1664,6 +1664,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/ungroup/app-index-view/app-index-view.vue'),
                 },
+                {
+                    path: 'ibizorders/:ibizorder?/testcleditview2/:testcleditview2?',
+                    meta: {
+                        caption: 'entities.ibizorder.views.testcleditview2.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'ibizorders', parameterName: 'ibizorder' },
+                            { pathName: 'testcleditview2', parameterName: 'testcleditview2' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sample/ibizorder-test-cledit-view2/ibizorder-test-cledit-view2.vue'),
+                },
                 {
                     path: 'ibizappviews/:ibizappview?/gridview/:gridview?',
                     meta: {
@@ -4999,6 +5013,19 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizbookupdate-default-grid-view/ibizbookupdate-default-grid-view.vue'),
     },
+    {
+        path: '/ibizorders/:ibizorder?/testcleditview2/:testcleditview2?',
+        meta: {
+            caption: 'entities.ibizorder.views.testcleditview2.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizorders', parameterName: 'ibizorder' },
+                { pathName: 'testcleditview2', parameterName: 'testcleditview2' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizorder-test-cledit-view2/ibizorder-test-cledit-view2.vue'),
+    },
     {
         path: '/ibizorders/:ibizorder?/treegridexview/:treegridexview?',
         meta: {

app_Web/src/pages/ungroup/app-index-view/app-index-view-base.vue

@@ -284,10 +284,10 @@ export default class AppIndexViewBase extends Vue {
         button_link1:new PanelButtonModel({ name: 'button_link1', caption: '页面链接', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', sysImage:{ iconcls: 'fa fa-dropbox', imagePath:'', rawContent: '' }, visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_main1', panel: this , buttonStyle: 'DEFAULT', iconAlign: '', renderMode: 'LINK', }),
         button_openview1:new PanelButtonModel({ name: 'button_openview1', caption: '打开页面', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_main1', panel: this , buttonStyle: 'DEFAULT', iconAlign: '', renderMode: '', }),
         button_calluilogic1:new PanelButtonModel({ name: 'button_calluilogic1', caption: '按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'INFO', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_main1', panel: this , buttonStyle: 'INFO', iconAlign: '', renderMode: '', }),
-        container_scroll_main1:new PanelContainerModel({ name: 'container_scroll_main1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:80, widthMode:'PERCENTAGE', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['app_apptitle','view_pagecaption','static_label2','static_text1','field_text_dynamic','field_switch','field_textbox','field_qrcode','button_link1','button_openview1','button_calluilogic1']}),
-        container_scroll_left1:new PanelContainerModel({ name: 'container_scroll_left1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'WEST', layoutHeight:0, heightMode:'', layoutWidth:20, widthMode:'PERCENTAGE', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:[]}),
-        container_scroll_header1:new PanelContainerModel({ name: 'container_scroll_header1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'NORTH', layoutHeight:80, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:[]}),
-        container_scroll1:new PanelContainerModel({ name: 'container_scroll1', caption: '滚动条容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container_scroll_main1','container_scroll_left1','container_scroll_header1']})
+        container_scroll_main1:new PanelContainerModel({ name: 'container_scroll_main1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:80, widthMode:'PERCENTAGE', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['app_apptitle','view_pagecaption','static_label2','static_text1','field_text_dynamic','field_switch','field_textbox','field_qrcode','button_link1','button_openview1','button_calluilogic1'] , dataRegionType:INHERIT }),
+        container_scroll_left1:new PanelContainerModel({ name: 'container_scroll_left1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'WEST', layoutHeight:0, heightMode:'', layoutWidth:20, widthMode:'PERCENTAGE', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:[] , dataRegionType:INHERIT }),
+        container_scroll_header1:new PanelContainerModel({ name: 'container_scroll_header1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'NORTH', layoutHeight:80, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:[] , dataRegionType:INHERIT }),
+        container_scroll1:new PanelContainerModel({ name: 'container_scroll1', caption: '滚动条容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container_scroll_main1','container_scroll_left1','container_scroll_header1'] , dataRegionType:INHERIT })
     };
 
     /**
@@ -313,6 +313,86 @@ export default class AppIndexViewBase extends Vue {
 
     }
 
+        /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public layoutpanel_button_link1_click(params: any = {}, tag?: any, $event?: any) {
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this;
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.panel_Usr1102678360_button_link1_click(datas, contextJO,paramJO,  $event, xData,this,undefined);
+    }
+        /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public layoutpanel_button_openview1_click(params: any = {}, tag?: any, $event?: any) {
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this;
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.panel_Usr1102678360_button_openview1_click(datas, contextJO,paramJO,  $event, xData,this,undefined);
+    }
+        /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public layoutpanel_button_calluilogic1_click(params: any = {}, tag?: any, $event?: any) {
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this;
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.panel_Usr1102678360_button_calluilogic1_click(datas, contextJO,paramJO,  $event, xData,this,undefined);
+    }
+
+
 
 
 

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

@@ -2241,6 +2241,19 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizbookupdate-default-grid-view/ibizbookupdate-default-grid-view.vue'),
     },
+    {
+        path: '/ibizorders/:ibizorder?/testcleditview2/:testcleditview2?',
+        meta: {
+            caption: 'entities.ibizorder.views.testcleditview2.caption',
+            info:'',
+            parameters: [
+                { pathName: 'ibizorders', parameterName: 'ibizorder' },
+                { pathName: 'testcleditview2', parameterName: 'testcleditview2' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizorder-test-cledit-view2/ibizorder-test-cledit-view2.vue'),
+    },
     {
         path: '/ibizorders/:ibizorder?/treegridexview/:treegridexview?',
         meta: {

app_Web/src/pages/ungroup/app-login-view/app-login-view-base.vue

@@ -266,8 +266,8 @@ export default class AppLoginViewBase extends Vue {
         auth_verificationcode:new PanelFieldModel({ name: 'auth_verificationcode', caption: '短信验证码', isShowCaption: false, sysCss: '', itemType: 'FIELD', 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: 'container1', panel: this , fieldState: '0', }),
         auth_loginmsg:new PanelFieldModel({ name: 'auth_loginmsg', caption: '登陆校验信息', isShowCaption: false, sysCss: '', itemType: 'FIELD', 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: 'container1', panel: this , fieldState: '0', }),
         auth_sso1:new PanelUserControlModel({ name: 'auth_sso1', caption: '第三方登陆', isShowCaption: true, sysCss: '', itemType: 'USERCONTROL', 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: 'container1', panel: this }),
-        container1:new PanelContainerModel({ name: 'container1', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:600, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'CENTER', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['userid','auth_password','auth_orgpick','auth_loginbutton1','auth_registbutton1','auth_resetinput1','auth_logout1','auth_captcha1','auth_verificationcode','auth_loginmsg','auth_sso1']}),
-        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:100, heightMode:'PERCENTAGE', layoutWidth:100, widthMode:'PERCENTAGE', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container1']})
+        container1:new PanelContainerModel({ name: 'container1', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:600, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'CENTER', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['userid','auth_password','auth_orgpick','auth_loginbutton1','auth_registbutton1','auth_resetinput1','auth_logout1','auth_captcha1','auth_verificationcode','auth_loginmsg','auth_sso1'] , 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:100, heightMode:'PERCENTAGE', layoutWidth:100, widthMode:'PERCENTAGE', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container1'] , dataRegionType:INHERIT })
     };
 
     /**
@@ -293,6 +293,112 @@ export default class AppLoginViewBase extends Vue {
 
     }
 
+        /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public layoutpanel_auth_loginbutton1_click(params: any = {}, tag?: any, $event?: any) {
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this;
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.panel_Usr1102196415_auth_loginbutton1_click(datas, contextJO,paramJO,  $event, xData,this,undefined);
+    }
+        /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public layoutpanel_auth_registbutton1_click(params: any = {}, tag?: any, $event?: any) {
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this;
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.panel_Usr1102196415_auth_registbutton1_click(datas, contextJO,paramJO,  $event, xData,this,undefined);
+    }
+        /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public layoutpanel_auth_resetinput1_click(params: any = {}, tag?: any, $event?: any) {
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this;
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.panel_Usr1102196415_auth_resetinput1_click(datas, contextJO,paramJO,  $event, xData,this,undefined);
+    }
+        /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public layoutpanel_auth_logout1_click(params: any = {}, tag?: any, $event?: any) {
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this;
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.panel_Usr1102196415_auth_logout1_click(datas, contextJO,paramJO,  $event, xData,this,undefined);
+    }
+
+
 
 
     /**

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

@@ -785,6 +785,7 @@ export const viewstate: any = {
                 '7ce3aaf69c0b882631428087b7db6464',
                 '38b0b453d423e0772822db6be4f02505',
                 '2D42F3B7-3267-4276-9120-10F2D81E35AF',
+                'D6D7779F-95C9-48C0-B2E1-ED4C20E5E157',
             ],
         },
         {
@@ -1670,6 +1671,18 @@ export const viewstate: any = {
                 '58e37ccddda10feedac7c809d5cee02a',
             ],
         },
+        {
+            viewtag: 'D6D7779F-95C9-48C0-B2E1-ED4C20E5E157',
+            viewmodule: 'Sample',
+            viewname: 'IBIZOrderTestCLEditView2',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                'f083dd992abed44bf15a9930b45c3895',
+                'b9bb43793e46dd754a82ae6928e5557d',
+                '6bc6e690dc5abfc6d89703e4459c785c',
+            ],
+        },
         {
             viewtag: 'd7f9470512d0d0ad2d4aba7b17e40b05',
             viewmodule: 'Sample',

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

@@ -152,6 +152,7 @@ export default class IBIZOrderUIServiceBase extends UIService {
         this.allViewMap.set(':',{viewname:'ganttview',srfappde:'ibizorders',component:'ibizorder-gantt-view'});
         this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'ibizorders',component:'ibizorder-pickup-grid-view'});
         this.allViewMap.set(':',{viewname:'seditview',srfappde:'ibizorders',component:'ibizorder-sedit-view'});
+        this.allViewMap.set(':',{viewname:'testcleditview2',srfappde:'ibizorders',component:'ibizorder-test-cledit-view2'});
         this.allViewMap.set('WFMDATAVIEW:ODSP:D:30',{viewname:'odsp_d30_wfgridview',srfappde:'ibizorders',component:'ibizorder-odsp-d30-wfgrid-view'});
         this.allViewMap.set(':',{viewname:'treegridexview',srfappde:'ibizorders',component:'ibizorder-tree-grid-ex-view'});
         this.allViewMap.set('EDITVIEW:MSTAG:10',{viewname:'state10editview2',srfappde:'ibizorders',component:'ibizorder-state10-edit-view2'});

app_Web/src/widgets/app/main-menu-appmenu/main-menu-appmenu-base.vue

@@ -925,6 +925,9 @@ export default class MainMenuBase extends Vue implements ControlInterface {
                 case 'AppFunc101': 
                     this.clickAppFunc101(item);
                     return;
+                case 'UsrAppFunc1103768001': 
+                    this.clickUsrAppFunc1103768001(item);
+                    return;
                 default:
                     console.warn('未指定应用功能');
             }
@@ -3434,6 +3437,29 @@ export default class MainMenuBase extends Vue implements ControlInterface {
             this.$router.push(path);
         })
     }
+    
+    /**
+     * 测试编辑视图（左右关系）视图面板
+     *
+     * @param {*} [item={}]
+     * @memberof MainMenu
+     */
+    public clickUsrAppFunc1103768001(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'ibizorders', parameterName: 'ibizorder' },
+            { pathName: 'testcleditview2', parameterName: 'testcleditview2' },
+        ];
+        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
+        if(Object.is(this.$route.fullPath,path)){
+            return;
+        }
+        this.$nextTick(function(){
+            this.$router.push(path);
+        })
+    }
 
     /**
      * 数据加载

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: 'IBIZBOOKGroupByCodelistListView' + (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: 'IBIZBOOKGroupByCodelistListView' + (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/usr2-dataview/usr2-dataview-model.ts

@@ -10,7 +10,7 @@ export default class Usr2Model {
 	 * 获取数据项集合
 	 *
 	 * @returns {any[]}
-	 * @memberof Usr2DataViewMode
+	 * @memberof Usr2Dataviewexpbar_dataviewMode
 	 */
 	public getDataItems(): any[] {
 		return [
@@ -39,17 +39,6 @@ export default class Usr2Model {
 				dataType: 'FONTKEY',
 			},
 
-      {
-        name: 'n_ibizbookname_like',
-        prop: 'n_ibizbookname_like',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_price_gtandeq',
-        prop: 'n_price_gtandeq',
-        dataType: 'QUERYPARAM'
-      },
-
 
       {
         name:'size',

app_Web/src/widgets/ibizorder/default-drbar/default-drbar-base.vue

@@ -3,7 +3,7 @@
         <el-menu
             :mode="menuDir"
             :default-openeds="defaultOpeneds"
-            :default-active="items[0].id"
+            :default-active="selection ? selection.id : ''"
             @select="onSelect"
             @open="onOpen"
             @close="onClose">
@@ -294,10 +294,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
                 }
             });
         }
-        this.$nextTick(() => {
-            this.onSelect(this.items[0].id)
-            this.$emit('selectionchange', [this.items[0]]);
-        });
     }
 
     /**

app_Web/src/widgets/ibizorder/default-drbar/default-drbar.less

-.app-dr-bar {
-    height: 100%;
-    width: 100%;
-    background: white;
-    >.ivu-layout-sider {
-        background: white;
-        border-right: solid 1px #e6e6e6;
-        margin-bottom: 10px;
-        >.ivu-layout-sider-children {
-            overflow: auto;
-            >.el-menu {
-                height: 100%;
-                border-right: solid 0px #e6e6e6;
-            }
-            > .el-menu {
-                margin-top: -1px;
-                border-right: 0;
-                .el-submenu__title i, .el-menu-item i {
-                    font-size: 14px;
-                    width: 14px;
-                }
-                .el-menu-item, .el-submenu__title {
-                    height: 36px;
-                    font-size: 14px;
-                    line-height: 32px;
-                    > img {
-                        height: 18px;
-                        width: 18px;
-                        margin-top: -2px;
-                        margin-right: 5px;
-                    }
-                }
-                .el-menu-item, .el-submenu, .el-menu {
-                    border-top: 1px solid #fff;
-                }
-                .el-menu-item, .el-submenu > .el-submenu__title {
-                    height: 40px;
-                    line-height: 36px;
-                    border-left: 3px solid transparent;
-                    padding-left: 16px !important;
-                }
-                .el-menu-item.is-active {
-                    background: #e9e9e9 !important;
-                    color: #666666 !important;
-                    border-left: 3px solid #3fd5c0;
-                    i {
-                        color: #666666;
-                    }
-                }
-                // .app-menu-icon {
-                //     margin-right: 3px;
-                // }
-                > .el-submenu {
-                    > .el-menu {
-                        > .el-menu-item, > .el-submenu > .el-submenu__title {
-                            padding-left: 38px !important;
-                        }
-                        > .el-submenu {
-                            > .el-menu {
-                                > .el-menu-item, > .el-submenu > .el-submenu__title {
-                                    padding-left: 58px !important;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    >content {
-        height: 100%;
-        .main-data {
-            width: 100%;
-            height: 100%;
-            padding: 0 15px;
-        }
-    }
-}
-
+.app-dr-bar {
+    height: 100%;
+    width: 100%;
+    background: white;
+    > .el-menu {
+        height: 100%;
+        border-right: solid 0px #e6e6e6;
+    }
+    > .el-menu {
+        margin-top: -1px;
+        border-right: 0;
+        .el-submenu__title i,
+        .el-menu-item i {
+            font-size: 14px;
+            width: 14px;
+        }
+        .el-menu-item,
+        .el-submenu__title {
+            height: 36px;
+            font-size: 14px;
+            line-height: 32px;
+            > img {
+                height: 18px;
+                width: 18px;
+                margin-top: -2px;
+                margin-right: 5px;
+            }
+        }
+        .el-menu-item,
+        .el-submenu,
+        .el-menu {
+            border-top: 1px solid #fff;
+        }
+        .el-menu-item,
+        .el-submenu > .el-submenu__title {
+            height: 40px;
+            line-height: 36px;
+            border-left: 3px solid transparent;
+        }
+        .el-menu-item.is-active {
+            background: #e9e9e9 !important;
+            color: #666666 !important;
+            border-left: 3px solid #3fd5c0;
+            i {
+                color: #666666;
+            }
+        }
+        // .app-menu-icon {
+        //     margin-right: 3px;
+        // }
+        > .el-submenu {
+            > .el-menu {
+                > .el-menu-item,
+                > .el-submenu > .el-submenu__title {
+                    padding-left: 38px !important;
+                }
+                > .el-submenu {
+                    > .el-menu {
+                        > .el-menu-item,
+                        > .el-submenu > .el-submenu__title {
+                            padding-left: 58px !important;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
 // this is less

app_Web/src/widgets/ibizorder/sform-form/sform-form-base.vue

@@ -1545,7 +1545,7 @@ export default class SFormBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSEditView3' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderTestCLEditView2' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1580,7 +1580,7 @@ export default class SFormBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {}): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSEditView3' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderTestCLEditView2' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1642,7 +1642,7 @@ export default class SFormBase extends Vue implements ControlInterface {
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSEditView3' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderTestCLEditView2' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1750,7 +1750,7 @@ export default class SFormBase extends Vue implements ControlInterface {
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSEditView3' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderTestCLEditView2' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
@@ -1827,7 +1827,7 @@ export default class SFormBase extends Vue implements ControlInterface {
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSEditView3' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderTestCLEditView2' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

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

@@ -340,7 +340,7 @@
 
 
     <!--输出实体[IBIZORDER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-25-14">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-38-14">
         <createTable tableName="T_IBIZORDER">
                 <column name="TP" remarks="" type="TEXT(1048576)">
                 </column>

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

@@ -37,7 +37,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZORDER]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-25-8" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-38-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>