@ibiz-template/runtime 0.3.3 → 0.3.4

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

@@ -51,6 +51,13 @@ export declare class CalendarController extends MDControlController<ISysCalendar
      * @memberof CalendarController
      */
     load(args?: MDCtrlLoadParams): Promise<ICalendarItemData[]>;
+    /**
+     * 前台排序（时间轴类型）
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-11-22 15:16:43
+     */
+    protected sortItems(): void;
     /**
      * 获取当前选中的日期
      *

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

@@ -1 +1 @@
-{"version":3,"file":"calendar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD;;;;;;;;;GASG;AACH,qBAAa,kBACX,SAAQ,mBAAmB,CAAC,YAAY,EAAE,cAAc,EAAE,cAAc,CACxE,YAAW,mBAAmB;IAE9B;;;;;;;OAOG;IACK,OAAO,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;;;;;OAQG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAsBrE;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK;IAwBjD;;;;;;;;OAQG;IACG,cAAc,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IA+BjE;;;;;;;;OAQG;IACG,UAAU,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBxD;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;CAGhC"}
+{"version":3,"file":"calendar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD;;;;;;;;;GASG;AACH,qBAAa,kBACX,SAAQ,mBAAmB,CAAC,YAAY,EAAE,cAAc,EAAE,cAAc,CACxE,YAAW,mBAAmB;IAE9B;;;;;;;OAOG;IACK,OAAO,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAM3B;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;;;;;OAQG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAuBrE;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAgB3B;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK;IAwBjD;;;;;;;;OAQG;IACG,cAAc,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAmCjE;;;;;;;;OAQG;IACG,UAAU,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBxD;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;CAGhC"}

package/out/controller/control/calendar/calendar.controller.js

@@ -65,11 +65,34 @@ export class CalendarController extends MDControlController {
         await this.afterLoad(args, items);
         this.state.isLoaded = true;
         this.state.items = items;
+        this.sortItems();
         await this.evt.emit('onLoadSuccess', {
             isInitialLoad,
         });
         return items;
     }
+    /**
+     * 前台排序（时间轴类型）
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-11-22 15:16:43
+     */
+    sortItems() {
+        if (this.model.calendarStyle === 'TIMELINE') {
+            this.state.items.sort((a, b) => {
+                const x = a.beginTime;
+                const y = b.beginTime;
+                let result = 0;
+                if (dayjs(x).isAfter(y)) {
+                    result = -1;
+                }
+                else if (dayjs(x).isBefore(y)) {
+                    result = 1;
+                }
+                return result;
+            });
+        }
+    }
     /**
      * 获取当前选中的日期
      *
@@ -124,8 +147,11 @@ export class CalendarController extends MDControlController {
         if (extraParams) {
             Object.assign(resultParams, extraParams);
         }
-        const timeParam = this.getCurSelectDate(resultParams);
-        Object.assign(resultParams, timeParam);
+        // 时间轴类型不需要开始结束时间参数
+        if (this.model.calendarStyle !== 'TIMELINE') {
+            const timeParam = this.getCurSelectDate(resultParams);
+            Object.assign(resultParams, timeParam);
+        }
         return resultParams;
     }
     /**

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

@@ -13,6 +13,12 @@ export declare class ChartController extends MDControlController<IDEChart, IChar
      * @type {EChartsType}
      */
     chart?: EChartsType;
+    /**
+     * 图表选项生成器
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-11-23 14:07:39
+     */
     generator: ChartOptionsGenerator;
     /**
      * 最终使用的echarts配置

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,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;IAWpC,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;IASnC;;;;;;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;cAKX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAWpC,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;IAWnC;;;;;;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"}

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

@@ -34,9 +34,11 @@ export class ChartController extends MDControlController {
     initChart(chart) {
         this.chart = chart;
         this.chart.on('click', params => {
-            const srfkey = this.generator.getSrfkeyByParams(params);
-            const activeData = this.state.items.find(item => item.srfkey === srfkey);
-            console.log('实体数据', activeData);
+            const activeData = this.generator.getChartDataByParams(params);
+            console.log('激活数据', activeData);
+            if (activeData) {
+                this.setActive(activeData);
+            }
         });
     }
     /**

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

@@ -1,6 +1,7 @@
 import { IDEChartSeries } from '@ibiz/model-core';
 import type { ECElementEvent, SeriesOption } from 'echarts';
 import { ChartOptionsGenerator } from './chart-options-generator';
+import { IChartData } from '../../../../interface';
 /** 序列的单条数据 */
 export type SingleData = {
     /**
@@ -8,12 +9,12 @@ export type SingleData = {
      */
     value: number;
     /**
-     * 完整的实体数据
+     * 图表数据
      * @author lxm
      * @date 2023-06-09 09:31:27
-     * @type {IData}
+     * @type {IChartData}
      */
-    deData?: IData;
+    chartData?: IChartData;
 };
 /** 分类数据，key是分类属性的值 */
 export type CatalogData = Map<string, SingleData>;
