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

app_Web/src/components/layout-element/structure/app-simpleflex-container/app-simpleflex-container.vue

@@ -110,7 +110,7 @@ export default class AppSimpleFlexContainer extends Vue {
             layoutModel = this.layoutModelDetails[name];
         }
         if (layoutModel) {
-            return layoutModel.getCommonLayoutStyle();
+            return layoutModel.getBoxLayOutStyle();
         }
     }
 

app_Web/src/components/layout-element/structure/app-standard-container/app-standard-container.vue

@@ -143,7 +143,7 @@ export default class AppStandardContainer extends Vue {
             layoutModel = this.layoutModelDetails[name];
         }
         if (layoutModel) {
-            return layoutModel.getCommonLayoutStyle();
+            return layoutModel.getBoxLayOutStyle();
         }
     }
 }

app_Web/src/model/panel-detail/panel-button.ts

@@ -9,22 +9,13 @@ import { PanelDetailModel } from './panel-detail';
  */
 export class PanelButtonModel extends PanelDetailModel {
 
-    constructor(opts: any = {}) {
-        super(opts);
-        this.uiAction = opts.uiAction;
-        this.buttonStyle = opts.buttonStyle;
-        this.renderMode = opts.renderMode;
-        this.iconAlign = opts.iconAlign || 'LEFT';
-        this.disabled = opts.disabled ? true : false;
-    }
-
     /**
      * 按钮对应的界面行为
      *
      * @type {*}
      * @memberof PanelButtonModel
      */
-    public uiAction:any;
+    public uiAction: any;
 
     /**
      * 图标方向
@@ -56,4 +47,74 @@ export class PanelButtonModel extends PanelDetailModel {
      */
     public renderMode: 'BUTTON' | 'LINK';
 
+    /**
+     * 边框样式
+     *
+     * @type {('NONE' | 'SOLID' | 'DOTTED' | 'DASHED' | 'DOUBLE')}
+     * @memberof PanelButtonModel
+     */
+    public borderStyle: 'NONE' | 'SOLID' | 'DOTTED' | 'DASHED' | 'DOUBLE' = 'NONE';
+
+    /**
+     * Creates an instance of PanelButtonModel.
+     * @param {*} [opts={}]
+     * @memberof PanelButtonModel
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+        this.uiAction = opts.uiAction;
+        this.buttonStyle = opts.buttonStyle;
+        this.renderMode = opts.renderMode;
+        this.iconAlign = opts.iconAlign || 'LEFT';
+        this.disabled = opts.disabled ? true : false;
+        this.borderStyle = opts.borderStyle ? opts.borderStyle : 'NONE';
+    }
+
+    /**
+     * 获取元素样式（按钮元素，包含内容盒子 大小/边距/边框 的样式）
+     *
+     * @memberof PanelButtonModel
+     */
+    public getElementStyle() {
+        const elementStyle = {};
+        Object.assign(elementStyle, this.getBoxSizeStyle());
+        Object.assign(elementStyle, this.getBoxSpacingStyle());
+        Object.assign(elementStyle, this.getBoxBorderStyle());
+        Object.assign(elementStyle, this.getBoxSelfAlignStyle());
+        return elementStyle;
+    }
+
+    /**
+     * 获取盒子边框样式（元素）
+     *
+     * @memberof PanelButtonModel
+     */
+    protected getBoxBorderStyle() {
+        const boxStyle = {};
+        if (this.borderStyle !== 'NONE') {
+            switch (this.borderStyle) {
+                // 实线边框
+                case 'SOLID':
+                    Object.assign(boxStyle, { 'border-style': 'solid' });
+                    break;
+                // 点状边框
+                case 'DOTTED':
+                    Object.assign(boxStyle, { 'border-style': 'dotted' });
+                    break;
+                // 虚线边框
+                case 'DASHED':
+                    Object.assign(boxStyle, { 'border-style': 'dashed' });
+                    break;
+                // 双线边框
+                case 'DOUBLE':
+                    Object.assign(boxStyle, { 'border-style': 'double' });
+                    break;
+                default:
+                    console.warn(`${this.borderStyle}暂未支持`);
+                    break;
+            }
+        }
+        return boxStyle;
+    }
+
 }
\ No newline at end of file

app_Web/src/model/panel-detail/panel-detail.ts

@@ -317,7 +317,6 @@ export class PanelDetailModel {
         const elementStyle = {};
         Object.assign(elementStyle, this.getBoxSizeStyle());
         Object.assign(elementStyle, this.getBoxSpacingStyle());
-        Object.assign(elementStyle, this.getBoxContentStyle());
         Object.assign(elementStyle, this.getBoxSelfAlignStyle());
         return elementStyle;
     }
