@ibiz-template/runtime 0.1.27 → 0.1.28

package/out/controller/control/data-view/data-view.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/data-view/data-view.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EACb,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAuB,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,qBAAa,yBAAyB,CAClC,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,EACvD,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,CAEzD,SAAQ,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACnC,YAAW,0BAA0B;IAErC;;;;;OAKG;IACK,OAAO,EAAE,sBAAsB,CAAC;IAExC;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAE7C;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1C;;;;;;OAMG;cACa,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnD;;;;;;OAMG;IACG,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB5C;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAsD5C;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAMzE;;;;;OAKG;IACH,eAAe,IAAI,eAAe,GAAG,IAAI;IAazC;;;;;;OAMG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,oBAAoB;IA2BnD;;;;;;;;OAQG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAWhB;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IActC;;;;OAIG;IACH,eAAe,IAAI,IAAI;IA6BvB;;;;;;OAMG;cACa,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAavD;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkC1C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAenD;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAW3D;;;;;;;OAOG;IACG,mBAAmB,CACvB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,IAAI,CAAC;CAWjB"}
+{"version":3,"file":"data-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/data-view/data-view.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EACb,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAuB,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,qBAAa,yBAAyB,CAClC,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,EACvD,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,CAEzD,SAAQ,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACnC,YAAW,0BAA0B;IAErC;;;;;OAKG;IACK,OAAO,EAAE,sBAAsB,CAAC;IAExC;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAE7C;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1C;;;;;;OAMG;cACa,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnD;;;;;;OAMG;IACG,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB5C;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAsD5C;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAOzE;;;;;OAKG;IACH,eAAe,IAAI,eAAe,GAAG,IAAI;IAazC;;;;;;OAMG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,oBAAoB;IA2BnD;;;;;;;;OAQG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAWhB;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IActC;;;;OAIG;IACH,eAAe,IAAI,IAAI;IA6BvB;;;;;;OAMG;cACa,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAavD;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkC1C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAenD;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAW3D;;;;;;;OAOG;IACG,mBAAmB,CACvB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,IAAI,CAAC;CAWjB"}

package/out/controller/control/data-view/data-view.controller.js

