QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-27 12:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: annotation broken (#20651)

Browse Source 
* fix: annotation broken

* fix UT

* add annotation data to mixed timeseries chart
This commit is contained in:
Yongjie Zhao
2022-07-12 06:23:57 +08:00
committed by GitHub
parent 6ee9be203a
commit 7f918a4ec0
7 changed files with 75 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,10 @@ import {
extractDataTotalValues,
extractShowValueIndexes,
} from '../utils/series';
import { extractAnnotationLabels } from '../utils/annotation';
import {
extractAnnotationLabels,
getAnnotationData,
} from '../utils/annotation';
import {
extractForecastSeriesContext,
extractForecastSeriesContexts,
@@ -93,12 +96,12 @@ export default function transformProps(
queriesData,
datasource,
theme,
annotationData = {},
} = chartProps;
const { verboseMap = {} } = datasource;
const [queryData] = queriesData;
const { data = [] } = queryData as TimeseriesChartDataResponseResult;
const dataTypes = getColtypesMapping(queryData);
const annotationData = getAnnotationData(chartProps);
const {
area,