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

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

@@ -312,7 +312,7 @@ export default class IBIZBOOKOptionView_layoutBase extends Vue {
         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: '', },
-        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:'', spacingLeft:'', spacingRight:'', spacingTop:'', 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' },
+        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:'INNERLARGE', spacingLeft:'', spacingRight:'', spacingTop:'INNERLARGE', 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:80, 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/ibizsample0003-stab-exp-view-layout/ibizsample0003-stab-exp-view-layout-base.vue

@@ -2,6 +2,44 @@
 <template>
     <div class="app-view-layout ibizsample0003-stab-exp-view-layout" v-loading="isLayoutLoadding" :style="{height: '100%', width: '100%', overflow: 'auto'}">
         <template v-show="!isLayoutLoadding">
+    <app-scroll-container name="container_scroll1" :layoutModelDetails="layoutModelDetails">
+        <template #container_scroll_main1>
+    <app-scroll-container name="container_scroll_main1" :layoutModelDetails="layoutModelDetails">
+        <template #tabexppanel>
+        <app-ctrl-pos name="tabexppanel" :layoutModelDetails="layoutModelDetails">
+        <view_tabexppanel 
+    :viewState="viewState"  
+    :viewparams="viewparams" 
+    :context="context"
+    :viewCtx="viewCtx"
+    name="tabexppanel"  
+    ref='tabexppanel' 
+    @closeview="closeView($event)">
+</view_tabexppanel>
+        </app-ctrl-pos>
+        </template>
+    </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"> 示例实体03 </app-preset-caption>
+        </template>
+    </app-simpleflex-container>
+        </template>
+        <template #container2>
+    <app-simpleflex-container name="container2" :layoutModelDetails="layoutModelDetails">
+    </app-simpleflex-container>
+        </template>
+    </app-simpleflex-container>
+        </template>
+    </app-scroll-container>
+        </template>
+    </app-scroll-container>
         </template>
     </div>
 </template>