@@ -139,6 +139,7 @@ export class DataViewControlController extends MDControlController {
         }
     }
     async afterLoad(args, items) {
+        await this.initGroupCodeListItems();
         await this.handleDataGroup();
         await this.initGroupActionStates();
         return items;
@@ -271,7 +272,7 @@ export class DataViewControlController extends MDControlController {
     async initGroupCodeListItems() {
         const { groupCodeListId } = this.model;
         if (!groupCodeListId) {
-            throw new RuntimeModelError(this.model, '分组代码表没有配置');
+            return;
         }
         const app = ibiz.hub.getApp(this.context.srfappid);
         this.groupCodeListItems = await app.codeList.get(groupCodeListId, this.context, this.params);
@@ -282,9 +283,9 @@ export class DataViewControlController extends MDControlController {
      * @memberof DataViewControlController
      */
     async handleCodeListGroup() {
-        const { groupAppDEFieldId } = this.model;
-        if (!this.groupCodeListItems) {
-            await this.initGroupCodeListItems();
+        const { groupAppDEFieldId, groupCodeListId } = this.model;
+        if (!groupCodeListId) {
+            throw new RuntimeModelError(this.model, '分组代码表没有配置');
         }
         const { items } = this.state;
         const groupMap = new Map();

package/out/controller/control/panel/panel/panel-item.controller.d.ts

@@ -81,14 +81,46 @@ export declare class PanelItemController<T extends IPanelItem = IPanelItem> impl
      * @date 2022-09-20 18:09:56
      * @param {string[]} names
      */
-    dataChangeNotify(names: string[]): void;
+    dataChangeNotify(names: string[]): Promise<void>;
     /**
      * 面板状态变更通知
      *
      * @author lxm
      * @date 2022-09-20 18:09:07
      */
-    panelStateNotify(_state: PanelNotifyState): void;
+    panelStateNotify(_state: PanelNotifyState): Promise<void>;
+    /**
+     * 计算项的禁用状态
+     * @author lxm
+     * @date 2023-06-26 06:19:00
+     * @param {IData} data
+     */
+    calcItemDisabled(data: IData): void;
+    /**
+     * 计算项的显示状态
+     * @author lxm
+     * @date 2023-06-26 06:19:00
+     * @param {IData} data
+     */
+    calcItemVisible(data: IData): void;
+    /**
+     * 计算项的必填状态
+     * @author lxm
+     * @date 2023-06-26 06:19:00
+     * @param {IData} data
+     */
+    calcItemRequired(data: IData): void;
+    /**
+     * 动态逻辑结果
+     * @author lxm
+     * @date 2023-09-21 03:36:37
+     * @protected
+     */
+    protected dynaLogicResult: {
+        visible: boolean;
+        disabled: boolean;
+        required: boolean;
+    };
     /**
      * 计算动态逻辑
      *

package/out/controller/control/panel/panel/panel-item.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel-item.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,6BAA6B,EAC9B,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,qBAAa,mBAAmB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAChE,YAAW,oBAAoB;aAgEb,KAAK,EAAE,CAAC;aACR,KAAK,EAAE,eAAe;aACtB,MAAM,CAAC;IAhEzB;;;;;;OAMG;IACH,KAAK,EAAE,cAAc,CAAC;IAEtB;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,gBAAgB,GAAG,6BAA6B,CAEjE;IAED;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAED;;;;;;;OAOG;gBAEe,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,eAAe,EACtB,MAAM,CAAC,6CAAqB;IAK9C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBvC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,cAAc;IAIvC;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAQvC;;;;;OAKG;IACH,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI;IAQhD;;;;;;;;;;OAUG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAmC5E;;;;;;OAMG;IACH,cAAc,CACZ,KAAK,EAAE,oBAAoB,GAC1B,gBAAgB,GAAG,6BAA6B;IAWnD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;CAc3C"}
+{"version":3,"file":"panel-item.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,6BAA6B,EAC9B,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,qBAAa,mBAAmB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAChE,YAAW,oBAAoB;aAgEb,KAAK,EAAE,CAAC;aACR,KAAK,EAAE,eAAe;aACtB,MAAM,CAAC;IAhEzB;;;;;;OAMG;IACH,KAAK,EAAE,cAAc,CAAC;IAEtB;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,gBAAgB,GAAG,6BAA6B,CAEjE;IAED;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAED;;;;;;;OAOG;gBAEe,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,eAAe,EACtB,MAAM,CAAC,6CAAqB;IAK9C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBvC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,cAAc;IAIvC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACG,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAoBnC;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAoBlC;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAoBnC;;;;;OAKG;IACH,SAAS,CAAC,eAAe;;;;MAIvB;IAEF;;;;;;;;;;OAUG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAmC5E;;;;;;OAMG;IACH,cAAc,CACZ,KAAK,EAAE,oBAAoB,GAC1B,gBAAgB,GAAG,6BAA6B;IAWnD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;CAc3C"}

package/out/controller/control/panel/panel/panel-item.controller.js

@@ -55,6 +55,17 @@ export class PanelItemController {
         this.model = model;
         this.panel = panel;
         this.parent = parent;
+        /**
+         * 动态逻辑结果
+         * @author lxm
+         * @date 2023-09-21 03:36:37
+         * @protected
+         */
+        this.dynaLogicResult = {
+            visible: true,
+            disabled: false,
+            required: false,
+        };
         this.state = this.createState();
     }
     /**
@@ -102,9 +113,13 @@ export class PanelItemController {
      * @date 2022-09-20 18:09:56
      * @param {string[]} names
      */
-    dataChangeNotify(names) {
+    async dataChangeNotify(names) {
         // 计算动态控制逻辑
         this.calcDynamicLogic(names);
+        // 计算显示，禁用，必填状态
+        this.calcItemDisabled(this.data);
+        this.calcItemVisible(this.data);
+        this.calcItemRequired(this.data);
         // 计算动态样式表
         this.calcDynaClass(this.data);
     }
@@ -114,12 +129,76 @@ export class PanelItemController {
      * @author lxm
      * @date 2022-09-20 18:09:07
      */
-    panelStateNotify(_state) {
+    async panelStateNotify(_state) {
         // 计算动态控制逻辑
         this.calcDynamicLogic([], true);
+        // 计算显示，禁用，必填状态
+        this.calcItemDisabled(this.data);
+        this.calcItemVisible(this.data);
+        this.calcItemRequired(this.data);
         // 计算动态样式表
         this.calcDynaClass(this.data);
     }
+    /**
+     * 计算项的禁用状态
+     * @author lxm
+     * @date 2023-06-26 06:19:00
+     * @param {IData} data
+     */
+    calcItemDisabled(data) {
+        let enable = !this.dynaLogicResult.disabled;
+        // 上层计算为启用时计算预定义项启用逻辑
+        if (enable && this.panel.scheduler) {
+            const itemEnable = this.panel.scheduler.triggerItemEnable(this.model.id, {
+                data: [data],
+            });
+            if (itemEnable !== undefined) {
+                enable = itemEnable;
+            }
+        }
+        // 修改state
+        this.state.disabled = !enable;
+    }
+    /**
+     * 计算项的显示状态
+     * @author lxm
+     * @date 2023-06-26 06:19:00
+     * @param {IData} data
+     */
+    calcItemVisible(data) {
+        let { visible } = this.dynaLogicResult;
+        // 上层计算为显示时计算预定义项显示逻辑
+        if (visible && this.panel.scheduler) {
+            const itemVIsible = this.panel.scheduler.triggerItemVisible(this.model.id, {
+                data: [data],
+            });
+            if (itemVIsible !== undefined) {
+                visible = itemVIsible;
+            }
+        }
+        // 修改state
+        this.state.visible = visible;
+    }
+    /**
+     * 计算项的必填状态
+     * @author lxm
+     * @date 2023-06-26 06:19:00
+     * @param {IData} data
+     */
+    calcItemRequired(data) {
+        let allowEmpty = !this.dynaLogicResult.required;
+        // 上层计算为启用时计算预定义项启用逻辑
+        if (allowEmpty && this.panel.scheduler) {
+            const itemAllowEmpty = this.panel.scheduler.triggerItemBlank(this.model.id, {
+                data: [data],
+            });
+            if (itemAllowEmpty !== undefined) {
+                allowEmpty = itemAllowEmpty;
+            }
+        }
+        // 修改state
+        this.state.required = !allowEmpty;
+    }
     /**
      * 计算动态逻辑
      *
@@ -147,15 +226,15 @@ export class PanelItemController {
                     switch (logic.logicCat) {
                         // 动态空输入，不满足则必填
                         case 'ITEMBLANK':
-                            this.state.required = !ok;
+                            this.dynaLogicResult.required = !ok;
                             break;
                         // 动态启用，满足则启用
                         case 'ITEMENABLE':
-                            this.state.disabled = !ok;
+                            this.dynaLogicResult.disabled = !ok;
                             break;
                         // 动态显示，满足则显示
                         case 'PANELVISIBLE':
-                            this.state.visible = ok;
+                            this.dynaLogicResult.visible = ok;
                             break;
                         default:
                     }

package/out/controller/control/panel/panel/panel.controller.d.ts

@@ -1,4 +1,4 @@
-import { IPanel, IPanelItem } from '@ibiz/model-core';
+import { IControlLogic, IPanel, IPanelItem } from '@ibiz/model-core';
 import { IPanelState, IPanelEvent, IPanelController, IPanelItemController, IPanelItemProvider, IControlProvider, IPanelItemContainerController } from '../../../../interface';
 import { ControlController } from '../../../common';
 import { PanelNotifyState } from '../../../constant';
@@ -111,5 +111,6 @@ export declare class PanelController<T extends IPanel = IPanel, S extends IPanel
      * @param {unknown} value 要设置的值
      */
     setDataValue(name: string, value: unknown): Promise<void>;
+    protected initControlScheduler(logics?: IControlLogic[]): void;
 }
 //# sourceMappingURL=panel.controller.d.ts.map

package/out/controller/control/panel/panel/panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,MAAM,EAEN,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,WAAW,EACX,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,6BAA6B,EAC9B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;;;;;;GAQG;AACH,qBAAa,eAAe,CACxB,CAAC,SAAS,MAAM,GAAG,MAAM,EACzB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,WAAW,GAAG,WAAW,CAErC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEpC;;;;;;OAMG;IACH,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEzE;;;;;;;OAOG;IACH,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;IAE7B;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;cAI3B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAK1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;;OAMG;cACa,wBAAwB,CACtC,UAAU,GAAE,UAAU,EAAE,GAAG,SAAqC,EAChE,KAAK,GAAE,eAAsB,EAC7B,MAAM,GAAE,6BAA6B,GAAG,SAAqB,GAC5D,OAAO,CAAC,IAAI,CAAC;IAyChB;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAa3B;;;;;;;OAOG;IACG,WAAW,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAiB/C;;;;;;;;OAQG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK;IAwB/B;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAMvC;;;;;OAKG;IACH,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAM/C;;;;;OAKG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAahE"}
+{"version":3,"file":"panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,MAAM,EAEN,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,WAAW,EACX,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,6BAA6B,EAC9B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;;;;;;GAQG;AACH,qBAAa,eAAe,CACxB,CAAC,SAAS,MAAM,GAAG,MAAM,EACzB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,WAAW,GAAG,WAAW,CAErC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEpC;;;;;;OAMG;IACH,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEzE;;;;;;;OAOG;IACH,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;IAE7B;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;cAI3B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAK1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;;OAMG;cACa,wBAAwB,CACtC,UAAU,GAAE,UAAU,EAAE,GAAG,SAAqC,EAChE,KAAK,GAAE,eAAsB,EAC7B,MAAM,GAAE,6BAA6B,GAAG,SAAqB,GAC5D,OAAO,CAAC,IAAI,CAAC;IAyChB;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAa3B;;;;;;;OAOG;IACG,WAAW,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAiB/C;;;;;;;;OAQG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK;IAwB/B;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAMvC;;;;;OAKG;IACH,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAM/C;;;;;OAKG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAc/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}

package/out/controller/control/panel/panel/panel.controller.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import { RuntimeError } from '@ibiz-template/core';
+import { recursiveIterate, RuntimeError } from '@ibiz-template/core';
 import { getPanelItemProvider } from '../../../../register';
 import { ControlController } from '../../../common';
 import { PanelNotifyState } from '../../../constant';
@@ -201,4 +201,14 @@ export class PanelController extends ControlController {
         this.state.data[name] = value;
         this.dataChangeNotify([name]);
     }
+    initControlScheduler(logics = []) {
+        const actualLogics = [...logics];
+        // 遍历所有的项，如果有逻辑的话加入
+        recursiveIterate(this.model, (item) => {
+            if (item.controlLogics) {
+                actualLogics.push(...item.controlLogics);
+            }
+        }, { childrenFields: ['rootPanelItems', 'panelItems', 'panelTabPages'] });
+        super.initControlScheduler(actualLogics);
+    }
 }

package/out/controller/control/toolbar/toolbar.controllerr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toolbar.controllerr.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controllerr.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EAEd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;;;;;;OAWG;cACa,UAAU,CACxB,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,KAAK,GAAE,KAAU,GAChB,OAAO,CAAC,IAAI,CAAC;cAgBA,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;;;;;;OAUG;IACG,WAAW,CACf,IAAI,EAAE,cAAc,GAAG,YAAY,EACnC,KAAK,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC;IAmBV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCpE,eAAe,CACb,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,EACrC,OAAO,EAAE,YAAY,EAAE,GACtB,IAAI;IAOP,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI;IAS/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}
+{"version":3,"file":"toolbar.controllerr.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controllerr.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EAEd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;;;;;;OAWG;cACa,UAAU,CACxB,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,KAAK,GAAE,KAAU,GAChB,OAAO,CAAC,IAAI,CAAC;cAoCA,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;;;;;;OAUG;IACG,WAAW,CACf,IAAI,EAAE,cAAc,GAAG,YAAY,EACnC,KAAK,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC;IAcV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCpE,eAAe,CACb,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,EACrC,OAAO,EAAE,YAAY,EAAE,GACtB,IAAI;IAOP,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI;IAS/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}

package/out/controller/control/toolbar/toolbar.controllerr.js

@@ -1,5 +1,6 @@
-import { recursiveIterate } from '@ibiz-template/core';
+import { recursiveIterate, RuntimeError } from '@ibiz-template/core';
 import { ViewCallTag, ViewMode } from '../../../constant';
+import { getUIActionById } from '../../../model';
 import { ControlVO } from '../../../service';
 import { UIActionUtil } from '../../../ui-action';
 import { ControlController } from '../../common';
@@ -38,12 +39,29 @@ export class ToolbarController extends ControlController {
         // 执行界面行为
         if (item.itemType === 'DEUIACTION') {
             const actionId = item.uiactionId;
-            const res = await this.ctx.view.call(ViewCallTag.GET_DATA);
-            const data = res || [];
-            const args = this.getEventArgs();
-            args.params = Object.assign(param, args.params);
-            await UIActionUtil.execAndResolved(actionId, Object.assign(Object.assign({}, args), { data,
-                event }));
+            const uiAction = await getUIActionById(actionId);
+            if (!uiAction) {
+                throw new RuntimeError(`没有找到界面行为模型${actionId}`);
+            }
+            // 是否过程中启用loading
+            const enableLoading = ['SYS', 'BACKEND', 'WFBACKEND'].includes(uiAction.uiactionMode) &&
+                uiAction.showBusyIndicator !== false;
+            if (enableLoading) {
+                this.state.buttonsState.setLoading(item.id);
+            }
+            try {
+                const res = await this.ctx.view.call(ViewCallTag.GET_DATA);
+                const data = res || [];
+                const args = this.getEventArgs();
+                args.params = Object.assign(param, args.params);
+                await UIActionUtil.execAndResolved(actionId, Object.assign(Object.assign({}, args), { data,
+                    event }));
+            }
+            finally {
+                if (enableLoading) {
+                    this.state.buttonsState.setLoading('');
+                }
+            }
         }
     }
     async onCreated() {
@@ -71,21 +89,15 @@ export class ToolbarController extends ControlController {
      * @memberof ToolbarController
      */
     async onItemClick(item, event, params) {
-        this.state.buttonsState.setLoading(item.id);
         const isExtra = item.buttonType === 'extra';
-        try {
-            await this._evt.emit('onClick', {
-                event,
-                eventArg: item.id,
-                buttonType: isExtra ? 'extra' : 'deuiaction',
-            });
-            // 工具栏才走界面行为
-            if (!isExtra) {
-                await this.doUIAction(item, event, params);
-            }
-        }
-        finally {
-            this.state.buttonsState.setLoading('');
+        await this._evt.emit('onClick', {
+            event,
+            eventArg: item.id,
+            buttonType: isExtra ? 'extra' : 'deuiaction',
+        });
+        // 工具栏才走界面行为
+        if (!isExtra) {
+            await this.doUIAction(item, event, params);
         }
     }
     async calcButtonState(data, appDeId) {

package/out/interface/controller/controller/control/panel-item/i-panel-item.controller.d.ts

@@ -39,13 +39,13 @@ export interface IPanelItemController {
      * @date 2022-09-20 18:09:56
      * @param {string[]} names
      */
-    dataChangeNotify(names: string[]): void;
+    dataChangeNotify(names: string[]): Promise<void>;
     /**
      * 面板状态变更通知
      *
      * @author lxm
      * @date 2022-09-20 18:09:07
      */
-    panelStateNotify(_state: PanelNotifyState): void;
+    panelStateNotify(state: PanelNotifyState): Promise<void>;
 }
 //# sourceMappingURL=i-panel-item.controller.d.ts.map

package/out/interface/controller/controller/control/panel-item/i-panel-item.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-panel-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/interface/controller/controller/control/panel-item/i-panel-item.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AAEpF,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,KAAK,EAAE,UAAU,CAAC;IAClB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,6BAA6B,CAAC;IAEvC;;;;;OAKG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAExC;;;;;OAKG;IACH,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAAC;CAClD"}
+{"version":3,"file":"i-panel-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/interface/controller/controller/control/panel-item/i-panel-item.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AAEpF,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,KAAK,EAAE,UAAU,CAAC;IAClB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,6BAA6B,CAAC;IAEvC;;;;;OAKG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1D"}

package/out/logic-scheduler/trigger/item-dyna-logic-trigger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"item-dyna-logic-trigger.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/trigger/item-dyna-logic-trigger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,qBAAa,oBAAqB,SAAQ,YAAY;IAC5C,IAAI,EAAE,aAAa,GAAG,YAAY,GAAG,WAAW,CAAC;IAEjD,QAAQ,EAAE,cAAc,CAAC;IAEjC,YAAY,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAS3C,kBAAkB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAmBlD,KAAK,CAAC,WAAW,EAAE,mBAAmB,GAAG,OAAO;IAKhD,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,OAAO;CAOhD"}
+{"version":3,"file":"item-dyna-logic-trigger.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/trigger/item-dyna-logic-trigger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,qBAAa,oBAAqB,SAAQ,YAAY;IAC5C,IAAI,EAAE,aAAa,GAAG,YAAY,GAAG,WAAW,CAAC;IAEjD,QAAQ,EAAE,cAAc,CAAC;IAEjC,YAAY,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAS3C,kBAAkB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAmBlD,KAAK,CAAC,WAAW,EAAE,mBAAmB,GAAG,OAAO;IAShD,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,OAAO;CAOhD"}

package/out/logic-scheduler/trigger/item-dyna-logic-trigger.js

@@ -22,8 +22,11 @@ export class ItemDynaLogicTrigger extends LogicTrigger {
         });
     }
     match(matchParams) {
+        var _a, _b;
         const superResult = super.match(matchParams);
-        return superResult && matchParams.itemName === this.logic.itemName;
+        return (superResult &&
+            // 忽略大小写匹配
+            ((_a = matchParams.itemName) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === ((_b = this.logic.itemName) === null || _b === void 0 ? void 0 : _b.toLowerCase()));
     }
     execute(executeParams) {
         const result = this.executor.execute(executeParams);

package/out/service/service/entity/method/method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,8BAAsB,MAAM;IA2CxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IA3ChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAOhC;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GAEf,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAwC7B;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW;CAM/D"}
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,8BAAsB,MAAM;IA2CxB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IA3ChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC;;;;;;;;OAQG;gBAES,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY;IAOhC;;;;;;;;;OASG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GAEf,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IA2C7B;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAM5C;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC;IAOpD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW;CAM/D"}

package/out/service/service/entity/method/method.js

@@ -52,14 +52,14 @@ export class Method {
                     res = await this.app.net.post(`${path}/${methodName}`, notNilEmpty(data) ? data : params);
                     break;
                 case 'GET':
-                    res = await this.app.net.get(`${path}/${methodName}`, data);
+                    res = await this.app.net.get(`${path}/${methodName}`, data || params);
                     break;
                 case 'PUT': {
                     res = await this.app.net.put(`${path}/${methodName}`, notNilEmpty(data) ? data : params);
                     break;
                 }
                 case 'DELETE':
-                    res = await this.app.net.delete(`${path}/${methodName}`, data);
+                    res = await this.app.net.delete(`${path}/${methodName}`, data || params);
                     break;
                 default:
                     if (requestMethod) {

package/out/service/utils/dynamic-code-list/dynamic-code-list.js

@@ -85,11 +85,11 @@ export class DynamicCodeListCache {
     async load(context = {}, params = {}) {
         const app = ibiz.hub.getApp(context.srfappid);
         // *预定义加载
+        // 特殊处理，避免预置代码表加载不全
+        if (!params.size) {
+            params = Object.assign(Object.assign({}, params), { size: 10000 });
+        }
         if (this.isPredefined) {
-            // 特殊处理，避免预置代码表加载不全
-            if (!params.size) {
-                params = Object.assign(Object.assign({}, params), { size: 10000 });
-            }
             const res = await app.net.get(`/dictionaries/codelist/${this.codeList.codeName}`, params);
             return Object.freeze(res.data.items);
         }

package/out/utils/wf-helper/wf-helper.js

@@ -28,8 +28,8 @@ export function getWFSubmitViewId(view, link) {
     const key = type
         ? `WFUTILACTION@${type.toUpperCase()}`
         : `WFACTION@${ibiz.env.isMob ? sequenceflowmobview : sequenceflowview}`;
-    const submitViewRef = appViewRefs.find(viewRef => {
-        return viewRef.name === key;
+    const submitViewRef = appViewRefs === null || appViewRefs === void 0 ? void 0 : appViewRefs.find(viewRef => {
+        return viewRef.name.indexOf(key) !== -1;
     });
     return submitViewRef === null || submitViewRef === void 0 ? void 0 : submitViewRef.refAppViewId;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.27",
+  "version": "0.1.28",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -35,7 +35,7 @@
     "@types/qs": "^6.9.8",
     "@types/systemjs": "^6.13.2",
     "async-validator": "^4.2.5",
-    "dayjs": "^1.11.9",
+    "dayjs": "^1.11.10",
     "echarts": "^5.4.3",
     "handlebars": "^4.7.8",
     "lodash-es": "^4.17.21",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "47fd86dcf2776e07c19dac787a61ec5ed612f085"
+  "gitHead": "143f856b53d9767d9ce655551148ab6d6abd2482"
 }

package/src/controller/control/data-view/data-view.controller.ts

@@ -195,6 +195,7 @@ export class DataViewControlController<
   }
 
   async afterLoad(args: MDCtrlLoadParams, items: IData[]): Promise<IData[]> {
+    await this.initGroupCodeListItems();
     await this.handleDataGroup();
     await this.initGroupActionStates();
     return items;
@@ -340,7 +341,7 @@ export class DataViewControlController<
   protected async initGroupCodeListItems(): Promise<void> {
     const { groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError(this.model, '分组代码表没有配置');
+      return;
     }
     const app = ibiz.hub.getApp(this.context.srfappid);
     this.groupCodeListItems = await app.codeList.get(
@@ -356,9 +357,9 @@ export class DataViewControlController<
    * @memberof DataViewControlController
    */
   async handleCodeListGroup(): Promise<void> {
-    const { groupAppDEFieldId } = this.model;
-    if (!this.groupCodeListItems) {
-      await this.initGroupCodeListItems();
+    const { groupAppDEFieldId, groupCodeListId } = this.model;
+    if (!groupCodeListId) {
+      throw new RuntimeModelError(this.model, '分组代码表没有配置');
     }
     const { items } = this.state;
     const groupMap: Map<string | number, IData[]> = new Map();