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

app_Web/src/components/layout-element/interactive/app-preset-button/app-preset-button.less

 .app-preset-button {
     height: 40px;
-    width: 100%;
+    width: auto;
     .ivu-btn {
         width: 100%;
         height: 100%;

app_Web/src/components/layout-element/login/app-login-button/app-login-button.less

 .app-login-button {
     height: 40px;
-    width: 100%;
+    width: auto;
     .ivu-btn {
         width: 100%;
         height: 100%;

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

@@ -202,6 +202,9 @@ export default class DefaultBase extends Vue implements ControlInterface {
         const data = args && args.data ? args.data : this.getData() || {};
         const event = args && args.event ? args.event : {};
         let result: boolean = true;
+        if ('search;load;save'.indexOf(eventName) !== -1) {
+            result = await this.execute_engine_searchform_ctrl_logic(data, event);
+        }
         if (!result) {
             return false;
         }
@@ -209,6 +212,17 @@ export default class DefaultBase extends Vue implements ControlInterface {
         return true;
     }
 
+    /**
+     * 部件逻辑 -- engine_searchform
+     *
+     * @param {string} eventName 部件事件名称
+     * @param {any[]} data 数据
+     * @param {*} event 源事件对象
+     * @memberof DefaultBase
+     */
+    public async execute_engine_searchform_ctrl_logic(data: any[], event?: any): Promise<boolean> {
+        return true;
+    }
 
 
 
@@ -687,7 +701,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 };
@@ -723,7 +737,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/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) {
@@ -365,7 +365,7 @@ export default class MainBase extends Vue implements ControlInterface {
         const data = args && args.data ? args.data : this.getData() || {};
         const event = args && args.event ? args.event : {};
         let result: boolean = true;
-        if ('rowdblclick;selectionchange;remove;load;beforeload'.indexOf(eventName) !== -1) {
+        if ('rowdblclick;selectionchange;load;beforeload'.indexOf(eventName) !== -1) {
             result = await this.execute_engine_grid_ctrl_logic(data, event);
         }
         if (!result) {
@@ -451,20 +451,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;
     
     /**
     * 是否嵌入关系界面
@@ -997,7 +983,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){
@@ -1092,7 +1078,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[] = [];
@@ -1198,7 +1184,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){
@@ -2115,7 +2101,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);
@@ -2123,7 +2109,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){
@@ -2190,7 +2176,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/IBIZCustomerUsr3EditView.json

@@ -704,11 +704,11 @@
   "getPSDEViewId" : "CA5E9C34-54D6-40DA-A97C-BB80464AA4C8",
   "getPSViewLayoutPanel" : {
     "getAllPSPanelFields" : [ {
-      "id" : "view_pagecaption2"
-    }, {
       "id" : "view_pagecaption"
     }, {
       "id" : "view_pagecaption1"
+    }, {
+      "id" : "view_pagecaption2"
     } ],
     "codeName" : "Layoutpanel",
     "controlType" : "VIEWLAYOUTPANEL",
@@ -2491,95 +2491,110 @@
             "caption" : "面板容器",
             "itemStyle" : "DEFAULT",
             "itemType" : "CONTAINER",
-            "name" : "container15",
+            "name" : "container14",
             "getPSLayout" : {
               "layout" : "SIMPLEFLEX"
             },
             "getPSLayoutPos" : {
-              "grow" : -1,
+              "grow" : 6,
               "layout" : "SIMPLEFLEX"
-            },
-            "getPSPanelItems" : [ {
-              "caption" : "页面标题",
-              "itemStyle" : "DEFAULT",
-              "itemType" : "FIELD",
-              "name" : "view_pagecaption2",
-              "getPSEditor" : {
-                "editorType" : "SPAN",
-                "name" : "view_pagecaption2",
-                "predefinedType" : "VIEW_PAGECAPTION",
-                "renderMode" : "HEADING1",
-                "enableLinkView" : false
-              },
-              "getPSLayoutPos" : {
-                "grow" : -1,
-                "layout" : "SIMPLEFLEX"
-              },
-              "hidden" : false,
-              "showCaption" : false
-            } ]
+            }
           }, {
             "caption" : "面板容器",
             "itemStyle" : "DEFAULT",
             "itemType" : "CONTAINER",
-            "name" : "container13",
+            "name" : "container15",
             "getPSLayout" : {
               "layout" : "SIMPLEFLEX"
             },
             "getPSLayoutPos" : {
-              "grow" : 3,
+              "grow" : -1,
               "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,
-                "layout" : "SIMPLEFLEX"
-              },
-              "hidden" : false,
-              "showCaption" : false
-            } ]
+            }
           }, {
             "caption" : "面板容器",
             "itemStyle" : "DEFAULT",
             "itemType" : "CONTAINER",
-            "name" : "container14",
+            "name" : "container13",
             "getPSLayout" : {
               "layout" : "SIMPLEFLEX"
             },
             "getPSLayoutPos" : {
-              "grow" : 6,
+              "grow" : 3,
               "layout" : "SIMPLEFLEX"
+            }
+          } ]
+        }, {
+          "caption" : "容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "container20",
+          "getPSLayout" : {
+            "align" : "center",
+            "dir" : "column",
+            "layout" : "FLEX",
+            "vAlign" : "center"
+          },
+          "getPSLayoutPos" : {
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER"
+          },
+          "getPSPanelItems" : [ {
+            "caption" : "页面标题",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "FIELD",
+            "name" : "view_pagecaption",
+            "getPSEditor" : {
+              "editorType" : "SPAN",
+              "name" : "view_pagecaption",
+              "predefinedType" : "VIEW_PAGECAPTION",
+              "renderMode" : "HEADING1",
+              "enableLinkView" : false
             },
-            "getPSPanelItems" : [ {
-              "caption" : "页面标题",
-              "itemStyle" : "DEFAULT",
-              "itemType" : "FIELD",
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "hAlignSelf" : "LEFT",
+              "layout" : "FLEX"
+            },
+            "hidden" : false,
+            "showCaption" : false
+          }, {
+            "caption" : "页面标题",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "FIELD",
+            "name" : "view_pagecaption1",
+            "getPSEditor" : {
+              "editorType" : "SPAN",
               "name" : "view_pagecaption1",
-              "getPSEditor" : {
-                "editorType" : "SPAN",
-                "name" : "view_pagecaption1",
-                "predefinedType" : "VIEW_PAGECAPTION",
-                "renderMode" : "HEADING1",
-                "enableLinkView" : false
-              },
-              "getPSLayoutPos" : {
-                "grow" : -1,
-                "layout" : "SIMPLEFLEX"
-              },
-              "hidden" : false,
-              "showCaption" : false
-            } ]
+              "predefinedType" : "VIEW_PAGECAPTION",
+              "renderMode" : "HEADING1",
+              "enableLinkView" : false
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "layout" : "FLEX"
+            },
+            "hidden" : false,
+            "showCaption" : false
+          }, {
+            "caption" : "页面标题",
+            "itemStyle" : "DEFAULT",
+            "itemType" : "FIELD",
+            "name" : "view_pagecaption2",
+            "getPSEditor" : {
+              "editorType" : "SPAN",
+              "name" : "view_pagecaption2",
+              "predefinedType" : "VIEW_PAGECAPTION",
+              "renderMode" : "HEADING1",
+              "enableLinkView" : false
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "hAlignSelf" : "RIGHT",
+              "layout" : "FLEX"
+            },
+            "hidden" : false,
+            "showCaption" : false
           } ]
         } ],
         "showCaption" : true

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

@@ -278,7 +278,7 @@
 
 
     <!--输出实体[IBIZCUSTOMER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-354-10">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-356-10">
         <createTable tableName="T_IBIZCUSTOMER">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>

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

@@ -19,7 +19,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZCUSTOMER]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizcustomer-354-4" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizcustomer-356-4" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZCUSTOMER">
                <![CDATA[ SELECT t1.[ADDRESS], t1.[CREATEDATE], t1.[CREATEMAN], t1.[CUSTOMERUID], t1.[IBIZCUSTOMERID], t1.[IBIZCUSTOMERNAME], t1.[SN], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZCUSTOMER] t1  ]]>
          </createView>