@@ -72,6 +73,13 @@ export declare class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeri
      * @type {GroupData}
      */
     groupData?: GroupData;
+    /**
+     * 根据分组处理出来的图表数据数组
+     * @author lxm
+     * @date 2023-06-09 02:58:28
+     * @type {GroupData}
+     */
+    chartDataArr: IChartData[];
     /**
      * 静态的序列options
      * @author lxm
@@ -120,6 +128,13 @@ export declare class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeri
      * @return {*}  {(string | undefined)}
      */
     translateVal(codeListKey: string | undefined, val: string | undefined, isExclude?: boolean): string | undefined;
+    /**
+     * 准备图表数据
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-11-23 15:24:12
+     */
+    protected prepareChartData(groupData: GroupData, deData: IData, catalog: string, group: string): void;
     /**
      * 计算分组数据
      * @author lxm
@@ -139,7 +154,7 @@ export declare class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeri
     protected calcGroupSeries(groupData: GroupData): SeriesOption[];
     /**
      * 生成每条序列的data,由于不同图表类型格式不同所以为any
-     * 默认提供的是二维数组，按[X轴，y轴]格式
+     * 默认提供的是二维数组，按[x轴, y轴, 图表数据]格式
      * @author lxm
      * @date 2023-06-09 03:38:07
      * @param {CatalogData} catalogData
@@ -155,13 +170,13 @@ export declare class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeri
      */
     calcByData(data: IData[]): SeriesOption[] | SeriesOption;
     /**
-     * 通过事件的params获取主键
+     * 通过echarts事件的params获取封装好的图表数据
      * @author lxm
      * @date 2023-06-09 10:56:25
      * @param {ECElementEvent} params
      * @return {*}  {string}
      */
