Skip to content

Commit d064375

Browse files
committed
feat: support multi previewSeries
1 parent ebe5a9e commit d064375

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

packages/vchart-extension/src/charts/combination-candlestick/combination-candlestick-transformer.ts

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,19 @@ export class CombinationCandlestickChartSpecTransformer<
5454
candlestickSpec.regionIndex = 0;
5555

5656
if (spec.previewSeries) {
57-
const tempPreviewSeries = spec.series.find(s => s.id === spec.previewSeries.id);
58-
let previewSeriesSpec;
59-
if (tempPreviewSeries) {
60-
merge(tempPreviewSeries, spec.previewSeries);
61-
previewSeriesSpec = tempPreviewSeries;
62-
} else {
63-
spec.series.push(spec.previewSeries);
64-
previewSeriesSpec = spec.previewSeries;
65-
}
66-
previewSeriesSpec.regionIndex = 1;
67-
this._transformSeriesData(spec, previewSeriesSpec);
57+
array(spec.previewSeries).forEach(previewSeries => {
58+
const tempPreviewSeries = spec.series.find(s => s.id === previewSeries.id);
59+
let previewSeriesSpec;
60+
if (tempPreviewSeries) {
61+
merge(tempPreviewSeries, previewSeries);
62+
previewSeriesSpec = tempPreviewSeries;
63+
} else {
64+
spec.series.push(previewSeries);
65+
previewSeriesSpec = previewSeries;
66+
}
67+
previewSeriesSpec.regionIndex = 1;
68+
this._transformSeriesData(spec, previewSeriesSpec);
69+
});
6870
}
6971
}
7072

packages/vchart-extension/src/charts/combination-candlestick/interface.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,23 @@ import type {
99
ICartesianChartSpec
1010
} from '@visactor/vchart';
1111

12+
export type ICombinationCandlestickPreviewSeriesSpec = IBarSeriesSpec | IAreaSeriesSpec | ILineSeriesSpec;
13+
1214
/**
1315
* @description 组合蜡烛图规约
1416
*/
1517
export interface ICombinationCandlestickChartSpec extends Omit<ICartesianChartSpec, 'region'> {
1618
type: 'combinationCandlestick';
1719

1820
/** 与蜡烛图使用同region的系列配置 */
19-
series?: ISeriesSpec[];
21+
series?: (ICombinationCandlestickPreviewSeriesSpec | ICandlestickSeriesSpec)[];
2022

2123
// 蜡烛系列 必须配置数据 不可以为数组
2224
candlestickSeries: ICandlestickSeriesSpec;
2325
candlestickRegion?: IRegionSpec;
2426

2527
// 预览系列 必须配置数据 不可以为数组
26-
previewSeries?: IBarSeriesSpec | IAreaSeriesSpec | ILineSeriesSpec;
28+
previewSeries?: ICombinationCandlestickPreviewSeriesSpec | ICombinationCandlestickPreviewSeriesSpec[];
2729
previewRegion?: IRegionSpec;
2830
// 预览图高度 可以是数字,返回数字的函数,或者百分百字符串 '30%'
2931
previewHeight?: number | ((maxSize: number) => number) | string;

0 commit comments

Comments
 (0)