QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-06-01 13:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(line-chart): Formula Annotations on Line Charts are broken (#20687)

Browse Source
This commit is contained in:
Stephen Liu
2022-07-13 16:42:11 +08:00
committed by GitHub
parent bd6037ef50
commit acdb271422
7 changed files with 63 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
superset-frontend/plugins/plugin-chart-echarts/src/utils/annotation.ts
View File

@@ -25,26 +25,31 @@ import {
AnnotationLayer,
AnnotationOpacity,
AnnotationType,
DataRecord,
evalExpression,
FormulaAnnotationLayer,
isRecordAnnotationResult,
isTableAnnotationLayer,
isTimeseriesAnnotationResult,
TimeseriesDataRecord,
} from '@superset-ui/core';
import { EchartsTimeseriesChartProps } from '../types';
import { AxisType, EchartsTimeseriesChartProps } from '../types';
import { EchartsMixedTimeseriesProps } from '../MixedTimeseries/types';
export function evalFormula(
formula: FormulaAnnotationLayer,
data: TimeseriesDataRecord[],
): [number, number][] {
data: DataRecord[],
xAxis: string,
xAxisType: AxisType,
): [any, number][] {
const { value: expression } = formula;
return data.map(row => [
Number(row.__timestamp),
evalExpression(expression, row.__timestamp as number),
]);
return data.map(row => {
let value = row[xAxis];
if (xAxisType === 'time') {
value = new Date(value as string).getTime();
}
return [value, evalExpression(expression, (value || 0) as number)];
});
}
export function parseAnnotationOpacity(opacity?: AnnotationOpacity): number {