@ibiz-template/runtime 0.1.27 → 0.1.29-dev.0

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/controller/control/tree-grid/index.d.ts

@@ -0,0 +1,3 @@
+export * from './tree-grid.controller';
+export * from './tree-grid.service';
+//# sourceMappingURL=index.d.ts.map

package/out/controller/control/tree-grid/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC"}

package/out/controller/control/tree-grid/index.js

@@ -0,0 +1,2 @@
+export * from './tree-grid.controller';
+export * from './tree-grid.service';

package/out/controller/control/tree-grid/tree-grid.controller.d.ts

@@ -0,0 +1,5 @@
+import { ITreeGridController } from '../../../interface';
+import { GridController } from '../grid';
+export declare class TreeGridController extends GridController implements ITreeGridController {
+}
+//# sourceMappingURL=tree-grid.controller.d.ts.map

package/out/controller/control/tree-grid/tree-grid.controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree-grid.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid/tree-grid.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,qBAAa,kBACX,SAAQ,cACR,YAAW,mBAAmB;CAAG"}

package/out/controller/control/tree-grid/tree-grid.controller.js

@@ -0,0 +1,3 @@
+import { GridController } from '../grid';
+export class TreeGridController extends GridController {
+}

package/out/controller/control/tree-grid/tree-grid.service.d.ts

@@ -0,0 +1,13 @@
+import { GridService } from '../grid';
+/**
+ * 树表格部件服务
+ *
+ * @author zk
+ * @date 2023-09-25 05:09:52
+ * @export
+ * @class TreeGridService
+ * @extends {TreeService}
+ */
+export declare class TreeGridService extends GridService {
+}
+//# sourceMappingURL=tree-grid.service.d.ts.map

package/out/controller/control/tree-grid/tree-grid.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree-grid.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid/tree-grid.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,WAAW;CAAG"}

package/out/controller/control/tree-grid/tree-grid.service.js

@@ -0,0 +1,12 @@
+import { GridService } from '../grid';
+/**
+ * 树表格部件服务
+ *
+ * @author zk
+ * @date 2023-09-25 05:09:52
+ * @export
+ * @class TreeGridService
+ * @extends {TreeService}
+ */
+export class TreeGridService extends GridService {
+}

package/out/controller/control/tree-grid-ex/index.d.ts

@@ -0,0 +1,3 @@
+export * from './tree-grid-ex.controller';
+export * from './tree-grid-ex.service';
+//# sourceMappingURL=index.d.ts.map

package/out/controller/control/tree-grid-ex/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid-ex/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC"}

package/out/controller/control/tree-grid-ex/index.js

@@ -0,0 +1,2 @@
+export * from './tree-grid-ex.controller';
+export * from './tree-grid-ex.service';

package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.d.ts

@@ -0,0 +1,134 @@
+import { IDETree, IDETreeColumn } from '@ibiz/model-core';
+import { MDCtrlLoadParams, ITreeNodeData, ITreeGridExController, IGridColumnProvider, ITreeGridExState, ITreeGridExEvent } from '../../../interface';
+import { MDControlController } from '../../common';
+import { GridColumnController, GridFieldColumnController, GridUAColumnController } from '../grid';
+import { TreeGridExService } from './tree-grid-ex.service';
+/**
+ * 树表格部件控制器
+ *
+ * @author zk
+ * @date 2023-09-21 06:09:46
+ * @export
+ * @class TreeGridExController
+ * @extends {MDControlController<IDETree, ITreeGridState, ITreeGridEvent>}
+ * @implements {ITreeGridExController}
+ */
+export declare class TreeGridExController extends MDControlController<IDETree, ITreeGridExState, ITreeGridExEvent> implements ITreeGridExController {
+    service: TreeGridExService;
+    /**
+     * 表格列的适配器
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:04
+     * @type {{ [key: string]: IGridColumnProvider }}
+     * @memberof TreeGridExController
+     */
+    providers: {
+        [key: string]: IGridColumnProvider;
+    };
+    /**
+     * 所有表格列控制器集合
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:10
+     * @type {{ [key: string]: GridColumnController }}
+     * @memberof TreeGridExController
+     */
+    columns: {
+        [key: string]: GridColumnController;
+    };
+    /**
+     * 所有表格属性列的控制器
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:16
+     * @type {{ [key: string]: GridFieldColumnController }}
+     * @memberof TreeGridExController
+     */
+    fieldColumns: {
+        [key: string]: GridFieldColumnController;
+    };
+    /**
+     * 所有表格操作列的控制器
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:21
+     * @type {{ [key: string]: GridUAColumnController }}
+     * @memberof TreeGridExController
+     */
+    uaColumns: {
+        [key: string]: GridUAColumnController;
+    };
+    protected initState(): void;
+    protected onCreated(): Promise<void>;
+    /**
+     * 初始化表格属性列，操作列，编辑项控制器
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:28
+     * @protected
+     * @return {*}  {Promise<void>}
+     * @memberof TreeGridExController
+     */
+    protected initGridColumns(): Promise<void>;
+    /**
+     * 初始化表格属性列，操作列，编辑项控制器
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:37
+     * @protected
+     * @param {IDETreeColumn} column
+     * @return {*}  {Promise<void>}
+     * @memberof TreeGridExController
+     */
+    protected initColumnsController(column: IDETreeColumn): Promise<void>;
+    /**
+     * 初始化表格列状态
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:43
+     * @protected
+     * @memberof TreeGridExController
+     */
+    protected initColumnStates(): void;
+    /**
+     * 计算列的固定状态
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:50
+     * @protected
+     * @memberof TreeGridExController
+     */
+    protected calcColumnFixed(): void;
+    /**
+     * 树部件加载，从根节点开始重新加载
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:56
+     * @param {MDCtrlLoadParams} [args={}]
+     * @return {*}  {Promise<ITreeNodeData[]>}
+     * @memberof TreeGridExController
+     */
+    load(args?: MDCtrlLoadParams): Promise<ITreeNodeData[]>;
+    /**
+     * 加载子节点数据
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:02
+     * @param {ITreeNodeData} [parentNode]
+     * @return {*}  {Promise<ITreeNodeData[]>}
+     * @memberof TreeGridExController
+     */
+    loadNodes(parentNode?: ITreeNodeData): Promise<ITreeNodeData[]>;
+    /**
+     * 计算展开节点集合
+     *
+     * @author zk
+     * @date 2023-09-21 06:09:07
+     * @param {ITreeNodeData[]} nodes
+     * @return {*}  {string[]}
+     * @memberof TreeGridExController
+     */
+    protected calcExpandedKeys(nodes: ITreeNodeData[]): string[];
+}
+//# sourceMappingURL=tree-grid-ex.controller.d.ts.map

package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree-grid-ex.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,qBAAqB,EACrB,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,CACvE,YAAW,qBAAqB;IAExB,OAAO,EAAE,iBAAiB,CAAC;IAEnC;;;;;;;OAOG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;;;OAOG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEtD;;;;;;;OAOG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAAE,CAAM;IAEhE;;;;;;;OAOG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAE1D,SAAS,CAAC,SAAS,IAAI,IAAI;cAQX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;;;;;OAQG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhD;;;;;;;;;OASG;cACa,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB3E;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAkBlC;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAcjC;;;;;;;;OAQG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAajE;;;;;;;;OAQG;IACG,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAyCrE;;;;;;;;OAQG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE;CAa7D"}