-    getSrfkeyByParams(params: ECElementEvent): string;
+    getChartDataByParams(params: ECElementEvent): IData | undefined;
     /**
      * 数据预处理
      * @return {*}

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":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EACL,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AAQnC,cAAc;AACd,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB,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;IAyF/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAzFjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;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,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,aAAa,EAAE,YAAY,CAAM;IAEjC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC;IAE/B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAQ;IAErC;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IA+BjD;;;;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;IAiBrB;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IA8DjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IAuB/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAQvD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAOxD;;;;;;OAMG;IACH,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;IAIjD;;;;;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;CAgInC"}
+{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EACL,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AASnD,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;IAiG/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAjGjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;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,EAAE,MAAM,CAAC;IAEnB;;;;;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;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IA+BjD;;;;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;IAiBrB;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CACxB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,IAAI;IAYP;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IAwFjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IAuB/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAQvD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAOxD;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;IAO/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;CAgInC"}

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

@@ -7,6 +7,7 @@ import weekOfYear from 'dayjs/plugin/weekOfYear';
 import isoWeek from 'dayjs/plugin/isoWeek';
 import { clone, isNil, mergeDeepRight } from 'ramda';
 import { parseUserParams, } from './chart-options-generator';
+import { ChartData } from '../../../../service';
 dayjs.extend(minMax);
 dayjs.extend(isSameOrBefore);
 dayjs.extend(quarterOfYear);
@@ -24,6 +25,13 @@ export class BaseSeriesGenerator {
     constructor(model, chartGenerator) {
         this.model = model;
         this.chartGenerator = chartGenerator;
+        /**
+         * 根据分组处理出来的图表数据数组
+         * @author lxm
+         * @date 2023-06-09 02:58:28
+         * @type {GroupData}
+         */
+        this.chartDataArr = [];
         /**
          * 静态的序列options
          * @author lxm
@@ -113,6 +121,24 @@ export class BaseSeriesGenerator {
         }
         return isExclude ? undefined : val;
     }
+    /**
+     * 准备图表数据
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-11-23 15:24:12
+     */
+    prepareChartData(groupData, deData, catalog, group) {
+        var _a;
+        if (this.groupField) {
+            Object.assign(deData, { [this.groupField]: group });
+        }
+        if (this.catalogField) {
+            Object.assign(deData, { [this.catalogField]: catalog });
+        }
+        const tempChartData = new ChartData(deData, this.model, catalog, group);
+        groupData[group].get(catalog).chartData = tempChartData;
+        (_a = this.chartDataArr) === null || _a === void 0 ? void 0 : _a.push(tempChartData);
+    }
     /**
      * 计算分组数据
      * @author lxm
@@ -123,6 +149,8 @@ export class BaseSeriesGenerator {
     calcGroupData(data) {
         // 清空分组数据
         this.groupData = {};
+        // 清空图表数据数组
+        this.chartDataArr = [];
         const groupData = this.groupData;
         // 分组属性代码表和分类属性代码表
         const { seriesCodeListId, catalogCodeListId } = this.model;
@@ -152,6 +180,13 @@ export class BaseSeriesGenerator {
             const catalog = this.translateVal(catalogCodeListId, item[this.catalogField], true);
             // 分类属性没值的数据排除
             if (!catalog) {
+                // 有代码表时，也需要封装chartData，此时值定死为0
+                if (catalogCodeListId && this.autoCompleteCategory) {
+                    const codeListItems = this.chartGenerator.codeListMap.get(catalogCodeListId);
+                    codeListItems.forEach(x => {
+                        this.prepareChartData(groupData, { [this.valueField]: 0 }, x.text, group);
+                    });
+                }
                 return;
             }
             // 该分类属性对应的单条数据不存在时新建一个
@@ -160,7 +195,13 @@ export class BaseSeriesGenerator {
             }
             // 相同分类属性的值属性数据累加
             groupData[group].get(catalog).value = plus(groupData[group].get(catalog).value, item[this.valueField]);
-            groupData[group].get(catalog).deData = item;
+            // 没有chartData说明是第一条，有chartData说明是累加数据，自己封装里面的deData
+            if (!groupData[group].get(catalog).chartData) {
+                this.prepareChartData(groupData, item, catalog, group);
+            }
+            else {
+                this.prepareChartData(groupData, { [this.valueField]: groupData[group].get(catalog).value }, catalog, group);
+            }
         });
         return groupData;
     }
@@ -192,7 +233,7 @@ export class BaseSeriesGenerator {
     }
     /**
      * 生成每条序列的data,由于不同图表类型格式不同所以为any
-     * 默认提供的是二维数组，按[X轴，y轴]格式
+     * 默认提供的是二维数组，按[x轴, y轴, 图表数据]格式
      * @author lxm
      * @date 2023-06-09 03:38:07
      * @param {CatalogData} catalogData
@@ -202,8 +243,7 @@ export class BaseSeriesGenerator {
     calcSeriesData(catalogData) {
         const temData = [];
         catalogData.forEach((catalog, key) => {
-            var _a;
-            temData.push([key, catalog.value, (_a = catalog.deData) === null || _a === void 0 ? void 0 : _a.srfkey]);
+            temData.push([key, catalog.value, catalog.chartData]);
         });
         return temData;
     }
@@ -221,14 +261,18 @@ export class BaseSeriesGenerator {
         return this.calcGroupSeries(groupData);
     }
     /**
-     * 通过事件的params获取主键
+     * 通过echarts事件的params获取封装好的图表数据
      * @author lxm
      * @date 2023-06-09 10:56:25
      * @param {ECElementEvent} params
      * @return {*}  {string}
      */
