@ibiz-template/runtime 0.3.3 → 0.3.4

package/out/controller/control/exp-bar/chart-exp-bar.controller.js

@@ -1,4 +1,5 @@
 import { ExpBarControlController } from './exp-bar.controller';
+import { convertNavData } from '../../../utils';
 /**
  * 图表导航栏控制器
  *
@@ -8,6 +9,65 @@ import { ExpBarControlController } from './exp-bar.controller';
  * @implements {IChartExpBarController}
  */
 export class ChartExpBarController extends ExpBarControlController {
+    /**
+     * 导航页面首次打开且没有回显时，
+     * 默认取第一条数据进行导航
+     * 对于不同的导航，第一条可导航的数据可能定义不同，可以重写改方法。
+     * @author lxm
+     * @date 2023-08-10 03:58:15
+     * @protected
+     */
+    navByFirstItem() {
+        const data = this.xDataController.state.items[0];
+        if (!data) {
+            // 导航视图传空让他导航占位绘制空界面
+            this.state.srfnav = '';
+            this._evt.emit('onNavViewChange', {
+                navViewMsg: {
+                    key: '',
+                    isCache: this.isCache,
+                },
+            });
+            return;
+        }
+        // 默认选中并激活第一项(这里的第一项是我们自己封装的chartData)
+        const activeSeriesGenerator = this.xDataController.generator.seriesGenerators.find(generator => {
+            return generator.chartDataArr.length > 0 && generator.model.navAppViewId;
+        });
+        if (activeSeriesGenerator) {
+            this.xDataController.setActive(activeSeriesGenerator.chartDataArr[0]);
+        }
+    }
+    /**
+     * 解析参数
+     *
+     * @author zk
+     * @date 2023-05-29 04:05:52
+     * @param {IDETabViewPanel} tabViewPanel
+     * @return {*}
+     * @memberof ExpBarControlController
+     */
+    prepareParams(XDataModel, data, context, params) {
+        var _a;
+        const { context: tempContext, params: tempParams } = super.prepareParams(XDataModel, data, context, params);
+        // 序列上或配置导航相关参数
+        if (data._seriesModelId) {
+            const seriesModel = (_a = XDataModel.dechartSerieses) === null || _a === void 0 ? void 0 : _a.find(series => {
+                return series.id === data._seriesModelId;
+            });
+            if (seriesModel) {
+                const { navigateContexts, navigateParams } = seriesModel;
+                // 序列上配的导航视图参数和上下文
+                const tempContext2 = convertNavData(navigateContexts, data, params, tempContext);
+                const tempParams2 = convertNavData(navigateParams, data, params, tempParams);
+                return {
+                    context: Object.assign(tempContext.clone(), tempContext2),
+                    params: tempParams2,
+                };
+            }
+        }
+        return { context: tempContext, params: tempParams };
+    }
     /**
      * 获取导航视图
      *
@@ -19,10 +79,16 @@ export class ChartExpBarController extends ExpBarControlController {
      */
     getNavViewMsg(data, context, params) {
         var _a;
-        const viewModelId = (_a = this.XDataModel.dechartSerieses) === null || _a === void 0 ? void 0 : _a[0].navAppViewId;
+        let viewModelId;
+        if (data._seriesModelId) {
+            const seriesModel = (_a = this.XDataModel.dechartSerieses) === null || _a === void 0 ? void 0 : _a.find(series => {
+                return series.id === data._seriesModelId;
+            });
+            viewModelId = seriesModel === null || seriesModel === void 0 ? void 0 : seriesModel.navAppViewId;
+        }
         const result = this.prepareParams(this.XDataModel, data, context, params);
         return {
-            key: data[this.navKeyName],
+            key: data._uuid,
             context: result.context,
             params: result.params,
             viewId: viewModelId,

package/out/interface/controller/state/control/i-chart.state.d.ts

@@ -9,4 +9,25 @@ import { IMDControlState } from './i-md-control.state';
  */
 export interface IChartState extends IMDControlState {
 }
+/**
+ * 图表数据格式
+ *
+ */
+export interface IChartData {
+    /**
+     * 序列模型id
+     *
+     */
+    _seriesModelId?: string;
+    /**
+     * 分组名称
+     *
+     */
+    _groupName?: string;
+    /**
+     * 分类值
+     *
+     */
+    _catalog?: string;
+}
 //# sourceMappingURL=i-chart.state.d.ts.map

package/out/interface/controller/state/control/i-chart.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-chart.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-chart.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AACH,MAAM,WAAW,WAAY,SAAQ,eAAe;CAAG"}
+{"version":3,"file":"i-chart.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-chart.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AACH,MAAM,WAAW,WAAY,SAAQ,eAAe;CAAG;AAEvD;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}

package/out/service/vo/chart-data/chart-data.d.ts

@@ -0,0 +1,11 @@
+import { IDEChartSeries } from '@ibiz/model-core';
+import { IChartData } from '../../../interface';
+export declare class ChartData implements IChartData {
+    [key: string | symbol]: any;
+    _seriesModelId?: string;
+    _catalog?: string;
+    _groupName?: string;
+    _uuid?: string;
+    constructor(deData: IData, seriesModel?: IDEChartSeries, catalog?: string, groupName?: string);
+}
+//# sourceMappingURL=chart-data.d.ts.map

package/out/service/vo/chart-data/chart-data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"chart-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/chart-data/chart-data.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAgBhD,qBAAa,SAAU,YAAW,UAAU;IAE1C,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,KAAK,CAAC,EAAE,MAAM,CAAC;gBAGb,MAAM,EAAE,KAAK,EACb,WAAW,CAAC,EAAE,cAAc,EAC5B,OAAO,CAAC,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM;CAuCrB"}

package/out/service/vo/chart-data/chart-data.js

@@ -0,0 +1,50 @@
+/* eslint-disable no-constructor-return */
+import { createUUID } from 'qx-util';
+// 更新属性，缺的补充定义
+function updateKeyDefine(target, keys) {
+    keys.forEach(key => {
+        if (!Object.prototype.hasOwnProperty.call(target, key)) {
+            Object.defineProperty(target, key, {
+                enumerable: true,
+                configurable: true,
+                writable: true,
+                value: undefined,
+            });
+        }
+    });
+}
+export class ChartData {
+    constructor(deData, seriesModel, catalog, groupName) {
+        this._seriesModelId = seriesModel === null || seriesModel === void 0 ? void 0 : seriesModel.id;
+        this._catalog = catalog;
+        this._groupName = groupName;
+        this._uuid = createUUID();
+        return new Proxy(this, {
+            set(target, p, value) {
+                if (Object.prototype.hasOwnProperty.call(deData, p)) {
+                    deData[p] = value;
+                }
+                else {
+                    target[p] = value;
+                }
+                return true;
+            },
+            get(target, p, _receiver) {
+                if (target[p] !== undefined) {
+                    return target[p];
+                }
+                if (deData[p] !== undefined) {
+                    return deData[p];
+                }
+            },
+            ownKeys(target) {
+                // 整合所有并排除重复
+                const allKeys = [
+                    ...new Set([...Object.keys(target), ...Object.keys(deData)]),
+                ];
+                updateKeyDefine(target, allKeys);
+                return allKeys;
+            },
+        });
+    }
+}

package/out/service/vo/chart-data/index.d.ts

@@ -0,0 +1,2 @@
+export { ChartData } from './chart-data';
+//# sourceMappingURL=index.d.ts.map

package/out/service/vo/chart-data/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/chart-data/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC"}

package/out/service/vo/chart-data/index.js

@@ -0,0 +1 @@
+export { ChartData } from './chart-data';

package/out/service/vo/index.d.ts

@@ -4,4 +4,5 @@ export * from './ui-map-field';
 export * from './calendar-item-data';
 export * from './map-data';
 export * from './panel-data';
+export * from './chart-data';
 //# sourceMappingURL=index.d.ts.map

package/out/service/vo/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/vo/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/vo/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC"}

package/out/service/vo/index.js

@@ -4,3 +4,4 @@ export * from './ui-map-field';
 export * from './calendar-item-data';
 export * from './map-data';
 export * from './panel-data';
+export * from './chart-data';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.3.0",
+    "@ibiz-template/core": "^0.3.4",
     "@ibiz/model-core": "^0.0.20",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.10",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "7f8e0137d5d235f6eebab383f046dd91a22ce94c"
+  "gitHead": "a6a5031e07ec179ddb6c855023243fe5006290e7"
 }

package/src/controller/control/calendar/calendar.controller.ts

@@ -88,12 +88,35 @@ export class CalendarController
     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
+   */
+  protected sortItems(): void {
+    if (this.model.calendarStyle === 'TIMELINE') {
+      this.state.items.sort((a: ICalendarItemData, b: ICalendarItemData) => {
+        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;
+      });
+    }
+  }
+
   /**
    * 获取当前选中的日期
    *
@@ -163,8 +186,12 @@ export class CalendarController
     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/src/controller/control/chart/chart.controller.ts

@@ -25,6 +25,12 @@ export class ChartController
    */
   chart?: EChartsType;
 
+  /**
+   * 图表选项生成器
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-23 14:07:39
+   */
   generator!: ChartOptionsGenerator;
 
   /**
@@ -70,9 +76,11 @@ export class ChartController
   initChart(chart: EChartsType): void {
     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/src/controller/control/chart/generator/base-series-generator.ts

@@ -15,6 +15,8 @@ import {
   ChartOptionsGenerator,
   parseUserParams,
 } from './chart-options-generator';
+import { IChartData } from '../../../../interface';
+import { ChartData } from '../../../../service';
 
 dayjs.extend(minMax);
 dayjs.extend(isSameOrBefore);
@@ -30,12 +32,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>;
@@ -102,6 +104,14 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
    */
   groupData?: GroupData;
 
+  /**
+   * 根据分组处理出来的图表数据数组
+   * @author lxm
+   * @date 2023-06-09 02:58:28
+   * @type {GroupData}
+   */
+  chartDataArr: IChartData[] = [];
+
   /**
    * 静态的序列options
    * @author lxm
@@ -223,6 +233,29 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
     return isExclude ? undefined : val;
   }
 
+  /**
+   * 准备图表数据
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-23 15:24:12
+   */
+  protected prepareChartData(
+    groupData: GroupData,
+    deData: IData,
+    catalog: string,
+    group: string,
+  ): void {
+    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;
+    this.chartDataArr?.push(tempChartData);
+  }
+
   /**
    * 计算分组数据
    * @author lxm
@@ -233,6 +266,8 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
   protected calcGroupData(data: IData[]): GroupData {
     // 清空分组数据
     this.groupData = {};
+    // 清空图表数据数组
+    this.chartDataArr = [];
     const groupData = this.groupData!;
     // 分组属性代码表和分类属性代码表
     const { seriesCodeListId, catalogCodeListId } = this.model;
@@ -274,6 +309,19 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
       );
       // 分类属性没值的数据排除
       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;
       }
 
@@ -286,7 +334,18 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
         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;
@@ -325,7 +384,7 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
 
   /**
    * 生成每条序列的data,由于不同图表类型格式不同所以为any
-   * 默认提供的是二维数组，按[X轴，y轴]格式
+   * 默认提供的是二维数组，按[x轴, y轴, 图表数据]格式
    * @author lxm
    * @date 2023-06-09 03:38:07
    * @param {CatalogData} catalogData
@@ -335,7 +394,7 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
   protected calcSeriesData(catalogData: CatalogData): any {
     const temData: IData[] = [];
     catalogData.forEach((catalog, key) => {
-      temData.push([key, catalog.value, catalog.deData?.srfkey]);
+      temData.push([key, catalog.value, catalog.chartData]);
     });
     return temData;
   }
@@ -355,14 +414,17 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
   }
 
   /**
-   * 通过事件的params获取主键
+   * 通过echarts事件的params获取封装好的图表数据
    * @author lxm
    * @date 2023-06-09 10:56:25
    * @param {ECElementEvent} params
    * @return {*}  {string}
    */
-  getSrfkeyByParams(params: ECElementEvent): string {
-    return (params.value as IData)[2];
+  getChartDataByParams(params: ECElementEvent): IData | undefined {
+    if (this.groupData && Object.keys(this.groupData).length === 1) {
+      return this.groupData[DEFAULT_GROUP].get(params.name)?.chartData;
+    }
+    return this.groupData?.[params.seriesName!].get(params.name)?.chartData;
   }
 
   /**

package/src/controller/control/chart/generator/chart-options-generator.ts

@@ -115,6 +115,14 @@ export class ChartOptionsGenerator {
    */
   codeListMap: Map<string, Readonly<CodeListItem[]>> = new Map();
 
+  /**
+   * 维护图表序列index对应序列生成器Map
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-22 17:27:15
+   */
+  seriesGeneratorIndexMap: Map<number, BaseSeriesGenerator> = new Map();
+
   constructor(private model: IDEChart) {
     const {
       dechartTitle,
@@ -353,12 +361,18 @@ export class ChartOptionsGenerator {
     // 生成seriesOptions
     const seriesOption: SeriesOption[] = [];
     this.seriesGenerators.forEach(generator => {
+      const startIndex = seriesOption.length; // 记录当前生成器开始的索引
       const series = generator.calcByData(data);
       if (series instanceof Array) {
         seriesOption.push(...series);
       } 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;
 
@@ -391,12 +405,19 @@ export class ChartOptionsGenerator {
     return this.options;
   }
 
-  getSrfkeyByParams(params: ECElementEvent): string {
-    const generator = this.seriesGenerators[params.seriesIndex!];
+  /**
+   * 根据echarts给的params得到图表数据
+   * @param {ECElementEvent} params
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-22 16:11:50
+   */
+  getChartDataByParams(params: ECElementEvent): IData | undefined {
+    const generator = this.seriesGeneratorIndexMap.get(params.seriesIndex!);
     if (!generator) {
       throw new RuntimeError(`找不到${params.seriesIndex}序列的generator！`);
     }
-    return generator.getSrfkeyByParams(params);
+    return generator.getChartDataByParams(params);
   }
 
   // protected calcRadarSeries(data: IData[], series: IChartSeriesFunnel) {

package/src/controller/control/chart/generator/funnel-series-generator.ts

@@ -1,10 +1,10 @@
 import { IChartSeriesFunnel } from '@ibiz/model-core';
-import type { ECElementEvent, FunnelSeriesOption, SeriesOption } from 'echarts';
+import type { FunnelSeriesOption, SeriesOption } from 'echarts';
 import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
 
 interface funnelSeriesData {
   name: string;
-  value: IData[];
+  value: Array<number | IData | undefined>;
 }
 
 /**
@@ -30,13 +30,9 @@ export class FunnelSeriesGenerator extends BaseSeriesGenerator<IChartSeriesFunne
     catalogData.forEach((catalog, key) => {
       temData.push({
         name: key,
-        value: [catalog.value, catalog.deData?.srfkey],
+        value: [catalog.value, catalog.chartData],
       });
     });
     return temData;
   }
-
-  getSrfkeyByParams(params: ECElementEvent): string {
-    return (params.value as IData)[1];
-  }
 }

package/src/controller/control/chart/generator/pie-series-generator.ts

@@ -1,10 +1,10 @@
 import { IChartSeriesPie } from '@ibiz/model-core';
-import type { ECElementEvent, PieSeriesOption, SeriesOption } from 'echarts';
+import type { PieSeriesOption, SeriesOption } from 'echarts';
 import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
 
 interface pieSeriesData {
   name: string;
-  value: IData[];
+  value: Array<number | IData | undefined>;
 }
 
 /**
@@ -30,13 +30,9 @@ export class PieSeriesGenerator extends BaseSeriesGenerator<IChartSeriesPie> {
     catalogData.forEach((catalog, key) => {
       temData.push({
         name: key,
-        value: [catalog.value, catalog.deData?.srfkey],
+        value: [catalog.value, catalog.chartData],
       });
     });
     return temData;
   }
-
-  getSrfkeyByParams(params: ECElementEvent): string {
-    return (params.value as IData)[1];
-  }
 }

package/src/controller/control/chart/generator/radar-series-generator.ts

@@ -1,5 +1,5 @@
 import { IChartSeriesRadar } from '@ibiz/model-core';
-import type { ECElementEvent, RadarSeriesOption, SeriesOption } from 'echarts';
+import type { RadarSeriesOption, SeriesOption } from 'echarts';
 import { mergeDeepRight } from 'ramda';
 import { BaseSeriesGenerator, DEFAULT_GROUP } from './base-series-generator';
 import { RadarCoordSystem } from './radar-coord-system';
@@ -53,7 +53,7 @@ export class RadarSeriesGenerator extends BaseSeriesGenerator<IChartSeriesRadar>
       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;
       });
@@ -73,8 +73,4 @@ export class RadarSeriesGenerator extends BaseSeriesGenerator<IChartSeriesRadar>
 
     return options as SeriesOption;
   }
-
-  getSrfkeyByParams(params: ECElementEvent): string {
-    return (params.value as IData)[1];
-  }
 }