@ibiz-template/runtime 0.7.26-alpha.2 → 0.7.26

package/out/controller/control/dashboard/custom-dashboard.controller.js

@@ -45,7 +45,7 @@ export class CustomDashboardController {
          */
         this.portletConfig = {};
         /**
-         * 自定义定制范围类型（public：公开，personal：个人，data：数据，默认是按照个人区分，配置了应用功能组件才生效）
+         * 自定义定制范围类型（public：公开，personal：个人，data：数据，dynamic: 自定义动态,默认是按照个人区分，配置了应用功能组件才生效）
          *
          * @author tony001
          * @date 2024-04-24 19:04:47
@@ -68,13 +68,6 @@ export class CustomDashboardController {
          * @type {string}
          */
         this.ownerId = '';
-        /**
-         * 是否多模式
-         *
-         * @type {boolean}
-         * @memberof CustomDashboardController
-         */
-        this.multiMode = false;
         this.context = dashboard.context;
         this.params = dashboard.params;
         this.init(dashboard.controlParams);
@@ -102,7 +95,6 @@ export class CustomDashboardController {
             this.ownerId = this.context[controlParams.owner_id];
         }
         if (controlParams.multimode === 'true') {
-            this.multiMode = true;
             this.type = 'dynamic';
         }
         // 配置了应用功能组件则走应用功能组件服务存储，否则走rt的config存储

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

@@ -31,6 +31,14 @@ export declare class DashboardController extends ControlController<IDashboard, I
     portlets: {
         [key: string]: IPortletController;
     };
+    /**
+     * 启用动态
+     *
+     * @author tony001
+     * @date 2024-06-27 11:06:24
+     * @type {boolean}
+     */
+    enableDynamic: boolean;
     protected initState(): void;
     protected onCreated(): Promise<void>;
     /**
@@ -58,6 +66,23 @@ export declare class DashboardController extends ControlController<IDashboard, I
      * @memberof DashboardController
      */
     resetPortlets(): Promise<void>;
+    /**
+     * 加载动态
+     *
+     * @author tony001
+     * @date 2024-06-27 16:06:21
+     * @return {*}  {Promise<IData[]>}
+     */
+    loadAllDynaPortlet(): Promise<IData[]>;
+    /**
+     * 通过指定标识加载门户部件
+     *
+     * @author tony001
+     * @date 2024-06-27 17:06:12
+     * @param {string} id
+     * @return {*}  {(Promise<IDBPortletPart | undefined>)}
+     */
+    loadDynaPortletById(id: string): Promise<IDBPortletPart | undefined>;
     /**
      * 通知所有表单成员表单操作过程中的数据变更
      *

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/dashboard.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,cAAc,EACf,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC5B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;;OAMG;IACH,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAE,CAAM;IAErD,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB1C;;;;;;;;OAQG;IACG,YAAY,CAChB,aAAa,EAAE,cAAc,EAAE,EAC/B,MAAM,CAAC,EAAE,2BAA2B,GACnC,OAAO,CAAC,IAAI,CAAC;IAwChB;;;;;;OAMG;IACG,kBAAkB,CAAC,MAAM,GAAE,KAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAW3D;;;;;OAKG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAQpC;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAQnD"}
+{"version":3,"file":"dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/dashboard.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EAEV,cAAc,EACf,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC5B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;;OAMG;IACH,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAE,CAAM;IAErD;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAS;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB1C;;;;;;;;OAQG;IACG,YAAY,CAChB,aAAa,EAAE,cAAc,EAAE,EAC/B,MAAM,CAAC,EAAE,2BAA2B,GACnC,OAAO,CAAC,IAAI,CAAC;IAwChB;;;;;;OAMG;IACG,kBAAkB,CAAC,MAAM,GAAE,KAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAW3D;;;;;OAKG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAQpC;;;;;;OAMG;IACG,kBAAkB,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAkB5C;;;;;;;OAOG;IACG,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAmB1E;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAQnD"}

package/out/controller/control/dashboard/dashboard.controller.js

@@ -1,3 +1,4 @@
+import { clone } from 'ramda';
 import { ControlType } from '../../../constant';
 import { getPortletProvider } from '../../../register';
 import { handleAllSettled } from '../../../utils';
@@ -31,13 +32,26 @@ export class DashboardController extends ControlController {
          * @type {{ [key: string]: IPortletController }}
          */
         this.portlets = {};
+        /**
+         * 启用动态
+         *
+         * @author tony001
+         * @date 2024-06-27 11:06:24
+         * @type {boolean}
+         */
+        this.enableDynamic = false;
     }
     initState() {
         super.initState();
     }
     async onCreated() {
+        this.model.enableCustomized = true;
         await super.onCreated();
         await this.initPortlets(this.model.controls);
+        // 设置启用动态
+        if (this.controlParams.enabledynamic === 'true') {
+            this.enableDynamic = true;
+        }
         // 实体门户视图监听视图数据变更，刷新界面行为组的状态。
         const { appDataEntityId } = this.view.model;
         if (appDataEntityId) {
@@ -117,6 +131,44 @@ export class DashboardController extends ControlController {
         });
         this.evt.emit('onResetPortlet', undefined);
     }
