diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/package.json b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/package.json index 2143894ee19b6..ae5d9f6cecf8b 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/package.json +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/package.json @@ -30,7 +30,7 @@ "@superset-ui/core": "0.17.32", "@types/mathjs": "^6.0.7", "d3-array": "^1.2.0", - "echarts": "^5.0.2", + "echarts": "^5.1.0", "mathjs": "^8.0.1" }, "peerDependencies": { diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts index 485e8828f8e1e..ac9e15ff85a06 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts @@ -44,6 +44,8 @@ import { MarkArea1DDataItemOption, MarkArea2DDataItemOption, } from 'echarts/types/src/component/marker/MarkAreaModel'; +import { MarkLine1DDataItemOption } from 'echarts/types/src/component/marker/MarkLineModel'; + import { extractForecastSeriesContext } from '../utils/prophet'; import { ForecastSeriesEnum, LegendOrientation } from '../types'; import { EchartsTimeseriesSeriesType } from './types'; @@ -234,10 +236,12 @@ export function transformEventAnnotation( const { name, color, opacity, style, width } = layer; const { descriptions, time, title } = annotation; const label = formatAnnotationLabel(name, title, descriptions); - const eventData = [ + const eventData: MarkLine1DDataItemOption[] = [ { name: label, xAxis: (time as unknown) as number, + // TODO: remove when https://github.com/apache/echarts/pull/14693 is released + symbolOffset: 0, }, ]; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/yarn.lock b/superset-frontend/temporary_superset_ui/superset-ui/yarn.lock index 639b4af1b3415..07707c418a4c3 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/yarn.lock +++ b/superset-frontend/temporary_superset_ui/superset-ui/yarn.lock @@ -10116,13 +10116,13 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -echarts@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.0.2.tgz#1726d17a57cf05d62cd0567b4325e1201a56baf6" - integrity sha512-En0VYpc96nw2/2AZoBWPHsGi471zMublttj50kfFpYAeR4geup0Tj9iVgEXh7QYZFPnRiruDJEjcB5PXZ+BYzQ== +echarts@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.1.0.tgz#768cc585aa092560f48f01b2d52de493aeecd2b0" + integrity sha512-/X2nnN5BXW2tuA/Hv9YY279rDfwcXaBAjK9Azi//llshbKyUXXxBknsug21GJRpwTmLZbE8rjjbhchdm01bZtw== dependencies: tslib "2.0.3" - zrender "5.0.4" + zrender "5.1.0" editions@^2.2.0: version "2.3.1" @@ -23645,9 +23645,9 @@ yosay@^2.0.2: taketalk "^1.0.0" wrap-ansi "^2.0.0" -zrender@5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.0.4.tgz#89c355af908b9f64a301b38f751b7951f2c8a95a" - integrity sha512-DJpy0yrHYY5CuH6vhb9IINWbjvBUe/56J8aH86Jb7O8rRPAYZ3M2E469Qf5B3EOIfM3o3aUrO5edRQfLJ+l1Qw== +zrender@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.1.0.tgz#b6a84c3aa7ccc6642ee0519901ca4c0835c4d85e" + integrity sha512-c+8VRx52ycbmqwHeHLlo/BAfIHBl/JZNLM6cfDQFgzIH05yb+f5J9F/fbRsP+zGc8dW9XHuhdt8/iqukgMZSeg== dependencies: tslib "2.0.3"