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

app_Web/src/components/app-panel-field/app-panel-field.less

@@ -2,7 +2,6 @@
     height: 100%;
     width: 100%;
     display: flex;
-    padding: 0 6px;
 
     .editor {
         flex-grow: 1;
@@ -15,15 +14,13 @@
         }
 
         .error-info {
-            color: red !important;
+            color: red;
         }
     }
 
     .app-panel-field-label {
-        height: 34px !important;
         line-height: 22px;
         flex-shrink: 0;
-        padding: 6px 10px 6px 0px;
     }
 }
 
@@ -51,6 +48,6 @@
 
 .app-panel-field.label-none {
     .app-panel-field-label {
-        display: none !important;
+        display: none;
     }
 }
\ No newline at end of file

app_Web/src/uiservice/ibizbook/custom-view-grid-load-ui-logic-base.ts

@@ -30,9 +30,9 @@ export default class CustomViewGridLoadUILogicBase {
      */
     protected logicParams: any[] = [
         {
-            name: '视图参数',
-            codeName: 'viewParam',
-            viewNavDataParam: true,
+            name: '搜索表单部件',
+            codeName: 'searchForm',
+            ctrlParam: true,
         },
         {
             name: '传入变量',
@@ -40,20 +40,26 @@ export default class CustomViewGridLoadUILogicBase {
             default: true,
             entityParam: true,
         },
+        {
+            name: '当前视图',
+            codeName: 'view',
+            activeViewParam: true,
+        },
         {
             name: '表格部件',
             codeName: 'grid',
             ctrlParam: true,
         },
         {
-            name: '搜索表单部件',
-            codeName: 'searchForm',
-            ctrlParam: true,
+            name: '视图参数',
+            codeName: 'viewParam',
+            viewNavDataParam: true,
         },
         {
-            name: '当前视图',
-            codeName: 'view',
-            activeViewParam: true,
+            name: '当前激活部件',
+            codeName: 'curCtrl',
+            activeCtrlParam: true,
+            ctrlParam: true,
         },
     ];
 
@@ -131,30 +137,34 @@ export default class CustomViewGridLoadUILogicBase {
     }
     
     /**
-     * 结束
+     * 搜索表单加载草稿
      *
      * @param {UIActionContext} actionContext 界面逻辑上下文
      * @memberof CustomViewGridLoadUILogicBase
      */
-    protected async execute_end1_node(actionContext: UIActionContext) {
-        const strReturnType: string = 'LOGICPARAM';
-        if (Object.is(strReturnType, LogicReturnType.NONEVALUE) || Object.is(strReturnType, LogicReturnType.NULLVALUE)) {
-            actionContext.setResult(null);
-        } else if (Object.is(strReturnType, LogicReturnType.SRCVALUE)) {
-            actionContext.setResult('');
-        } else if (Object.is(strReturnType, LogicReturnType.BREAK)) {
-            actionContext.setResult(LogicReturnType.BREAK);
-        } else if (Object.is(strReturnType, LogicReturnType.LOGICPARAM) || Object.is(strReturnType, LogicReturnType.LOGICPARAMFIELD)) {
-            const returnParam = actionContext.getParam('Default');
-            if (Object.is(strReturnType, LogicReturnType.LOGICPARAM)) {
-                actionContext.setResult(returnParam.getReal());
-            } else {
-                actionContext.setResult(returnParam.get(''));
+    protected async execute_viewctrlinvoke2_node(actionContext: UIActionContext) {
+        const invokeCtrl = 'searchForm';
+        const invokeMethod = 'loadDraft';
+        const invokeParam = 'viewParam';
+        if (!invokeCtrl || !invokeMethod) {
+            throw new Error(`界面对象或者调用方法缺失`);
+        }
+        const invokeUICtrl = actionContext.getParam(invokeCtrl).getReal();
+        if (invokeUICtrl[invokeMethod] && invokeUICtrl[invokeMethod] instanceof Function) {
+            try {
+                const result = await invokeUICtrl[invokeMethod]();
+                if (invokeParam) {
+                    actionContext.getParam(invokeParam).bind(result);
+                }
+                actionContext.bindLastReturnParam(result);
+            } catch (error:any) {
+                throw new Error(`${invokeCtrl}界面对象调用${invokeMethod}方法发生异常`);
             }
         } else {
-            throw new Error(`无法识别的返回值类型${strReturnType}`);
+            throw new Error(`${invokeCtrl}界面对象不存在${invokeMethod}方法`);
         }
-        console.log('已完成执行 结束 节点');
+        console.log('已完成执行 搜索表单加载草稿 节点');
+        await this.execute_viewctrlinvoke1_node(actionContext);
     }
     
     /**
@@ -185,14 +195,41 @@ export default class CustomViewGridLoadUILogicBase {
     }
     
     /**
-     * 搜索表单加载草稿
+     * 结束
      *
      * @param {UIActionContext} actionContext 界面逻辑上下文
      * @memberof CustomViewGridLoadUILogicBase
      */
-    protected async execute_viewctrlinvoke2_node(actionContext: UIActionContext) {
-        const invokeCtrl = 'searchForm';
-        const invokeMethod = 'loadDraft';
+    protected async execute_end1_node(actionContext: UIActionContext) {
+        const strReturnType: string = 'LOGICPARAM';
+        if (Object.is(strReturnType, LogicReturnType.NONEVALUE) || Object.is(strReturnType, LogicReturnType.NULLVALUE)) {
+            actionContext.setResult(null);
+        } else if (Object.is(strReturnType, LogicReturnType.SRCVALUE)) {
+            actionContext.setResult('');
+        } else if (Object.is(strReturnType, LogicReturnType.BREAK)) {
+            actionContext.setResult(LogicReturnType.BREAK);
+        } else if (Object.is(strReturnType, LogicReturnType.LOGICPARAM) || Object.is(strReturnType, LogicReturnType.LOGICPARAMFIELD)) {
+            const returnParam = actionContext.getParam('Default');
+            if (Object.is(strReturnType, LogicReturnType.LOGICPARAM)) {
+                actionContext.setResult(returnParam.getReal());
+            } else {
+                actionContext.setResult(returnParam.get(''));
+            }
+        } else {
+            throw new Error(`无法识别的返回值类型${strReturnType}`);
+        }
+        console.log('已完成执行 结束 节点');
+    }
+    
+    /**
+     * 表格加载
+     *
+     * @param {UIActionContext} actionContext 界面逻辑上下文
+     * @memberof CustomViewGridLoadUILogicBase
+     */
+    protected async execute_viewctrlinvoke1_node(actionContext: UIActionContext) {
+        const invokeCtrl = 'grid';
+        const invokeMethod = 'load';
         const invokeParam = 'viewParam';
         if (!invokeCtrl || !invokeMethod) {
             throw new Error(`界面对象或者调用方法缺失`);
@@ -211,8 +248,8 @@ export default class CustomViewGridLoadUILogicBase {
         } else {
             throw new Error(`${invokeCtrl}界面对象不存在${invokeMethod}方法`);
         }
-        console.log('已完成执行 搜索表单加载草稿 节点');
-        await this.execute_viewctrlinvoke1_node(actionContext);
+        console.log('已完成执行 表格加载 节点');
+        await this.execute_end1_node(actionContext);
     }
     
     /**
@@ -247,36 +284,5 @@ export default class CustomViewGridLoadUILogicBase {
         }
     }
     
-    /**
-     * 表格加载
-     *
-     * @param {UIActionContext} actionContext 界面逻辑上下文
-     * @memberof CustomViewGridLoadUILogicBase
-     */
-    protected async execute_viewctrlinvoke1_node(actionContext: UIActionContext) {
-        const invokeCtrl = 'grid';
-        const invokeMethod = 'load';
-        const invokeParam = 'viewParam';
-        if (!invokeCtrl || !invokeMethod) {
-            throw new Error(`界面对象或者调用方法缺失`);
-        }
-        const invokeUICtrl = actionContext.getParam(invokeCtrl).getReal();
-        if (invokeUICtrl[invokeMethod] && invokeUICtrl[invokeMethod] instanceof Function) {
-            try {
-                const result = await invokeUICtrl[invokeMethod]();
-                if (invokeParam) {
-                    actionContext.getParam(invokeParam).bind(result);
-                }
-                actionContext.bindLastReturnParam(result);
-            } catch (error:any) {
-                throw new Error(`${invokeCtrl}界面对象调用${invokeMethod}方法发生异常`);
-            }
-        } else {
-            throw new Error(`${invokeCtrl}界面对象不存在${invokeMethod}方法`);
-        }
-        console.log('已完成执行 表格加载 节点');
-        await this.execute_end1_node(actionContext);
-    }
-    
 
 }
\ No newline at end of file

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

@@ -692,7 +692,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: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr3GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -728,7 +728,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public async loadDraft(opt: any = {},mode?:string): Promise<any> {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr3GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-base.vue

@@ -678,7 +678,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};
@@ -757,7 +757,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[] = [];
@@ -866,7 +866,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);
@@ -874,7 +874,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/list-exp-list/list-exp-list-base.vue

@@ -581,7 +581,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }        
         const arg: any = {...opt};
@@ -711,7 +711,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_layout' + (this.$t('app.list.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.removeAction') as string) });
             return;
         }
         if (datas.length === 0) {
@@ -816,7 +816,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_layout' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (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);
@@ -824,7 +824,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_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZOrderListExpView' + (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 IBIZOrderPickupGridViewBase
+     * @memberof IBIZOrderSF1GridViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -442,6 +442,20 @@ 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;
     
     /**
     * 是否嵌入关系界面
@@ -976,7 +990,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderPickupGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderSF1GridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1105,7 +1119,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1219,7 +1233,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: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2150,7 +2164,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: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2159,7 +2173,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: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2235,7 +2249,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

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

@@ -104,6 +104,21 @@ 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

@@ -2433,14 +2433,30 @@
       } ],
       "parallelOutput" : true
     }, {
-      "codeName" : "END1",
-      "logicNodeType" : "END",
-      "name" : "结束",
-      "getReturnParam" : {
+      "codeName" : "VIEWCTRLINVOKE2",
+      "getInvokeCtrl" : {
         "modelref" : true,
-        "id" : "Default"
+        "id" : "searchForm"
       },
-      "returnType" : "LOGICPARAM"
+      "invokeMethod" : "loadDraft",
+      "getInvokeParam" : {
+        "modelref" : true,
+        "id" : "viewParam"
+      },
+      "logicNodeType" : "VIEWCTRLINVOKE",
+      "name" : "搜索表单加载草稿",
+      "getPSDEUILogicLinks" : [ {
+        "getDstPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "VIEWCTRLINVOKE1"
+        },
+        "linkMode" : 0,
+        "name" : "连接名称",
+        "getSrcPSDEUILogicNode" : {
+          "modelref" : true,
+          "id" : "VIEWCTRLINVOKE2"
+        }
+      } ]
     }, {
       "codeName" : "BINDPARAM1",
       "getDstPSDEUILogicParam" : {
@@ -2467,28 +2483,37 @@
         "id" : "view"
       }
     }, {
-      "codeName" : "VIEWCTRLINVOKE2",
+      "codeName" : "END1",
+      "logicNodeType" : "END",
+      "name" : "结束",
+      "getReturnParam" : {
+        "modelref" : true,
+        "id" : "Default"
+      },
+      "returnType" : "LOGICPARAM"
+    }, {
+      "codeName" : "VIEWCTRLINVOKE1",
       "getInvokeCtrl" : {
         "modelref" : true,
-        "id" : "searchForm"
+        "id" : "grid"
       },
-      "invokeMethod" : "loadDraft",
+      "invokeMethod" : "load",
       "getInvokeParam" : {
         "modelref" : true,
         "id" : "viewParam"
       },
       "logicNodeType" : "VIEWCTRLINVOKE",
-      "name" : "搜索表单加载草稿",
+      "name" : "表格加载",
       "getPSDEUILogicLinks" : [ {
         "getDstPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "VIEWCTRLINVOKE1"
+          "id" : "END1"
         },
         "linkMode" : 0,
         "name" : "连接名称",
         "getSrcPSDEUILogicNode" : {
           "modelref" : true,
-          "id" : "VIEWCTRLINVOKE2"
+          "id" : "VIEWCTRLINVOKE1"
         }
       } ]
     }, {
@@ -2553,58 +2578,39 @@
         "modelref" : true,
         "id" : "view"
       }
-    }, {
-      "codeName" : "VIEWCTRLINVOKE1",
-      "getInvokeCtrl" : {
-        "modelref" : true,
-        "id" : "grid"
-      },
-      "invokeMethod" : "load",
-      "getInvokeParam" : {
-        "modelref" : true,
-        "id" : "viewParam"
-      },
-      "logicNodeType" : "VIEWCTRLINVOKE",
-      "name" : "表格加载",
-      "getPSDEUILogicLinks" : [ {
-        "getDstPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "END1"
-        },
-        "linkMode" : 0,
-        "name" : "连接名称",
-        "getSrcPSDEUILogicNode" : {
-          "modelref" : true,
-          "id" : "VIEWCTRLINVOKE1"
-        }
-      } ]
     } ],
     "getPSDEUILogicParams" : [ {
-      "codeName" : "viewParam",
-      "logicName" : "视图参数",
-      "name" : "视图参数",
-      "viewNavDataParam" : true
+      "codeName" : "searchForm",
+      "logicName" : "搜索表单部件",
+      "name" : "搜索表单部件",
+      "ctrlParam" : true
     }, {
       "codeName" : "Default",
       "logicName" : "传入变量",
       "name" : "传入变量",
       "default" : true,
       "entityParam" : true
+    }, {
+      "codeName" : "view",
+      "logicName" : "当前视图",
+      "name" : "当前视图",
+      "activeViewParam" : true
     }, {
       "codeName" : "grid",
       "logicName" : "表格部件",
       "name" : "表格部件",
       "ctrlParam" : true
     }, {
-      "codeName" : "searchForm",
-      "logicName" : "搜索表单部件",
-      "name" : "搜索表单部件",
-      "ctrlParam" : true
+      "codeName" : "viewParam",
+      "logicName" : "视图参数",
+      "name" : "视图参数",
+      "viewNavDataParam" : true
     }, {
-      "codeName" : "view",
-      "logicName" : "当前视图",
-      "name" : "当前视图",
-      "activeViewParam" : true
+      "codeName" : "curCtrl",
+      "logicName" : "当前激活部件",
+      "name" : "当前激活部件",
+      "activeCtrlParam" : true,
+      "ctrlParam" : true
     } ],
     "getStartPSDEUILogicNode" : {
       "modelref" : true,

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

@@ -27220,14 +27220,30 @@
           } ],
           "parallelOutput" : true
         }, {
-          "codeName" : "END1",
-          "logicNodeType" : "END",
-          "name" : "结束",
-          "getReturnParam" : {
+          "codeName" : "VIEWCTRLINVOKE2",
+          "getInvokeCtrl" : {
             "modelref" : true,
-            "id" : "Default"
+            "id" : "searchForm"
           },
-          "returnType" : "LOGICPARAM"
+          "invokeMethod" : "loadDraft",
+          "getInvokeParam" : {
+            "modelref" : true,
+            "id" : "viewParam"
+          },
+          "logicNodeType" : "VIEWCTRLINVOKE",
+          "name" : "搜索表单加载草稿",
+          "getPSDEUILogicLinks" : [ {
+            "getDstPSDEUILogicNode" : {
+              "modelref" : true,
+              "id" : "VIEWCTRLINVOKE1"
+            },
+            "linkMode" : 0,
+            "name" : "连接名称",
+            "getSrcPSDEUILogicNode" : {
+              "modelref" : true,
+              "id" : "VIEWCTRLINVOKE2"
+            }
+          } ]
         }, {
           "codeName" : "BINDPARAM1",
           "getDstPSDEUILogicParam" : {
@@ -27254,28 +27270,37 @@
             "id" : "view"
           }
         }, {
-          "codeName" : "VIEWCTRLINVOKE2",
+          "codeName" : "END1",
+          "logicNodeType" : "END",
+          "name" : "结束",
+          "getReturnParam" : {
+            "modelref" : true,
+            "id" : "Default"
+          },
+          "returnType" : "LOGICPARAM"
+        }, {
+          "codeName" : "VIEWCTRLINVOKE1",
           "getInvokeCtrl" : {
             "modelref" : true,
-            "id" : "searchForm"
+            "id" : "grid"
           },
-          "invokeMethod" : "loadDraft",
+          "invokeMethod" : "load",
           "getInvokeParam" : {
             "modelref" : true,
             "id" : "viewParam"
           },
           "logicNodeType" : "VIEWCTRLINVOKE",
-          "name" : "搜索表单加载草稿",
+          "name" : "表格加载",
           "getPSDEUILogicLinks" : [ {
             "getDstPSDEUILogicNode" : {
               "modelref" : true,
-              "id" : "VIEWCTRLINVOKE1"
+              "id" : "END1"
             },
             "linkMode" : 0,
             "name" : "连接名称",
             "getSrcPSDEUILogicNode" : {
               "modelref" : true,
-              "id" : "VIEWCTRLINVOKE2"
+              "id" : "VIEWCTRLINVOKE1"
             }
           } ]
         }, {
@@ -27340,58 +27365,39 @@
             "modelref" : true,
             "id" : "view"
           }
-        }, {
-          "codeName" : "VIEWCTRLINVOKE1",
-          "getInvokeCtrl" : {
-            "modelref" : true,
-            "id" : "grid"
-          },
-          "invokeMethod" : "load",
-          "getInvokeParam" : {
-            "modelref" : true,
-            "id" : "viewParam"
-          },
-          "logicNodeType" : "VIEWCTRLINVOKE",
-          "name" : "表格加载",
-          "getPSDEUILogicLinks" : [ {
-            "getDstPSDEUILogicNode" : {
-              "modelref" : true,
-              "id" : "END1"
-            },
-            "linkMode" : 0,
-            "name" : "连接名称",
-            "getSrcPSDEUILogicNode" : {
-              "modelref" : true,
-              "id" : "VIEWCTRLINVOKE1"
-            }
-          } ]
         } ],
         "getPSDEUILogicParams" : [ {
-          "codeName" : "viewParam",
-          "logicName" : "视图参数",
-          "name" : "视图参数",
-          "viewNavDataParam" : true
+          "codeName" : "searchForm",
+          "logicName" : "搜索表单部件",
+          "name" : "搜索表单部件",
+          "ctrlParam" : true
         }, {
           "codeName" : "Default",
           "logicName" : "传入变量",
           "name" : "传入变量",
           "default" : true,
           "entityParam" : true
+        }, {
+          "codeName" : "view",
+          "logicName" : "当前视图",
+          "name" : "当前视图",
+          "activeViewParam" : true
         }, {
           "codeName" : "grid",
           "logicName" : "表格部件",
           "name" : "表格部件",
           "ctrlParam" : true
         }, {
-          "codeName" : "searchForm",
-          "logicName" : "搜索表单部件",
-          "name" : "搜索表单部件",
-          "ctrlParam" : true
+          "codeName" : "viewParam",
+          "logicName" : "视图参数",
+          "name" : "视图参数",
+          "viewNavDataParam" : true
         }, {
-          "codeName" : "view",
-          "logicName" : "当前视图",
-          "name" : "当前视图",
-          "activeViewParam" : true
+          "codeName" : "curCtrl",
+          "logicName" : "当前激活部件",
+          "name" : "当前激活部件",
+          "activeCtrlParam" : true,
+          "ctrlParam" : 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-766-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-768-7">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>