+    /**
+     * 加载动态
+     *
+     * @author tony001
+     * @date 2024-06-27 16:06:21
+     * @return {*}  {Promise<IData[]>}
+     */
+    async loadAllDynaPortlet() {
+        var _a;
+        const app = ibiz.hub.getApp(ibiz.env.appId);
+        const res = await app.deService.exec('psappportlet', 'fetchdefault', this.context, {
+            size: 1000,
+            n_pssysappid_eq: app.model.codeName,
+            n_dynamodelflag_noteq: 0,
+        });
+        if (res && ((_a = res.data) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+            return res.data;
+        }
+        return [];
+    }
+    /**
+     * 通过指定标识加载门户部件
+     *
+     * @author tony001
+     * @date 2024-06-27 17:06:12
+     * @param {string} id
+     * @return {*}  {(Promise<IDBPortletPart | undefined>)}
+     */
+    async loadDynaPortletById(id) {
+        const app = ibiz.hub.getApp(ibiz.env.appId);
+        const tempContext = clone(this.context);
+        Object.assign(tempContext, { psappportlet: id });
+        const res = await app.deService.exec('psappportlet', 'get', tempContext, this.params);
+        if (res && res.data && res.data.controlmodel) {
+            const controlModel = JSON.parse(res.data.controlmodel);
+            return (await ibiz.hub.translationModelToDsl(controlModel, 'CTRL'));
+        }
+    }
     /**
      * 通知所有表单成员表单操作过程中的数据变更
      *

package/out/controller/control/grid/grid/entity-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity-schema.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/entity-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AASnD;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,KAAK,EACX,CAAC,EAAE,cAAc,GAChB,OAAO,CACN;IAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;IAAC,eAAe,EAAE,eAAe,EAAE,CAAA;CAAE,GAC3E,SAAS,CACZ,CAqFA"}
+{"version":3,"file":"entity-schema.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/entity-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AASnD;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,KAAK,EACX,CAAC,EAAE,cAAc,GAChB,OAAO,CACN;IAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;IAAC,eAAe,EAAE,eAAe,EAAE,CAAA;CAAE,GAC3E,SAAS,CACZ,CAsFA"}

package/out/controller/control/grid/grid/entity-schema.js

@@ -71,6 +71,7 @@ export async function calcColumnModelBySchema(json, c) {
             widthUnit: 'PX',
             valueType: 'SIMPLE',
             caption: item.description,
+            hideDefault: true,
             dataItemName: item.key,
         });
         addDataItems.push({

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

@@ -49,6 +49,13 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @type {boolean}
      */
     addSchemaColumn: boolean;
+    /**
+     * 是否显示百分比
+     *
+     * @type {boolean}
+     * @memberof GridController
+     */
+    showPercent: boolean;
     /**
      * 所有表格列控制器集合
      *
@@ -262,10 +269,9 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * 计算当前页的聚合数据
      * @author lxm
      * @date 2023-08-07 04:22:09
-     * @protected
      * @param {IData[]} items
      */
-    protected calcAggResult(items: IData[]): void;
+    calcAggResult(items: IData[]): void;
     /**
      * 后台删除结束后界面删除逻辑
      *
@@ -550,5 +556,12 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      * @return {*}  {Promise<void>}
      */
     updateChangedItems(changedItems: ControlVO[]): Promise<void>;
+    /**
+     * 计算统计数据
+     * @author: zzq
+     * @date 2024-06-28 17:12:58
+     * @return {*}  {Promise<void>}
+     */
+    calcTotalData(): void;
 }
 //# sourceMappingURL=grid.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}

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

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import { awaitTimeout, debounceAndAsyncMerge, EntityError, mergeDefaultInLeft, recursiveIterate, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
+import { awaitTimeout, debounceAndAsyncMerge, EntityError, mergeDefaultInLeft, plus, recursiveIterate, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
 import { clone, isNil } from 'ramda';
 import dayjs from 'dayjs';
 import { GridRowState } from './grid-row.state';
@@ -45,6 +45,13 @@ export class GridController extends MDControlController {
          * @type {boolean}
          */
         this.addSchemaColumn = false;
+        /**
+         * 是否显示百分比
+         *
+         * @type {boolean}
+         * @memberof GridController
+         */
+        this.showPercent = false;
         /**
          * 所有表格列控制器集合
          *
@@ -208,6 +215,7 @@ export class GridController extends MDControlController {
      */
     async onCreated() {
         this.addSchemaColumn = this.controlParams.enablejsonschema === 'true';
+        this.showPercent = this.controlParams.showpercent === 'true';
         await this.initByEntitySchema();
         await super.onCreated();
         this.service = new GridService(this.model);
@@ -454,6 +462,7 @@ export class GridController extends MDControlController {
         await this.loadRemoteAgg();
         this.calcAggResult(this.state.items);
         this.calcShowMode(this.state.items);
+        this.calcTotalData();
         return items;
     }
     /**
@@ -540,7 +549,6 @@ export class GridController extends MDControlController {
      * 计算当前页的聚合数据
      * @author lxm
      * @date 2023-08-07 04:22:09
-     * @protected
      * @param {IData[]} items
      */
     calcAggResult(items) {
@@ -1408,4 +1416,26 @@ export class GridController extends MDControlController {
             await this.afterLoad({}, this.state.items);
         }
     }
+    /**
+     * 计算统计数据
+     * @author: zzq
+     * @date 2024-06-28 17:12:58
+     * @return {*}  {Promise<void>}
+     */
+    calcTotalData() {
+        if (!this.showPercent) {
+            return;
+        }
+        const totalResult = {};
+        Object.values(this.fieldColumns).forEach(column => {
+            const fieldName = column.model.id;
+            const result = this.state.items
+                .map(item => item[fieldName])
+                .reduce((a, b) => plus(a, b), 0);
+            if (result) {
+                totalResult[fieldName] = result;
+            }
+        });
+        this.state.totalResult = totalResult;
+    }
 }

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAK1B,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AASpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,kBAAkB,CAAC;IACrF;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAa;IAE/C;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;OAKG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;cAEe,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAoBzC;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAKrC;;;;;OAKG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAoBzC;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA4CvE;;;;;;;;OAQG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAexE;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC;IAqBnE;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,SAAS;IAiFhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;IAsBxC;;;;;;;;;;OAUG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAcjB"}
+{"version":3,"file":"grid-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AASpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,kBAAkB,CAAC;IACrF;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAa;IAE/C;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;OAKG;IACH,IAAI,SAAS,IAAI,MAAM,CAEtB;cAEe,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAoBzC;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAKrC;;;;;OAKG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAoBzC;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA4CvE;;;;;;;;OAQG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAexE;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC;IAqBnE;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,SAAS;IAiFhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;IAsBxC;;;;;;;;;;OAUG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CAcjB"}

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.js

@@ -3,6 +3,7 @@ import { DataTypes, ModelError, plus } from '@ibiz-template/core';
 import dayjs from 'dayjs';
 import { debounce } from 'lodash-es';
 import { clone, isNil } from 'ramda';
+import { isNilOrEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../../../../command';
 import { parseUserParams } from '../../../../../model';
 import { UIActionUtil } from '../../../../../ui-action';
@@ -287,7 +288,7 @@ export class GridFieldColumnController extends GridColumnController {
             return ValueExUtil.toText(this.model, value);
         }
         // 根据格式化配置格式化显示
-        const strVal = `${value || ''}`;
+        const strVal = `${isNilOrEmpty(value) ? '' : value}`;
         if (!this.valueFormat) {
             return strVal;
         }

package/out/controller/control/report-panel/generator/base-generator.d.ts

@@ -46,12 +46,12 @@ export declare class ReportPanelBaseGenerator {
      */
     constructor(model: IDEReportPanel, reportPanel: IReportPanelController);
     /**
-     * 设置配置
+     * 初始化配置
      *
-     * @protected
-     * @memberof ReportPanelBaseGenerator
+     * @author tony001
+     * @date 2024-06-26 16:06:01
      */
-    protected setConfig(): void;
+    initConfig(): Promise<void>;
     /**
      * 初始化
      *

package/out/controller/control/report-panel/generator/base-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/report-panel/generator/base-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D;;;;;GAKG;AACH,qBAAa,wBAAwB;IACnC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,EAAG,cAAc,CAAC;IAEjC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAG,sBAAsB,CAAC;IAE/C;;;;;;OAMG;IACI,QAAQ,EAAE,KAAK,GAAG,SAAS,CAAC;IAEnC;;;;;OAKG;IACI,MAAM,EAAE,KAAK,CAAM;IAE1B;;;;OAIG;gBAED,KAAK,EAAE,cAAc,EACrB,WAAW,EAAE,sBAAsB;IAOrC;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAE3B;;;;;OAKG;IACI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAI9B;;;;;;OAMG;IACI,IAAI,CAAC,IAAI,GAAE,KAAU,GAAG,OAAO,CAAC,KAAK,CAAC;CAG9C"}
+{"version":3,"file":"base-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/report-panel/generator/base-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D;;;;;GAKG;AACH,qBAAa,wBAAwB;IACnC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,EAAG,cAAc,CAAC;IAEjC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAG,sBAAsB,CAAC;IAE/C;;;;;;OAMG;IACI,QAAQ,EAAE,KAAK,GAAG,SAAS,CAAC;IAEnC;;;;;OAKG;IACI,MAAM,EAAE,KAAK,CAAM;IAE1B;;;;OAIG;gBAED,KAAK,EAAE,cAAc,EACrB,WAAW,EAAE,sBAAsB;IAMrC;;;;;OAKG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAExC;;;;;OAKG;IACI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAI9B;;;;;;OAMG;IACI,IAAI,CAAC,IAAI,GAAE,KAAU,GAAG,OAAO,CAAC,KAAK,CAAC;CAG9C"}

package/out/controller/control/report-panel/generator/base-generator.js

@@ -20,15 +20,14 @@ export class ReportPanelBaseGenerator {
         this.config = {};
         this.model = model;
         this.reportPanel = reportPanel;
-        this.setConfig();
     }
     /**
-     * 设置配置
+     * 初始化配置
      *
-     * @protected
-     * @memberof ReportPanelBaseGenerator
+     * @author tony001
+     * @date 2024-06-26 16:06:01
      */
-    setConfig() { }
+    async initConfig() { }
     /**
      * 初始化
      *

package/out/controller/control/report-panel/generator/bi-generator.d.ts

@@ -10,13 +10,13 @@ import { ReportPanelBaseGenerator } from './base-generator';
  */
 export declare class BIReportPanelGenerator extends ReportPanelBaseGenerator {
     /**
-     * 设置配置
+     * 初始化配置
      *
      * @author tony001
-     * @date 2024-06-18 14:06:38
-     * @protected
+     * @date 2024-06-26 16:06:54
+     * @return {*}  {Promise<void>}
      */
-    protected setConfig(): void;
+    initConfig(): Promise<void>;
     /**
      * 加载数据
      *
@@ -26,5 +26,15 @@ export declare class BIReportPanelGenerator extends ReportPanelBaseGenerator {
      * @return {*}  {Promise<IData>}
      */
     load(data?: IData): Promise<IData>;
+    /**
+     * 转化报表数据到配置数据
+     *
+     * @author tony001
+     * @date 2024-06-28 14:06:43
+     * @private
+     * @param {IModel} model
+     * @return {*}  {IData}
+     */
+    private translateReportToConfig;
 }
 //# sourceMappingURL=bi-generator.d.ts.map

package/out/controller/control/report-panel/generator/bi-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bi-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/report-panel/generator/bi-generator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D;;;;;;;;GAQG;AACH,qBAAa,sBAAuB,SAAQ,wBAAwB;IAClE;;;;;;OAMG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAkB3B;;;;;;;OAOG;IACI,IAAI,CAAC,IAAI,GAAE,KAAU,GAAG,OAAO,CAAC,KAAK,CAAC;CAM9C"}
+{"version":3,"file":"bi-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/report-panel/generator/bi-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D;;;;;;;;GAQG;AACH,qBAAa,sBAAuB,SAAQ,wBAAwB;IAClE;;;;;;OAMG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;;;OAOG;IACI,IAAI,CAAC,IAAI,GAAE,KAAU,GAAG,OAAO,CAAC,KAAK,CAAC;IAO7C;;;;;;;;OAQG;IACH,OAAO,CAAC,uBAAuB;CAwDhC"}

package/out/controller/control/report-panel/generator/bi-generator.js

@@ -1,5 +1,3 @@
-import { RuntimeError } from '@ibiz-template/core';
-import { ScriptFactory } from '../../../../utils';
 import { ReportPanelBaseGenerator } from './base-generator';
 /**
  * BI报表相关
@@ -12,23 +10,14 @@ import { ReportPanelBaseGenerator } from './base-generator';
  */
 export class BIReportPanelGenerator extends ReportPanelBaseGenerator {
     /**
-     * 设置配置
+     * 初始化配置
      *
      * @author tony001
-     * @date 2024-06-18 14:06:38
-     * @protected
+     * @date 2024-06-26 16:06:54
+     * @return {*}  {Promise<void>}
      */
-    setConfig() {
-        var _a;
-        if (!((_a = this.model.appDEReport) === null || _a === void 0 ? void 0 : _a.reportUIModel)) {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.reportPanel.noReportUIModel'));
-        }
-        const sourceModel = ScriptFactory.execScriptFn({}, this.model.appDEReport.reportUIModel, {
-            isAsync: false,
-            singleRowReturn: true,
-        });
-        sourceModel.reportTag = this.model.appDEReport.id;
-        this.config = sourceModel;
+    async initConfig() {
+        this.config = this.translateReportToConfig(this.model);
     }
     /**
      * 加载数据
@@ -44,4 +33,65 @@ export class BIReportPanelGenerator extends ReportPanelBaseGenerator {
         }
         return Promise.resolve(data);
     }
+    /**
+     * 转化报表数据到配置数据
+     *
+     * @author tony001
+     * @date 2024-06-28 14:06:43
+     * @private
+     * @param {IModel} model
+     * @return {*}  {IData}
+     */
+    translateReportToConfig(model) {
+        const config = {};
+        const biReportDatas = {};
+        const propertyData = {
+            caption: model.logicName,
+            data: biReportDatas,
+        };
+        const { appDEReport } = model;
+        console.log(appDEReport);
+        config.reportTag = appDEReport.id;
+        const tempAppBISchemeId = appDEReport.appBISchemeId.split('.').pop();
+        config.selectedSchemeId = tempAppBISchemeId;
+        const { appBICubeId, appBIReportDimensions, appBIReportMeasures, reportUIModel, } = appDEReport.appBIReport;
+        config.selectCubeId = `${tempAppBISchemeId}.${appBICubeId}`;
+        if (reportUIModel) {
+            const reportUIModelObj = JSON.parse(reportUIModel);
+            config.selectChartType = reportUIModelObj.selectChartType;
+            propertyData.style = reportUIModelObj.style;
+        }
+        else {
+            config.selectChartType = 'NUMBER';
+        }
+        if (appBIReportMeasures && appBIReportMeasures.length > 0) {
+            appBIReportMeasures.forEach((measure) => {
+                if (!biReportDatas.measure) {
+                    biReportDatas.measure = [];
+                }
+                biReportDatas.measure.push({
+                    pssysbischemeid: tempAppBISchemeId,
+                    pssysbicubemeasureid: `${tempAppBISchemeId}.${appBICubeId}.${measure.measureTag}`,
+                    pssysbicubeid: `${tempAppBISchemeId}.${appBICubeId}`,
+                    codename: measure.measureTag,
+                });
+            });
+        }
+        if (appBIReportDimensions && appBIReportDimensions.length > 0) {
+            appBIReportDimensions.forEach((dimension) => {
+                if (!biReportDatas.dimension) {
+                    biReportDatas.dimension = [];
+                }
+                biReportDatas.dimension.push({
+                    pssysbischemeid: tempAppBISchemeId,
+                    pssysbicubedimensionid: `${tempAppBISchemeId}.${appBICubeId}.${dimension.dimensionTag}`,
+                    pssysbicubeid: `${tempAppBISchemeId}.${appBICubeId}`,
+                    codename: dimension.dimensionTag,
+                    pscodelistid: dimension.appCodeListId,
+                });
+            });
+        }
+        config.propertyData = propertyData;
+        return config;
+    }
 }

package/out/controller/control/report-panel/generator/user-generator.d.ts

@@ -8,12 +8,12 @@ import { ReportPanelBaseGenerator } from './base-generator';
  */
 export declare class UserReportPanelGenerator extends ReportPanelBaseGenerator {
     /**
-     * 设置配置，临时使用，后续需更新 todo
+     * 初始化配置
      *
      * @protected
      * @memberof UserReportPanelGenerator
      */
-    protected setConfig(): void;
+    initConfig(): Promise<void>;
     /**
      * 加载
      *

package/out/controller/control/report-panel/generator/user-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/report-panel/generator/user-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAE5D;;;;;;GAMG;AACH,qBAAa,wBAAyB,SAAQ,wBAAwB;IACpE;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IA2C3B;;;;;;OAMG;IACI,IAAI,CAAC,IAAI,GAAE,KAAU,GAAG,OAAO,CAAC,KAAK,CAAC;CAM9C"}
+{"version":3,"file":"user-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/report-panel/generator/user-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAE5D;;;;;;GAMG;AACH,qBAAa,wBAAyB,SAAQ,wBAAwB;IACpE;;;;;OAKG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA2CxC;;;;;;OAMG;IACI,IAAI,CAAC,IAAI,GAAE,KAAU,GAAG,OAAO,CAAC,KAAK,CAAC;CAM9C"}

package/out/controller/control/report-panel/generator/user-generator.js

@@ -8,12 +8,12 @@ import { ReportPanelBaseGenerator } from './base-generator';
  */
 export class UserReportPanelGenerator extends ReportPanelBaseGenerator {
     /**
-     * 设置配置，临时使用，后续需更新 todo
+     * 初始化配置
      *
      * @protected
      * @memberof UserReportPanelGenerator
      */
-    setConfig() {
+    async initConfig() {
         this.config = {
             CONFIG: {
                 fitView: true,

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

@@ -1 +1 @@
-{"version":3,"file":"report-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/report-panel/report-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EACjB,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAGtE,qBAAa,qBACX,SAAQ,iBAAiB,CACvB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;OAIG;IACH,SAAS,CAAC,OAAO,EAAG,kBAAkB,CAAC;IAEvC;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;;OAMG;IACI,SAAS,EAAG,wBAAwB,CAAC;IAE5C;;;;;;;OAOG;IACH,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,iBAAiB,CAAC,CAEvD;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,OAAO,CAaxB;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC;;;;;;;OAOG;IACU,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,CAAC;IA+B9D;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAIpE;;;;OAIG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAkB7D;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE;IAOlB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAU9B;;;;;;OAMG;IACG,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC;CAsBlD"}
+{"version":3,"file":"report-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/report-panel/report-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EACjB,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAGtE,qBAAa,qBACX,SAAQ,iBAAiB,CACvB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;OAIG;IACH,SAAS,CAAC,OAAO,EAAG,kBAAkB,CAAC;IAEvC;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;;OAMG;IACI,SAAS,EAAG,wBAAwB,CAAC;IAE5C;;;;;;;OAOG;IACH,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,iBAAiB,CAAC,CAEvD;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,OAAO,CAaxB;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC;;;;;;;OAOG;IACU,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,CAAC;IA+B9D;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAIpE;;;;OAIG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAkB7D;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE;IAOlB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAU9B;;;;;;OAMG;IACG,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC;CAsBlD"}

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

@@ -54,6 +54,9 @@ export class ReportPanelController extends ControlController {
     async onCreated() {
         await super.onCreated();
         this.generator = ReportPanelGeneratorFactory.getInstance(this.model, this);
+        if (this.generator) {
+            await this.generator.initConfig();
+        }
         this.dataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId, this.model.appId);
         this.service = new ReportPanelService(this.model);
         await this.service.init(this.context);

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,EAEd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEZ,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAGrB;;;;;;;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;;;;;;OAMG;IACH,eAAe,EAAE,cAAc,EAAE,CAAM;IAEvC;;;;;;OAMG;IACH,aAAa,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAE5D,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;IA4ChB;;;;;;;OAOG;cACa,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;cAWzC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgD1C;;;;;;;;;;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;IAgDpE,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;IAelE;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAqB3C"}
+{"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,EAEd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEZ,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAGrB;;;;;;;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;;;;;;OAMG;IACH,eAAe,EAAE,cAAc,EAAE,CAAM;IAEvC;;;;;;OAMG;IACH,aAAa,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAE5D,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;IA4ChB;;;;;;;OAOG;cACa,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;cAWzC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgD1C;;;;;;;;;;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;IAsDpE,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;IAelE;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAqB3C"}

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

@@ -164,6 +164,13 @@ export class ToolbarController extends ControlController {
             _data = data.getOrigin();
         }
         await this.state.buttonsState.update(this.context, _data, appDeId);
+        // 配置是否隐藏 isHiddenItem
+        this.allToolbarItems.forEach(item => {
+            const itemState = this.state.buttonsState[item.id];
+            if (item.hiddenItem) {
+                itemState.visible = false;
+            }
+        });
         // 计算菜单项逻辑的预置逻辑
         if (this.scheduler) {
             const logicParams = {};

package/out/global/global-util/global-util.d.ts

@@ -1,6 +1,6 @@
 import { IExcelUtil } from '../../interface';
 import { UIActionUtil } from '../../ui-action';
-import { TextUtil, LayoutPanelUtil, HandlebarsUtil, RawValueUtil, ThemeUtil, ErrorHandlerCenter, ViewStack, AnimeUtil, FileUtil, ShortCutUtil } from '../../utils';
+import { TextUtil, LayoutPanelUtil, HandlebarsUtil, RawValueUtil, ThemeUtil, ErrorHandlerCenter, ViewStack, AnimeUtil, FileUtil, ShortCutUtil, BIReportUtil } from '../../utils';
 /**
  * 全局工具方法或对象
  *
@@ -89,6 +89,13 @@ export declare class GlobalUtil {
      * @memberof GlobalUtil
      */
     readonly file: FileUtil;
+    /**
+     * bi报表工具类
+     *
+     * @author tony001
+     * @date 2024-06-30 11:06:13
+     */
+    readonly biReport: BIReportUtil;
     constructor();
     /**
      * 获取导出Excel工具类对象

package/out/global/global-util/global-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-util.d.ts","sourceRoot":"","sources":["../../../src/global/global-util/global-util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,QAAQ,EACR,eAAe,EACf,cAAc,EACd,YAAY,EACZ,SAAS,EAET,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,QAAQ,EACR,YAAY,EACb,MAAM,aAAa,CAAC;AAKrB;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,kBAAyB;IAE7C;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,YAAmB;IAEjC;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,iBAAwB;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,eAAsB;IAEvC;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,sBAAgB;IAE/B;;;;OAIG;IACH,QAAQ,CAAC,KAAK,qBAA4B;IAE1C;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,YAAmB;IAErC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,YAAmB;IAEjC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,eAAsB;IAEvC;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,WAAkB;;IAM/B;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IAEzC;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IAOtB;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IASxB;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAiBpC;;;;;OAKG;IACH,cAAc,IAAI,OAAO;IAIzB;;;;;OAKG;IACH,eAAe,IAAI,OAAO,EAAE;CAG7B"}
+{"version":3,"file":"global-util.d.ts","sourceRoot":"","sources":["../../../src/global/global-util/global-util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,QAAQ,EACR,eAAe,EACf,cAAc,EACd,YAAY,EACZ,SAAS,EAET,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,YAAY,EACb,MAAM,aAAa,CAAC;AAKrB;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,kBAAyB;IAE7C;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,YAAmB;IAEjC;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,iBAAwB;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,eAAsB;IAEvC;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,sBAAgB;IAE/B;;;;OAIG;IACH,QAAQ,CAAC,KAAK,qBAA4B;IAE1C;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,YAAmB;IAErC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,YAAmB;IAEjC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,eAAsB;IAEvC;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,eAAsB;;IAMvC;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IAEzC;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IAOtB;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IASxB;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAiBpC;;;;;OAKG;IACH,cAAc,IAAI,OAAO;IAIzB;;;;;OAKG;IACH,eAAe,IAAI,OAAO,EAAE;CAG7B"}