@visactor/vchart 1.12.2-alpha.3 → 1.12.2-alpha.9

package/build/index.js

@@ -35878,7 +35878,7 @@
           } = breakData(),
           domain = scale.domain();
         scaleTicks = [];
-        for (let i = 0; i < domain.length; i++) if (i < domain.length - 1) {
+        for (let i = 0; i < domain.length - 1; i++) {
           getTicks(count, [domain[i], domain[i + 1]]).forEach(tick => {
             breakRanges.some(breakRange => tick >= breakRange[0] && tick <= breakRange[1]) || scaleTicks.push(tick);
           });
@@ -35935,7 +35935,7 @@
           AABBBounds: bounds,
           value: scaleTicks[i]
         }));
-        const samplingMethod = breakData ? methods$1.greedy : methods$1.parity;
+        const samplingMethod = breakData && breakData() ? methods$1.greedy : methods$1.parity;
         for (; items.length >= 3 && hasOverlap$1(items, labelGap);) items = samplingMethod(items, labelGap);
         const ticks = items.map(item => item.value);
         ticks.length < 3 && labelFlush && (ticks.length > 1 && ticks.pop(), last(ticks) !== last(scaleTicks) && ticks.push(last(scaleTicks))), scaleTicks = ticks;
@@ -48891,6 +48891,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
       isProgressive() {
         return this.renderContext && (!!this.renderContext.progressive || !!this.renderContext.beforeTransformProgressive);
       }
+      canAnimateAfterProgressive() {
+        return this.renderContext && this.renderContext.beforeTransformProgressive && this.renderContext.beforeTransformProgressive.canAnimate();
+      }
       isDoingProgressive() {
         return this.renderContext && (this.renderContext.progressive && this.renderContext.progressive.currentIndex < this.renderContext.progressive.totalStep || this.renderContext.beforeTransformProgressive && this.renderContext.beforeTransformProgressive.unfinished());
       }
