@ibiz-template/runtime 0.6.18 → 0.7.0

package/out/app-hub.d.ts

@@ -245,5 +245,12 @@ export declare class AppHub implements IAppHubService {
      */
     getAppDEService(appId: string, entityId: string, context: IContext): Promise<IAppDEService>;
     reset(): void;
+    /**
+     * 销毁基座
+     *
+     * @author tony001
+     * @date 2024-04-10 17:04:38
+     */
+    destroy(): void;
 }
 //# sourceMappingURL=app-hub.d.ts.map

package/out/app-hub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-hub.d.ts","sourceRoot":"","sources":["../src/app-hub.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app-hub.d.ts","sourceRoot":"","sources":["../src/app-hub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EACL,aAAa,EACb,cAAc,EACd,WAAW,EACX,mBAAmB,EACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D;;;;;;;GAOG;AACH,qBAAa,MAAO,YAAW,cAAc;IAC3C;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAiB;IAE1C;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,gBAAuB;IAE1C;;;;;;OAMG;IACH,WAAW,EAAG,aAAa,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE/D;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAa;IAEnD;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAa;IAE7E;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAEpD;;;;OAIG;IACH,MAAM,mBAA0B;IAEhC,MAAM,mBAA0B;IAEhC;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAW;IAE1C;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAW5C;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI;IAIhE;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAItC;;;;;;;OAOG;IACH,qBAAqB,CACnB,KAAK,EAAE,cAAc,EACrB,KAAK,GAAE,MAAuB,GAC7B,IAAI;IAQP;;;;;;;;OAQG;IACH,UAAU,CACR,GAAG,EAAE,MAAM,EACX,KAAK,GAAE,MAAuB,EAC9B,QAAQ,GAAE,MAAW,GACpB,IAAI;IAeP;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAKhC;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAOxD;;;;;;;OAOG;IACG,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAiBhD;;;;;;;;;OASG;IACG,WAAW,CACf,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,CAAC;IAYpB;;;;;;;;OAQG;IACG,gBAAgB,CACpB,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,MAAuB,GAC7B,OAAO,CAAC,cAAc,CAAC;IAuB1B;;;;;;;OAOG;cACa,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAsB3D;;;;;;;OAOG;IACG,WAAW,CAAC,GAAG,GAAE,MAAuB,GAAG,OAAO,CAAC,WAAW,CAAC;IAIrE;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW;IAchD;;;;;;OAMG;IACH,UAAU,IAAI,WAAW,EAAE;IAO3B;;;;;;;;;OASG;IACG,eAAe,CACnB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,aAAa,CAAC;IAKzB,KAAK,IAAI,IAAI;IAMb;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAKhB"}

package/out/app-hub.js

@@ -355,4 +355,15 @@ export class AppHub {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         this.configCache = undefined;
     }
+    /**
+     * 销毁基座
+     *
+     * @author tony001
+     * @date 2024-04-10 17:04:38
+     */
+    destroy() {
+        ibiz.hub.getAllApps().forEach(app => {
+            app.destroy();
+        });
+    }
 }

package/out/application.d.ts

@@ -145,5 +145,12 @@ export declare class Application implements IAppService {
      * @return {*}  {Promise<void>}
      */
     initMqtt(): Promise<void>;
+    /**
+     * 销毁应用
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:51
+     */
+    destroy(): void;
 }
 //# sourceMappingURL=application.d.ts.map

package/out/application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAY,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,aAAa,EACb,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;;;;;;;GAQG;AACH,qBAAa,WAAY,YAAW,WAAW;aAkFjB,KAAK,EAAE,YAAY;IAjF/C;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE5D;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAElC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAErC;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB;;;;;;OAMG;gBACyB,KAAK,EAAE,YAAY;IAc/C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B;;;;;;;OAOG;cACa,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAMvC;;;;;;;OAOG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAqBxE;;;;;;;OAOG;IACG,SAAS,CACb,EAAE,EAAE,MAAM,EACV,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAajC;;;;;;;OAOG;IACG,YAAY,CAChB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAUlC;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAuBhC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAY,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,aAAa,EACb,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;;;;;;;GAQG;AACH,qBAAa,WAAY,YAAW,WAAW;aAkFjB,KAAK,EAAE,YAAY;IAjF/C;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE5D;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAElC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAErC;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB;;;;;;OAMG;gBACyB,KAAK,EAAE,YAAY;IAc/C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B;;;;;;;OAOG;cACa,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAMvC;;;;;;;OAOG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAqBxE;;;;;;;OAOG;IACG,SAAS,CACb,EAAE,EAAE,MAAM,EACV,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAajC;;;;;;;OAOG;IACG,YAAY,CAChB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAUlC;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAwB/B;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAGhB"}

