diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts index 8ac08e39257b..593ac053cc16 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts @@ -236,6 +236,8 @@ export default function transformProps( markerSize, data1, annotationData, + colorScale, + sliceId, ), ); } diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts index b8585c6e68ed..16007e1bb22b 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts @@ -259,6 +259,8 @@ export default function transformProps( markerSize, data, annotationData, + colorScale, + sliceId, ), ); } diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts index 7e8dbf855cb8..e574ad4cc709 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts @@ -418,9 +418,11 @@ export function transformTimeseriesAnnotation( markerSize: number, data: TimeseriesDataRecord[], annotationData: AnnotationData, + colorScale: CategoricalColorScale, + sliceId?: number, ): SeriesOption[] { const series: SeriesOption[] = []; - const { hideLine, name, opacity, showMarkers, style, width } = layer; + const { hideLine, name, opacity, showMarkers, style, width, color } = layer; const result = annotationData[name]; if (isTimeseriesAnnotationResult(result)) { result.forEach(annotation => { @@ -435,6 +437,7 @@ export function transformTimeseriesAnnotation( opacity: parseAnnotationOpacity(opacity), type: style as ZRLineType, width: hideLine ? 0 : width, + color: color || colorScale(name, sliceId), }, }); });