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

app_Web/src/uiservice/ibizbook/custom-edit-ui-logic-base.ts

@@ -29,31 +29,30 @@ export default class CustomEditUILogicBase {
      */
     protected logicParams: any[] = [
         {
-            name: '传入变量',
-            codeName: 'Default',
-            default: true,
-            entityParam: true,
+            name: '当前视图',
+            codeName: 'view',
+            activeViewParam: true,
         },
         {
-            name: '当前激活部件',
+            name: '当前表格部件',
             codeName: 'grid',
-            activeCtrlParam: true,
             ctrlParam: true,
         },
         {
-            name: '当前容器',
-            codeName: 'currentContainer',
-            activeContainerParam: true,
+            name: '表格数据',
+            codeName: 'gridData',
+            entityListParam: true,
         },
         {
-            name: '当前视图',
-            codeName: 'view',
-            activeViewParam: true,
+            name: '传入变量',
+            codeName: 'Default',
+            default: true,
+            entityParam: true,
         },
         {
-            name: '表格数据',
-            codeName: 'gridData',
-            entityListParam: true,
+            name: '当前容器',
+            codeName: 'currentContainer',
+            activeContainerParam: true,
         },
     ];
 
@@ -127,34 +126,21 @@ export default class CustomEditUILogicBase {
     protected async execute_begin_node(actionContext: UIActionContext) {
         actionContext.setResult(actionContext.defaultParam.getReal());
         console.log('已完成执行 开始 节点');
-        await this.execute_bindparam1_node(actionContext);
+        await this.execute_bindparam2_node(actionContext);
     }
     
     /**
-     * 绑定表格选中数据
+     * 界面行为
      *
      * @param {UIActionContext} actionContext 界面逻辑上下文
      * @memberof CustomEditUILogicBase
      */
-    protected async execute_bindparam1_node(actionContext: UIActionContext) {
-        try {
-            //  源数据
-            const srcParam = actionContext.getParam('grid');
-            //  目标数据
-            const dstParam = actionContext.getParam('gridData');
-            //  源属性
-            const srcFieldName: string = 'selections';
-            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('已完成执行 绑定表格选中数据 节点');
-        await this.execute_deuiaction1_node(actionContext);
+    protected async execute_deuiaction1_node(actionContext: UIActionContext) {
+        const data = actionContext.defaultParam.getReal();
+        const { context, viewparams } = actionContext;
+        //  TODO 调用实体界面行为节点
+        console.log('已完成执行 界面行为 节点');
+        await this.execute_end1_node(actionContext);
     }
     
     /**
@@ -185,17 +171,57 @@ export default class CustomEditUILogicBase {
     }
     
     /**
-     * 界面行为
+     * 绑定表格
      *
      * @param {UIActionContext} actionContext 界面逻辑上下文
      * @memberof CustomEditUILogicBase
      */
-    protected async execute_deuiaction1_node(actionContext: UIActionContext) {
-        const data = actionContext.defaultParam.getReal();
-        const { context, viewparams } = actionContext;
-        //  TODO 调用实体界面行为节点
-        console.log('已完成执行 界面行为 节点');
-        await this.execute_end1_node(actionContext);
+    protected async execute_bindparam2_node(actionContext: UIActionContext) {
+        try {
+            //  源数据
+            const srcParam = actionContext.getParam('view');
+            //  目标数据
+            const dstParam = actionContext.getParam('grid');
+            //  源属性
+            const srcFieldName: string = 'grid';
+            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('已完成执行 绑定表格 节点');
+        await this.execute_bindparam1_node(actionContext);
+    }
+    
+    /**
+     * 绑定表格选中数据
+     *
+     * @param {UIActionContext} actionContext 界面逻辑上下文
+     * @memberof CustomEditUILogicBase
+     */
+    protected async execute_bindparam1_node(actionContext: UIActionContext) {
+        try {
+            //  源数据
+            const srcParam = actionContext.getParam('grid');
+            //  目标数据
+            const dstParam = actionContext.getParam('gridData');
+            //  源属性
+            const srcFieldName: string = 'selections';
+            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('已完成执行 绑定表格选中数据 节点');
+        await this.execute_deuiaction1_node(actionContext);
     }
     
 

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/ibizorder/card-navigation-dataview/card-navigation-dataview-base.vue

@@ -665,7 +665,7 @@ export default class CardNavigationBase 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: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -744,7 +744,7 @@ export default class CardNavigationBase 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: 'IBIZOrderDataViewExpView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -853,7 +853,7 @@ export default class CardNavigationBase 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: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (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);
@@ -861,7 +861,7 @@ export default class CardNavigationBase 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: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){

app_Web/src/widgets/ibizorder/list-exp-list/list-exp-list-base.vue

@@ -530,7 +530,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }        
         const arg: any = {...opt};
@@ -646,7 +646,7 @@ export default class ListExpBase 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: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.removeAction') as string) });
             return;
         }
         if (datas.length === 0) {
@@ -741,7 +741,7 @@ export default class ListExpBase 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: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (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);
@@ -749,7 +749,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){

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

@@ -2126,7 +2126,7 @@
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "BINDPARAM1"
+          "id" : "BINDPARAM2"
         },
         "linkMode" : 0,
         "name" : "连接名称",
@@ -2137,95 +2137,119 @@
       } ],
       "parallelOutput" : true
     }, {
-      "codeName" : "BINDPARAM1",
+      "codeName" : "DEUIACTION1",
+      "getDstPSAppDEUIAction" : {
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
+        },
+        "modelref" : true,
+        "id" : "Edit@IBIZBOOK"
+      },
+      "getDstPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
+      },
       "getDstPSDEUILogicParam" : {
         "modelref" : true,
         "id" : "gridData"
       },
-      "logicNodeType" : "BINDPARAM",
-      "name" : "绑定表格选中数据",
+      "logicNodeType" : "DEUIACTION",
+      "name" : "界面行为",
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "DEUIACTION1"
+          "id" : "END1"
         },
         "linkMode" : 0,
         "name" : "连接名称",
         "getSrcPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "BINDPARAM1"
