chore(plugin-chart-echarts): bump to ECharts 5.2.1 (apache-superset#1370

) * chore(plugin-chart-echarts): bump to ECharts 5.2.1 * ignore type error
preset-io · Sep 22, 2021 · 7aef068 · 7aef068
1 parent dead812
commit 7aef068
Show file tree

Hide file tree

Showing 21 changed files with 55 additions and 50 deletions.
diff --git a/plugins/plugin-chart-echarts/package.json b/plugins/plugin-chart-echarts/package.json
@@ -30,7 +30,7 @@
     "@superset-ui/core": "0.18.5",
     "@types/math-expression-evaluator": "^1.2.1",
     "d3-array": "^1.2.0",
-    "echarts": "^5.2.0",
+    "echarts": "^5.2.1",
     "lodash": "^4.17.15",
     "math-expression-evaluator": "^1.3.8"
   },

diff --git a/plugins/plugin-chart-echarts/src/BoxPlot/transformProps.ts b/plugins/plugin-chart-echarts/src/BoxPlot/transformProps.ts
@@ -23,7 +23,7 @@ import {
   getNumberFormatter,
   getTimeFormatter,
 } from '@superset-ui/core';
-import { EChartsOption, BoxplotSeriesOption } from 'echarts';
+import { EChartsCoreOption, BoxplotSeriesOption } from 'echarts';
 import { CallbackDataParams } from 'echarts/types/src/util/types';
 import {
   BoxPlotChartTransformedProps,
@@ -206,7 +206,7 @@ export default function transformProps(
     yAxisTitleMargin,
     xAxisTitleMargin,
   );
-  const echartOptions: EChartsOption = {
+  const echartOptions: EChartsCoreOption = {
     grid: {
       ...defaultGrid,
       ...chartPadding,

diff --git a/plugins/plugin-chart-echarts/src/BoxPlot/types.ts b/plugins/plugin-chart-echarts/src/BoxPlot/types.ts
@@ -23,7 +23,7 @@ import {
   QueryFormData,
   SetDataMaskHook,
 } from '@superset-ui/core';
-import { EChartsOption } from 'echarts';
+import { EChartsCoreOption } from 'echarts';
 import { EchartsTitleFormData, DEFAULT_TITLE_FORM_DATA } from '../types';
 
 export type BoxPlotQueryFormData = QueryFormData & {
@@ -56,7 +56,7 @@ export interface BoxPlotChartTransformedProps {
   formData: BoxPlotQueryFormData;
   height: number;
   width: number;
-  echartOptions: EChartsOption;
+  echartOptions: EChartsCoreOption;
   emitFilter: boolean;
   setDataMask: SetDataMaskHook;
   labelMap: Record<string, DataRecordValue[]>;

diff --git a/plugins/plugin-chart-echarts/src/Funnel/transformProps.ts b/plugins/plugin-chart-echarts/src/Funnel/transformProps.ts
@@ -26,7 +26,7 @@ import {
   NumberFormatter,
 } from '@superset-ui/core';
 import { CallbackDataParams } from 'echarts/types/src/util/types';
-import { EChartsOption, FunnelSeriesOption } from 'echarts';
+import { EChartsCoreOption, FunnelSeriesOption } from 'echarts';
 import {
   DEFAULT_FORM_DATA as DEFAULT_FUNNEL_FORM_DATA,
   EchartsFunnelChartProps,
@@ -181,11 +181,12 @@ export default function transformProps(
           fontWeight: 'bold',
         },
       },
+      // @ts-ignore
       data: transformedData,
     },
   ];
 
-  const echartOptions: EChartsOption = {
+  const echartOptions: EChartsCoreOption = {
     grid: {
       ...defaultGrid,
     },

diff --git a/plugins/plugin-chart-echarts/src/Funnel/types.ts b/plugins/plugin-chart-echarts/src/Funnel/types.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { EChartsOption } from 'echarts';
+import { EChartsCoreOption } from 'echarts';
 import {
   ChartDataResponseResult,
   ChartProps,
@@ -80,7 +80,7 @@ export interface FunnelChartTransformedProps {
   formData: EchartsFunnelFormData;
   height: number;
   width: number;
-  echartOptions: EChartsOption;
+  echartOptions: EChartsCoreOption;
   emitFilter: boolean;
   setDataMask: SetDataMaskHook;
   labelMap: Record<string, DataRecordValue[]>;

diff --git a/plugins/plugin-chart-echarts/src/Gauge/transformProps.ts b/plugins/plugin-chart-echarts/src/Gauge/transformProps.ts
@@ -25,7 +25,7 @@ import {
   getMetricLabel,
   DataRecordValue,
 } from '@superset-ui/core';
-import { EChartsOption, GaugeSeriesOption } from 'echarts';
+import { EChartsCoreOption, GaugeSeriesOption } from 'echarts';
 import { GaugeDataItemOption } from 'echarts/types/src/chart/gauge/GaugeSeries';
 import range from 'lodash/range';
 import { parseNumbersList } from '../utils/controls';
@@ -253,7 +253,7 @@ export default function transformProps(
     },
   ];
 
-  const echartOptions: EChartsOption = {
+  const echartOptions: EChartsCoreOption = {
     series,
   };
 

diff --git a/plugins/plugin-chart-echarts/src/Graph/transformProps.ts b/plugins/plugin-chart-echarts/src/Graph/transformProps.ts
@@ -23,7 +23,7 @@ import {
   DataRecord,
   DataRecordValue,
 } from '@superset-ui/core';
-import { EChartsOption, GraphSeriesOption } from 'echarts';
+import { EChartsCoreOption, GraphSeriesOption } from 'echarts';
 import { extent as d3Extent } from 'd3-array';
 import { GraphEdgeItemOption } from 'echarts/types/src/chart/graph/GraphSeries';
 import {
@@ -265,7 +265,7 @@ export default function transformProps(chartProps: ChartProps): EchartsProps {
     },
   ];
 
-  const echartOptions: EChartsOption = {
+  const echartOptions: EChartsCoreOption = {
     animationDuration: DEFAULT_GRAPH_SERIES_OPTION.animationDuration,
     animationEasing: DEFAULT_GRAPH_SERIES_OPTION.animationEasing,
     tooltip: {

diff --git a/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts b/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
@@ -28,7 +28,7 @@ import {
   isIntervalAnnotationLayer,
   isTimeseriesAnnotationLayer,
 } from '@superset-ui/core';
-import { EChartsOption, SeriesOption } from 'echarts';
+import { EChartsCoreOption, SeriesOption } from 'echarts';
 import {
   DEFAULT_FORM_DATA,
   EchartsMixedTimeseriesFormData,
@@ -227,7 +227,7 @@ export default function transformProps(
 
   const { setDataMask = () => {} } = hooks;
 
-  const echartOptions: EChartsOption = {
+  const echartOptions: EChartsCoreOption = {
     useUTC: true,
     grid: {
       ...defaultGrid,

diff --git a/plugins/plugin-chart-echarts/src/MixedTimeseries/types.ts b/plugins/plugin-chart-echarts/src/MixedTimeseries/types.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { EChartsOption } from 'echarts';
+import { EChartsCoreOption } from 'echarts';
 import {
   AnnotationLayer,
   TimeGranularity,
@@ -140,7 +140,7 @@ export type EchartsMixedTimeseriesChartTransformedProps = {
   formData: EchartsMixedTimeseriesFormData;
   height: number;
   width: number;
-  echartOptions: EChartsOption;
+  echartOptions: EChartsCoreOption;
   emitFilter: boolean;
   emitFilterB: boolean;
   setDataMask: SetDataMaskHook;

diff --git a/plugins/plugin-chart-echarts/src/Pie/transformProps.ts b/plugins/plugin-chart-echarts/src/Pie/transformProps.ts
@@ -26,7 +26,7 @@ import {
   NumberFormatter,
 } from '@superset-ui/core';
 import { CallbackDataParams } from 'echarts/types/src/util/types';
-import { EChartsOption, PieSeriesOption } from 'echarts';
+import { EChartsCoreOption, PieSeriesOption } from 'echarts';
 import {
   DEFAULT_FORM_DATA as DEFAULT_PIE_FORM_DATA,
   EchartsPieChartProps,
@@ -211,7 +211,7 @@ export default function transformProps(chartProps: EchartsPieChartProps): PieCha
     },
   ];
 
-  const echartOptions: EChartsOption = {
+  const echartOptions: EChartsCoreOption = {
     grid: {
       ...defaultGrid,
     },

diff --git a/plugins/plugin-chart-echarts/src/Pie/types.ts b/plugins/plugin-chart-echarts/src/Pie/types.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { EChartsOption } from 'echarts';
+import { EChartsCoreOption } from 'echarts';
 import {
   ChartDataResponseResult,
   ChartProps,
@@ -88,7 +88,7 @@ export interface PieChartTransformedProps {
   formData: EchartsPieFormData;
   height: number;
   width: number;
-  echartOptions: EChartsOption;
+  echartOptions: EChartsCoreOption;
   emitFilter: boolean;
   setDataMask: SetDataMaskHook;
   labelMap: Record<string, DataRecordValue[]>;

diff --git a/plugins/plugin-chart-echarts/src/Radar/transformProps.ts b/plugins/plugin-chart-echarts/src/Radar/transformProps.ts
@@ -27,7 +27,7 @@ import {
 } from '@superset-ui/core';
 import { CallbackDataParams } from 'echarts/types/src/util/types';
 import { RadarSeriesDataItemOption } from 'echarts/types/src/chart/radar/RadarSeries';
-import { EChartsOption, RadarSeriesOption } from 'echarts';
+import { EChartsCoreOption, RadarSeriesOption } from 'echarts';
 import {
   DEFAULT_FORM_DATA as DEFAULT_RADAR_FORM_DATA,
   EchartsRadarChartProps,
@@ -195,7 +195,7 @@ export default function transformProps(
     },
   ];
 
-  const echartOptions: EChartsOption = {
+  const echartOptions: EChartsCoreOption = {
     grid: {
       ...defaultGrid,
     },

diff --git a/plugins/plugin-chart-echarts/src/Radar/types.ts b/plugins/plugin-chart-echarts/src/Radar/types.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { EChartsOption } from 'echarts';
+import { EChartsCoreOption } from 'echarts';
 import {
   ChartDataResponseResult,
   ChartProps,
@@ -82,7 +82,7 @@ export interface RadarChartTransformedProps {
   formData: EchartsRadarFormData;
   height: number;
   width: number;
-  echartOptions: EChartsOption;
+  echartOptions: EChartsCoreOption;
   setDataMask: SetDataMaskHook;
   labelMap: Record<string, DataRecordValue[]>;
   groupby: string[];

diff --git a/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx b/plugins/plugin-chart-echarts/src/Timeseries/EchartsTimeseries.tsx
@@ -71,9 +71,7 @@ export default function EchartsTimeseries({
 
   const eventHandlers: EventHandlers = {
     click: props => {
-      const { seriesName: name, value } = props;
-      const xValue = value[0].getTime?.() || value[0];
-      console.log(props, name, xValue);
+      const { seriesName: name } = props;
       const values = Object.values(selectedValues);
       if (values.includes(name)) {
         handleChange(values.filter(v => v !== name));

diff --git a/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts b/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
@@ -28,7 +28,7 @@ import {
   TimeseriesChartDataResponseResult,
   DataRecordValue,
 } from '@superset-ui/core';
-import { EChartsOption, SeriesOption } from 'echarts';
+import { EChartsCoreOption, SeriesOption } from 'echarts';
 import {
   DEFAULT_FORM_DATA,
   EchartsTimeseriesChartProps,
@@ -221,7 +221,7 @@ export default function transformProps(
     yAxisTitleMargin,
     xAxisTitleMargin,
   );
-  const echartOptions: EChartsOption = {
+  const echartOptions: EChartsCoreOption = {
     useUTC: true,
     grid: {
       ...defaultGrid,
@@ -233,6 +233,7 @@ export default function transformProps(
       nameGap: xAxisTitleMargin,
       nameLocation: 'middle',
       axisLabel: {
+        hideOverlap: true,
         formatter: xAxisFormatter,
         rotate: xAxisLabelRotation,
       },

diff --git a/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts b/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts
@@ -36,7 +36,7 @@ import {
 import { SeriesOption } from 'echarts';
 import {
   CallbackDataParams,
-  DefaultExtraStateOpts,
+  DefaultStatesMixin,
   ItemStyleOption,
   LineStyleOption,
   OptionName,
@@ -301,7 +301,7 @@ export function transformEventAnnotation(
       },
     ];
 
-    const lineStyle: LineStyleOption & DefaultExtraStateOpts['emphasis'] = {
+    const lineStyle: LineStyleOption & DefaultStatesMixin['emphasis'] = {
       width,
       type: style as ZRLineType,
       color: color || colorScale(name),

diff --git a/plugins/plugin-chart-echarts/src/Tree/transformProps.ts b/plugins/plugin-chart-echarts/src/Tree/transformProps.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { ChartProps, getMetricLabel, DataRecordValue } from '@superset-ui/core';
-import { EChartsOption, TreeSeriesOption } from 'echarts';
+import { EChartsCoreOption, TreeSeriesOption } from 'echarts';
 import {
   TreeSeriesCallbackDataParams,
   TreeSeriesNodeItemOption,
@@ -190,7 +190,7 @@ export default function transformProps(chartProps: ChartProps): EchartsProps {
     },
   ];
 
-  const echartOptions: EChartsOption = {
+  const echartOptions: EChartsCoreOption = {
     animationDuration: DEFAULT_TREE_SERIES_OPTION.animationDuration,
     animationEasing: DEFAULT_TREE_SERIES_OPTION.animationEasing,
     series,

diff --git a/plugins/plugin-chart-echarts/src/Treemap/transformProps.ts b/plugins/plugin-chart-echarts/src/Treemap/transformProps.ts
@@ -28,7 +28,7 @@ import {
 } from '@superset-ui/core';
 import { groupBy, isNumber, transform } from 'lodash';
 import { TreemapSeriesNodeItemOption } from 'echarts/types/src/chart/treemap/TreemapSeries';
-import { EChartsOption, TreemapSeriesOption } from 'echarts';
+import { EChartsCoreOption, TreemapSeriesOption } from 'echarts';
 import {
   DEFAULT_FORM_DATA as DEFAULT_TREEMAP_FORM_DATA,
   EchartsTreemapChartProps,
@@ -279,7 +279,7 @@ export default function transformProps(
     },
   ];
 
-  const echartOptions: EChartsOption = {
+  const echartOptions: EChartsCoreOption = {
     tooltip: {
       ...defaultTooltip,
       trigger: 'item',

diff --git a/plugins/plugin-chart-echarts/src/Treemap/types.ts b/plugins/plugin-chart-echarts/src/Treemap/types.ts
@@ -24,7 +24,7 @@ import {
   QueryFormMetric,
   SetDataMaskHook,
 } from '@superset-ui/core';
-import { EChartsOption } from 'echarts';
+import { EChartsCoreOption } from 'echarts';
 import { CallbackDataParams } from 'echarts/types/src/util/types';
 import { LabelPositionEnum } from '../types';
 
@@ -77,7 +77,7 @@ export interface TreemapTransformedProps {
   formData: EchartsTreemapFormData;
   height: number;
   width: number;
-  echartOptions: EChartsOption;
+  echartOptions: EChartsCoreOption;
   emitFilter: boolean;
   setDataMask: SetDataMaskHook;
   labelMap: Record<string, DataRecordValue[]>;

diff --git a/plugins/plugin-chart-echarts/src/types.ts b/plugins/plugin-chart-echarts/src/types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { DataRecordValue, SetDataMaskHook } from '@superset-ui/core';
-import { EChartsOption } from 'echarts';
+import { EChartsCoreOption } from 'echarts';
 import { TooltipMarker } from 'echarts/types/src/util/format';
 
 export type EchartsStylesProps = {
@@ -28,7 +28,7 @@ export type EchartsStylesProps = {
 export interface EchartsProps {
   height: number;
   width: number;
-  echartOptions: EChartsOption;
+  echartOptions: EChartsCoreOption;
   eventHandlers?: EventHandlers;
   selectedValues?: Record<number, string>;
   forceClear?: boolean;
@@ -102,7 +102,7 @@ export interface EChartTransformedProps<F> {
   formData: F;
   height: number;
   width: number;
-  echartOptions: EChartsOption;
+  echartOptions: EChartsCoreOption;
   emitFilter: boolean;
   setDataMask: SetDataMaskHook;
   labelMap: Record<string, DataRecordValue[]>;