fix(plugin-chart-echarts): [time-series][mixed timeseries] marker con…

…trol does not work (apache#1187) * fix(plugin-chart-echarts): fix marker option is not work * fix(plugin-chart-echarts): lint
zhaoyongjie · Nov 17, 2021 · e32452f · e32452f
1 parent c296f92
commit e32452f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/...uperset_ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts b/...uperset_ui/superset-ui/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
@@ -129,7 +129,6 @@ export default function transformProps(chartProps: ChartProps): EchartsProps {
       opacity,
       seriesType,
       stack,
-      richTooltip,
       yAxisIndex,
     });
     if (transformedSeries) series.push(transformedSeries);
@@ -142,7 +141,6 @@ export default function transformProps(chartProps: ChartProps): EchartsProps {
       opacity: opacityB,
       seriesType: seriesTypeB,
       stack: stackB,
-      richTooltip,
       yAxisIndex: yAxisIndexB,
     });
     if (transformedSeries) series.push(transformedSeries);

diff --git a/...ary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts b/...ary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
@@ -107,7 +107,6 @@ export default function transformProps(chartProps: ChartProps): EchartsProps {
       opacity,
       seriesType,
       stack,
-      richTooltip,
     });
     if (transformedSeries) series.push(transformedSeries);
   });

diff --git a/...orary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts b/...orary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts
@@ -70,7 +70,6 @@ export function transformSeries(
     opacity?: number;
     seriesType?: EchartsTimeseriesSeriesType;
     stack?: boolean;
-    richTooltip?: boolean;
     yAxisIndex?: number;
   },
 ): SeriesOption | undefined {
@@ -83,7 +82,6 @@ export function transformSeries(
     opacity,
     seriesType,
     stack,
-    richTooltip,
     yAxisIndex = 0,
   } = opts;
   const forecastSeries = extractForecastSeriesContext(name || '');
@@ -136,10 +134,7 @@ export function transformSeries(
     },
     showSymbol:
       !isConfidenceBand &&
-      (plotType === 'scatter' ||
-        (forecastEnabled && isObservation) ||
-        markerEnabled ||
-        !richTooltip), // TODO: forcing markers when richTooltip is enabled will be removed once ECharts supports item based tooltips without markers
+      (plotType === 'scatter' || (forecastEnabled && isObservation) || markerEnabled),
     symbolSize: markerSize,
   };
 }