-    getSrfkeyByParams(params) {
-        return params.value[2];
+    getChartDataByParams(params) {
+        var _a, _b, _c;
+        if (this.groupData && Object.keys(this.groupData).length === 1) {
+            return (_a = this.groupData[DEFAULT_GROUP].get(params.name)) === null || _a === void 0 ? void 0 : _a.chartData;
+        }
+        return (_c = (_b = this.groupData) === null || _b === void 0 ? void 0 : _b[params.seriesName].get(params.name)) === null || _c === void 0 ? void 0 : _c.chartData;
     }
     /**
      * 数据预处理

package/out/controller/control/chart/generator/chart-options-generator.d.ts

@@ -62,6 +62,13 @@ export declare class ChartOptionsGenerator {
      * @date 2023-06-09 07:47:35
      */
     codeListMap: Map<string, Readonly<CodeListItem[]>>;
+    /**
+     * 维护图表序列index对应序列生成器Map
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-11-22 17:27:15
+     */
+    seriesGeneratorIndexMap: Map<number, BaseSeriesGenerator>;
     constructor(model: IDEChart);
     protected initSeriesGenerators(): void;
     protected calcTitleOption(chartTitle: IDEChartTitle): EChartsOption['title'];
@@ -103,6 +110,13 @@ export declare class ChartOptionsGenerator {
      * @return {*}  {EChartsOption}
      */
     calcOptionsByData(data: IData[]): EChartsOption;
-    getSrfkeyByParams(params: ECElementEvent): string;
+    /**
+     * 根据echarts给的params得到图表数据
+     * @param {ECElementEvent} params
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-11-22 16:11:50
+     */
+    getChartDataByParams(params: ECElementEvent): IData | undefined;
 }
 //# sourceMappingURL=chart-options-generator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EAEf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,cAAc,EACd,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAmBzE;AAED,qBAAa,qBAAqB;IA4DpB,OAAO,CAAC,KAAK;IA3DzB;;;;;OAKG;IACH,MAAM,EAAG,cAAc,CAAC;IAExB;;;;;OAKG;IACH,aAAa,EAAE,aAAa,CAI1B;IAEF;;;;;OAKG;IACH,OAAO,EAAE,aAAa,CAAM;IAE5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B;;;;;OAKG;IACH,gBAAgB,EAAE,mBAAmB,EAAE,CAAM;IAE7C;;;;;OAKG;IACH,QAAQ,gCAAuC;IAE/C;;;;OAIG;IACH,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAa;gBAE3C,KAAK,EAAE,QAAQ;IAoCnC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAgCtC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAmB5E,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,cAAc,GAC1B,aAAa,CAAC,QAAQ,CAAC;IAe1B,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,GACzC,oBAAoB,EAAE,GAAG,oBAAoB,EAAE;IAwClD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAM7D;;;;;;OAMG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKtC;;;;;;;;;OASG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrE;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,aAAa;IA8D/C,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;CA8DlD"}
+{"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EAEf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,cAAc,EACd,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAmBzE;AAED,qBAAa,qBAAqB;IAoEpB,OAAO,CAAC,KAAK;IAnEzB;;;;;OAKG;IACH,MAAM,EAAG,cAAc,CAAC;IAExB;;;;;OAKG;IACH,aAAa,EAAE,aAAa,CAI1B;IAEF;;;;;OAKG;IACH,OAAO,EAAE,aAAa,CAAM;IAE5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B;;;;;OAKG;IACH,gBAAgB,EAAE,mBAAmB,EAAE,CAAM;IAE7C;;;;;OAKG;IACH,QAAQ,gCAAuC;IAE/C;;;;OAIG;IACH,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAa;IAE/D;;;;;OAKG;IACH,uBAAuB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAa;gBAElD,KAAK,EAAE,QAAQ;IAoCnC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAgCtC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAmB5E,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,cAAc,GAC1B,aAAa,CAAC,QAAQ,CAAC;IAe1B,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,GACzC,oBAAoB,EAAE,GAAG,oBAAoB,EAAE;IAwClD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAM7D;;;;;;OAMG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKtC;;;;;;;;;OASG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrE;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,aAAa;IAoE/C;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;CA8DhE"}

package/out/controller/control/chart/generator/chart-options-generator.js

@@ -76,6 +76,13 @@ export class ChartOptionsGenerator {
          * @date 2023-06-09 07:47:35
          */
         this.codeListMap = new Map();
+        /**
+         * 维护图表序列index对应序列生成器Map
+         * @return {*}
+         * @author: zhujiamin
+         * @Date: 2023-11-22 17:27:15
+         */
+        this.seriesGeneratorIndexMap = new Map();
         const { dechartTitle, dechartLegend, chartXAxises, chartYAxises, userParam, } = model;
         // 标题
         if (dechartTitle) {
@@ -281,6 +288,7 @@ export class ChartOptionsGenerator {
         // 生成seriesOptions
         const seriesOption = [];
         this.seriesGenerators.forEach(generator => {
+            const startIndex = seriesOption.length; // 记录当前生成器开始的索引
             const series = generator.calcByData(data);
             if (series instanceof Array) {
                 seriesOption.push(...series);
@@ -288,6 +296,11 @@ export class ChartOptionsGenerator {
             else {
                 seriesOption.push(series);
             }
+            const endIndex = seriesOption.length - 1; // 记录当前生成器结束的索引
+            // 将生成器和对应的索引范围存入映射
+            for (let i = startIndex; i <= endIndex; i++) {
+                this.seriesGeneratorIndexMap.set(i, generator);
+            }
         });
         this.options.series = seriesOption;
         // 柱状图、折线图、散点图单个序列并且该序列分组数据只有一条时，不用显示图例
@@ -307,11 +320,18 @@ export class ChartOptionsGenerator {
         }
         return this.options;
     }
-    getSrfkeyByParams(params) {
-        const generator = this.seriesGenerators[params.seriesIndex];
+    /**
+     * 根据echarts给的params得到图表数据
+     * @param {ECElementEvent} params
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-11-22 16:11:50
+     */
+    getChartDataByParams(params) {
+        const generator = this.seriesGeneratorIndexMap.get(params.seriesIndex);
         if (!generator) {
             throw new RuntimeError(`找不到${params.seriesIndex}序列的generator！`);
         }
-        return generator.getSrfkeyByParams(params);
+        return generator.getChartDataByParams(params);
     }
 }

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

@@ -1,9 +1,9 @@
 import { IChartSeriesFunnel } from '@ibiz/model-core';
-import type { ECElementEvent, SeriesOption } from 'echarts';
+import type { SeriesOption } from 'echarts';
 import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
 interface funnelSeriesData {
     name: string;
-    value: IData[];
+    value: Array<number | IData | undefined>;
 }
 /**
  * 漏斗图序列生成器
@@ -16,7 +16,6 @@ interface funnelSeriesData {
 export declare class FunnelSeriesGenerator extends BaseSeriesGenerator<IChartSeriesFunnel> {
     protected calcStaticOptions(): SeriesOption;
     protected calcSeriesData(catalogData: CatalogData): funnelSeriesData[];
-    getSrfkeyByParams(params: ECElementEvent): string;
 }
 export {};
 //# sourceMappingURL=funnel-series-generator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"funnel-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/funnel-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAsB,YAAY,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3E,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,KAAK,EAAE,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,qBAAa,qBAAsB,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;IAChF,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAS3C,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,gBAAgB,EAAE;IAWtE,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;CAGlD"}
+{"version":3,"file":"funnel-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/funnel-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAsB,YAAY,EAAE,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3E,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,KAAK,GAAG,SAAS,CAAC,CAAC;CAC1C;AAED;;;;;;;GAOG;AACH,qBAAa,qBAAsB,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;IAChF,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAS3C,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,gBAAgB,EAAE;CAUvE"}

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

@@ -17,15 +17,11 @@ export class FunnelSeriesGenerator extends BaseSeriesGenerator {
     calcSeriesData(catalogData) {
         const temData = [];
         catalogData.forEach((catalog, key) => {
-            var _a;
             temData.push({
                 name: key,
-                value: [catalog.value, (_a = catalog.deData) === null || _a === void 0 ? void 0 : _a.srfkey],
+                value: [catalog.value, catalog.chartData],
             });
         });
         return temData;
     }
-    getSrfkeyByParams(params) {
-        return params.value[1];
-    }
 }

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

@@ -1,9 +1,9 @@
 import { IChartSeriesPie } from '@ibiz/model-core';
-import type { ECElementEvent, SeriesOption } from 'echarts';
+import type { SeriesOption } from 'echarts';
 import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
 interface pieSeriesData {
     name: string;
-    value: IData[];
+    value: Array<number | IData | undefined>;
 }
 /**
  * 饼图序列生成器
@@ -16,7 +16,6 @@ interface pieSeriesData {
 export declare class PieSeriesGenerator extends BaseSeriesGenerator<IChartSeriesPie> {
     protected calcStaticOptions(): SeriesOption;
     protected calcSeriesData(catalogData: CatalogData): pieSeriesData[];
-    getSrfkeyByParams(params: ECElementEvent): string;
 }
 export {};
 //# sourceMappingURL=pie-series-generator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pie-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/pie-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAmB,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3E,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,KAAK,EAAE,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,mBAAmB,CAAC,eAAe,CAAC;IAC1E,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAS3C,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,aAAa,EAAE;IAWnE,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;CAGlD"}
+{"version":3,"file":"pie-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/pie-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3E,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,KAAK,GAAG,SAAS,CAAC,CAAC;CAC1C;AAED;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,mBAAmB,CAAC,eAAe,CAAC;IAC1E,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAS3C,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,aAAa,EAAE;CAUpE"}

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

@@ -17,15 +17,11 @@ export class PieSeriesGenerator extends BaseSeriesGenerator {
     calcSeriesData(catalogData) {
         const temData = [];
         catalogData.forEach((catalog, key) => {
-            var _a;
             temData.push({
                 name: key,
-                value: [catalog.value, (_a = catalog.deData) === null || _a === void 0 ? void 0 : _a.srfkey],
+                value: [catalog.value, catalog.chartData],
             });
         });
         return temData;
     }
-    getSrfkeyByParams(params) {
-        return params.value[1];
-    }
 }

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

@@ -1,5 +1,5 @@
 import { IChartSeriesRadar } from '@ibiz/model-core';
-import type { ECElementEvent, SeriesOption } from 'echarts';
+import type { SeriesOption } from 'echarts';
 import { BaseSeriesGenerator } from './base-series-generator';
 /**
  * 雷达序列生成器
@@ -19,6 +19,5 @@ export declare class RadarSeriesGenerator extends BaseSeriesGenerator<IChartSeri
      */
     calcRadarCoordSystem(data: IData[]): void;
     calcByData(_data: IData[]): SeriesOption | SeriesOption[];
-    getSrfkeyByParams(params: ECElementEvent): string;
 }
 //# sourceMappingURL=radar-series-generator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"radar-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/radar-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAqB,YAAY,EAAE,MAAM,SAAS,CAAC;AAE/E,OAAO,EAAE,mBAAmB,EAAiB,MAAM,yBAAyB,CAAC;AAG7E;;;;;;;GAOG;AACH,qBAAa,oBAAqB,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAC9E,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAM3C;;;;;OAKG;IACH,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAoBzC,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,GAAG,YAAY,EAAE;IA6BzD,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM;CAGlD"}
+{"version":3,"file":"radar-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/radar-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAqB,YAAY,EAAE,MAAM,SAAS,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAiB,MAAM,yBAAyB,CAAC;AAG7E;;;;;;;GAOG;AACH,qBAAa,oBAAqB,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAC9E,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAM3C;;;;;OAKG;IACH,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAoBzC,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,GAAG,YAAY,EAAE;CA4B1D"}

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

@@ -41,7 +41,7 @@ export class RadarSeriesGenerator extends BaseSeriesGenerator {
             const catalogData = groupData[group];
             const value = radar.indicatorKeys.map(key => {
                 if (catalogData.has(key)) {
-                    return catalogData.get(key);
+                    return catalogData.get(key).value;
                 }
                 return 0;
             });
@@ -58,7 +58,4 @@ export class RadarSeriesGenerator extends BaseSeriesGenerator {
         }
         return options;
     }
-    getSrfkeyByParams(params) {
-        return params.value[1];
-    }
 }

package/out/controller/control/exp-bar/chart-exp-bar.controller.d.ts

@@ -1,4 +1,4 @@
-import { IChartExpBar } from '@ibiz/model-core';
+import { IChartExpBar, INavigatable } from '@ibiz/model-core';
 import { IChartExpBarState, IChartExpBarEvent, IChartExpBarController, INavViewMsg } from '../../../interface';
 import { ExpBarControlController } from './exp-bar.controller';
 /**
@@ -10,6 +10,30 @@ import { ExpBarControlController } from './exp-bar.controller';
  * @implements {IChartExpBarController}
  */
 export declare class ChartExpBarController extends ExpBarControlController<IChartExpBar, IChartExpBarState, IChartExpBarEvent> implements IChartExpBarController {
+    /**
+     * 导航页面首次打开且没有回显时，
+     * 默认取第一条数据进行导航
+     * 对于不同的导航，第一条可导航的数据可能定义不同，可以重写改方法。
+     * @author lxm
+     * @date 2023-08-10 03:58:15
+     * @protected
+     */
+    protected navByFirstItem(): void;
+    /**
+     * 解析参数
+     *
+     * @author zk
+     * @date 2023-05-29 04:05:52
+     * @param {IDETabViewPanel} tabViewPanel
+     * @return {*}
+     * @memberof ExpBarControlController
+     */
+    prepareParams(XDataModel: INavigatable & {
+        appDataEntityId?: string;
+    }, data: IData, context: IContext, params: IParams): {
+        context: IContext;
+        params: IParams;
+    };
     /**
      * 获取导航视图
      *

package/out/controller/control/exp-bar/chart-exp-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chart-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/chart-exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,uBAAuB,CAC7B,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;CAYf"}
+{"version":3,"file":"chart-exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/chart-exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAI/D;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,uBAAuB,CAC7B,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,IAAI,IAAI;IAwBhC;;;;;;;;OAQG;IACH,aAAa,CACX,UAAU,EAAE,YAAY,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,EACvD,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAsCzC;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;CAmBf"}