@@ -235,7 +273,7 @@ export default class IBIZSample0003STabExpView_layoutBase extends Vue {
      * @public
      * @memberof IBIZSample0003STabExpView_layoutBase
      */
-    public rootLayoutDetailNames: string[] = [ ];
+    public rootLayoutDetailNames: string[] = [ 'container_scroll1' ];
 
     /**
      * 视图布局面板项模型对象
@@ -244,6 +282,14 @@ export default class IBIZSample0003STabExpView_layoutBase extends Vue {
      * @memberof IBIZSample0003STabExpView_layoutBase
      */
     public layoutItems:any = {
+        tabexppanel:{ name: 'tabexppanel', type: 'VIEWLAYOUT', caption: 'TABEXPPANEL部件', 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_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:['tabexppanel'] , 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', 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:3, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['view_pagecaption'] , dataRegionType: 'INHERIT' },
+        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:9, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:[] , 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'] , 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/uiservice/ibizbook/form-load-ui-logic-base.ts

+import { UIActionContext } from "@/logic/ui-logic";
+import { LogicReturnType } from "@/logic/const/logic-return-type";
+import { UILogicParamType } from "@/logic/const/ui-logic-param-type";
+import { Util } from "@/utils";
+import { AppMessageBox } from "@/utils/app-message-box/app-message-box";
+import { Subject } from "rxjs";
+/**
+ * 表单加载
+ *
+ * @export
+ * @class FormLoadUILogicBase
+ */
+export default class FormLoadUILogicBase {
+
+    /**
+     * Creates an instance of  FormLoadBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof FormLoadUILogicBase
+     */
+    constructor(opts: any = {}) { }
+
+    /**
+     * 逻辑参数
+     *
+     * @protected
+     * @type {any[]}
+     * @memberof FormLoadUILogicBase
+     */
+    protected logicParams: any[] = [
+        {
+            name: '当前表单',
+            codeName: 'form',
+            ctrlParam: true,
+        },
+        {
+            name: '传入变量',
+            codeName: 'Default',
+            default: true,
+            entityParam: true,
+        },
+        {
+            name: '当前视图',
+            codeName: 'view',
+            activeViewParam: true,
+        },
+    ];
+
+    /**
+     * 执行前
+     *
+     * @param {*} args
+     * @param {*} [context={}]
+     * @param {*} [params={}]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @param {*} [actioncontext]
+     * @param {string} [srfParentDeName]
+     * @return {*} 
+     * @memberof FormLoadUILogicBase
+     */
+    public beforeExecute(args: any, context: any = {}, params: any = {},
+        $event?: any, xData?: any, actioncontext?: any, srfParentDeName?: string) {
+        return new UIActionContext(this.logicParams, args, context, params, $event, xData, actioncontext, srfParentDeName)
+    }
+
+    /**
+     * 执行
+     *
+     * @param {any[]} args
+     * @param {*} [context={}]
+     * @param {*} [params={}]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @param {*} [actionContext]
+     * @param {string} [srfParentDeName]
+     * @memberof FormLoadUILogicBase
+     */
+    async execute(args: any[], context:any = {} ,params: any = {}, $event?: any, xData?: any, actioncontext?: any, srfParentDeName?: string) {
+        try {
+            const actionContext = this.beforeExecute(args, context, params, $event, xData, actioncontext, srfParentDeName);
+            await this.execute_begin_node(actionContext);
+            return actionContext.getResult();
+        } catch (error: any) {
+            throw new Error(`${error && error.message ? error.message : '发生未知错误！'}`);
+        }
+    }
+
+    /**
+     * 开始
+     *
+     * @param {UIActionContext} actionContext 界面逻辑上下文
+     * @memberof FormLoadUILogicBase
+     */
+    protected async execute_begin_node(actionContext: UIActionContext) {
+        actionContext.setResult(actionContext.defaultParam.getReal());
+        console.log('已完成执行 开始 节点');
+    }
+    
+    /**
+     * 绑定参数
+     *
+     * @param {UIActionContext} actionContext 界面逻辑上下文
+     * @memberof FormLoadUILogicBase
+     */
+    protected async execute_bindparam1_node(actionContext: UIActionContext) {
+        try {
+            //  源数据
+            const srcParam = actionContext.getParam('view');
+            //  目标数据
+            const dstParam = actionContext.getParam('form');
+            //  源属性
+            const srcFieldName: string = '';
+            if (srcFieldName) {
+                dstParam.bind(srcParam.get(srcFieldName));
+            } else {
+                dstParam.bind(srcParam.getReal());
+            }
+            actionContext.bindLastReturnParam(null);
+        } catch (error: any) {
+            throw new Error(`逻辑参数当前表单 ${error && error.message ? error.message : '发生未知错误!'}`);
+        }
+        console.log('已完成执行 绑定参数 节点');
+    }
+    
+
+}
\ No newline at end of file

app_Web/src/uiservice/ibizbook/form-load-ui-logic.ts

+import { Http,Util } from '@/utils';
+import FormLoadUILogicBase from './form-load-ui-logic-base';
+
+/**
+ * 表单加载
+ *
+ * @export
+ * @class FormLoadUILogic
+ */
+export default class FormLoadUILogic extends FormLoadUILogicBase {
+
+    /**
+     * 表单加载 逻辑实例对象
+     *
+     * @private
+     * @static
+     * @type {FormLoadUILogic}
+     * @memberof FormLoadUILogic
+     */
+    private static instance: FormLoadUILogic;
+
+    /**
+     * 获取 表单加载 逻辑实例对象
+     *
+     * @static
+     * @return {*}  {FormLoadUILogic}
+     * @memberof FormLoadUILogic
+     */
+    static getInstance(): FormLoadUILogic {
+        if (!this.instance) {
+            this.instance = new FormLoadUILogic();
+        }
+        return this.instance;
+    }
+
+    /**
+     * Creates an instance of  FormLoadUILogic
+     * 
+     * @param {*} [opts={}]
+     * @memberof  FormLoadUILogic
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+}
\ No newline at end of file

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

@@ -4,6 +4,7 @@ import UIService from '../ui-service';
 import { Subject } from 'rxjs';
 import IBIZBOOKService from '@/service/ibizbook/ibizbook-service';
 import IBIZBOOKAuthService from '@/authservice/ibizbook/ibizbook-auth-service';
+import FormLoadUILogic from './form-load-ui-logic';
 import GridLoadUILogic from './grid-load-ui-logic';
 
 /**
@@ -584,6 +585,9 @@ export default class IBIZBOOKUIServiceBase extends UIService {
      * @memberof UIService
      */
     public executeUILogic(name: string, args: any[], context?: any, params?: any, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string | undefined): void {
+        if (name === 'FormLoad') {
+            FormLoadUILogic.getInstance().execute(args, context, params, $event, xData, actionContext, srfParentDeName);
+        }
         if (name === 'GridLoad') {
             GridLoadUILogic.getInstance().execute(args, context, params, $event, xData, actionContext, srfParentDeName);
         }

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: 'IBIZBOOKCustomView_layout' + (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 };
@@ -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: 'IBIZBOOKCustomView_layout' + (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/main-form/main-form-base.vue

@@ -1808,7 +1808,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1843,7 +1843,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {}): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1905,7 +1905,7 @@ export default class MainBase 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: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -2013,7 +2013,7 @@ export default class MainBase 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: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
@@ -2090,7 +2090,7 @@ export default class MainBase 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: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];
@@ -2507,4 +2507,5 @@ export default class MainBase extends Vue implements ControlInterface {
 
 <style lang='less'>
 @import './main-form.less';
+</style>import './main-form.less';
 </style>
\ No newline at end of file

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: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (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: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (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: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (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: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (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: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (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: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (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,6 +69,11 @@ 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/PSAPPDATAENTITIES/IBIZBOOK.json

@@ -2054,6 +2054,50 @@
     "id" : "toolbar_CustomView_layouttoolbar_deuiaction1_click@IBIZBOOK"
   } ],
   "getAllPSAppDEUILogics" : [ {
+    "codeName" : "FormLoad",
+    "defaultParamName" : "Default",
+    "logicName" : "表单加载",
+    "name" : "表单加载",
+    "getPSDEUILogicNodes" : [ {
+      "codeName" : "Begin",
+      "logicNodeType" : "BEGIN",
+      "name" : "开始",
+      "parallelOutput" : true
+    }, {
+      "codeName" : "BINDPARAM1",
+      "getDstPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "form"
+      },
+      "logicNodeType" : "BINDPARAM",
+      "name" : "绑定参数",
+      "getSrcPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "view"
+      }
+    } ],
+    "getPSDEUILogicParams" : [ {
+      "codeName" : "form",
+      "logicName" : "当前表单",
+      "name" : "当前表单",
+      "ctrlParam" : true
+    }, {
+      "codeName" : "Default",
+      "logicName" : "传入变量",
+      "name" : "传入变量",
+      "default" : true,
+      "entityParam" : true
+    }, {
+      "codeName" : "view",
+      "logicName" : "当前视图",
+      "name" : "当前视图",
+      "activeViewParam" : true
+    } ],
+    "getStartPSDEUILogicNode" : {
+      "modelref" : true,
+      "id" : "Begin"
+    }
+  }, {
     "codeName" : "GridLoad",
     "defaultParamName" : "Default",
     "logicName" : "表格加载",

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

@@ -1179,6 +1179,8 @@
             "heightMode" : "FULL",
             "layout" : "BORDER",
             "layoutPos" : "CENTER",
+            "spacingBottom" : "INNERLARGE",
+            "spacingTop" : "INNERLARGE",
             "widthMode" : "FULL"
           },
           "getPSPanelItems" : [ {

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

@@ -979,6 +979,9 @@
   "getPSDEViewCodeName" : "STabExpView_layout",
   "getPSDEViewId" : "56B4E537-B83E-4643-8466-7E9BE592874D",
   "getPSViewLayoutPanel" : {
+    "getAllPSPanelFields" : [ {
+      "id" : "view_pagecaption"
+    } ],
     "codeName" : "Layoutpanel",
     "controlType" : "VIEWLAYOUTPANEL",
     "layoutMode" : "TABLE_24COL",
@@ -993,6 +996,120 @@
       "columnCount" : 24,
       "layout" : "TABLE_24COL"
     },
+    "getRootPSPanelItems" : [ {
+      "caption" : "滚动条容器",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container_scroll1",
+      "getPSLayout" : {
+        "layout" : "BORDER"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "面板容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container_scroll_main1",
+        "getPSLayout" : {
+          "layout" : "BORDER"
+        },
+        "getPSLayoutPos" : {
+          "layout" : "BORDER",
+          "layoutPos" : "CENTER"
+        },
+        "getPSPanelItems" : [ {
+          "caption" : "TABEXPPANEL部件",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CTRLPOS",
+          "name" : "tabexppanel",
+          "getPSLayoutPos" : {
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER"
+          },
+          "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" : "container_grid1",
+          "getPSLayout" : {
+            "layout" : "SIMPLEFLEX"
+          },
+          "getPSLayoutPos" : {
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "面板容器",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CONTAINER",
+            "name" : "container1",
+            "getPSLayout" : {
+              "layout" : "SIMPLEFLEX"
+            },
+            "getPSLayoutPos" : {
+              "grow" : 3,
+              "layout" : "SIMPLEFLEX"
+            },
+            "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" : "面板容器",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "CONTAINER",
+            "name" : "container2",
+            "getPSLayout" : {
+              "layout" : "SIMPLEFLEX"
+            },
+            "getPSLayoutPos" : {
+              "grow" : 9,
+              "layout" : "SIMPLEFLEX"
+            }
+          } ]
+        } ],
+        "showCaption" : true
+      } ]
+    } ],
     "layoutBodyOnly" : true,
     "layoutPanel" : true,
     "useDefaultLayout" : false,

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

@@ -172,7 +172,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-354-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-361-7">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -640,7 +640,7 @@
 
 
     <!--输出实体[IBIZSAMPLE0003]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0003-69-21">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0003-73-21">
         <createTable tableName="T_IBIZSAMPLE0003">
                 <column name="IBIZSAMPLE0003NAME" remarks="" type="VARCHAR(200)">
                 </column>

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

@@ -79,7 +79,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZSAMPLE0003]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0003-69-15" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0003-73-15" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZSAMPLE0003">
                <![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[FIELD01], t1.[IBIZSAMPLE0003ID], t1.[IBIZSAMPLE0003NAME], t1.[MEMO], t1.[PIBIZSAMPLE0003ID], t11.[IBIZSAMPLE0003NAME] AS [PIBIZSAMPLE0003NAME], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZSAMPLE0003] t1  LEFT JOIN T_IBIZSAMPLE0003 t11 ON t1.PIBIZSAMPLE0003ID = t11.IBIZSAMPLE0003ID  ]]>
          </createView>