@ibiz-template/runtime 0.7.41-alpha.9 → 0.7.41-alpha.90

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

@@ -92,6 +92,12 @@ export declare class ChartController extends MDControlController<IDEChart, IChar
      * @memberof ChartController
      */
     handleMultipleSerieGridData(): void;
+    spanMethod(data: {
+        row: IData;
+        column: IData;
+        rowIndex: number;
+        columnIndex: number;
+    }): number[];
     /**
      * 计算表格数据
      *
@@ -125,6 +131,30 @@ export declare class ChartController extends MDControlController<IDEChart, IChar
      * @date 2023-06-09 09:37:25
      */
     resizeChart(): void;
+    /**
+     * @description 跳转第一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    goToFirstPage(): Promise<IData[]>;
+    /**
+     * @description 跳转上一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    goToPreviousPage(): Promise<IData[]>;
+    /**
+     * @description 跳转下一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    goToNextPage(): Promise<IData[]>;
+    /**
+     * @description 跳转最后一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    goToLastPage(): Promise<IData[]>;
     protected onDestroyed(): Promise<void>;
 }
 //# sourceMappingURL=chart.controller.d.ts.map

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;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,eACX,SAAQ,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC9D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,EAAG,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB;;;;OAIG;IACH,YAAY,UAAQ;IAEpB,SAAS,CAAC,SAAS,IAAI,IAAI;cAUX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBpC,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUzE;;;;;OAKG;IACI,kBAAkB,CAAC,GAAG,GAAE,OAAc,GAAG,IAAI;IAyBpD;;;;;OAKG;IACI,uBAAuB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS;IA8B7D;;;;;;OAMG;IACI,wBAAwB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK;IA4ElD;;;;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;IAanC;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,GAAE,KAAK,EAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlE;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBlC;;;;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;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,eACX,SAAQ,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC9D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,EAAG,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB;;;;OAIG;IACH,YAAY,UAAQ;IAEpB,SAAS,CAAC,SAAS,IAAI,IAAI;cAUX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBpC,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUzE;;;;;OAKG;IACI,kBAAkB,CAAC,GAAG,GAAE,OAAc,GAAG,IAAI;IAyBpD;;;;;OAKG;IACI,uBAAuB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS;IA8B7D;;;;;;OAMG;IACI,wBAAwB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK;IA4ElD;;;;OAIG;IACI,cAAc,IAAI,IAAI;IAc7B;;;;;;OAMG;IACI,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAW/C;;;;;;OAMG;IACI,yBAAyB,IAAI,IAAI;IA0ExC;;;;;;;;OAQG;IACI,2BAA2B,IAAI,IAAI;IA6DnC,UAAU,CAAC,IAAI,EAAE;QACtB,GAAG,EAAE,KAAK,CAAC;QACX,MAAM,EAAE,KAAK,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,MAAM,EAAE;IA2BZ;;;;OAIG;IACI,eAAe,IAAI,IAAI;IAU9B;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAanC;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,GAAE,KAAK,EAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlE;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBlC;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAMnB;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAIvC;;;;OAIG;IACG,gBAAgB,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAI1C;;;;OAIG;IACG,YAAY,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAItC;;;;OAIG;IACG,YAAY,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;cAItB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7C"}

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

@@ -238,33 +238,24 @@ export class ChartController extends MDControlController {
         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,
+                name: ibiz.i18n.t('runtime.controller.control.chart.catalogField'),
             },
             {
                 id: valueField,
-                name: valueTitle === null || valueTitle === void 0 ? void 0 : valueTitle.logicName,
+                name: ibiz.i18n.t('runtime.controller.control.chart.value'),
             },
             {
                 id: 'srfpercent',
-                name: '百分比',
+                name: ibiz.i18n.t('runtime.controller.control.chart.percent'),
             },
         ];
-        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))
@@ -285,6 +276,36 @@ export class ChartController extends MDControlController {
                 tempData.push(tempItem);
             }
         }
+        else if (groupData) {
+            tempGridHeader.unshift({
+                id: 'srfSerieGroup',
+                name: ibiz.i18n.t('runtime.controller.control.chart.serieGroup'),
+            });
+            // 根据名称模拟的多序列
+            Object.keys(groupData).forEach((key) => {
+                const group = groupData[key];
+                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 = {
+                        srfSerieGroup: key,
+                        [catalogField]: _key,
+                        [valueField]: tempValue,
+                        srfpercent: percent,
+                    };
+                    tempData.push(tempItem);
+                }
+            });
+        }
+        this.state.gridHeaders = tempGridHeader;
         this.state.gridData = tempData;
     }
     /**
@@ -300,29 +321,31 @@ export class ChartController extends MDControlController {
         // 多序列,表格第一列使用分组属性的值，后续其他列通过其他序列计算后动态组装,
         const tempHeaders = [];
         const tempData = [];
+        tempHeaders.push({
+            id: 'srfGroupName',
+            name: ibiz.i18n.t('runtime.controller.control.chart.serieGroup'),
+        });
         this.generator.seriesGenerators.forEach((serie) => {
-            const { catalogField, valueField, groupData } = serie;
+            const { catalogField, valueField, groupData, seriesName } = 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,
+                    name: ibiz.i18n.t('runtime.controller.control.chart.catalogField'),
                 });
             }
-            const valueTitle = fields.find((field) => {
-                return field.id === valueField.toLowerCase();
-            });
-            tempHeaders.push({
-                id: valueField,
-                name: valueTitle === null || valueTitle === void 0 ? void 0 : valueTitle.logicName,
+            const temp = tempHeaders.find(item => {
+                return item.id === valueField;
             });
+            if (!temp) {
+                tempHeaders.push({
+                    id: valueField,
+                    name: ibiz.i18n.t('runtime.controller.control.chart.value'),
+                });
+            }
             if (groupData && groupData.$default_group) {
                 const group = groupData.$default_group;
                 for (const [key, value] of group) {
@@ -330,10 +353,11 @@ export class ChartController extends MDControlController {
                         ? 0
                         : Number(value.value);
                     const index = tempData.findIndex((item) => {
-                        return item[catalogField] === key;
+                        return (item[catalogField] === key && item.srfGroupName === seriesName);
                     });
                     if (index < 0) {
                         const tempItem = {
+                            srfGroupName: seriesName,
                             [catalogField]: key,
                             [valueField]: tempValue,
                         };
@@ -349,6 +373,32 @@ export class ChartController extends MDControlController {
         this.state.gridHeaders = tempHeaders;
         this.state.gridData = tempData;
     }
+    spanMethod(data) {
+        var _a;
+        const { row, column, rowIndex, columnIndex } = data;
+        if (column.property === 'srfGroupName') {
+            // 只有第一列或有值时才和并
+            const allow = columnIndex === 0 || row.srfGroupName;
+            // 第二行开始合并
+            if (rowIndex > 0 &&
+                allow &&
+                row.srfGroupName === ((_a = this.state.gridData[rowIndex - 1]) === null || _a === void 0 ? void 0 : _a.srfGroupName)) {
+                return [0, 0];
+            }
+            // 第一行计算出合并长度
+            let rowspan = 1;
+            for (let i = rowIndex + 1; i < this.state.gridData.length; i++) {
+                if (allow && this.state.gridData[i].srfGroupName === row.srfGroupName) {
+                    rowspan += 1;
+                }
+                else {
+                    break;
+                }
+            }
+            return [rowspan, 1];
+        }
+        return [1, 1];
+    }
     /**
      * 计算表格数据
      *
@@ -378,7 +428,7 @@ export class ChartController extends MDControlController {
                 this.setActive(activeData);
             }
         });
-        if (this.state.optionsReady) {
+        if (this.state.optionsReady && this.chart) {
             this.updateChart();
         }
     }
@@ -407,7 +457,8 @@ export class ChartController extends MDControlController {
      */
     async updateChart() {
         if (!this.chart) {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.chart.noInitialised'));
+            ibiz.log.error(ibiz.i18n.t('runtime.controller.control.chart.noInitialised'));
+            return;
         }
         if (!this.options) {
             throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.chart.noCalculated'));
@@ -426,6 +477,38 @@ export class ChartController extends MDControlController {
             this.chart.resize();
         }
     }
+    /**
+     * @description 跳转第一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    async goToFirstPage() {
+        return [];
+    }
+    /**
+     * @description 跳转上一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    async goToPreviousPage() {
+        return [];
+    }
+    /**
+     * @description 跳转下一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    async goToNextPage() {
+        return [];
+    }
+    /**
+     * @description 跳转最后一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    async goToLastPage() {
+        return [];
+    }
     async onDestroyed() {
         var _a;
         window.removeEventListener('resize', this.resizeChart);

package/out/controller/control/chart/generator/base-series-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EAEf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EAEL,qBAAqB,EACtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAUjE,cAAc;AACd,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;CACxB,CAAC;AACF,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAElD,sBAAsB;AACtB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,qBAAa,mBAAmB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAiH/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAjHjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAM;IAE1B;;;;;OAKG;IACH,aAAa,EAAE,KAAK,EAAE,CAAM;IAE5B;;;;;OAKG;IACH,UAAU,EAAG,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAG,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,YAAY,EAAE,UAAU,EAAE,CAAM;IAEhC;;;;;OAKG;IACH,aAAa,EAAE,YAAY,CAAM;IAEjC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC;IAE/B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAQ;IAErC;;;;;OAKG;IACH,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAa;IAE3C;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IAQjD;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE,CAAC,EAAE,cAAc,EAAE,qBAAqB,GAAG,IAAI;IAiDjE;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAmB3C;;;;;;;;;;;OAWG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,SAAS,GAAE,OAAe,GACzB,MAAM,GAAG,SAAS;IAYrB;;;;;;OAMG;IACH,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAWrC;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CACxB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,gBAAgB,EAAE,KAAK,EAAE,GACxB,IAAI;IAqBP;;;;;;;OAOG;IACH,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,GAAG,KAAK,EAAE;IAoEpE;;;;;;;;;;;;OAYG;IACH,SAAS,CAAC,mBAAmB,CAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,IAAI,EAAE,KAAK,EAAE,EACb,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,YAAY,EAAE,GACrC,YAAY,EAAE;IAkCjB;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IAsNjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IA4C/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAevD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAexD;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;IAW/D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAmDtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA+BnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IAsHlC;;;;;OAKG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAqBpC"}

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

@@ -1,4 +1,5 @@
 /* eslint-disable no-unused-expressions */
+/* eslint-disable eqeqeq */
 import { plus, RuntimeModelError, toNumberOrNil } from '@ibiz-template/core';
 import dayjs from 'dayjs';
 import minMax from 'dayjs/plugin/minMax';
@@ -9,7 +10,7 @@ import isoWeek from 'dayjs/plugin/isoWeek';
 import { clone, isNil, mergeDeepRight } from 'ramda';
 import { parseUserParams, } from './chart-options-generator';
 import { ChartData } from '../../../../service';
-import { generateYearWeekRange } from '../../../utils';
+import { generateYearWeekRange } from '../../../../utils';
 dayjs.extend(minMax);
 dayjs.extend(isSameOrBefore);
 dayjs.extend(quarterOfYear);
@@ -153,19 +154,16 @@ export class BaseSeriesGenerator {
      * @return {*}  {(string | undefined)}
      */
     translateVal(codeListKey, val, isExclude = false) {
-        if (isNil(val)) {
+        if (isNil(val))
             return undefined;
-        }
-        if (isNil(codeListKey)) {
+        if (isNil(codeListKey))
             return val;
-        }
         const codeListItems = this.chartGenerator.codeListMap.get(codeListKey);
         if (codeListItems === null || codeListItems === void 0 ? void 0 : codeListItems.length) {
-            const find = codeListItems.find(x => x.value === val);
-            if (find) {
+            const find = codeListItems.find(x => x.value == val);
+            if (find)
                 return find.text;
-            }
-            return '未定义';
+            return ibiz.i18n.t('runtime.common.undefined');
         }
         return isExclude ? undefined : val;
     }
@@ -291,9 +289,11 @@ export class BaseSeriesGenerator {
             this.chartGenerator.model.controlParam &&
             ((_a = this.chartGenerator.model.controlParam.ctrlParams) === null || _a === void 0 ? void 0 : _a.NOSORT)) {
             // 不依照代码表排序
-            const orginItem = Array.from(new Set(data.map((_data) => {
+            const orginItem = Array.from(new Set(data
+                .map((_data) => {
                 return _data[codename];
-            })));
+            })
+                .filter(val => !!val)));
             const cloneItem = clone(codeListItems);
             cloneItem.sort((a, b) => {
                 const aIndex = orginItem.findIndex((_code) => {
@@ -685,6 +685,8 @@ export class BaseSeriesGenerator {
                 dates.push(dayjs(date));
             });
         });
+        if (!dates.length)
+            return;
         // 使用 dayjs 的 max() 和 min() 方法找出最大和最小日期
         const maxDate = dayjs.max(dates);
         const minDate = dayjs.min(dates);
@@ -797,6 +799,8 @@ export class BaseSeriesGenerator {
                 dates.push(date);
             });
         });
+        if (!dates.length)
+            return;
         // 补全每组缺失的日期值，防止横坐标绘制异常
         dates.forEach(date => {
             Object.keys(data).forEach(key => {

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

@@ -1 +1 @@
-{"version":3,"file":"custom-dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/custom-dashboard.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;GAMG;AACH,qBAAa,yBAA0B,YAAW,aAAa;IAkIpD,KAAK,EAAE,UAAU;IACjB,SAAS,EAAE,mBAAmB;IAlIvC;;;;;OAKG;IACH,eAAe,EAAE,KAAK,EAAE,CAAM;IAE9B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAM;IAE1B;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAM;IAExB;;;;;OAKG;IACH,aAAa,EAAE,KAAK,CAAM;IAE1B;;;;;;OAMG;IACH,aAAa,EAAE,KAAK,CAAM;IAE1B;;;;;;OAMG;IACH,MAAM,EAAE,aAAa,GAAG,SAAS,CAAC;IAElC;;;;;;OAMG;IACH,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IAE9B;;;;;;OAMG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;;OAMG;IACH,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAc;IAElD;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAM;IAEvB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAM;IAErB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAQ;IAE9B;;;;;OAKG;gBAEM,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,mBAAmB;IAOvC;;;;;;OAMG;IACH,OAAO,CAAC,IAAI;IAqCZ;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAkBtB;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,KAAK,CAAC;IA0C3C;;;;OAIG;IACG,oBAAoB,IAAI,OAAO,CAAC,KAAK,CAAC;IAK5C;;;;;;;;;OASG;IACG,mBAAmB,CACvB,KAAK,EAAE,KAAK,EAAE,EACd,MAAM,GAAE,KAAU,EAClB,MAAM,GAAE,KAAU,GACjB,OAAO,CAAC,KAAK,CAAC;CAmDlB"}
+{"version":3,"file":"custom-dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/custom-dashboard.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD;;;;;;GAMG;AACH,qBAAa,yBAA0B,YAAW,aAAa;IAkIpD,KAAK,EAAE,UAAU;IACjB,SAAS,EAAE,mBAAmB;IAlIvC;;;;;OAKG;IACH,eAAe,EAAE,KAAK,EAAE,CAAM;IAE9B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAM;IAE1B;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAM;IAExB;;;;;OAKG;IACH,aAAa,EAAE,KAAK,CAAM;IAE1B;;;;;;OAMG;IACH,aAAa,EAAE,KAAK,CAAM;IAE1B;;;;;;OAMG;IACH,MAAM,EAAE,aAAa,GAAG,SAAS,CAAC;IAElC;;;;;;OAMG;IACH,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IAE9B;;;;;;OAMG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;;OAMG;IACH,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAc;IAElD;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAM;IAEvB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAM;IAErB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAQ;IAE9B;;;;;OAKG;gBAEM,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,mBAAmB;IAOvC;;;;;;OAMG;IACH,OAAO,CAAC,IAAI;IAqCZ;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAkBtB;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,KAAK,CAAC;IAiD3C;;;;OAIG;IACG,oBAAoB,IAAI,OAAO,CAAC,KAAK,CAAC;IAK5C;;;;;;;;;OASG;IACG,mBAAmB,CACvB,KAAK,EAAE,KAAK,EAAE,EACd,MAAM,GAAE,KAAU,EAClB,MAAM,GAAE,KAAU,GACjB,OAAO,CAAC,KAAK,CAAC;CA0DlB"}

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

@@ -1,5 +1,6 @@
 import { clone } from 'ramda';
 import { ConfigService, UtilService } from '../../../service';
+import { deepDeleteSubAppId, deepFillSubAppId } from './dashboard.util';
 /**
  * 自定义数据看板部件控制器
  * @author lxm
@@ -165,6 +166,7 @@ export class CustomDashboardController {
      * @Date: 2023-09-20 16:22:49
      */
     async loadCustomModelData() {
+        var _a;
         if (this.multiMode && !this.context.srfdynadashboardid) {
             return { model: this.customModelData, config: this.portletConfig };
         }
@@ -178,10 +180,18 @@ export class CustomDashboardController {
         if (res.model) {
             for (let i = 0; i < res.model.length; i++) {
                 const item = res.model[i];
+                const mainApp = ibiz.hub.getApp(ibiz.env.appId);
                 if (item.orignModel) {
                     item.portletModel = (await ibiz.hub.translationModelToDsl(item.portletModel, 'CTRL'));
                     delete item.orignModel;
                 }
+                const targetApp = (_a = mainApp.model.subAppRefs) === null || _a === void 0 ? void 0 : _a.find(app => {
+                    var _a;
+                    return (_a = app.id) === null || _a === void 0 ? void 0 : _a.endsWith(item.appCodeName);
+                });
+                if (targetApp && targetApp.id) {
+                    deepFillSubAppId(item.portletModel, targetApp.id);
+                }
             }
             this.customModelData = res.model;
         }
@@ -240,8 +250,15 @@ export class CustomDashboardController {
                 }
             });
         }
+        const cloneModel = clone(model);
+        // 删除无用的数据(appId，仅界面使用)
+        cloneModel.forEach((item) => {
+            if (item.portletModel) {
+                deepDeleteSubAppId(item.portletModel);
+            }
+        });
         const data = {
-            model,
+            model: cloneModel,
             colNum: this.layoutColNum,
             rowH: this.layoutRowH,
             config: this.portletConfig,

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

@@ -1,7 +1,8 @@
 import { IDashboard, IDBPortletPart } from '@ibiz/model-core';
-import { IDashboardState, IDashboardEvent, IDashboardController, IPortletProvider, IPortletController, IPortletContainerController, ISearchCond } from '../../../interface';
+import { IDashboardState, IDashboardEvent, IDashboardController, IPortletProvider, IPortletController, IPortletContainerController, ISearchCond, IApiPortletTypeMapping } from '../../../interface';
 import { ControlController } from '../../common';
 import { CustomDashboardController } from './custom-dashboard.controller';
+import { MobCustomDashboardController } from './mob-custom-dashboard.controller';
 /**
  * 数据看板部件控制器
  * @author lxm
@@ -48,6 +49,12 @@ export declare class DashboardController extends ControlController<IDashboard, I
      * @type {(CustomDashboardController | undefined)}
      */
     customDashboard: CustomDashboardController | undefined;
+    /**
+     * @description 移动端自定义数据看板部件控制器
+     * @type {(MobCustomDashboardController | undefined)}
+     * @memberof DashboardController
+     */
+    mobCustomDashboard: MobCustomDashboardController | undefined;
     enableAnchorCtrls: IData[];
     /**
      * 初始化状态
@@ -74,6 +81,18 @@ export declare class DashboardController extends ControlController<IDashboard, I
      * @return {*}  {(CustomDashboardController | undefined)}
      */
     getCustomDashboard(): CustomDashboardController | undefined;
+    /**
+     * @description 设置移动端自定义数据看板部件控制器
+     * @param {MobCustomDashboardController} mobCustomDashboard
+     * @memberof DashboardController
+     */
+    setMobCustomDashboard(mobCustomDashboard: MobCustomDashboardController): void;
+    /**
+     * @description 获取移动端自定义数据看板部件控制器
+     * @returns {*}  {(MobCustomDashboardController | undefined)}
+     * @memberof DashboardController
+     */
+    getMobCustomDashboard(): MobCustomDashboardController | undefined;
     /**
      * 初始化子门户部件
      *
@@ -163,5 +182,14 @@ export declare class DashboardController extends ControlController<IDashboard, I
      * @return {*}  {IParams}
      */
     getExtendParamsById(id: string): IParams;
+    /**
+     * @description 获取门户部件
+     * @template K
+     * @param {K} type 门户部件类型
+     * @param {string} id 门户部件标识
+     * @returns {*}  {IApiPortletTypeMapping[K]}
+     * @memberof IDashboardController
+     */
+    getPortlet<K extends keyof IApiPortletTypeMapping>(type: K, id: string): IApiPortletTypeMapping[K];
 }
 //# sourceMappingURL=dashboard.controller.d.ts.map

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":"AAEA,OAAO,EAEL,UAAU,EAGV,cAAc,EACf,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAE3B,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAS1E;;;;;;;;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,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAa;IAE/C;;;;;;OAMG;IACH,eAAe,EAAE,yBAAyB,GAAG,SAAS,CAAC;IAEhD,iBAAiB,EAAE,KAAK,EAAE,CAAM;IAEvC;;;;;;OAMG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAe1C;;;;;;OAMG;IACH,kBAAkB,CAAC,eAAe,EAAE,yBAAyB,GAAG,IAAI;IAIpE;;;;;;OAMG;IACH,kBAAkB,IAAI,yBAAyB,GAAG,SAAS;IAI3D;;;;;;;;OAQG;IACG,YAAY,CAChB,aAAa,EAAE,cAAc,EAAE,EAC/B,MAAM,CAAC,EAAE,2BAA2B,GACnC,OAAO,CAAC,IAAI,CAAC;IA8ChB;;;;;;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;IAgD5C;;;;;;;OAOG;IACG,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAoB1E;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IASlD;;;;;;;OAOG;IACG,oBAAoB,CAAC,IAAI,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAwChE;;;;;;;;;OASG;cACa,cAAc,CAC5B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,KAAK,EACb,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,OAAO,GACnB,OAAO,CAAC,IAAI,CAAC;IA4ChB;;;;;;OAMG;IACG,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;;;OAOG;IACH,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;CA6HzC"}
+{"version":3,"file":"dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/dashboard.controller.ts"],"names":[],"mappings":"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"}

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

@@ -4,7 +4,7 @@ import { getPortletProvider } from '../../../register';
 import { handleAllSettled } from '../../../utils';
 import { ControlController } from '../../common';
 import { getOriginData } from '../../utils';
-import { filterPortletByConfig, filterPortletByID, generateCacheKy, getFilterSearchConds, getPortletModelByID, } from './dashboard.util';
+import { deepFillSubAppId, filterPortletByConfig, filterPortletByID, generateCacheKy, getFilterSearchConds, getPortletModelByID, } from './dashboard.util';
 /**
  * 数据看板部件控制器
  * @author lxm
@@ -88,6 +88,22 @@ export class DashboardController extends ControlController {
     getCustomDashboard() {
         return this.customDashboard;
     }
+    /**
+     * @description 设置移动端自定义数据看板部件控制器
+     * @param {MobCustomDashboardController} mobCustomDashboard
+     * @memberof DashboardController
+     */
+    setMobCustomDashboard(mobCustomDashboard) {
+        this.mobCustomDashboard = mobCustomDashboard;
+    }
+    /**
+     * @description 获取移动端自定义数据看板部件控制器
+     * @returns {*}  {(MobCustomDashboardController | undefined)}
+     * @memberof DashboardController
+     */
+    getMobCustomDashboard() {
+        return this.mobCustomDashboard;
+    }
     /**
      * 初始化子门户部件
      *
@@ -171,7 +187,7 @@ export class DashboardController extends ControlController {
      */
     async loadAllDynaPortlet() {
         var _a;
-        const app = ibiz.hub.getApp(ibiz.env.appId);
+        const app = ibiz.hub.getApp(this.model.appId);
         const result = [];
         // 存在动态代码表标识
         if (this.controlParams.dynamiccodelist) {
@@ -212,14 +228,27 @@ export class DashboardController extends ControlController {
      * @return {*}  {(Promise<IDBPortletPart | undefined>)}
      */
     async loadDynaPortletById(id) {
-        const app = ibiz.hub.getApp(ibiz.env.appId);
+        var _a;
+        const app = ibiz.hub.getApp(this.model.appId);
         const tempContext = clone(this.context);
         Object.assign(tempContext, { psappportlet: id });
         const res = await app.deService.exec('psappportlet', 'get', tempContext, this.params);
         this.dynaPortletMap.set(id, res.data);
         if (res && res.data && res.data.controlmodel) {
             const controlModel = JSON.parse(res.data.controlmodel);
-            return (await ibiz.hub.translationModelToDsl(controlModel, 'CTRL'));
+            const result = (await ibiz.hub.translationModelToDsl(controlModel, 'CTRL'));
+            const appId = res.data.pssysappid;
+            if (appId) {
+                const mainApp = ibiz.hub.getApp(ibiz.env.appId);
+                const targetApp = (_a = mainApp.model.subAppRefs) === null || _a === void 0 ? void 0 : _a.find(subAppRef => {
+                    var _a;
+                    return (_a = subAppRef.id) === null || _a === void 0 ? void 0 : _a.endsWith(appId);
+                });
+                if (targetApp && targetApp.id) {
+                    deepFillSubAppId(result, targetApp.id);
+                }
+            }
+            return result;
         }
     }
     /**
@@ -257,7 +286,10 @@ export class DashboardController extends ControlController {
         }
         const items = [];
         Object.values(this.portlets).forEach((portlet) => {
-            if (portlet.model && portlet.model.portletType !== 'FILTER') {
+            if (portlet.model &&
+                portlet.model.portletType !== 'FILTER' &&
+                portlet.model.portletType !== 'RAWITEM' &&
+                portlet.model.portletType !== 'CONTAINER') {
                 items.push(portlet.model);
             }
         });
@@ -289,7 +321,7 @@ export class DashboardController extends ControlController {
         var _a;
         if (!this.customDashboard)
             return;
-        const app = ibiz.hub.getApp(ibiz.env.appId);
+        const app = ibiz.hub.getApp(this.model.appId);
         // 新建
         if (isNewFilter) {
             // 仿真过滤器占位
@@ -319,7 +351,12 @@ export class DashboardController extends ControlController {
         }
         // 设置缓存
         const searchCondCacheKey = generateCacheKy(this.context, this, model.id);
-        localStorage.setItem(searchCondCacheKey, JSON.stringify(searchconds));
+        if (searchconds) {
+            localStorage.setItem(searchCondCacheKey, JSON.stringify(searchconds));
+        }
+        else {
+            localStorage.removeItem(searchCondCacheKey);
+        }
         // 存数
         const result = await this.customDashboard.saveCustomModelData(this.customDashboard.customModelData, { [model.id]: { srftitle: model.title } }, { [model.id]: { config, searchconds } });
         this.evt.emit('onSavePortlet', result);
@@ -362,7 +399,7 @@ export class DashboardController extends ControlController {
                         var _a, _b;
                         const filterParam = this.customDashboard.portletFilter[key];
                         const { config, searchconds } = filterParam;
-                        const app = ibiz.hub.getApp(ibiz.env.appId);
+                        const app = ibiz.hub.getApp(this.model.appId);
                         const targetFilter = (_a = app.model.appPortlets) === null || _a === void 0 ? void 0 : _a.find((portletModel) => {
                             return portletModel.id === key;
                         });
@@ -433,8 +470,19 @@ export class DashboardController extends ControlController {
             }
         }
         if (params.searchconds && params.searchconds.length > 0) {
-            result.params = params;
+            result.params = [params];
         }
         return result;
     }
+    /**
+     * @description 获取门户部件
+     * @template K
+     * @param {K} type 门户部件类型
+     * @param {string} id 门户部件标识
+     * @returns {*}  {IApiPortletTypeMapping[K]}
+     * @memberof IDashboardController
+     */
+    getPortlet(type, id) {
+        return this.portlets[id];
+    }
 }

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

@@ -69,4 +69,15 @@ export declare function filterPortletByID(id: string, context: IContext, items:
  * @return {*}  {string[]}
  */
 export declare function filterPortletByConfig(config: IData, items: string[]): string[];
+/**
+ * 递归填充子门户部件的子应用标识
+ * @param model
+ * @param appId
+ */
+export declare function deepFillSubAppId(model: IModel, appId: string): void;
+/**
+ * 递归删除子门户部件的子应用标识
+ * @param model
+ */
+export declare function deepDeleteSubAppId(model: IModel): void;
 //# sourceMappingURL=dashboard.util.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.util.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/dashboard.util.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,cAAc,EAIf,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,oBAAoB,EACpB,aAAa,EAId,MAAM,oBAAoB,CAAC;AAG5B;;;;;;;;GAQG;AACH,wBAAgB,gCAAgC,CAC9C,oBAAoB,EAAE,cAAc,EAAE,GACrC,aAAa,EAAE,CA0CjB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,QAAQ,EACjB,SAAS,EAAE,oBAAoB,EAC/B,GAAG,EAAE,MAAM,GACV,MAAM,CAER;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,KAAK,GAAG,SAAS,EAC9B,oBAAoB,EAAE,cAAc,EAAE,GAAG,SAAS,GACjD,aAAa,GAAG,SAAS,CAgB3B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,GAC1B,MAAM,GAAG,SAAS,CAapB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,cAAc,EAAE,EACvB,MAAM,GAAE,OAAe,GACtB,cAAc,EAAE,CAuClB;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,KAAK,EACb,KAAK,EAAE,MAAM,EAAE,GACd,MAAM,EAAE,CAUV"}
+{"version":3,"file":"dashboard.util.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/dashboard.util.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,cAAc,EAIf,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,oBAAoB,EACpB,aAAa,EAId,MAAM,oBAAoB,CAAC;AAG5B;;;;;;;;GAQG;AACH,wBAAgB,gCAAgC,CAC9C,oBAAoB,EAAE,cAAc,EAAE,GACrC,aAAa,EAAE,CA0CjB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,QAAQ,EACjB,SAAS,EAAE,oBAAoB,EAC/B,GAAG,EAAE,MAAM,GACV,MAAM,CAER;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,KAAK,GAAG,SAAS,EAC9B,oBAAoB,EAAE,cAAc,EAAE,GAAG,SAAS,GACjD,aAAa,GAAG,SAAS,CAc3B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,GAC1B,MAAM,GAAG,SAAS,CAapB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,cAAc,EAAE,EACvB,MAAM,GAAE,OAAe,GACtB,cAAc,EAAE,CAuClB;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,KAAK,EACb,KAAK,EAAE,MAAM,EAAE,GACd,MAAM,EAAE,CAUV;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAiBnE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAiBtD"}