@@ -50671,7 +50674,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         if (this._progressiveMarks && this._progressiveMarks.some(mark => mark.isDoingProgressive())) {
           const raf = vglobal.getRequestAnimationFrame();
           this._progressiveRafId = raf(this.handleProgressiveFrame);
-        }
+        } else this._progressiveMarks && this._progressiveMarks.every(mark => mark.canAnimateAfterProgressive()) ? this.animate.animate() : this._progressiveMarks && (this._progressiveMarks = null);
       }
       clearProgressive() {
         if (this._progressiveRafId) {
@@ -51969,9 +51972,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                   data: labelData
                 } = attributes,
                 restAttribute = __rest(attributes, ["data"]);
-              return Object.assign({
+              return Object.assign(Object.assign({}, merge$2({}, themeDatum, restAttribute)), {
                 data: labelData
-              }, merge$2({}, themeDatum, restAttribute));
+              });
             };
             mark.elements.forEach(element => {
               if ("willRelease" !== element.getGraphicItem().releaseStatus) if (mark.isCollectionMark()) {
@@ -54436,11 +54439,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         if (!chart) {
             return null;
         }
-        const { x, y } = pos;
         const angleAxisList = getAxis(chart, (cmp) => cmp.getOrient() === 'angle', pos);
         const radiusAxisList = getAxis(chart, (cmp) => cmp.getOrient() === 'radius', pos);
+        if ((!angleAxisList || !angleAxisList.length) && (!radiusAxisList || !radiusAxisList.length)) {
+            return null;
+        }
         const targetAxisInfo = [];
         const getDimensionField = (series) => series.getDimensionField()[0];
+        const { x, y } = pos;
         if (angleAxisList) {
             angleAxisList.forEach(axis => {
                 var _a;
@@ -54583,6 +54589,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         const { x, y } = pos;
         const xAxisList = (_a = getAxis(chart, (cmp) => isXAxis(cmp.getOrient()), pos)) !== null && _a !== void 0 ? _a : [];
         const yAxisList = (_b = getAxis(chart, (cmp) => isYAxis(cmp.getOrient()), pos)) !== null && _b !== void 0 ? _b : [];
+        if (!xAxisList.length && !yAxisList.length) {
+            return null;
+        }
         const bandAxisSet = new Set();
         const linearAxisSet = new Set();
         const forceAxisSet = new Set();
@@ -54606,14 +54615,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             axisList.forEach(axis => {
                 if (forceAxisSet.size > 0) {
                     if (forceAxisSet.has(axis)) {
-                        const info = getDimensionInfoByPosition(axis, posValue, orient, getDimensionFieldFunc(isXAxis, isDiscrete(axis.getScale().type)));
+                        const info = getDimensionInfoByPosition(axis, posValue, getDimensionFieldFunc(isXAxis, isDiscrete(axis.getScale().type)));
                         info && targetAxisInfo.push(info);
                     }
                 }
                 else {
                     const hasDiscreteAxis = bandAxisSet.size > 0;
                     if ((hasDiscreteAxis ? bandAxisSet : linearAxisSet).has(axis)) {
-                        const info = getDimensionInfoByPosition(axis, posValue, orient, getDimensionFieldFunc(isXAxis, hasDiscreteAxis));
+                        const info = getDimensionInfoByPosition(axis, posValue, getDimensionFieldFunc(isXAxis, hasDiscreteAxis));
                         info && targetAxisInfo.push(info);
                     }
                 }
@@ -54636,7 +54645,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         return targetAxisInfo;
     };
-    const getDimensionInfoByPosition = (axis, posValue, posKey, getDimensionField) => {
+    const getDimensionInfoByPosition = (axis, posValue, getDimensionField) => {
         const value = axis.positionToData(posValue, true);
         return isNil$1(value) ? null : getDimensionInfoByValue(axis, value, getDimensionField);
     };
@@ -60988,7 +60997,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.12.2-alpha.3";
+    const version = "1.12.2-alpha.9";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -61015,28 +61024,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
     }
 
-    const getTooltipActualActiveType = (spec) => {
-        var _a, _b, _c;
-        if ((spec === null || spec === void 0 ? void 0 : spec.visible) === false) {
-            return [];
-        }
-        const activeTypeMap = {
-            mark: ((_a = spec === null || spec === void 0 ? void 0 : spec.mark) === null || _a === void 0 ? void 0 : _a.visible) !== false,
-            dimension: ((_b = spec === null || spec === void 0 ? void 0 : spec.dimension) === null || _b === void 0 ? void 0 : _b.visible) !== false,
-            group: ((_c = spec === null || spec === void 0 ? void 0 : spec.group) === null || _c === void 0 ? void 0 : _c.visible) !== false
-        };
-        if (isValid$1(spec === null || spec === void 0 ? void 0 : spec.activeType)) {
-            Object.keys(activeTypeMap).forEach(t => {
-                var _a;
-                activeTypeMap[t] = (_a = spec === null || spec === void 0 ? void 0 : spec.activeType) === null || _a === void 0 ? void 0 : _a.includes(t);
-            });
-        }
-        return Object.keys(activeTypeMap).filter(t => activeTypeMap[t]);
-    };
-    function isEmptyPos(params) {
-        return isNil$1(params.mark) && isNil$1(params.model) && isNil$1(params.datum);
-    }
-
     class BaseSeriesTooltipHelper extends BaseTooltipHelper {
         constructor(series) {
             super();
@@ -61115,22 +61102,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this.updateTooltipSpec();
         }
         updateTooltipSpec() {
-            var _a, _b, _c, _d;
-            const seriesTooltipSpec = (_b = (_a = this.series.getSpec()) === null || _a === void 0 ? void 0 : _a.tooltip) !== null && _b !== void 0 ? _b : {};
-            const chartTooltipSpec = (_d = (_c = this.series.getChart().getSpec()) === null || _c === void 0 ? void 0 : _c.tooltip) !== null && _d !== void 0 ? _d : {};
-            const spec = Object.assign(Object.assign({}, chartTooltipSpec), seriesTooltipSpec);
-            ['mark', 'dimension', 'group'].forEach(activeType => {
-                const pattern = spec[activeType];
-                if (isValid$1(pattern)) {
-                    spec[activeType] = Object.assign(Object.assign({}, pattern), { title: addExtraInfoToTooltipTitlePattern(pattern.title, {
-                            seriesId: this.series.id
-                        }, true), content: addExtraInfoToTooltipContentPattern(pattern.content, {
-                            seriesId: this.series.id
-                        }, true) });
-                }
-            });
-            this.spec = spec;
-            this.activeType = getTooltipActualActiveType(spec);
+            var _a;
+            const seriesTooltipSpec = (_a = this.series.getSpec()) === null || _a === void 0 ? void 0 : _a.tooltip;
+            this.spec = seriesTooltipSpec;
             this._seriesCacheInfo = this._getSeriesCacheInfo();
         }
         getDefaultTooltipPattern(activeType, dimensionInfo) {
@@ -61211,26 +61185,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return null;
         }
     }
-    const merge = (source, extraInfo, overwrite) => {
-        const info = isFunction$1(extraInfo) ? extraInfo(source) : extraInfo;
-        return overwrite ? Object.assign(Object.assign({}, source), info) : Object.assign(Object.assign({}, info), source);
-    };
-    const addExtraInfoToTooltipTitlePattern = (pattern, extraInfo, overwrite) => {
-        const result = isValid$1(pattern)
-            ? isFunction$1(pattern)
-                ? (...args) => merge(pattern(...args), extraInfo, overwrite)
-                : merge(pattern, extraInfo, overwrite)
-            : undefined;
-        return result;
-    };
-    const addExtraInfoToTooltipContentPattern = (pattern, extraInfo, overwrite) => {
-        const result = isValid$1(pattern)
-            ? array(pattern).map(patternItem => isFunction$1(patternItem)
-                ? (...args) => array(patternItem(...args)).map(line => merge(line, extraInfo, overwrite))
-                : merge(patternItem, extraInfo, overwrite))
-            : undefined;
-        return result;
-    };
 
     const methods = {
         min: (arr) => {
@@ -66291,7 +66245,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     else {
                         gapRatio = gap / axisLength;
                     }
-                    const symbolAngle = isValidNumber$1(breakSymbol.angle) ? breakSymbol.angle : isX ? 60 : 15;
+                    const symbolAngle = isValidNumber$1(breakSymbol === null || breakSymbol === void 0 ? void 0 : breakSymbol.angle) ? breakSymbol.angle : isX ? 60 : 15;
                     return {
                         range: [ratio - gapRatio / 2, ratio + gapRatio / 2],
                         breakSymbol: Object.assign(Object.assign({ visible: true }, breakSymbol), { angle: (symbolAngle * Math.PI) / 180 }),
@@ -74227,7 +74181,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 const specFromChart = this._getDefaultSpecFromChart(chartSpec);
                 newSpec = mergeSpec({}, this._theme, specFromChart, spec);
                 const getMergedLabelSpec = (position, label) => {
-                    if (position === 'inside') {
+                    if (position === 'inside' || position === 'inside-center') {
                         return mergeSpec({}, this._theme.innerLabel, label);
                     }
                     return mergeSpec({}, this._theme.outerLabel, label);
@@ -75843,32 +75797,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
 
     class DotSeriesTooltipHelper extends BaseSeriesTooltipHelper {
-        updateTooltipSpec() {
-            var _a;
-            super.updateTooltipSpec();
-            if (isValid$1((_a = this.spec) === null || _a === void 0 ? void 0 : _a.mark)) {
-                this.spec.mark.updateContent = (prev, datum, params) => {
-                    const childrenContent = [];
-                    const childrenPrev = prev.filter((p) => p.key === 'children');
-                    childrenPrev.length > 0 &&
-                        childrenPrev[0].value.forEach((element) => {
-                            let flag = true;
-                            for (const key in element) {
-                                childrenContent.push({
-                                    shapeType: 'circle',
-                                    hasShape: flag,
-                                    shapeColor: this.shapeColorCallback(datum[0].datum[0]),
-                                    shapeStroke: this.shapeStrokeCallback(datum[0].datum[0]),
-                                    key: key,
-                                    value: element[key] + ''
-                                });
-                                flag = false;
-                            }
-                        });
-                    return prev.concat(childrenContent);
-                };
-            }
-        }
         getDefaultTooltipPattern(activeType) {
             if (activeType === 'mark') {
                 return {
@@ -75916,20 +75844,22 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     ],
                     updateContent: (prev, datum, params) => {
                         const childrenContent = [];
-                        prev[3].value.forEach((element) => {
-                            let flag = true;
-                            for (const key in element) {
-                                childrenContent.push({
-                                    shapeType: 'circle',
-                                    hasShape: flag,
-                                    shapeColor: this.shapeColorCallback(datum[0].datum[0]),
-                                    shapeStroke: this.shapeStrokeCallback(datum[0].datum[0]),
-                                    key: key,
-                                    value: element[key] + ''
-                                });
-                                flag = false;
-                            }
-                        });
+                        const childrenPrev = prev.filter((p) => p.key === 'children');
+                        childrenPrev.length > 0 &&
+                            childrenPrev[0].value.forEach((element) => {
+                                let flag = true;
+                                for (const key in element) {
+                                    childrenContent.push({
+                                        shapeType: 'circle',
+                                        hasShape: flag,
+                                        shapeColor: this.shapeColorCallback(datum[0].datum[0]),
+                                        shapeStroke: this.shapeStrokeCallback(datum[0].datum[0]),
+                                        key: key,
+                                        value: element[key] + ''
+                                    });
+                                    flag = false;
+                                }
+                            });
                         return prev.concat(childrenContent);
                     }
                 };
@@ -79270,6 +79200,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           segmentationInput.maskCanvas = maskCanvas, this.options.onUpdateMaskCanvas && this.options.onUpdateMaskCanvas(maskCanvas), this.doLayout(), this.isImageFinished = !0, this.isLayoutFinished = !0;
         }
       }
+      canAnimate() {
+        return !0;
+      }
       unfinished() {
         return !this.isLayoutFinished;
       }
@@ -82962,14 +82895,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 return (_g = this._colorScale) === null || _g === void 0 ? void 0 : _g.scale(sourceName);
             };
             this._handleEmphasisElement = (params) => {
-                var _a;
+                var _a, _b, _c, _d, _e;
                 const emphasisSpec = (_a = this._spec.emphasis) !== null && _a !== void 0 ? _a : {};
                 const element = params.item;
                 if (emphasisSpec.effect === 'adjacency') {
-                    if (element && element.mark.id().includes('node')) {
+                    if (element && element.mark === ((_b = this._nodeMark) === null || _b === void 0 ? void 0 : _b.getProduct())) {
                         this._handleNodeAdjacencyClick(element);
                     }
-                    else if (element && element.mark.id().includes('link')) {
+                    else if (element && element.mark === ((_c = this._linkMark) === null || _c === void 0 ? void 0 : _c.getProduct())) {
                         this._handleLinkAdjacencyClick(element);
                     }
                     else {
@@ -82977,10 +82910,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     }
                 }
                 else if (emphasisSpec.effect === 'related') {
-                    if (element && element.mark.id().includes('node')) {
+                    if (element && element.mark === ((_d = this._nodeMark) === null || _d === void 0 ? void 0 : _d.getProduct())) {
                         this._handleNodeRelatedClick(element);
                     }
-                    else if (element && element.mark.id().includes('link')) {
+                    else if (element && element.mark === ((_e = this._linkMark) === null || _e === void 0 ? void 0 : _e.getProduct())) {
                         this._handleLinkRelatedClick(element);
                     }
                     else {
@@ -82990,6 +82923,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             };
             this._handleClearEmpty = () => {
                 var _a, _b;
+                if (!this._needClear) {
+                    return;
+                }
                 const allNodeElements = (_a = this._nodeMark) === null || _a === void 0 ? void 0 : _a.getProductElements();
                 if (!allNodeElements || !allNodeElements.length) {
                     return;
@@ -83005,6 +82941,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 allLinkElements.forEach(el => {
                     el.removeState(states);
                 });
+                this._needClear = false;
             };
             this._handleNodeAdjacencyClick = (element) => {
                 const nodeDatum = element.getDatum();
@@ -83054,6 +82991,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 if (this._nodeMark) {
                     this._highLightElements(this._nodeMark.getProductElements(), highlightNodes);
                 }
+                this._needClear = true;
             };
             this._handleLinkAdjacencyClick = (element) => {
                 const curLinkDatum = element.getDatum();
@@ -83077,6 +83015,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 if (this._nodeMark) {
                     this._highLightElements(this._nodeMark.getProductElements(), highlightNodes);
                 }
+                this._needClear = true;
             };
             this._handleNodeRelatedClick = (element) => {
                 var _a;
@@ -83260,6 +83199,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                         this._highLightElements(this._nodeMark.getProductElements(), highlightNodes);
                     }
                 }
+                this._needClear = true;
             };
             this._handleLinkRelatedClick = (element) => {
                 var _a;
@@ -83367,6 +83307,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     });
                     this._highLightElements(allNodeElements, highlightNodes);
                 }
+                this._needClear = true;
             };
         }
         get direction() {
@@ -83541,6 +83482,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._initLinkMarkStyle();
         }
         _initNodeMarkStyle() {
+            var _a, _b;
             const nodeMark = this._nodeMark;
             if (!nodeMark) {
                 return;
@@ -83551,11 +83493,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 },
                 x1: (datum) => datum.x1,
                 y: (datum) => datum.y0,
-                y1: (datum) => datum.y1,
-                fill: this._fillByNode
+                y1: (datum) => datum.y1
             }, STATE_VALUE_ENUM.STATE_NORMAL, AttributeLevel.Mark);
+            this.setMarkStyle(nodeMark, {
+                fill: (_b = (_a = this._spec.node.style) === null || _a === void 0 ? void 0 : _a.fill) !== null && _b !== void 0 ? _b : this._fillByNode
+            }, 'normal', AttributeLevel.User_Mark);
         }
         _initLinkMarkStyle() {
+            var _a, _b;
             const linkMark = this._linkMark;
             if (!linkMark) {
                 return;
@@ -83566,9 +83511,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 y0: (datum) => datum.y0,
                 y1: (datum) => datum.y1,
                 thickness: (datum) => datum.thickness,
-                fill: this._fillByLink,
                 direction: this.direction
             }, STATE_VALUE_ENUM.STATE_NORMAL, AttributeLevel.Series);
+            this.setMarkStyle(linkMark, {
+                fill: (_b = (_a = this._spec.link.style) === null || _a === void 0 ? void 0 : _a.fill) !== null && _b !== void 0 ? _b : this._fillByLink
+            }, 'normal', AttributeLevel.User_Mark);
         }
         initLabelMarkStyle(labelMark, labelSpec) {
             if (!labelMark) {
@@ -89601,31 +89548,78 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         return markInfoList;
     };
 
-    const makeDefaultPattern = (series, activeType, dimensionInfo) => {
-        var _a, _b;
-        return (_b = (_a = series.tooltipHelper) === null || _a === void 0 ? void 0 : _a.getDefaultTooltipPattern(activeType, dimensionInfo)) !== null && _b !== void 0 ? _b : null;
+    const getTooltipActualActiveType = (spec) => {
+        var _a, _b, _c;
+        if ((spec === null || spec === void 0 ? void 0 : spec.visible) === false) {
+            return [];
+        }
+        const activeTypeMap = {
+            mark: ((_a = spec === null || spec === void 0 ? void 0 : spec.mark) === null || _a === void 0 ? void 0 : _a.visible) !== false,
+            dimension: ((_b = spec === null || spec === void 0 ? void 0 : spec.dimension) === null || _b === void 0 ? void 0 : _b.visible) !== false,
+            group: ((_c = spec === null || spec === void 0 ? void 0 : spec.group) === null || _c === void 0 ? void 0 : _c.visible) !== false
+        };
+        if (isValid$1(spec === null || spec === void 0 ? void 0 : spec.activeType)) {
+            Object.keys(activeTypeMap).forEach(t => {
+                var _a;
+                activeTypeMap[t] = (_a = spec === null || spec === void 0 ? void 0 : spec.activeType) === null || _a === void 0 ? void 0 : _a.includes(t);
+            });
+        }
+        return Object.keys(activeTypeMap).filter(t => activeTypeMap[t]);
     };
+    const isActiveTypeVisible = (type, spec) => {
+        if (!spec) {
+            return true;
+        }
+        if (spec.visible === false) {
+            return false;
+        }
+        if (spec[type] && spec[type].visible === false) {
+            return false;
+        }
+        if (spec.activeType && !spec.activeType.includes(type)) {
+            return false;
+        }
+        return true;
+    };
+    function isEmptyPos(params) {
+        return isNil$1(params.mark) && isNil$1(params.model) && isNil$1(params.datum);
+    }
+    function combinePattern(patternList) {
+        if (!patternList || !patternList.length) {
+            return null;
+        }
+        const defaultPatternContent = [];
+        patternList.forEach(({ content }) => {
+            if (isFunction$1(content)) {
+                defaultPatternContent.push(content);
+            }
+            else if (isArray$1(content)) {
+                content.forEach(c => {
+                    defaultPatternContent.push(c);
+                });
+            }
+            else if (content) {
+                defaultPatternContent.push(content);
+            }
+        });
+        if (defaultPatternContent.length) {
+            return Object.assign(Object.assign({}, patternList[0]), { content: defaultPatternContent });
+        }
+        return patternList[0];
+    }
 
     const getTooltipSpecForShow = (activeType, globalSpec, series, dimensionInfo) => {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         const finalSpec = Object.assign(Object.assign({}, globalSpec), { activeType });
         const { style = {} } = globalSpec;
         switch (activeType) {
             case 'mark':
             case 'group':
                 if (series) {
-                    const seriesSpec = ((_b = (_a = series.tooltipHelper) === null || _a === void 0 ? void 0 : _a.spec) !== null && _b !== void 0 ? _b : {});
-                    if (isValid$1(seriesSpec.visible) || isValid$1(seriesSpec.activeType)) {
-                        finalSpec.visible = getTooltipActualActiveType(seriesSpec).includes(activeType);
-                    }
-                    else if (isValid$1(globalSpec.visible) || isValid$1(globalSpec.activeType)) {
-                        finalSpec.visible = getTooltipActualActiveType(globalSpec).includes(activeType);
-                    }
-                    else {
-                        finalSpec.visible = true;
-                    }
-                    finalSpec.handler = (_d = (_c = seriesSpec.handler) !== null && _c !== void 0 ? _c : globalSpec.handler) !== null && _d !== void 0 ? _d : undefined;
-                    if ((_e = finalSpec.handler) === null || _e === void 0 ? void 0 : _e.showTooltip) {
+                    const seriesSpec = (_a = series.getSpec()) === null || _a === void 0 ? void 0 : _a.tooltip;
+                    finalSpec.visible = true;
+                    finalSpec.handler = (_b = seriesSpec === null || seriesSpec === void 0 ? void 0 : seriesSpec.handler) !== null && _b !== void 0 ? _b : globalSpec.handler;
+                    if ((_c = finalSpec.handler) === null || _c === void 0 ? void 0 : _c.showTooltip) {
                         return finalSpec;
                     }
                 }
@@ -89633,165 +89627,168 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             case 'dimension':
                 if (dimensionInfo === null || dimensionInfo === void 0 ? void 0 : dimensionInfo.length) {
                     const seriesList = getSeriesListFromDimensionInfo(dimensionInfo);
-                    if (seriesList.every(series => { var _a; return !getTooltipActualActiveType((_a = series.tooltipHelper) === null || _a === void 0 ? void 0 : _a.spec).includes('dimension'); })) {
+                    if (seriesList.every(series => { var _a; return !isActiveTypeVisible('dimension', (_a = series.tooltipHelper) === null || _a === void 0 ? void 0 : _a.spec); })) {
                         finalSpec.visible = false;
                     }
-                    else if (isValid$1(globalSpec.visible) || isValid$1(globalSpec.activeType)) {
-                        finalSpec.visible = getTooltipActualActiveType(globalSpec).includes('dimension');
-                    }
                     else {
                         finalSpec.visible = true;
                     }
-                    finalSpec.handler = (_f = globalSpec.handler) !== null && _f !== void 0 ? _f : undefined;
-                    if ((_g = finalSpec.handler) === null || _g === void 0 ? void 0 : _g.showTooltip) {
+                    finalSpec.handler = (_d = globalSpec.handler) !== null && _d !== void 0 ? _d : undefined;
+                    if ((_e = finalSpec.handler) === null || _e === void 0 ? void 0 : _e.showTooltip) {
                         return finalSpec;
                     }
                 }
                 break;
         }
-        const defaultPattern = getDefaultTooltipPattern(activeType, series, dimensionInfo);
-        const seriesPattern = getSeriesTooltipPattern(activeType, series, dimensionInfo);
-        const userPattern = mergeSpec({}, cloneDeep(globalSpec[activeType]), seriesPattern);
-        const defaultPatternTitle = defaultPattern.title;
-        const titleShape = getShapePattern(undefined, userPattern, style.shape, undefined, defaultPatternTitle);
-        if (isValid$1(userPattern.title)) {
-            userPattern.title = addExtraInfoToTooltipTitlePattern(userPattern.title, Object.assign(Object.assign({}, defaultPatternTitle), titleShape));
-        }
-        else {
-            userPattern.title = addExtraInfoToTooltipTitlePattern(defaultPatternTitle, titleShape, true);
-        }
-        const defaultPatternContent = array(defaultPattern.content);
-        if (isValid$1(userPattern.content)) {
-            const shapePatternMap = getShapePatternMapOfEachSeries(defaultPatternContent);
-            userPattern.content = addExtraInfoToTooltipContentPattern(userPattern.content, userLine => getShapePattern(userLine, userPattern, style.shape, shapePatternMap));
-        }
-        else {
-            userPattern.content = addExtraInfoToTooltipContentPattern(defaultPatternContent, line => getShapePattern(undefined, userPattern, style.shape, undefined, line), true);
+        const defaultPattern = (_f = getDefaultTooltipPattern(activeType, series, dimensionInfo)) !== null && _f !== void 0 ? _f : {};
+        const userPattern = getSeriesTooltipPattern(activeType, globalSpec, series, dimensionInfo);
+        if (userPattern) {
+            const defaultPatternTitle = defaultPattern.title;
+            const defaultTitleShape = getShapePattern(undefined, userPattern, style.shape, undefined, defaultPatternTitle);
+            if (isValid$1(userPattern.title)) {
+                userPattern.title = addExtraInfoToTooltipTitlePattern(userPattern.title, Object.assign(Object.assign({}, defaultPatternTitle), defaultTitleShape));
+            }
+            else {
+                userPattern.title = addExtraInfoToTooltipTitlePattern(defaultPatternTitle, defaultTitleShape, true);
+            }
+            const defaultPatternContent = array(defaultPattern.content);
+            if (isValid$1(userPattern.content)) {
+                const shapePatternMap = getShapePatternMapOfEachSeries(defaultPatternContent);
+                userPattern.content = addExtraInfoToTooltipContentPattern(userPattern.content, userLine => getShapePattern(userLine, userPattern, style.shape, shapePatternMap));
+            }
+            else {
+                userPattern.content = addExtraInfoToTooltipContentPattern(defaultPatternContent, line => getShapePattern(undefined, userPattern, style.shape, undefined, line), true);
+            }
         }
         finalSpec[activeType] = Object.assign(Object.assign(Object.assign({}, defaultPattern), userPattern), { activeType });
         return finalSpec;
     };
     const getDefaultTooltipPattern = (activeType, series, dimensionInfo) => {
-        var _a;
-        let defaultPattern = {};
         switch (activeType) {
             case 'mark':
             case 'group':
                 if (series) {
-                    defaultPattern = (_a = makeDefaultPattern(series, activeType)) !== null && _a !== void 0 ? _a : {};
+                    return series.tooltipHelper.getDefaultTooltipPattern(activeType);
                 }
                 break;
             case 'dimension':
                 if (dimensionInfo === null || dimensionInfo === void 0 ? void 0 : dimensionInfo.length) {
                     const patternList = [];
-                    dimensionInfo.forEach(({ data }) => data.forEach(data => {
-                        const { series } = data;
+                    dimensionInfo.forEach(info => info.data.forEach(datum => {
+                        const { series } = datum;
                         const mockDimensionInfo = [
-                            Object.assign(Object.assign({}, dimensionInfo[0]), { data: [data] })
+                            Object.assign(Object.assign({}, info), { data: [datum] })
                         ];
-                        const pattern = makeDefaultPattern(series, 'dimension', mockDimensionInfo);
+                        const pattern = series.tooltipHelper.getDefaultTooltipPattern(activeType, mockDimensionInfo);
                         if (pattern) {
                             patternList.push(pattern);
                         }
                     }));
-                    const defaultPatternContent = [];
-                    patternList.forEach(({ content }) => {
-                        if (isFunction$1(content)) {
-                            defaultPatternContent.push(content);
-                        }
-                        else {
-                            defaultPatternContent.push(...array(content));
-                        }
-                    });
-                    defaultPattern = Object.assign(Object.assign({}, patternList[0]), { content: defaultPatternContent });
+                    return combinePattern(patternList);
                 }
                 break;
         }
-        return defaultPattern;
+        return undefined;
     };
-    const getSeriesTooltipPattern = (activeType, series, dimensionInfo) => {
-        var _a, _b;
-        let seriesPattern = {};
-        switch (activeType) {
-            case 'mark':
-            case 'group':
-                if (series) {
-                    const seriesSpec = ((_b = (_a = series.tooltipHelper) === null || _a === void 0 ? void 0 : _a.spec) !== null && _b !== void 0 ? _b : {});
-                    seriesPattern = seriesSpec[activeType] ? cloneDeep(seriesSpec[activeType]) : {};
-                }
-                break;
-            case 'dimension':
-                if (dimensionInfo === null || dimensionInfo === void 0 ? void 0 : dimensionInfo.length) {
-                    const seriesList = getSeriesListFromDimensionInfo(dimensionInfo);
-                    const seriesPatternList = seriesList
-                        .filter(series => {
-                        var _a;
-                        const spec = (_a = series.tooltipHelper) === null || _a === void 0 ? void 0 : _a.spec;
-                        return isValid$1(spec === null || spec === void 0 ? void 0 : spec.dimension) && getTooltipActualActiveType(spec).includes('dimension');
-                    })
-                        .map(series => series.tooltipHelper.spec.dimension);
-                    if (seriesPatternList.length) {
-                        let seriesPatternContent = [];
-                        if (seriesPatternList.every(({ content }) => isNil$1(content))) {
-                            seriesPatternContent = undefined;
+    const getSeriesTooltipPattern = (activeType, globalSpec, series, dimensionInfo) => {
+        const allSeries = activeType === 'dimension' && (dimensionInfo === null || dimensionInfo === void 0 ? void 0 : dimensionInfo.length)
+            ? getSeriesListFromDimensionInfo(dimensionInfo)
+            : (activeType === 'mark' || activeType === 'group') && series
+                ? [series]
+                : null;
+        if (allSeries && allSeries.length) {
+            const seriesPatternList = [];
+            allSeries.forEach(s => {
+                var _a;
+                const seriesSpec = (_a = s.tooltipHelper) === null || _a === void 0 ? void 0 : _a.spec;
+                if (isActiveTypeVisible(activeType, seriesSpec)) {
+                    let finalPattern = seriesSpec && seriesSpec[activeType]
+                        ? Object.assign(Object.assign({}, globalSpec[activeType]), seriesSpec[activeType]) : globalSpec[activeType];
+                    if (finalPattern) {
+                        finalPattern = cloneDeep(finalPattern);
+                        if (finalPattern.title) {
+                            finalPattern.title = addExtraInfoToTooltipTitlePattern(finalPattern.title, {
+                                seriesId: s.id
+                            }, true);
                         }
-                        else {
-                            seriesPatternList.forEach(({ content }) => {
-                                if (isNil$1(content)) {
-                                    return;
-                                }
-                                if (isFunction$1(content)) {
-                                    seriesPatternContent === null || seriesPatternContent === void 0 ? void 0 : seriesPatternContent.push(content);
-                                }
-                                else {
-                                    seriesPatternContent === null || seriesPatternContent === void 0 ? void 0 : seriesPatternContent.push(...array(content));
-                                }
-                            });
+                        if (finalPattern.content) {
+                            finalPattern.content = addExtraInfoToTooltipContentPattern(finalPattern.content, {
+                                seriesId: s.id
+                            }, true);
                         }
-                        seriesPattern = Object.assign(Object.assign({}, seriesPatternList[0]), { content: seriesPatternContent });
+                        seriesPatternList.push(finalPattern);
                     }
                 }
-                break;
+            });
+            return seriesPatternList && seriesPatternList.length ? combinePattern(seriesPatternList) : null;
         }
-        return seriesPattern;
+        return undefined;
+    };
+    const getSeriesListFromDimensionInfo = (dimensionInfo) => {
+        const list = [];
+        dimensionInfo.forEach(info => {
+            info.data.forEach(datum => {
+                if (isValid$1(datum.series)) {
+                    list.push(datum.series);
+                }
+            });
+        });
+        return list;
     };
-    const getSeriesListFromDimensionInfo = memoize((dimensionInfo) => {
-        return dimensionInfo.reduce((list, cur) => list.concat(cur.data.map(data => data.series).filter(isValid$1)), []);
-    });
     const getShapePatternMapOfEachSeries = (content) => {
         const shapePatternMap = {};
         content.forEach(line => {
-            var _a;
-            const key = (_a = line.seriesId) !== null && _a !== void 0 ? _a : 0;
-            if (!shapePatternMap[key]) {
+            const key = line.seriesId;
+            if (isValid$1(key) && !shapePatternMap[key]) {
                 shapePatternMap[key] = line;
             }
+            if (!shapePatternMap[-1]) {
+                shapePatternMap[-1] = line;
+            }
         });
         return shapePatternMap;
     };
+    const isShapeKey = (key) => key.toLowerCase().includes('shape');
     const getShapePattern = (userLinePattern, userPattern, userStyle, shapePatternMap, defaultShapePattern) => {
-        var _a, _b, _c;
+        var _a, _b;
         if (userStyle) {
             userStyle.shapeSize = (_a = userStyle.shapeSize) !== null && _a !== void 0 ? _a : userStyle.size;
         }
-        const shapePatternFromMap = (_c = shapePatternMap === null || shapePatternMap === void 0 ? void 0 : shapePatternMap[(_b = userLinePattern === null || userLinePattern === void 0 ? void 0 : userLinePattern.seriesId) !== null && _b !== void 0 ? _b : 0]) !== null && _c !== void 0 ? _c : shapePatternMap === null || shapePatternMap === void 0 ? void 0 : shapePatternMap[0];
-        const maps = [userLinePattern, userPattern, userStyle, shapePatternFromMap, defaultShapePattern].filter(isValid$1);
-        const shapeKeys = new Set(maps
-            .reduce((keys, cur) => keys.concat(Object.keys(cur)), [])
-            .filter(key => key.toLowerCase().includes('shape')));
+        const shapePatternFromMap = shapePatternMap
+            ? (_b = shapePatternMap[userLinePattern === null || userLinePattern === void 0 ? void 0 : userLinePattern.seriesId]) !== null && _b !== void 0 ? _b : shapePatternMap[-1]
+            : null;
         const shapePattern = {};
-        shapeKeys.forEach(key => {
-            let value;
-            let i = 0;
-            do {
-                value = maps[i++][key];
-            } while (i < maps.length && isNil$1(value));
-            if (value !== undefined) {
-                shapePattern[key] = value;
+        [userLinePattern, userPattern, userStyle, shapePatternFromMap, defaultShapePattern].forEach(cfg => {
+            if (isValid$1(cfg)) {
+                Object.keys(cfg).forEach(key => {
+                    if (isShapeKey(key) && isNil$1(shapePattern[key]) && !isNil$1(cfg[key])) {
+                        shapePattern[key] = cfg[key];
+                    }
+                });
             }
         });
         return shapePattern;
     };
+    const merge = (source, extraInfo, overwrite) => {
+        const info = isFunction$1(extraInfo) ? extraInfo(source) : extraInfo;
+        return overwrite ? Object.assign(Object.assign({}, source), info) : Object.assign(Object.assign({}, info), source);
+    };
+    const addExtraInfoToTooltipTitlePattern = (pattern, extraInfo, overwrite) => {
+        const result = isValid$1(pattern)
+            ? isFunction$1(pattern)
+                ? (...args) => merge(pattern(...args), extraInfo, overwrite)
+                : merge(pattern, extraInfo, overwrite)
+            : undefined;
+        return result;
+    };
+    const addExtraInfoToTooltipContentPattern = (pattern, extraInfo, overwrite) => {
+        const result = isValid$1(pattern)
+            ? array(pattern).map(patternItem => isFunction$1(patternItem)
+                ? (...args) => array(patternItem(...args)).map(line => merge(line, extraInfo, overwrite))
+                : merge(patternItem, extraInfo, overwrite))
+            : undefined;
+        return result;
+    };
 
     const getTooltipContentValue = (field, datum, params, formatter) => {
         let value;
@@ -89860,6 +89857,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         key: '其他',
         value: '...'
     };
+    const TOOLTIP_TYPES = ['group', 'mark', 'dimension'];
 
     const getTimeString = (value, timeFormat, timeFormatMode) => {
         if (!timeFormat && !timeFormatMode) {
@@ -89936,7 +89934,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             case 'dimension':
                 for (const { data: d } of data) {
                     for (const { datum: datumList, series } of d) {
-                        if (!getTooltipActualActiveType((_c = series.tooltipHelper) === null || _c === void 0 ? void 0 : _c.spec).includes('dimension')) {
+                        if (!isActiveTypeVisible('dimension', (_c = series.tooltipHelper) === null || _c === void 0 ? void 0 : _c.spec)) {
                             continue;
                         }
                         const contentPatterns = (_d = patternContent === null || patternContent === void 0 ? void 0 : patternContent.filter(c => isNil$1(c.seriesId) || c.seriesId === series.id)) !== null && _d !== void 0 ? _d : [];
@@ -90070,6 +90068,48 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             return undefined;
         }
+        _updateViewSpec(params) {
+            const { changePositionOnly, model, dimensionInfo } = params;
+            if (!changePositionOnly || !this._cacheViewSpec) {
+                this._cacheViewSpec = getTooltipSpecForShow(this.activeType, this.component.getSpec(), model, dimensionInfo);
+            }
+        }
+        _updateActualTooltip(data, params) {
+            var _a, _b, _c, _d;
+            const pattern = this._cacheViewSpec[this.activeType];
+            const { changePositionOnly } = params;
+            if (!changePositionOnly || !this._cacheActualTooltip) {
+                const tooltipContent = getShowContent(pattern, data, params);
+                const visible = isValid$1(tooltipContent) ? getTooltipPatternValue(pattern.visible, data, params) !== false : false;
+                this._cacheActualTooltip = Object.assign(Object.assign({}, tooltipContent), { visible, activeType: pattern.activeType, data });
+                const { title, content } = this._cacheActualTooltip;
+                this._cacheActualTooltip.title = (_b = (_a = pattern.updateTitle) === null || _a === void 0 ? void 0 : _a.call(pattern, title, data, params)) !== null && _b !== void 0 ? _b : title;
+                this._cacheActualTooltip.content = (_d = (_c = pattern.updateContent) === null || _c === void 0 ? void 0 : _c.call(pattern, content, data, params)) !== null && _d !== void 0 ? _d : content;
+            }
+        }
+        shouldHandleTooltip(params, mouseEventData) {
+            var _a, _b;
+            const { tooltipInfo: info } = mouseEventData;
+            if (isNil$1(info)) {
+                return false;
+            }
+            return isActiveTypeVisible(this.activeType, (_b = (_a = params.model) === null || _a === void 0 ? void 0 : _a.tooltipHelper) === null || _b === void 0 ? void 0 : _b.spec);
+        }
+        clearCache() {
+            this._cacheViewSpec = undefined;
+            this._cacheActualTooltip = undefined;
+        }
+    }
+
+    class DimensionTooltipProcessor extends BaseTooltipProcessor {
+        constructor() {
+            super(...arguments);
+            this.activeType = 'dimension';
+        }
+        showTooltip(info, params, changePositionOnly) {
+            const newParams = Object.assign(Object.assign({}, params), { dimensionInfo: this._preprocessDimensionInfo(info), changePositionOnly, tooltip: this.component });
+            return this._showTooltipByHandler(info, newParams);
+        }
         _getDimensionInfo(params) {
             var _a, _b;
             let targetDimensionInfo;
@@ -90127,53 +90167,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             return targetDimensionInfo;
         }
-        _updateViewSpec(params) {
-            const { changePositionOnly, model, dimensionInfo } = params;
-            if (!changePositionOnly || !this._cacheViewSpec) {
-                this._cacheViewSpec = getTooltipSpecForShow(this.activeType, this.component.getSpec(), model, dimensionInfo);
-            }
-        }
-        _updateActualTooltip(data, params) {
-            var _a, _b, _c, _d;
-            const pattern = this._cacheViewSpec[this.activeType];
-            const { changePositionOnly } = params;
-            if (!changePositionOnly || !this._cacheActualTooltip) {
-                const tooltipContent = getShowContent(pattern, data, params);
-                const visible = isValid$1(tooltipContent) ? getTooltipPatternValue(pattern.visible, data, params) !== false : false;
-                this._cacheActualTooltip = Object.assign(Object.assign({}, tooltipContent), { visible, activeType: pattern.activeType, data });
-                const { title, content } = this._cacheActualTooltip;
-                this._cacheActualTooltip.title = (_b = (_a = pattern.updateTitle) === null || _a === void 0 ? void 0 : _a.call(pattern, title, data, params)) !== null && _b !== void 0 ? _b : title;
-                this._cacheActualTooltip.content = (_d = (_c = pattern.updateContent) === null || _c === void 0 ? void 0 : _c.call(pattern, content, data, params)) !== null && _d !== void 0 ? _d : content;
-            }
-        }
-        clearCache() {
-            this._cacheViewSpec = undefined;
-            this._cacheActualTooltip = undefined;
-        }
-    }
-
-    class DimensionTooltipProcessor extends BaseTooltipProcessor {
-        constructor() {
-            super(...arguments);
-            this.activeType = 'dimension';
-        }
-        showTooltip(info, params, changePositionOnly) {
-            const newParams = Object.assign(Object.assign({}, params), { dimensionInfo: this._preprocessDimensionInfo(info), changePositionOnly, tooltip: this.component });
-            return this._showTooltipByHandler(info, newParams);
-        }
-        shouldHandleTooltip(params, mouseEventData) {
-            var _a, _b;
-            const { tooltipInfo: info } = mouseEventData;
-            if (isNil$1(info)) {
-                return false;
-            }
-            const helper = (_a = params.model) === null || _a === void 0 ? void 0 : _a.tooltipHelper;
-            const activeType = (_b = helper === null || helper === void 0 ? void 0 : helper.activeType) !== null && _b !== void 0 ? _b : this.component.getSpec().activeType;
-            if (!activeType.includes('dimension')) {
-                return false;
-            }
-            return true;
-        }
         getMouseEventData(params) {
             var _a;
             return {
@@ -90193,24 +90186,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this.activeType = 'mark';
         }
         showTooltip(info, params, changePositionOnly) {
-            const { datum, series, dimensionInfo } = info;
+            const { datum, series } = info;
             const tooltipData = [{ datum: [datum], series }];
-            const newParams = Object.assign(Object.assign({}, params), { dimensionInfo: this._preprocessDimensionInfo(dimensionInfo), changePositionOnly, tooltip: this.component });
+            const newParams = Object.assign(Object.assign({}, params), { changePositionOnly, tooltip: this.component });
             return this._showTooltipByHandler(tooltipData, newParams);
         }
-        shouldHandleTooltip(params, mouseEventData) {
-            var _a;
-            const { tooltipInfo: info } = mouseEventData;
-            if (isNil$1(info)) {
-                return false;
-            }
-            const helper = (_a = params.model) === null || _a === void 0 ? void 0 : _a.tooltipHelper;
-            if (!(helper === null || helper === void 0 ? void 0 : helper.activeType.includes('mark'))) {
-                return false;
-            }
-            return true;
-        }
-        getMouseEventData(params, dimensionInfo) {
+        getMouseEventData(params) {
             var _a;
             let info;
             let ignore;
@@ -90223,8 +90204,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     info = {
                         mark: params.mark,
                         datum: params.datum,
-                        series,
-                        dimensionInfo
+                        series
                     };
                 }
                 else if ((ignoreTriggers === null || ignoreTriggers === void 0 ? void 0 : ignoreTriggers.has(params.model)) || (ignoreTriggers === null || ignoreTriggers === void 0 ? void 0 : ignoreTriggers.has(params.mark))) {
@@ -90244,24 +90224,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this.activeType = 'group';
         }
         showTooltip(info, params, changePositionOnly) {
-            const { datum, series, dimensionInfo } = info;
+            const { datum, series } = info;
             const tooltipData = [{ datum: array(datum), series }];
-            const newParams = Object.assign(Object.assign({}, params), { groupDatum: this._getGroupDatum(params), dimensionInfo: this._preprocessDimensionInfo(dimensionInfo), changePositionOnly, tooltip: this.component });
+            const newParams = Object.assign(Object.assign({}, params), { groupDatum: this._getGroupDatum(params), changePositionOnly, tooltip: this.component });
             return this._showTooltipByHandler(tooltipData, newParams);
         }
-        shouldHandleTooltip(params, mouseEventData) {
-            var _a;
-            const { tooltipInfo: info } = mouseEventData;
-            if (isNil$1(info)) {
-                return false;
-            }
-            const helper = (_a = params.model) === null || _a === void 0 ? void 0 : _a.tooltipHelper;
-            if (!(helper === null || helper === void 0 ? void 0 : helper.activeType.includes('group'))) {
-                return false;
-            }
-            return true;
-        }
-        getMouseEventData(params, dimensionInfo) {
+        getMouseEventData(params) {
             var _a, _b;
             let info;
             let ignore;
@@ -90277,8 +90245,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                         info = {
                             mark: params.mark,
                             datum: params.datum,
-                            series,
-                            dimensionInfo
+                            series
                         };
                     }
                 }
@@ -90437,12 +90404,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     dimension: false,
                     group: false
                 };
-                success.group = this._showTooltipByMouseEvent('group', mouseEventData, params, isClick);
-                if (!success.group) {
-                    success.mark = this._showTooltipByMouseEvent('mark', mouseEventData, params, isClick);
-                }
-                if (!success.mark && !success.group) {
-                    success.dimension = this._showTooltipByMouseEvent('dimension', mouseEventData, params, isClick);
+                for (let i = 0, len = TOOLTIP_TYPES.length; i < len; i++) {
+                    const type = TOOLTIP_TYPES[i];
+                    const res = this.processor[type] ? this._showTooltipByMouseEvent(type, mouseEventData, params, isClick) : false;
+                    if (res) {
+                        success[type] = true;
+                        break;
+                    }
                 }
                 if (Object.values(success).every(val => !val) && !isEmptyPos(params)) {
                     if (ignoreMark && isMarkInfo(this._cacheInfo)) {
@@ -90507,22 +90475,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     tooltipInfo: {},
                     ignore: {}
                 };
-                let activeType = 'dimension';
-                const { tooltipInfo, ignore } = this.processor[activeType].getMouseEventData(params);
-                result.tooltipInfo[activeType] = tooltipInfo;
-                result.ignore[activeType] = ignore;
-                const dimensionInfo = tooltipInfo;
-                for (activeType of Object.keys(this.processor)) {
-                    if (activeType !== 'dimension') {
-                        const { tooltipInfo, ignore } = this.processor[activeType].getMouseEventData(params, dimensionInfo);
-                        result.tooltipInfo[activeType] = tooltipInfo;
-                        result.ignore[activeType] = ignore;
-                    }
-                }
+                Object.keys(this.processor).forEach(activeType => {
+                    const { tooltipInfo, ignore } = this.processor[activeType].getMouseEventData(params);
+                    result.tooltipInfo[activeType] = tooltipInfo;
+                    result.ignore[activeType] = ignore;
+                });
                 return result;
             };
             this._hideTooltipByHandler = (params) => {
-                var _a, _b, _c, _d;
+                var _a, _b, _c;
                 if (!this._isTooltipShown && !((_b = (_a = this.tooltipHandler) === null || _a === void 0 ? void 0 : _a.isTooltipShown) === null || _b === void 0 ? void 0 : _b.call(_a))) {
                     return 0;
                 }
@@ -90530,15 +90491,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 Object.values(this.processor).forEach((processor) => {
                     processor.clearCache();
                 });
-                let hideTooltip;
-                if ((_c = this._spec.handler) === null || _c === void 0 ? void 0 : _c.hideTooltip) {
-                    hideTooltip = this._spec.handler.hideTooltip.bind(this._spec.handler);
-                }
-                else if ((_d = this.tooltipHandler) === null || _d === void 0 ? void 0 : _d.hideTooltip) {
-                    hideTooltip = this.tooltipHandler.hideTooltip.bind(this.tooltipHandler);
-                }
-                if (hideTooltip) {
-                    const result = hideTooltip(params);
+                const handler = (_c = this._spec.handler) !== null && _c !== void 0 ? _c : this.tooltipHandler;
+                if (handler.hideTooltip) {
+                    const result = handler.hideTooltip.call(handler, params);
                     if (!result) {
                         this._isTooltipShown = false;
                     }
@@ -90639,11 +90594,17 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
         }
         _initProcessor() {
-            this.processor = {
-                mark: new MarkTooltipProcessor(this),
-                dimension: new DimensionTooltipProcessor(this),
-                group: new GroupTooltipProcessor(this)
-            };
+            const activeType = this._spec.activeType;
+            this.processor = {};
+            if (activeType.includes('dimension')) {
+                this.processor.dimension = new DimensionTooltipProcessor(this);
+            }
+            if (activeType.includes('group')) {
+                this.processor.group = new GroupTooltipProcessor(this);
+            }
+            if (activeType.includes('mark')) {
+                this.processor.mark = new MarkTooltipProcessor(this);
+            }
         }
         _initEvent() {
             var _a;
@@ -98701,22 +98662,26 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     const getHorizontalPositionType = (position, defaultCase) => { var _a, _b; return (_b = (_a = positionType[position]) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : defaultCase; };
     const getVerticalPositionType = (position, defaultCase) => { var _a, _b; return (_b = (_a = positionType[position]) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : defaultCase; };
-    const getCartesianCrosshairRect = (dimensionInfo, series, layoutStartPoint) => {
+    const getCartesianCrosshairRect = (dimensionData, layoutStartPoint) => {
+        var _a;
         const currValueX = new Map();
         const currValueY = new Map();
-        dimensionInfo.forEach(({ axis, value }) => {
-            if (['top', 'bottom'].includes(axis.getOrient())) {
-                currValueX.set(axis.getSpecIndex(), {
-                    value,
-                    axis
-                });
-            }
-            else {
-                currValueY.set(axis.getSpecIndex(), {
-                    value,
-                    axis
-                });
-            }
+        const { series, datum } = dimensionData;
+        const isHorizontal = series.direction === "horizontal";
+        const axisHelper = isHorizontal
+            ? series.getYAxisHelper()
+            : series.getXAxisHelper();
+        const axisId = axisHelper.getAxisId();
+        const axis = series
+            .getChart()
+            .getComponentsByKey('axes')
+            .find(axis => axis.id === axisId);
+        if (!axis) {
+            return undefined;
+        }
+        (isHorizontal ? currValueY : currValueX).set(axis.getSpecIndex(), {
+            value: (_a = series.getDatumPositionValues(datum[0], series.getDimensionField())) === null || _a === void 0 ? void 0 : _a[0],
+            axis
         });
         const xHair = {
             visible: !!currValueX.size,
@@ -99030,29 +98995,28 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 return 0;
             };
             this._getActualTooltipPosition = (actualTooltip, params, tooltipBoxSize) => {
-                var _a, _b, _c, _d, _e, _f, _g, _h;
-                const event = params.event;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j;
                 const { tooltipSpec } = params;
-                const firstDimensionInfo = (_a = params.dimensionInfo) === null || _a === void 0 ? void 0 : _a[0];
                 const invalidPosition = {
                     x: Infinity,
                     y: Infinity
                 };
-                let { offsetX, offsetY } = this._option;
                 if (!tooltipSpec) {
                     this._cacheTooltipPosition = undefined;
                     return invalidPosition;
                 }
+                const event = params.event;
                 const { activeType, data } = actualTooltip;
-                const pattern = tooltipSpec[activeType];
-                const position = getTooltipPatternValue(pattern.position, data, params);
-                const positionMode = (_b = getTooltipPatternValue(pattern.positionMode, data, params)) !== null && _b !== void 0 ? _b : (activeType === 'mark' ? 'mark' : 'pointer');
-                const tooltipParentElement = this._getParentElement(tooltipSpec);
+                const firstDim = activeType === 'dimension' ? (_b = (_a = data[0]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b[0] : data === null || data === void 0 ? void 0 : data[0];
+                let { offsetX, offsetY } = this._option;
+                const spec = tooltipSpec[activeType];
+                const position = getTooltipPatternValue(spec.position, data, params);
+                const positionMode = (_c = getTooltipPatternValue(spec.positionMode, data, params)) !== null && _c !== void 0 ? _c : (activeType === 'mark' ? 'mark' : 'pointer');
                 const { width: tooltipBoxWidth = 0, height: tooltipBoxHeight = 0 } = tooltipBoxSize !== null && tooltipBoxSize !== void 0 ? tooltipBoxSize : {};
                 const isCanvas = tooltipSpec.renderMode === 'canvas';
-                const canvasRect = (_c = params === null || params === void 0 ? void 0 : params.chart) === null || _c === void 0 ? void 0 : _c.getCanvasRect();
-                const canvasWidth = (_d = canvasRect === null || canvasRect === void 0 ? void 0 : canvasRect.width) !== null && _d !== void 0 ? _d : DEFAULT_CHART_WIDTH;
-                const canvasHeight = (_e = canvasRect === null || canvasRect === void 0 ? void 0 : canvasRect.height) !== null && _e !== void 0 ? _e : DEFAULT_CHART_HEIGHT;
+                const canvasRect = (_d = params === null || params === void 0 ? void 0 : params.chart) === null || _d === void 0 ? void 0 : _d.getCanvasRect();
+                const canvasWidth = (_e = canvasRect === null || canvasRect === void 0 ? void 0 : canvasRect.width) !== null && _e !== void 0 ? _e : DEFAULT_CHART_WIDTH;
+                const canvasHeight = (_f = canvasRect === null || canvasRect === void 0 ? void 0 : canvasRect.height) !== null && _f !== void 0 ? _f : DEFAULT_CHART_HEIGHT;
                 let isFixedPosition = false;
                 const containerSize = {
                     width: 0,
@@ -99066,8 +99030,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     containerSize.width = window.innerWidth;
                     containerSize.height = window.innerHeight;
                     if (!isCanvas) {
-                        tooltipParentElementRect = (_g = (_f = tooltipParentElement === null || tooltipParentElement === void 0 ? void 0 : tooltipParentElement.getBoundingClientRect) === null || _f === void 0 ? void 0 : _f.call(tooltipParentElement)) !== null && _g !== void 0 ? _g : invalidPosition;
-                        const chartElement = ((_h = this._compiler.getCanvas()) !== null && _h !== void 0 ? _h : this._chartContainer);
+                        const tooltipParentElement = this._getParentElement(tooltipSpec);
+                        tooltipParentElementRect = (_h = (_g = tooltipParentElement === null || tooltipParentElement === void 0 ? void 0 : tooltipParentElement.getBoundingClientRect) === null || _g === void 0 ? void 0 : _g.call(tooltipParentElement)) !== null && _h !== void 0 ? _h : invalidPosition;
+                        const chartElement = ((_j = this._compiler.getCanvas()) !== null && _j !== void 0 ? _j : this._chartContainer);
                         const chartElementRect = chartElement === null || chartElement === void 0 ? void 0 : chartElement.getBoundingClientRect();
                         relativePosOffset = {
                             x: chartElementRect.x - tooltipParentElementRect.x,
@@ -99104,9 +99069,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                             x2 = bounds.x2 + startPoint.x;
                         }
                     }
-                    else if (mode === 'crosshair' && ((_a = firstDimensionInfo === null || firstDimensionInfo === void 0 ? void 0 : firstDimensionInfo.axis) === null || _a === void 0 ? void 0 : _a.getCoordinateType()) === 'cartesian') {
+                    else if (mode === 'crosshair' &&
+                        ((_a = firstDim === null || firstDim === void 0 ? void 0 : firstDim.series) === null || _a === void 0 ? void 0 : _a.coordinate) === 'cartesian' &&
+                        firstDim.datum &&
+                        firstDim.datum.length) {
                         isFixedPosition = true;
-                        const rect = getCartesianCrosshairRect(params.dimensionInfo, getFirstSeries(this._component.getRegions(), 'cartesian'), startPoint);
+                        const rect = getCartesianCrosshairRect(firstDim, startPoint);
                         if (rect) {
                             x1 = rect.start.x;
                             x2 = rect.end.x;
@@ -99151,9 +99119,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                             y2 = bounds.y2 + startPoint.y;
                         }
                     }
-                    else if (mode === 'crosshair' && ((_a = firstDimensionInfo === null || firstDimensionInfo === void 0 ? void 0 : firstDimensionInfo.axis) === null || _a === void 0 ? void 0 : _a.getCoordinateType()) === 'cartesian') {
+                    else if (mode === 'crosshair' &&
+                        ((_a = firstDim === null || firstDim === void 0 ? void 0 : firstDim.series) === null || _a === void 0 ? void 0 : _a.coordinate) === 'cartesian' &&
+                        firstDim.datum &&
+                        firstDim.datum.length) {
                         isFixedPosition = true;
-                        const rect = getCartesianCrosshairRect(params.dimensionInfo, getFirstSeries(this._component.getRegions(), 'cartesian'), startPoint);
+                        const rect = getCartesianCrosshairRect(firstDim, startPoint);
                         if (rect) {
                             y1 = rect.start.y;
                             y2 = rect.end.y;
@@ -99350,49 +99321,23 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                         y = (containerHeight - tooltipParentElementRect.y) / tooltipParentElementScale - tooltipBoxHeight;
                     }
                 };
-                switch (getHorizontalPositionType(position, 'right')) {
-                    case 'center':
-                    case 'centerLeft':
-                    case 'centerRight':
-                        if (isLeftOut()) {
-                            detectLeftFirst();
-                            detectRightLast();
-                        }
-                        else {
-                            detectRightFirst();
-                            detectLeftLast();
-                        }
-                        break;
-                    case 'left':
-                        detectLeftFirst();
-                        detectRightLast();
-                        break;
-                    case 'right':
-                        detectRightFirst();
-                        detectLeftLast();
-                        break;
+                const horizontalType = getHorizontalPositionType(position, 'right');
+                if (horizontalType === 'left' || (horizontalType.includes('center') && isLeftOut())) {
+                    detectLeftFirst();
+                    detectRightLast();
                 }
-                switch (getVerticalPositionType(position, 'bottom')) {
-                    case 'center':
-                    case 'centerTop':
-                    case 'centerBottom':
-                        if (isTopOut()) {
-                            detectTopFirst();
-                            detectBottomLast();
-                        }
-                        else {
-                            detectBottomFirst();
-                            detectTopLast();
-                        }
-                        break;
-                    case 'top':
-                        detectTopFirst();
-                        detectBottomLast();
-                        break;
-                    case 'bottom':
-                        detectBottomFirst();
-                        detectTopLast();
-                        break;
+                else {
+                    detectRightFirst();
+                    detectLeftLast();
+                }
+                const verticalType = getVerticalPositionType(position, 'bottom');
+                if (verticalType === 'top' || (verticalType.includes('center') && isTopOut())) {
+                    detectTopFirst();
+                    detectBottomLast();
+                }
+                else {
+                    detectBottomFirst();
+                    detectTopLast();
                 }
                 const result = { x, y };
                 this._cacheTooltipPosition = result;