package/out/application.js

@@ -168,4 +168,13 @@ export class Application {
             await this.mqtt.connect();
         }
     }
+    /**
+     * 销毁应用
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:51
+     */
+    destroy() {
+        this.codeList.destroy();
+    }
 }

package/out/controller/common/control/md-control.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EAGf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAoB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACI,SAAS,UAAS;IAEzB,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAgB3B;;;;;OAKG;IACH,SAAS,CAAC,cAAc,sBAA6B;IAErD;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;cAEe,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAkB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACH,YAAY,IAAI;QACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;IAOD;;;;;;;;OAQG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAoCnD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B7D;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA4DzD;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIzE;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9B;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA8DtD;;;;;OAKG;IACG,gBAAgB,CACpB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,OAAO,CAAC;IAanB;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAU9B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAqBtC;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAkCjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC7D;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CA0CpD"}
+{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/common/control/md-control.controller.js

@@ -209,6 +209,9 @@ export class MDControlController extends ControlController {
             if (typeof res.total === 'number') {
                 this.state.total = res.total;
             }
+            if (typeof res.totalPages === 'number') {
+                this.state.totalPages = res.totalPages;
+            }
             if (isLoadMore) {
                 this.state.items.push(...res.data);
             }

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

@@ -30,6 +30,44 @@ export declare class ChartController extends MDControlController<IDEChart, IChar
     protected initState(): void;
     protected onCreated(): Promise<void>;
     afterLoad(args: MDCtrlLoadParams, items: IData[]): Promise<IData[]>;
+    /**
+     * 解析表格相关参数
+     *
+     * @memberof ChartController
+     */
+    parseGridParam(): void;
+    /**
+     * 计算总数
+     *
+     * @param {string} valueField
+     * @return {*}
+     * @memberof ChartController
+     */
+    computeTotal(valueField: string): number;
+    /**
+     * 处理单序列时的表格数据
+     * 图表单序列时，首先获取配置的分类属性和值属性的title,构建表头，内置支持百分比列
+     * 然后遍历图表默认分出来的分组数据去生成表格的数据
+     *
+     * @memberof ChartController
+     */
+    handleSingleSerieGridData(): void;
+    /**
+     * 处理多序列时的表格数据
+     * 图表多序列时，首先去遍历序列，然后获取每个序列的分类属性和值属性以及已经分好的分组数据，
+     * 查找当前的表格头数组中是否存在当前的分类或者值属性组成的项，如果没有就将当前分类或者值属性添加到表格头数组中，以序列作为表格列
+     * 同理，循环当前序列的分组数据，并根据当前分组属性的值生成表格数据，如果在表格数据中已经存在具有相同分组属性值，则把当前序列的当前分组属性对应的值属性
+     * 添加到表格数据中对应的项里
+     *
+     * @memberof ChartController
+     */
+    handleMultipleSerieGridData(): void;
+    /**
+     * 计算表格数据
+     *
+     * @memberof ChartController
+     */
+    computeGridData(): void;
     /**
      * 初始化echarts对象
      * @author lxm

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

@@ -1 +1 @@
-{"version":3,"file":"chart.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/chart/chart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,qBAAa,eACX,SAAQ,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC9D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,EAAG,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAYpC,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUzE;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAUnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,GAAE,KAAK,EAAqB,GAAG,IAAI;IAKnD;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAWnB;;;;OAIG;IACH,WAAW,IAAI,IAAI;cAMH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7C"}
+{"version":3,"file":"chart.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/chart/chart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,qBAAa,eACX,SAAQ,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC9D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,EAAG,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,SAAS,CAAC,SAAS,IAAI,IAAI;cASX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUzE;;;;OAIG;IACI,cAAc,IAAI,IAAI;IAc7B;;;;;;OAMG;IACI,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAW/C;;;;;;OAMG;IACI,yBAAyB,IAAI,IAAI;IAuDxC;;;;;;;;OAQG;IACI,2BAA2B,IAAI,IAAI;IAwD1C;;;;OAIG;IACI,eAAe,IAAI,IAAI;IAU9B;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAUnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,GAAE,KAAK,EAAqB,GAAG,IAAI;IASnD;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAWnB;;;;OAIG;IACH,WAAW,IAAI,IAAI;cAMH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7C"}

package/out/controller/control/chart/chart.controller.js

@@ -6,6 +6,10 @@ export class ChartController extends MDControlController {
     initState() {
         super.initState();
         this.state.size = 1000;
+        this.state.showGrid = false;
+        this.state.gridHeaders = [];
+        this.state.gridData = [];
+        this.state.gridPosition = 'bottom';
     }
     async onCreated() {
         await super.onCreated();
@@ -13,6 +17,8 @@ export class ChartController extends MDControlController {
         await this.service.init(this.context);
         this.generator = new ChartOptionsGenerator(this.model);
         await this.generator.init(this.context, this.params);
+        // 计算图表表格相关参数
+        this.parseGridParam();
         // 监听resize调整图表大小
         this.resizeChart = this.resizeChart.bind(this);
         window.addEventListener('resize', this.resizeChart);
@@ -26,6 +32,179 @@ export class ChartController extends MDControlController {
         this.calcOptions();
         return result;
     }
+    /**
+     * 解析表格相关参数
+     *
+     * @memberof ChartController
+     */
+    parseGridParam() {
+        if (this.model.dechartDataGrid) {
+            if (this.model.dechartDataGrid.dataGridPos) {
+                this.state.gridPosition =
+                    this.model.dechartDataGrid.dataGridPos.toLocaleLowerCase();
+            }
+            else {
+                this.state.gridPosition = 'bottom';
+            }
+            if (this.model.dechartDataGrid.showDataGrid === true) {
+                this.state.showGrid = true;
+            }
+        }
+    }
+    /**
+     * 计算总数
+     *
+     * @param {string} valueField
+     * @return {*}
+     * @memberof ChartController
+     */
+    computeTotal(valueField) {
+        let total = 0;
+        this.state.items.forEach((item) => {
+            const value = Number(item[valueField]);
+            if (!Number.isNaN(value)) {
+                total += Number(value);
+            }
+        });
+        return total;
+    }
+    /**
+     * 处理单序列时的表格数据
+     * 图表单序列时，首先获取配置的分类属性和值属性的title,构建表头，内置支持百分比列
+     * 然后遍历图表默认分出来的分组数据去生成表格的数据
+     *
+     * @memberof ChartController
+     */
+    handleSingleSerieGridData() {
+        const serie = this.generator.seriesGenerators[0];
+        // 单序列，构建表格数据，第一列为分组属性，第二列为值属性的值，第三列为百分比
+        const { catalogField, valueField, groupData } = serie;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const fields = serie.chartGenerator.entity.appDEFields;
+        // 获取到分类和值属性的title,构建表头
+        const cataTitle = fields.find((field) => {
+            return field.id === catalogField;
+        });
+        const valueTitle = fields.find((field) => {
+            return field.id === valueField;
+        });
+        const tempGridHeader = [
+            {
+                id: catalogField,
+                name: cataTitle === null || cataTitle === void 0 ? void 0 : cataTitle.logicName,
+            },
+            {
+                id: valueField,
+                name: valueTitle === null || valueTitle === void 0 ? void 0 : valueTitle.logicName,
+            },
+            {
+                id: 'srfpercent',
+                name: '百分比',
+            },
+        ];
+        this.state.gridHeaders = tempGridHeader;
+        const tempData = [];
+        const total = this.computeTotal(valueField);
+        if (groupData && groupData.$default_group) {
+            const group = groupData.$default_group;
+            for (const [key, value] of group) {
+                const tempValue = Number.isNaN(Number(value.value))
+                    ? 0
+                    : Number(value.value);
+                let percent = '';
+                if (total === 0 || Number.isNaN(Number(value.value))) {
+                    percent = '0%';
+                }
+                else {
+                    percent = `${Math.round((tempValue / total) * 100)}%`;
+                }
+                const tempItem = {
+                    [catalogField]: key,
+                    [valueField]: tempValue,
+                    srfpercent: percent,
+                };
+                tempData.push(tempItem);
+            }
+        }
+        this.state.gridData = tempData;
+    }
+    /**
+     * 处理多序列时的表格数据
+     * 图表多序列时，首先去遍历序列，然后获取每个序列的分类属性和值属性以及已经分好的分组数据，
+     * 查找当前的表格头数组中是否存在当前的分类或者值属性组成的项，如果没有就将当前分类或者值属性添加到表格头数组中，以序列作为表格列
+     * 同理，循环当前序列的分组数据，并根据当前分组属性的值生成表格数据，如果在表格数据中已经存在具有相同分组属性值，则把当前序列的当前分组属性对应的值属性
+     * 添加到表格数据中对应的项里
+     *
+     * @memberof ChartController
+     */
+    handleMultipleSerieGridData() {
+        // 多序列,表格第一列使用分组属性的值，后续其他列通过其他序列计算后动态组装,
+        const tempHeaders = [];
+        const tempData = [];
+        this.generator.seriesGenerators.forEach((serie) => {
+            const { catalogField, valueField, groupData } = serie;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const fields = serie.chartGenerator.entity.appDEFields;
+            const _index = tempHeaders.findIndex((item) => {
+                return item.id === catalogField;
+            });
+            if (_index < 0) {
+                const cataTitle = fields.find((field) => {
+                    return field.id === catalogField.toLowerCase();
+                });
+                tempHeaders.push({
+                    id: catalogField,
+                    name: cataTitle === null || cataTitle === void 0 ? void 0 : cataTitle.logicName,
+                });
+            }
+            const valueTitle = fields.find((field) => {
+                return field.id === valueField.toLowerCase();
+            });
+            tempHeaders.push({
+                id: valueField,
+                name: valueTitle === null || valueTitle === void 0 ? void 0 : valueTitle.logicName,
+            });
+            if (groupData && groupData.$default_group) {
+                const group = groupData.$default_group;
+                for (const [key, value] of group) {
+                    const tempValue = Number.isNaN(Number(value.value))
+                        ? 0
+                        : Number(value.value);
+                    const index = tempData.findIndex((item) => {
+                        return item[catalogField] === key;
+                    });
+                    if (index < 0) {
+                        const tempItem = {
+                            [catalogField]: key,
+                            [valueField]: tempValue,
+                        };
+                        tempData.push(tempItem);
+                    }
+                    else {
+                        // 在对应的数据项上添加属性
+                        Object.assign(tempData[index], { [valueField]: tempValue });
+                    }
+                }
+            }
+        });
+        this.state.gridHeaders = tempHeaders;
+        this.state.gridData = tempData;
+    }
+    /**
+     * 计算表格数据
+     *
+     * @memberof ChartController
+     */
+    computeGridData() {
+        if (this.generator && this.generator.seriesGenerators) {
+            if (this.generator.seriesGenerators.length === 1) {
+                this.handleSingleSerieGridData();
+            }
+            else {
+                this.handleMultipleSerieGridData();
+            }
+        }
+    }
     /**
      * 初始化echarts对象
      * @author lxm
@@ -50,6 +229,10 @@ export class ChartController extends MDControlController {
      */
     calcOptions(data = this.state.items) {
         this.options = this.generator.calcOptionsByData(data);
+        if (this.state.showGrid) {
+            // 开启图表表格后才会计算表格的数据
+            this.computeGridData();
+        }
         this.updateChart();
     }
     /**

package/out/controller/control/chart/generator/base-series-generator.js

@@ -195,7 +195,7 @@ export class BaseSeriesGenerator {
                 groupData[group].set(catalog, { value: 0 });
             }
             // 相同分类属性的值属性数据累加
-            groupData[group].get(catalog).value = plus(groupData[group].get(catalog).value, item[this.valueField]);
+            groupData[group].get(catalog).value = plus(groupData[group].get(catalog).value, item[this.valueField] || 0);
             // 没有chartData说明是第一条，有chartData说明是累加数据，自己封装里面的deData
             if (!groupData[group].get(catalog).chartData) {
                 this.prepareChartData(groupData, item, catalog, group);

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

@@ -1 +1 @@
-{"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,UAAU,EAA6B,MAAM,qBAAqB,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAiB,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EACV,wBAAwB,EACxB,kBAAkB,EAElB,oBAAoB,EACrB,MAAM,gBAAgB,CAAC;AAExB;;;;;;;;;GASG;AACH,8BAAsB,cAAc,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE,kBAAkB,EAAE,CAAM;IAErC;;;;;;OAMG;IACH,WAAW,EAAE,oBAAoB,EAAE,CAAM;IAEzC;;;;;OAKG;IACH,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAM;IAE7C;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAStD;;;;;OAKG;IACH,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAM7C;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;;OAMG;cACa,qBAAqB,CACnC,OAAO,GAAE,aAAa,EAA4B,EAClD,IAAI,GAAE,cAAqB,EAC3B,MAAM,GAAE,wBAAwB,GAAG,SAAqB,GACvD,OAAO,CAAC,IAAI,CAAC;IA8ChB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAE/B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;;;;;OAOG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBzD,cAAc,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9D;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAWlC;;;;;;;OAOG;IACH,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GACzC,IAAI;IAUP;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;cAiBlD,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAM5C;;;;;;OAMG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB5C;;;;;;OAMG;IACH,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;CAO9D"}
+{"version":3,"file":"form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/form/form.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/form/form/form.controller.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-param-reassign */
 import { RuntimeModelError, debounceAndAsyncMerge, recursiveIterate, EntityError, } from '@ibiz-template/core';
-import { findChildFormDetails, isFormDataContainer } from '../../../../model';
+import { calcDeCodeNameById, findChildFormDetails, isFormDataContainer, } from '../../../../model';
 import { getFormDetailProvider } from '../../../../register';
 import { ControlVO, CounterService } from '../../../../service';
 import { handleAllSettled } from '../../../../utils';
@@ -268,9 +268,10 @@ export class FormController extends ControlController {
         this.counters = {};
         const { appCounterRefs } = this.model;
         if (appCounterRefs && appCounterRefs.length > 0) {
+            const dataKey = this.context[calcDeCodeNameById(this.model.appDataEntityId)];
             try {
                 await Promise.all(appCounterRefs.map(async (counterRef) => {
-                    const counter = await CounterService.getCounterByRef(counterRef, this.context);
+                    const counter = await CounterService.getCounterByRef(counterRef, this.context, dataKey ? { customId: dataKey } : undefined);
                     this.counters[counterRef.id] = counter;
                 }));
             }
@@ -289,7 +290,7 @@ export class FormController extends ControlController {
     setDetailError(name, message) {
         const detail = this.details[name];
         const state = detail === null || detail === void 0 ? void 0 : detail.state;
-        if (state && state.error) {
+        if (state) {
             state.error = message;
         }
     }

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.d.ts

@@ -1,4 +1,4 @@
-import { FormDetailState } from '../form-detail';
+import { FormMDCtrlState } from './form-mdctrl.state';
 export interface MDCtrlFormItem {
     /**
      * 唯一标识
@@ -28,7 +28,7 @@ export interface MDCtrlFormItem {
  * @author: zhujiamin
  * @Date: 2023-01-04 10:26:34
  */
-export declare class FormMDCtrlFormState extends FormDetailState {
+export declare class FormMDCtrlFormState extends FormMDCtrlState {
     /**
      * 每个表单绘制相关参数
      * @author lxm

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-mdctrl-form.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,WAAW,cAAc;IAC7B;;;;;OAKG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;;;OAKG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;GAKG;AACH,qBAAa,mBAAoB,SAAQ,eAAe;IACtD;;;;;OAKG;IACH,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;CAC1B"}
+{"version":3,"file":"form-mdctrl-form.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,WAAW,cAAc;IAC7B;;;;;OAKG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;;;OAKG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;GAKG;AACH,qBAAa,mBAAoB,SAAQ,eAAe;IACtD;;;;;OAKG;IACH,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;CAC1B"}

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.js

@@ -1,9 +1,9 @@
-import { FormDetailState } from '../form-detail';
+import { FormMDCtrlState } from './form-mdctrl.state';
 /**
  * 表单多数据部件状态
  * @return {*}
  * @author: zhujiamin
  * @Date: 2023-01-04 10:26:34
  */
-export class FormMDCtrlFormState extends FormDetailState {
+export class FormMDCtrlFormState extends FormMDCtrlState {
 }

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.d.ts

@@ -1,5 +1,7 @@
-import { IDEFormMDCtrl } from '@ibiz/model-core';
+import { IDEFormMDCtrl, IUIActionGroupDetail } from '@ibiz/model-core';
 import { FormDetailController } from '../form-detail';
+import { FormMDCtrlState } from './form-mdctrl.state';
+import { FormNotifyState } from '../../../../constant';
 /**
  * 表单多数据部件控制器
  *
@@ -10,6 +12,15 @@ import { FormDetailController } from '../form-detail';
  * @extends {FormDetailController<IDEFormMDCtrl>}
  */
 export declare class FormMDCtrlController extends FormDetailController<IDEFormMDCtrl> {
+    /**
+     * 表单多数据部件控制器状态
+     *
+     * @author lxm
+     * @date 2023-11-09 04:33:47
+     * @type {FormMDCtrlFormState}
+     */
+    state: FormMDCtrlState;
+    protected createState(): FormMDCtrlState;
     /**
      * 名称
      * @author lxm
@@ -67,6 +78,26 @@ export declare class FormMDCtrlController extends FormDetailController<IDEFormMD
      * @return {*}  {Promise<void>}
      */
     updateFormItem(): Promise<void>;
+    formStateNotify(state: FormNotifyState): Promise<void>;
+    /**
+     * 初始化
+     *
+     * @author zk
+     * @date 2023-07-25 10:07:11
+     * @return {*}  {Promise<void>}
+     * @memberof FormMDCtrlController
+     */
+    protected onInit(): Promise<void>;
+    initActionStates(): Promise<void>;
+    /**
+     * 触发操作列点击事件
+     *
+     * @author lxm
+     * @date 2022-09-07 22:09:46
+     * @param {IPSUIActionGroupDetail} detail
+     * @param {MouseEvent} event
+     */
+    onActionClick(detail: IUIActionGroupDetail, event: MouseEvent): Promise<void>;
     /**
      * 刷新
      * @author lxm

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-mdctrl.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB,CAAC,aAAa,CAAC;IAC3E;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;OAMG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;;OAOG;IACH,IAAI,YAAY,IAAI,OAAO,CAK1B;IAED;;;;;;;OAOG;IACH,IAAI,YAAY,IAAI,OAAO,CAK1B;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAK1B;IAED;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAMrC;;;;OAIG;IACH,OAAO,IAAI,IAAI;IAIf;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;CAInC"}
+{"version":3,"file":"form-mdctrl.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB,CAAC,aAAa,CAAC;IAC3E;;;;;;OAMG;IACK,KAAK,EAAE,eAAe,CAAC;IAE/B,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;OAMG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;;OAOG;IACH,IAAI,YAAY,IAAI,OAAO,CAK1B;IAED;;;;;;;OAOG;IACH,IAAI,YAAY,IAAI,OAAO,CAK1B;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAK1B;IAED;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAM/B,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5D;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAgBhB;;;;OAIG;IACH,OAAO,IAAI,IAAI;IAIf;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;CAInC"}

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.js

@@ -1,5 +1,8 @@
 import { BitMask } from '@ibiz-template/core';
 import { FormDetailController } from '../form-detail';
+import { FormMDCtrlState } from './form-mdctrl.state';
+import { ButtonContainerState, UIActionButtonState } from '../../../../utils';
+import { UIActionUtil } from '../../../../../ui-action';
 /**
  * 表单多数据部件控制器
  *
@@ -10,6 +13,10 @@ import { FormDetailController } from '../form-detail';
  * @extends {FormDetailController<IDEFormMDCtrl>}
  */
 export class FormMDCtrlController extends FormDetailController {
+    createState() {
+        var _a;
+        return new FormMDCtrlState((_a = this.parent) === null || _a === void 0 ? void 0 : _a.state);
+    }
     /**
      * 名称
      * @author lxm
@@ -86,6 +93,62 @@ export class FormMDCtrlController extends FormDetailController {
             await this.form.updateFormItem(this.model.deformItemUpdateId);
         }
     }
+    async formStateNotify(state) {
+        super.formStateNotify(state);
+        // 只在加载后台数据之后，更新界面行为组状态
+        if (this.state.actionGroupState) {
+            const deData = this.data.getOrigin ? this.data.getOrigin() : this.data;
+            this.state.actionGroupState.update(this.form.context, deData);
+        }
+    }
+    /**
+     * 初始化
+     *
+     * @author zk
+     * @date 2023-07-25 10:07:11
+     * @return {*}  {Promise<void>}
+     * @memberof FormMDCtrlController
+     */
+    async onInit() {
+        super.onInit();
+        await this.initActionStates();
+    }
+    async initActionStates() {
+        var _a;
+        // 操作列按钮状态控制
+        const { uiactionGroup } = this.model;
+        if (!((_a = uiactionGroup === null || uiactionGroup === void 0 ? void 0 : uiactionGroup.uiactionGroupDetails) === null || _a === void 0 ? void 0 : _a.length)) {
+            return;
+        }
+        const containerState = new ButtonContainerState();
+        uiactionGroup.uiactionGroupDetails.forEach(detail => {
+            const actionid = detail.uiactionId;
+            if (actionid) {
+                const buttonState = new UIActionButtonState(detail.id, this.form.context.srfappid, actionid);
+                containerState.addState(detail.id, buttonState);
+            }
+        });
+        await containerState.update(this.form.context);
+        this.state.actionGroupState = containerState;
+    }
+    /**
+     * 触发操作列点击事件
+     *
+     * @author lxm
+     * @date 2022-09-07 22:09:46
+     * @param {IPSUIActionGroupDetail} detail
+     * @param {MouseEvent} event
+     */
+    async onActionClick(detail, event) {
+        const actionId = detail.uiactionId;
+        await UIActionUtil.execAndResolved(actionId, {
+            context: this.context,
+            params: this.params,
+            data: [this.data],
+            view: this.form.view,
+            event,
+        }, detail.appId);
+    }
     /**
      * 刷新
      * @author lxm

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.d.ts

@@ -0,0 +1,12 @@
+import { IButtonContainerState } from '../../../../../interface';
+import { FormDetailState } from '../form-detail';
+export declare class FormMDCtrlState extends FormDetailState {
+    /**
+     * 界面行为组状态
+     *
+     * @type {(IButtonContainerState | null)}
+     * @memberof PortletPartState
+     */
+    actionGroupState: IButtonContainerState | null;
+}
+//# sourceMappingURL=form-mdctrl.state.d.ts.map

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-mdctrl.state.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,qBAAa,eAAgB,SAAQ,eAAe;IAClD;;;;;OAKG;IACH,gBAAgB,EAAE,qBAAqB,GAAG,IAAI,CAAQ;CACvD"}

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.js

@@ -0,0 +1,13 @@
+import { FormDetailState } from '../form-detail';
+export class FormMDCtrlState extends FormDetailState {
+    constructor() {
+        super(...arguments);
+        /**
+         * 界面行为组状态
+         *
+         * @type {(IButtonContainerState | null)}
+         * @memberof PortletPartState
+         */
+        this.actionGroupState = null;
+    }
+}

package/out/controller/control/search-bar/index.d.ts

@@ -1,6 +1,8 @@
 export * from './search-bar.controller';
 export { SearchBarFilterController } from './search-bar-filter.controller';
 export * from './entity-schema';
-export * from './use-searchcond';
+export * from './interface-util';
+export * from './util';
 export { SearchBarFilterItemsController } from './search-bar-filter-items.controller';
+export { SearchBarFilterSimpleItemsController } from './search-bar-filter-simple-items.controller';
 //# sourceMappingURL=index.d.ts.map

package/out/controller/control/search-bar/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,QAAQ,CAAC;AACvB,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,oCAAoC,EAAE,MAAM,6CAA6C,CAAC"}