pt/superset
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2024-09-12 08:39:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(plugin-chart-echarts): [feature parity] annotation line chart color not working (#19758)

Browse Source
This commit is contained in:
Stephen Liu 2022-04-29 00:10:58 +08:00 committed by GitHub
parent d5ea537b0e
commit 11562971fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
View File

@ -236,6 +236,8 @@ export default function transformProps(
markerSize, markerSize,
data1, data1,
annotationData, annotationData,
colorScale,
sliceId,
), ),
); );
} }

2
superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
View File

@ -259,6 +259,8 @@ export default function transformProps(
markerSize, markerSize,
data, data,
annotationData, annotationData,
colorScale,
sliceId,
), ),
); );
} }

5
superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts
View File

@ -418,9 +418,11 @@ export function transformTimeseriesAnnotation(
markerSize: number, markerSize: number,
data: TimeseriesDataRecord[], data: TimeseriesDataRecord[],
annotationData: AnnotationData, annotationData: AnnotationData,
colorScale: CategoricalColorScale,
sliceId?: number,
): SeriesOption[] { ): SeriesOption[] {
const series: 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]; const result = annotationData[name];
if (isTimeseriesAnnotationResult(result)) { if (isTimeseriesAnnotationResult(result)) {
result.forEach(annotation => { result.forEach(annotation => {
@ -435,6 +437,7 @@ export function transformTimeseriesAnnotation(
opacity: parseAnnotationOpacity(opacity), opacity: parseAnnotationOpacity(opacity),
type: style as ZRLineType, type: style as ZRLineType,
width: hideLine ? 0 : width, width: hideLine ? 0 : width,
color: color || colorScale(name, sliceId),
}, },
}); });
}); });