@@ -432,39 +431,7 @@ export class PanelDetailModel {
     }
 
     /**
-     * 获取盒子内容样式（元素，包含内容换行模式，内容水平对齐，内容垂直对齐）
-     *
-     * @memberof PanelDetailModel
-     */
-    protected getBoxContentStyle() {
-        const boxStyle = {};
-        return boxStyle;
-    }
-
-    /**
-     * 获取盒子边框样式（元素）
-     *
-     * @memberof PanelDetailModel
-     */
-    protected getBoxBorderStyle() {
-        const boxStyle = {};
-        return boxStyle;
-    }
-
-    /**
-     * 获取通用布局样式(SAMPLEFLEX/FLEX)（布局，包含约束内容区布局的样式，包含内容区的对齐方式）
-     *
-     * @return {*} 
-     * @memberof PanelDetailModel
-     */
-    public getCommonLayoutStyle() {
-        const layoutStyle = {};
-        Object.assign(layoutStyle, this.getBoxLayOutStyle());
-        return layoutStyle;
-    }
-
-    /**
-     * 获取盒子布局样式(布局)
+     * 获取盒子布局样式(布局,包含约束内容区布局的样式)
      *
      * @memberof PanelDetailModel
      */

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

@@ -310,8 +310,8 @@ export default class IBIZBOOKOptionView_layoutBase extends Vue {
     public layoutItems:any = {
         form:{ name: 'form', type: 'VIEWLAYOUT', caption: '表单', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_main1', panel: this },
         container_scroll_main1:{ name: 'container_scroll_main1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:100, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['form'] , dataRegionType: 'INHERIT' },
-        button_calluilogic2:{ name: 'button_calluilogic2', type: 'VIEWLAYOUT', caption: '确认', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'PRIMARY', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:60, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , buttonStyle: 'PRIMARY', iconAlign: '', predefinedType: 'DATA_SAVECHANGES', renderMode: '', },
-        button_calluilogic1:{ name: 'button_calluilogic1', type: 'VIEWLAYOUT', caption: '取消', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:60, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , buttonStyle: 'DEFAULT', iconAlign: '', predefinedType: 'DATA_CANCELCHANGES', renderMode: '', },
+        button_calluilogic2:{ name: 'button_calluilogic2', type: 'VIEWLAYOUT', caption: '确认', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'PRIMARY', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:60, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , buttonStyle: 'PRIMARY', borderStyle: '', iconAlign: '', predefinedType: 'DATA_SAVECHANGES', renderMode: '', },
+        button_calluilogic1:{ name: 'button_calluilogic1', type: 'VIEWLAYOUT', caption: '取消', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:60, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , buttonStyle: 'DEFAULT', borderStyle: '', iconAlign: '', predefinedType: 'DATA_CANCELCHANGES', renderMode: '', },
         container1:{ name: 'container1', type: 'VIEWLAYOUT', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'CENTER', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', spacingBottom:'INNERMEDIUM', spacingLeft:'', spacingRight:'', spacingTop:'INNERMEDIUM', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'flex-end',dir:'row',vAlign:'center'}, parentName: 'container_scroll_bottom1', panel: this , details:['button_calluilogic2','button_calluilogic1'] , dataRegionType: 'INHERIT' },
         container_scroll_bottom1:{ name: 'container_scroll_bottom1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'SOUTH', layoutHeight:64, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['container1'] , dataRegionType: 'INHERIT' },
         container_scroll1:{ name: 'container_scroll1', type: 'VIEWLAYOUT', 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:0, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container_scroll_main1','container_scroll_bottom1'] , dataRegionType: 'INHERIT' }

app_Web/src/pages/sample/ibizbooktest-cldata-view/ibizbooktest-cldata-view-base.vue

@@ -441,7 +441,7 @@ export default class IBIZBOOKTestCLDataViewBase extends Vue {
         toolbar:{ name: 'toolbar', type: 'VIEWLAYOUT', caption: '工具栏', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'MIDDLE', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container3', panel: this },
         container3:{ name: 'container3', type: 'VIEWLAYOUT', 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:['toolbar'] , dataRegionType: 'INHERIT' },
         container_grid1:{ name: 'container_grid1', type: 'VIEWLAYOUT', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_header1', panel: this , details:['container1','container2','container3'] , dataRegionType: 'INHERIT' },
-        container_scroll_header1:{ name: 'container_scroll_header1', type: 'VIEWLAYOUT', 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_grid1'] , dataRegionType: 'INHERIT' },
+        container_scroll_header1:{ name: 'container_scroll_header1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'NORTH', layoutHeight:50, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['container_grid1'] , dataRegionType: 'INHERIT' },
         container_scroll1:{ name: 'container_scroll1', type: 'VIEWLAYOUT', 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:0, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container_scroll_main1','container_scroll_header1'] , dataRegionType: 'INHERIT' }
     };
     

app_Web/src/pages/sample/ibizorder-test-clchart-view/ibizorder-test-clchart-view-base.vue

 <template>
-    <div class="app-view-layout ibizorder-test-clchart-view" v-loading="isLayoutLoadding" :style="{height: '100%', width: '100%','display': 'flex', 'flex-direction': 'column'}">
+    <div class="app-view-layout ibizorder-test-clchart-view" v-loading="isLayoutLoadding" :style="{height: '100%', width: '100%', overflow: 'auto'}">
         <template v-show="!isLayoutLoadding">
-    <app-standard-container name="page_container" :isMultiContainer="false" :layoutModelDetails="layoutModelDetails">
-        <template #container_grid1>
-    <app-simpleflex-container name="container_grid1" :layoutModelDetails="layoutModelDetails">
-        <template #container1>
-    <app-simpleflex-container name="container1" :layoutModelDetails="layoutModelDetails">
-        <template #view_pagecaption>
-        <app-preset-caption name="view_pagecaption" :layoutModelDetails="layoutModelDetails"> 测试布局面板（图表） </app-preset-caption>
-        </template>
-    </app-simpleflex-container>
-        </template>
-        <template #container2>
-    <app-simpleflex-container name="container2" :layoutModelDetails="layoutModelDetails">
-        <template #quicksearchbar>
-        <app-ctrl-pos name="quicksearchbar" :layoutModelDetails="layoutModelDetails">
-        <i-input v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="订单名称" />
-        </app-ctrl-pos>
-        </template>
-    </app-simpleflex-container>
-        </template>
-        <template #container_2>
-    <app-simpleflex-container name="container_2" :layoutModelDetails="layoutModelDetails">
-        <template #toolbar>
-        <app-ctrl-pos name="toolbar" :layoutModelDetails="layoutModelDetails">
-                <span>部件占位toolbar</span>
-        </app-ctrl-pos>
-        </template>
-    </app-simpleflex-container>
-        </template>
-    </app-simpleflex-container>
-        </template>
-        <template #container_5>
-    <app-standard-container name="container_5" :isMultiContainer="false" :layoutModelDetails="layoutModelDetails">
-        <template #searchform>
-        <app-ctrl-pos name="searchform" :layoutModelDetails="layoutModelDetails">
-        <view_searchform 
-    :viewState="viewState"  
-    :viewparams="viewparams" 
-    :context="context"
-    :viewCtx="viewCtx"
-    :showBusyIndicator="true"
-    loaddraftAction="FilterGetDraft"
-    loadAction="FilterGet"
-
-    name="searchform"  
-    ref='searchform' 
-    @search="searchform_search($event)"  
-    @load="searchform_load($event)"  
-    @save="searchform_save($event)"  
-    @closeview="closeView($event)">
-</view_searchform>
-        </app-ctrl-pos>
-        </template>
+    <app-scroll-container name="container_scroll1" :layoutModelDetails="layoutModelDetails">
+        <template #container_scroll_main1>
+    <app-scroll-container name="container_scroll_main1" :layoutModelDetails="layoutModelDetails">
         <template #chart>
         <app-ctrl-pos name="chart" :layoutModelDetails="layoutModelDetails">
         <view_chart 
@@ -70,9 +21,24 @@
 </view_chart>
         </app-ctrl-pos>
         </template>
-    </app-standard-container>
+    </app-scroll-container>
+        </template>
+        <template #container_scroll_header1>
+    <app-scroll-container name="container_scroll_header1" :layoutModelDetails="layoutModelDetails">
+        <template #container_grid1>
+    <app-simpleflex-container name="container_grid1" :layoutModelDetails="layoutModelDetails">
+        <template #container1>
+    <app-simpleflex-container name="container1" :layoutModelDetails="layoutModelDetails">
+        <template #view_pagecaption>
+        <app-preset-caption name="view_pagecaption" :layoutModelDetails="layoutModelDetails"> 测试布局面板（图表） </app-preset-caption>
+        </template>
+    </app-simpleflex-container>
+        </template>
+    </app-simpleflex-container>
+        </template>
+    </app-scroll-container>
         </template>
-    </app-standard-container>
+    </app-scroll-container>
         </template>
     </div>
 </template>
@@ -312,7 +278,7 @@ export default class IBIZOrderTestCLChartViewBase extends Vue {
      * @public
      * @memberof IBIZOrderTestCLChartViewBase
      */
-    public rootLayoutDetailNames: string[] = [ 'page_container' ];
+    public rootLayoutDetailNames: string[] = [ 'container_scroll1' ];
 
     /**
      * 视图布局面板项模型对象
@@ -321,17 +287,13 @@ export default class IBIZOrderTestCLChartViewBase extends Vue {
      * @memberof IBIZOrderTestCLChartViewBase
      */
     public layoutItems:any = {
-        view_pagecaption:{ name: 'view_pagecaption', type: 'VIEWLAYOUT', 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', predefinedType: 'VIEW_PAGECAPTION', renderMode: 'HEADING1', dataItemName:'', },
-        container1:{ name: 'container1', type: 'VIEWLAYOUT', 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:{ name: 'quicksearchbar', type: 'VIEWLAYOUT', 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:{ name: 'container2', type: 'VIEWLAYOUT', 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:{ name: 'toolbar', type: 'VIEWLAYOUT', 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', type: 'VIEWLAYOUT', 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', type: 'VIEWLAYOUT', 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:{ name: 'searchform', type: 'VIEWLAYOUT', caption: 'SEARCHFORM', 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: 'container_5', panel: this },
-        chart:{ name: 'chart', type: 'VIEWLAYOUT', caption: 'CHART', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:100, heightMode:'PERCENTAGE', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_5', panel: this },
-        container_5:{ name: 'container_5', type: 'VIEWLAYOUT', 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','chart'] , dataRegionType: 'INHERIT' },
-        page_container:{ name: 'page_container', type: 'VIEWLAYOUT', 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','container_5'] , dataRegionType: 'INHERIT' }
+        chart:{ name: 'chart', type: 'VIEWLAYOUT', caption: '图表', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_main1', panel: this },
+        container_scroll_main1:{ name: 'container_scroll_main1', type: 'VIEWLAYOUT', 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:['chart'] , dataRegionType: 'INHERIT' },
+        view_pagecaption:{ name: 'view_pagecaption', type: 'VIEWLAYOUT', 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:'LEFT', vAlignSelf:'MIDDLE', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , fieldState: '0', predefinedType: 'VIEW_PAGECAPTION', renderMode: 'HEADING1', dataItemName:'', },
+        container1:{ name: 'container1', type: 'VIEWLAYOUT', 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:12, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['view_pagecaption'] , dataRegionType: 'INHERIT' },
+        container_grid1:{ name: 'container_grid1', type: 'VIEWLAYOUT', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_header1', panel: this , details:['container1'] , dataRegionType: 'INHERIT' },
+        container_scroll_header1:{ name: 'container_scroll_header1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'NORTH', layoutHeight:50, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['container_grid1'] , dataRegionType: 'INHERIT' },
+        container_scroll1:{ name: 'container_scroll1', type: 'VIEWLAYOUT', 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:0, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container_scroll_main1','container_scroll_header1'] , dataRegionType: 'INHERIT' }
     };
     
     /**

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

@@ -299,17 +299,17 @@ export default class AppIndexViewBase extends Vue {
         field_textbox2:{ name: 'field_textbox2', type: 'VIEWLAYOUT', 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', predefinedType: 'FIELD_TEXTBOX', dataItemName:'', },
         field_textbox3:{ name: 'field_textbox3', type: 'VIEWLAYOUT', 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', predefinedType: 'FIELD_TEXTBOX', dataItemName:'', },
         field_qrcode:{ name: 'field_qrcode', type: 'VIEWLAYOUT', 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', predefinedType: 'FIELD_QRCODE', dataItemName:'', },
-        button_link1:{ name: 'button_link1', type: 'VIEWLAYOUT', caption: '页面链接', isShowCaption: true, sysCss: '', itemType: 'BUTTON', 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 , buttonStyle: 'DEFAULT', iconAlign: '', renderMode: 'LINK', },
-        button_openview:{ name: 'button_openview', type: 'VIEWLAYOUT', caption: '打开页面', isShowCaption: true, sysCss: '', itemType: 'BUTTON', 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 , buttonStyle: 'DEFAULT', iconAlign: '', renderMode: '', },
-        button_calluilogic1:{ name: 'button_calluilogic1', type: 'VIEWLAYOUT', caption: '无处理按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DANGER', visible: false, disabled: false, layout:'', layoutPos:'', layoutHeight:60, heightMode:'PX', layoutWidth:120, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'CENTER', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , buttonStyle: 'DANGER', iconAlign: '', renderMode: '', },
-        button_calluilogic2:{ name: 'button_calluilogic2', type: 'VIEWLAYOUT', caption: '界面行为按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'INFO', 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 , buttonStyle: 'INFO', iconAlign: '', renderMode: '', },
-        button_calluilogic3:{ name: 'button_calluilogic3', type: 'VIEWLAYOUT', caption: '实体视图按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'PRIMARY', 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 , buttonStyle: 'PRIMARY', iconAlign: '', renderMode: '', },
-        button_calluilogic5:{ name: 'button_calluilogic5', type: 'VIEWLAYOUT', caption: '建立数据按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'SUCCESS', 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 , buttonStyle: 'SUCCESS', iconAlign: '', predefinedType: 'DATA_CREATEOBJECT', renderMode: '', },
-        button_calluilogic6:{ name: 'button_calluilogic6', type: 'VIEWLAYOUT', caption: '保存变更按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'WARNING', 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 , buttonStyle: 'WARNING', iconAlign: '', predefinedType: 'DATA_SAVECHANGES', renderMode: '', },
-        button_calluilogic8:{ name: 'button_calluilogic8', type: 'VIEWLAYOUT', caption: '删除数据按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'PRIMARY', 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 , buttonStyle: 'PRIMARY', iconAlign: '', predefinedType: 'DATA_REMOVEOBJECT', renderMode: '', },
-        button_calluilogic9:{ name: 'button_calluilogic9', type: 'VIEWLAYOUT', caption: '同步数据按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'INVERSE', 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 , buttonStyle: 'INVERSE', iconAlign: '', predefinedType: 'DATA_SYNCHRONIZE', renderMode: '', },
-        button_calluilogic10:{ name: 'button_calluilogic10', type: 'VIEWLAYOUT', caption: '自定义按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DANGER', 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 , buttonStyle: 'DANGER', iconAlign: '', renderMode: '', },
-        open_yuque:{ name: 'open_yuque', type: 'VIEWLAYOUT', caption: '语雀文档', isShowCaption: true, sysCss: '', itemType: 'BUTTON', 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 , buttonStyle: 'DEFAULT', iconAlign: '', renderMode: '', },
+        button_link1:{ name: 'button_link1', type: 'VIEWLAYOUT', caption: '页面链接', isShowCaption: true, sysCss: '', itemType: 'BUTTON', 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 , buttonStyle: 'DEFAULT', borderStyle: '', iconAlign: '', renderMode: 'LINK', },
+        button_openview:{ name: 'button_openview', type: 'VIEWLAYOUT', caption: '打开页面', isShowCaption: true, sysCss: '', itemType: 'BUTTON', 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 , buttonStyle: 'DEFAULT', borderStyle: '', iconAlign: '', renderMode: '', },
+        button_calluilogic1:{ name: 'button_calluilogic1', type: 'VIEWLAYOUT', caption: '无处理按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DANGER', visible: false, disabled: false, layout:'', layoutPos:'', layoutHeight:60, heightMode:'PX', layoutWidth:120, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'CENTER', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , buttonStyle: 'DANGER', borderStyle: 'DASHED', iconAlign: '', renderMode: '', },
+        button_calluilogic2:{ name: 'button_calluilogic2', type: 'VIEWLAYOUT', caption: '界面行为按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'INFO', 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 , buttonStyle: 'INFO', borderStyle: '', iconAlign: '', renderMode: '', },
+        button_calluilogic3:{ name: 'button_calluilogic3', type: 'VIEWLAYOUT', caption: '实体视图按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'PRIMARY', 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 , buttonStyle: 'PRIMARY', borderStyle: '', iconAlign: '', renderMode: '', },
+        button_calluilogic5:{ name: 'button_calluilogic5', type: 'VIEWLAYOUT', caption: '建立数据按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'SUCCESS', 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 , buttonStyle: 'SUCCESS', borderStyle: '', iconAlign: '', predefinedType: 'DATA_CREATEOBJECT', renderMode: '', },
+        button_calluilogic6:{ name: 'button_calluilogic6', type: 'VIEWLAYOUT', caption: '保存变更按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'WARNING', 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 , buttonStyle: 'WARNING', borderStyle: '', iconAlign: '', predefinedType: 'DATA_SAVECHANGES', renderMode: '', },
+        button_calluilogic8:{ name: 'button_calluilogic8', type: 'VIEWLAYOUT', caption: '删除数据按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'PRIMARY', 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 , buttonStyle: 'PRIMARY', borderStyle: '', iconAlign: '', predefinedType: 'DATA_REMOVEOBJECT', renderMode: '', },
+        button_calluilogic9:{ name: 'button_calluilogic9', type: 'VIEWLAYOUT', caption: '同步数据按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'INVERSE', 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 , buttonStyle: 'INVERSE', borderStyle: '', iconAlign: '', predefinedType: 'DATA_SYNCHRONIZE', renderMode: '', },
+        button_calluilogic10:{ name: 'button_calluilogic10', type: 'VIEWLAYOUT', caption: '自定义按钮', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DANGER', 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 , buttonStyle: 'DANGER', borderStyle: '', iconAlign: '', renderMode: '', },
+        open_yuque:{ name: 'open_yuque', type: 'VIEWLAYOUT', caption: '语雀文档', isShowCaption: true, sysCss: '', itemType: 'BUTTON', 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 , buttonStyle: 'DEFAULT', borderStyle: '', iconAlign: '', renderMode: '', },
         container1:{ name: 'container1', type: 'VIEWLAYOUT', 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:['app_apptitle','view_pagecaption','static_label1','static_text1','field_text_dynamic','field_switch','field_textbox','field_textbox1','field_textbox2','field_textbox3','field_qrcode','button_link1','button_openview','button_calluilogic1','button_calluilogic2','button_calluilogic3','button_calluilogic5','button_calluilogic6','button_calluilogic8','button_calluilogic9','button_calluilogic10','open_yuque'] , dataRegionType: 'INHERIT' }
     };
     

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

@@ -268,14 +268,14 @@ export default class AppLoginViewBase extends Vue {
         auth_orgpick:{ name: 'auth_orgpick', type: 'VIEWLAYOUT', 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', predefinedType: 'AUTH_ORGPICK', dataItemName:'', },
         userid:{ name: 'userid', type: 'VIEWLAYOUT', caption: '用户名', isShowCaption: false, sysCss: 'greenToolBar', 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', predefinedType: 'AUTH_USERID', dataItemName:'username', },
         auth_password:{ name: 'auth_password', type: 'VIEWLAYOUT', 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', predefinedType: 'AUTH_PASSWORD', dataItemName:'', },
-        auth_loginbutton1:{ name: 'auth_loginbutton1', type: 'VIEWLAYOUT', caption: '登陆', isShowCaption: true, sysCss: 'deepskyblueToolBar', itemType: 'BUTTON', itemStyle: 'PRIMARY', sysImage:{ iconcls: 'fa fa-refresh', imagePath:'', rawContent: '' }, visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:175, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'CENTER', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this , buttonStyle: 'PRIMARY', iconAlign: '', predefinedType: 'APP_LOGIN', renderMode: '', },
-        auth_resetinput1:{ name: 'auth_resetinput1', type: 'VIEWLAYOUT', caption: '重置', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:175, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'CENTER', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this , buttonStyle: 'DEFAULT', iconAlign: '', predefinedType: 'DATA_CANCELCHANGES', renderMode: '', },
+        auth_loginbutton1:{ name: 'auth_loginbutton1', type: 'VIEWLAYOUT', caption: '登陆', isShowCaption: true, sysCss: 'deepskyblueToolBar', itemType: 'BUTTON', itemStyle: 'PRIMARY', sysImage:{ iconcls: 'fa fa-refresh', imagePath:'', rawContent: '' }, visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:175, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'CENTER', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this , buttonStyle: 'PRIMARY', borderStyle: '', iconAlign: '', predefinedType: 'APP_LOGIN', renderMode: '', },
+        auth_resetinput1:{ name: 'auth_resetinput1', type: 'VIEWLAYOUT', caption: '重置', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:175, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'CENTER', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this , buttonStyle: 'DEFAULT', borderStyle: '', iconAlign: '', predefinedType: 'DATA_CANCELCHANGES', renderMode: '', },
         container2:{ name: 'container2', type: 'VIEWLAYOUT', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:100, widthMode:'PERCENTAGE', spacingBottom:'OUTERLARGE', spacingLeft:'', spacingRight:'', spacingTop:'OUTERLARGE', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'space-around',dir:'row',vAlign:'center'}, parentName: 'container1', panel: this , details:['auth_loginbutton1','auth_resetinput1'] , dataRegionType: 'INHERIT' },
         auth_loginmsg:{ name: 'auth_loginmsg', type: 'VIEWLAYOUT', 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', predefinedType: 'AUTH_LOGINMSG', renderMode: '', dataItemName:'', },
         auth_captcha1:{ name: 'auth_captcha1', type: 'VIEWLAYOUT', 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 },
         auth_verificationcode:{ name: 'auth_verificationcode', type: 'VIEWLAYOUT', 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', predefinedType: 'AUTH_VERIFICATIONCODE', dataItemName:'', },
         auth_sso1:{ name: 'auth_sso1', type: 'VIEWLAYOUT', 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 },
-        auth_logout1:{ name: 'auth_logout1', type: 'VIEWLAYOUT', caption: '登出', isShowCaption: true, sysCss: '', itemType: 'BUTTON', 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 , buttonStyle: 'DEFAULT', iconAlign: '', predefinedType: 'APP_LOGOUT', renderMode: '', },
+        auth_logout1:{ name: 'auth_logout1', type: 'VIEWLAYOUT', caption: '登出', isShowCaption: true, sysCss: '', itemType: 'BUTTON', 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 , buttonStyle: 'DEFAULT', borderStyle: '', iconAlign: '', predefinedType: 'APP_LOGOUT', renderMode: '', },
         container1:{ name: 'container1', type: 'VIEWLAYOUT', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:600, heightMode:'PX', layoutWidth:450, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'CENTER', vAlignSelf:'MIDDLE', flexGrow:-1, flexParams:{align:'',dir:'column',vAlign:''}, parentName: 'page_container', panel: this , details:['auth_orgpick','userid','auth_password','container2','auth_loginmsg','auth_captcha1','auth_verificationcode','auth_sso1','auth_logout1'] , dataRegionType: 'INHERIT' },
         page_container:{ name: 'page_container', type: 'VIEWLAYOUT', caption: '图片背景容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', sysImage:{ iconcls: '', imagePath:'/assets/img/login_bg.png', rawContent: '' }, 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' }
     };

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

@@ -598,7 +598,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: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -634,7 +634,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: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

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

@@ -671,7 +671,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: 'IBIZBOOKUsr8GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -707,7 +707,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: 'IBIZBOOKUsr8GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

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

@@ -629,7 +629,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 };
@@ -665,7 +665,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/ibizbook/usr4-dataview/usr4-dataview-base.vue

@@ -657,7 +657,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, isReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -736,7 +736,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -845,7 +845,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -853,7 +853,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-model.ts

@@ -69,11 +69,6 @@ export default class Usr4Model {
         prop: 'n_ibizbookname_like',
         dataType: 'QUERYPARAM'
       },
-      {
-        name: 'n_price_gtandeq',
-        prop: 'n_price_gtandeq',
-        dataType: 'QUERYPARAM'
-      },
 
 
       {

app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue

@@ -299,7 +299,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZOrderSF1GridViewBase
+     * @memberof IBIZOrderPickupGridViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -421,20 +421,6 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
-    /**
-     * 打开新建数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public newdata: any;
-    /**
-     * 打开编辑数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -967,7 +953,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -1062,7 +1048,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1168,7 +1154,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2085,7 +2071,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -2093,7 +2079,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){
@@ -2160,7 +2146,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

app_Web/src/widgets/ibizorder/main-grid/main-grid-model.ts

@@ -104,21 +104,6 @@ export default class MainModel {
         prop: 'n_ibizordername_like',
         dataType: 'QUERYPARAM'
       },
-      {
-        name: 'n_orderstate_eq',
-        prop: 'n_orderstate_eq',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_ordertime_gt',
-        prop: 'n_ordertime_gt',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_ordertime_lt',
-        prop: 'n_ordertime_lt',
-        dataType: 'QUERYPARAM'
-      },
 
         {
           name:'size',

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

@@ -408,10 +408,10 @@
     "getAllPSPanelFields" : [ {
       "id" : "view_pagecaption"
     } ],
-    "codeName" : "TestCLChartView",
+    "codeName" : "Layoutpanel",
     "controlType" : "VIEWLAYOUTPANEL",
-    "layoutMode" : "FLEX",
-    "logicName" : "测试布局面板（图表）布局面板",
+    "layoutMode" : "TABLE_24COL",
+    "logicName" : "图表视图",
     "name" : "layoutpanel",
     "getPSAppDataEntity" : {
       "modelref" : true,
@@ -419,166 +419,117 @@
     },
     "getPSControlParam" : { },
     "getPSLayout" : {
-      "layout" : "FLEX"
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
     },
     "getRootPSPanelItems" : [ {
-      "caption" : "容器",
+      "caption" : "滚动条容器",
       "itemStyle" : "DEFAULT",
       "itemType" : "CONTAINER",
-      "name" : "page_container",
+      "name" : "container_scroll1",
       "getPSLayout" : {
-        "dir" : "column",
-        "layout" : "FLEX"
+        "layout" : "BORDER"
       },
       "getPSLayoutPos" : {
-        "grow" : -1,
-        "layout" : "FLEX"
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
       },
       "getPSPanelItems" : [ {
-        "caption" : "栅格容器",
+        "caption" : "面板容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container_grid1",
+        "name" : "container_scroll_main1",
         "getPSLayout" : {
-          "layout" : "SIMPLEFLEX"
+          "layout" : "BORDER"
         },
         "getPSLayoutPos" : {
-          "grow" : -1,
-          "layout" : "FLEX"
+          "layout" : "BORDER",
+          "layoutPos" : "CENTER"
         },
         "getPSPanelItems" : [ {
-          "caption" : "面板容器",
+          "caption" : "图表",
           "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container1",
-          "getPSLayout" : {
-            "layout" : "SIMPLEFLEX"
-          },
+          "itemType" : "CTRLPOS",
+          "name" : "chart",
           "getPSLayoutPos" : {
-            "grow" : 6,
-            "layout" : "SIMPLEFLEX"
+            "heightMode" : "FULL",
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER",
+            "widthMode" : "FULL"
           },
-          "getPSPanelItems" : [ {
-            "caption" : "页面标题",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "FIELD",
-            "name" : "view_pagecaption",
-            "getPSEditor" : {
-              "editorType" : "SPAN",
-              "name" : "view_pagecaption",
-              "predefinedType" : "VIEW_PAGECAPTION",
-              "renderMode" : "HEADING1",
-              "enableLinkView" : false
-            },
-            "getPSLayoutPos" : {
-              "grow" : -1,
-              "hAlignSelf" : "LEFT",
-              "heightMode" : "FULL",
-              "layout" : "SIMPLEFLEX",
-              "widthMode" : "FULL"
-            },
-            "hidden" : false,
-            "showCaption" : false
-          } ]
-        }, {
-          "caption" : "面板容器",
+          "showCaption" : true
+        } ],
+        "showCaption" : true
+      }, {
+        "caption" : "面板容器",
+        "contentHeight" : 50.0,
+        "height" : 50.0,
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container_scroll_header1",
+        "getPSLayout" : {
+          "layout" : "BORDER"
+        },
+        "getPSLayoutPos" : {
+          "height" : 50,
+          "heightMode" : "PX",
+          "layout" : "BORDER",
+          "layoutPos" : "NORTH"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "栅格容器",
           "itemStyle" : "DEFAULT",
           "itemType" : "CONTAINER",
-          "name" : "container2",
+          "name" : "container_grid1",
           "getPSLayout" : {
             "layout" : "SIMPLEFLEX"
           },
           "getPSLayoutPos" : {
-            "grow" : 3,
-            "layout" : "SIMPLEFLEX"
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER"
           },
           "getPSPanelItems" : [ {
-            "caption" : "QUICKSEARCHBAR",
+            "caption" : "面板容器",
             "itemStyle" : "DEFAULT",
-            "itemType" : "CTRLPOS",
-            "name" : "quicksearchbar",
-            "getPSLayoutPos" : {
-              "grow" : -1,
-              "hAlignSelf" : "RIGHT",
-              "heightMode" : "FULL",
+            "itemType" : "CONTAINER",
+            "name" : "container1",
+            "getPSLayout" : {
               "layout" : "SIMPLEFLEX"
             },
-            "showCaption" : true
-          } ]
-        }, {
-          "caption" : "容器",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container_2",
-          "getPSLayout" : {
-            "layout" : "SIMPLEFLEX"
-          },
-          "getPSLayoutPos" : {
-            "grow" : -1,
-            "layout" : "SIMPLEFLEX"
-          },
-          "getPSPanelItems" : [ {
-            "caption" : "TOOLBAR",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "CTRLPOS",
-            "name" : "toolbar",
             "getPSLayoutPos" : {
-              "grow" : -1,
-              "hAlignSelf" : "RIGHT",
-              "heightMode" : "FULL",
+              "grow" : 12,
               "layout" : "SIMPLEFLEX"
             },
-            "showCaption" : true
+            "getPSPanelItems" : [ {
+              "caption" : "页面标题",
+              "itemStyle" : "DEFAULT",
+              "itemType" : "FIELD",
+              "name" : "view_pagecaption",
+              "getPSEditor" : {
+                "editorType" : "SPAN",
+                "name" : "view_pagecaption",
+                "predefinedType" : "VIEW_PAGECAPTION",
+                "renderMode" : "HEADING1",
+                "enableLinkView" : false
+              },
+              "getPSLayoutPos" : {
+                "grow" : -1,
+                "hAlignSelf" : "LEFT",
+                "layout" : "SIMPLEFLEX",
+                "vAlignSelf" : "MIDDLE"
+              },
+              "hidden" : false,
+              "showCaption" : false
+            } ]
           } ]
-        } ]
-      }, {
-        "caption" : "容器",
-        "contentHeight" : 100.0,
-        "height" : 100.0,
-        "itemStyle" : "DEFAULT",
-        "itemType" : "CONTAINER",
-        "name" : "container_5",
-        "getPSLayout" : {
-          "layout" : "FLEX"
-        },
-        "getPSLayoutPos" : {
-          "grow" : -1,
-          "height" : 100,
-          "heightMode" : "PERCENTAGE",
-          "layout" : "FLEX"
-        },
-        "getPSPanelItems" : [ {
-          "caption" : "SEARCHFORM",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CTRLPOS",
-          "name" : "searchform",
-          "getPSLayoutPos" : {
-            "grow" : -1,
-            "heightMode" : "FULL",
-            "layout" : "FLEX"
-          },
-          "showCaption" : true
-        }, {
-          "caption" : "CHART",
-          "contentHeight" : 100.0,
-          "height" : 100.0,
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CTRLPOS",
-          "name" : "chart",
-          "getPSLayoutPos" : {
-            "grow" : -1,
-            "height" : 100,
-            "heightMode" : "PERCENTAGE",
-            "layout" : "FLEX"
-          },
-          "showCaption" : true
-        } ]
+        } ],
+        "showCaption" : true
       } ]
     } ],
-    "layoutBodyOnly" : false,
+    "layoutBodyOnly" : true,
     "layoutPanel" : true,
     "useDefaultLayout" : false,
-    "modelid" : "644DA5CC-C900-4A39-A63F-45A6A153EF2C",
+    "modelid" : "77A3FD74-8CD9-4902-A5BD-4CE979A77938",
     "modeltype" : "PSSYSVIEWLAYOUTPANEL"
   },
   "title" : "测试布局面板（图表）",

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

@@ -340,7 +340,7 @@
 
 
     <!--输出实体[IBIZORDER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-531-14">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-535-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-531-8" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-535-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>