From 603b6ad52a052f6e5473973a4bdb9bdc16173253 Mon Sep 17 00:00:00 2001 From: Jenny Cho Date: Thu, 18 Feb 2021 09:24:36 +0900 Subject: [PATCH] fix: resolve emitted data of grouped series models(fix #565) --- apps/chart/src/component/lineSeries.ts | 2 +- apps/chart/src/component/selectedSeries.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/chart/src/component/lineSeries.ts b/apps/chart/src/component/lineSeries.ts index e6534ed0f..7689c2423 100644 --- a/apps/chart/src/component/lineSeries.ts +++ b/apps/chart/src/component/lineSeries.ts @@ -255,7 +255,7 @@ export default class LineSeries extends Component { this.rect.width, getCoordinateXValue(datum as CoordinateDataType), getCoordinateDataIndex(datum, categories, idx, this.startIndex), - xAxisLimit, + xAxisLimit ); points.push({ x, y, value }); }); diff --git a/apps/chart/src/component/selectedSeries.ts b/apps/chart/src/component/selectedSeries.ts index 9f965c6c7..644fac0f1 100644 --- a/apps/chart/src/component/selectedSeries.ts +++ b/apps/chart/src/component/selectedSeries.ts @@ -20,6 +20,8 @@ type ActiveSeriesNames = { [key in TooltipModelName]: string[] }; export default class SelectedSeries extends Component { models: ResponderSeriesModel = {} as ResponderSeriesModel; + seriesModels: ResponderSeriesModel = {} as ResponderSeriesModel; + activeSeriesNames: ActiveSeriesNames = {} as ActiveSeriesNames; isShow = false; @@ -101,11 +103,11 @@ export default class SelectedSeries extends Component { }) ? [] : models; - + this.seriesModels[alias || name] = this.getSelectedSeriesModels(selectedSeriesEventModel); this.isShow = !!Object.values(this.models).flatMap((value) => value).length; this.eventBus.emit( this.isShow ? 'selectSeries' : 'unselectSeries', - makeObservableObjectToNormal(this.getSelectedSeriesModels(selectedSeriesEventModel)) + makeObservableObjectToNormal(this.seriesModels) ); this.activeSeriesNames[name] = this.getSeriesNames(selectedSeriesEventModel.models, name); this.setActiveState();