-        }
-      } ],
-      "srcFieldName" : "selections",
-      "getSrcPSDEUILogicParam" : {
-        "modelref" : true,
-        "id" : "grid"
+          "id" : "DEUIACTION1"
         }
+      } ]
     }, {
       "codeName" : "END1",
       "logicNodeType" : "END",
       "name" : "结束",
       "returnType" : "NULLVALUE"
     }, {
-      "codeName" : "DEUIACTION1",
-      "getDstPSAppDEUIAction" : {
-        "getPSAppDataEntity" : {
+      "codeName" : "BINDPARAM2",
+      "getDstPSDEUILogicParam" : {
         "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
+        "id" : "grid"
       },
+      "logicNodeType" : "BINDPARAM",
+      "name" : "绑定表格",
+      "getPSDEUILogicLinks" : [ {
+        "getDstPSDEUILogicNode" : {
           "modelref" : true,
-        "id" : "Edit@IBIZBOOK"
+          "id" : "BINDPARAM1"
         },
-      "getDstPSAppDataEntity" : {
+        "linkMode" : 0,
+        "name" : "连接名称",
+        "getSrcPSDEUILogicNode" : {
           "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
-      },
+          "id" : "BINDPARAM2"
+        }
+      } ],
+      "srcFieldName" : "grid",
+      "getSrcPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "view"
+      }
+    }, {
+      "codeName" : "BINDPARAM1",
       "getDstPSDEUILogicParam" : {
         "modelref" : true,
         "id" : "gridData"
       },
-      "logicNodeType" : "DEUIACTION",
-      "name" : "界面行为",
+      "logicNodeType" : "BINDPARAM",
+      "name" : "绑定表格选中数据",
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "END1"
+          "id" : "DEUIACTION1"
         },
         "linkMode" : 0,
         "name" : "连接名称",
         "getSrcPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "DEUIACTION1"
+          "id" : "BINDPARAM1"
+        }
+      } ],
+      "srcFieldName" : "selections",
+      "getSrcPSDEUILogicParam" : {
+        "modelref" : true,
+        "id" : "grid"
       }
-      } ]
     } ],
     "getPSDEUILogicParams" : [ {
+      "codeName" : "view",
+      "logicName" : "当前视图",
+      "name" : "当前视图",
+      "activeViewParam" : true
+    }, {
+      "codeName" : "grid",
+      "logicName" : "当前表格部件",
+      "name" : "当前表格部件",
+      "ctrlParam" : true
+    }, {
+      "codeName" : "gridData",
+      "logicName" : "表格数据",
+      "name" : "表格数据",
+      "entityListParam" : true
+    }, {
       "codeName" : "Default",
       "logicName" : "传入变量",
       "name" : "传入变量",
       "default" : true,
       "entityParam" : true
-    }, {
-      "codeName" : "grid",
-      "logicName" : "当前激活部件",
-      "name" : "当前激活部件",
-      "activeCtrlParam" : true,
-      "ctrlParam" : true
     }, {
       "codeName" : "currentContainer",
       "logicName" : "当前容器",
       "name" : "当前容器",
       "activeContainerParam" : true
-    }, {
-      "codeName" : "view",
-      "logicName" : "当前视图",
-      "name" : "当前视图",
-      "activeViewParam" : true
-    }, {
-      "codeName" : "gridData",
-      "logicName" : "表格数据",
-      "name" : "表格数据",
-      "entityListParam" : true
     } ],
     "getStartPSDEUILogicNode" : {
       "modelref" : true,

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

@@ -172,7 +172,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-542-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-547-7">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>