feat(radar): Radar series tooltip support dimensionIndex

src/chart/radar/RadarView.ts

@@ -31,6 +31,7 @@ import { VectorArray } from 'zrender/src/core/vector';
 import { setLabelStyle, getLabelStatesModels } from '../../label/labelStyle';
 import ZRImage from 'zrender/src/graphic/Image';
 import { saveOldStyle } from '../../animation/basicTransition';
+import { getECData } from '../../util/innerStore';
 
 type RadarSymbol = ReturnType<typeof symbolUtil.createSymbol> & {
     __dimIdx: number
@@ -241,9 +242,10 @@ class RadarView extends ChartView {
                     symbolPath.style.strokeNoScale = true;
                 }
 
+                const dimensionIndex = data.getDimensionIndex(symbolPath.__dimIdx);
                 const pathEmphasisState = symbolPath.ensureState('emphasis');
                 pathEmphasisState.style = zrUtil.clone(itemHoverStyle);
-                let defaultText = data.getStore().get(data.getDimensionIndex(symbolPath.__dimIdx), idx);
+                let defaultText = data.getStore().get(dimensionIndex, idx);
                 (defaultText == null || isNaN(defaultText as number)) && (defaultText = '');
 
                 setLabelStyle(
@@ -257,6 +259,11 @@ class RadarView extends ChartView {
                         defaultOpacity: itemStyle.opacity
                     }
                 );
+
+                // bind additional data to eventData
+                getECData(symbolPath).eventData = {
+                    dimensionIndex,
+                };
             });
 
             toggleHoverEmphasis(

src/component/tooltip/TooltipView.ts

@@ -674,7 +674,7 @@ class TooltipView extends ComponentView {
             return;
         }
 
-        const params = dataModel.getDataParams(dataIndex, dataType);
+        const params = dataModel.getDataParams(dataIndex, dataType, dispatcher);
         const markupStyleCreator = new TooltipMarkupStyleCreator();
         // Pre-create marker style for makers. Users can assemble richText
         // text in `formatter` callback and use those markers style.

src/core/echarts.ts

@@ -1073,8 +1073,8 @@ class ECharts extends Eventful<ECEventDefinition> {
                 if (isGlobalOut) {
                     params = {} as ECElementEvent;
                 }
-                else {
-                    el && findEventDispatcher(el, (parent) => {
+                else if (el) {
+                    findEventDispatcher(el, (parent) => {
                         const ecData = getECData(parent);
                         if (ecData && ecData.dataIndex != null) {
                             const dataModel = ecData.dataModel || ecModel.getSeriesByIndex(ecData.seriesIndex);

src/model/mixin/dataFormat.ts

@@ -31,7 +31,8 @@ import {
     ComponentMainType,
     ComponentSubType,
     DimensionLoose,
-    InterpolatableValue
+    InterpolatableValue,
+    ECElement
 } from '../../util/types';
 import GlobalModel from '../Global';
 import { TooltipMarkupBlockFragment } from '../../component/tooltip/tooltipMarkup';
@@ -57,7 +58,8 @@ export class DataFormatMixin {
      */
     getDataParams(
         dataIndex: number,
-        dataType?: SeriesDataType
+        dataType?: SeriesDataType,
+        el?: ECElement
     ): CallbackDataParams {
 
         const data = this.getData(dataType);
@@ -88,6 +90,7 @@ export class DataFormatMixin {
             color: color,
             borderColor: borderColor,
             dimensionNames: userOutput ? userOutput.fullDimensions : null,
+            dimensionIndex: el ? el.__dimIdx : null,
             encode: userOutput ? userOutput.encode : null,
 
             // Param name list for mapping `a`, `b`, `c`, `d`, `e`

src/util/types.ts

@@ -137,6 +137,11 @@ export interface ECElement extends Element {
      * Force disable morphing
      */
     disableMorphing?: boolean
+
+    /**
+     * From RadarSymbol
+     */
+    __dimIdx?: number;
 }
 
 export interface DataHost {