@visactor/vchart 2.0.11-alpha.0 → 2.0.11-alpha.2

package/build/index.es.js

@@ -61532,7 +61532,7 @@ const lookup = (data, opt) => {
     });
 };
 
-const version = "2.0.11-alpha.0";
+const version = "2.0.11-alpha.2";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();
@@ -95882,7 +95882,10 @@ class Tooltip extends BaseComponent {
             for (let i = 0, len = supportedTooltip.length; i < len; i++) {
                 const type = supportedTooltip[i];
                 const res = this.processor[type] ? this._showTooltipByMouseEvent(type, mouseEventData, params, isClick) : false;
-                if (res) {
+                if (res === 'unShowByOption') {
+                    success[type] = 'unShowByOption';
+                }
+                else if (res) {
                     success[type] = true;
                     break;
                 }
@@ -95895,23 +95898,19 @@ class Tooltip extends BaseComponent {
                     success.dimension = this._showTooltipByMouseEvent('dimension', mouseEventData, params, isClick);
                 }
             }
-            if (!success.mark && !success.group && (!success.dimension || isNil$1(dimensionInfo))) {
-                this._handleChartMouseOut(params);
+            if (success.mark !== true && success.group !== true && (success.dimension !== true || isNil$1(dimensionInfo))) {
+                if (!this._cacheActiveType || success[this._cacheActiveType] !== 'unShowByOption') {
+                    this._handleChartMouseOut(params);
+                }
             }
             else {
                 this._initEventOfTooltipContent();
             }
         };
         this._showTooltipByMouseEvent = (activeType, mouseEventData, params, isClick, useCache) => {
-            var _a, _b;
-            if ((_a = this._option) === null || _a === void 0 ? void 0 : _a.componentShowContent) {
-                if (this._option.componentShowContent.tooltip === false) {
-                    return false;
-                }
-                if (isObject$2(this._option.componentShowContent.tooltip) &&
-                    this._option.componentShowContent.tooltip[activeType] === false) {
-                    return false;
-                }
+            var _a;
+            if (!this._showContentByEvent(activeType)) {
+                return 'unShowByOption';
             }
             const processor = this.processor[activeType];
             if (!processor.shouldHandleTooltip(params, mouseEventData.tooltipInfo[activeType])) {
@@ -95945,7 +95944,7 @@ class Tooltip extends BaseComponent {
                     }, this._spec.hideTimer);
                 }
             }
-            const vchart = (_b = this._option) === null || _b === void 0 ? void 0 : _b.globalInstance;
+            const vchart = (_a = this._option) === null || _a === void 0 ? void 0 : _a.globalInstance;
             if (success && VChart.globalConfig.uniqueTooltip && vchart) {
                 VChart.hideTooltip(vchart.id);
             }
@@ -96170,6 +96169,19 @@ class Tooltip extends BaseComponent {
         }
         return throttle(callback, wait);
     }
+    _showContentByEvent(activeType) {
+        var _a;
+        if ((_a = this._option) === null || _a === void 0 ? void 0 : _a.componentShowContent) {
+            if (this._option.componentShowContent.tooltip === false) {
+                return false;
+            }
+            if (isObject$2(this._option.componentShowContent.tooltip) &&
+                this._option.componentShowContent.tooltip[activeType] === false) {
+                return false;
+            }
+        }
+        return true;
+    }
     reInit(spec) {
         var _a, _b, _c;
         super.reInit(spec);
@@ -96200,6 +96212,7 @@ class Tooltip extends BaseComponent {
         const result = showTooltip(datum, options, this);
         if (result !== 'none') {
             this._alwaysShow = !!(options === null || options === void 0 ? void 0 : options.alwaysShow);
+            this._cacheActiveType = result;
         }
         return result;
     }
@@ -96526,7 +96539,7 @@ class BaseCrossHair extends BaseComponent {
     }
     _registerEvent(eventName, isOut, click) {
         var _a;
-        if (!isOut && ((_a = this._option.componentShowContent) === null || _a === void 0 ? void 0 : _a.crosshair) === false) {
+        if (((_a = this._option.componentShowContent) === null || _a === void 0 ? void 0 : _a.crosshair) === false) {
             return;
         }
         const handler = isOut ? this._handleOutEvent : click ? this._handleClickInEvent : this._handleHoverInEvent;

package/build/index.js

@@ -61538,7 +61538,7 @@
         });
     };
 
-    const version = "2.0.11-alpha.0";
+    const version = "2.0.11-alpha.2";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -95888,7 +95888,10 @@
                 for (let i = 0, len = supportedTooltip.length; i < len; i++) {
                     const type = supportedTooltip[i];
                     const res = this.processor[type] ? this._showTooltipByMouseEvent(type, mouseEventData, params, isClick) : false;
-                    if (res) {
+                    if (res === 'unShowByOption') {
+                        success[type] = 'unShowByOption';
+                    }
+                    else if (res) {
                         success[type] = true;
                         break;
                     }
@@ -95901,23 +95904,19 @@
                         success.dimension = this._showTooltipByMouseEvent('dimension', mouseEventData, params, isClick);
                     }
                 }
-                if (!success.mark && !success.group && (!success.dimension || isNil$1(dimensionInfo))) {
-                    this._handleChartMouseOut(params);
+                if (success.mark !== true && success.group !== true && (success.dimension !== true || isNil$1(dimensionInfo))) {
+                    if (!this._cacheActiveType || success[this._cacheActiveType] !== 'unShowByOption') {
+                        this._handleChartMouseOut(params);
+                    }
                 }
                 else {
                     this._initEventOfTooltipContent();
                 }
             };
             this._showTooltipByMouseEvent = (activeType, mouseEventData, params, isClick, useCache) => {
-                var _a, _b;
-                if ((_a = this._option) === null || _a === void 0 ? void 0 : _a.componentShowContent) {
-                    if (this._option.componentShowContent.tooltip === false) {
-                        return false;
-                    }
-                    if (isObject$2(this._option.componentShowContent.tooltip) &&
-                        this._option.componentShowContent.tooltip[activeType] === false) {
-                        return false;
-                    }
+                var _a;
+                if (!this._showContentByEvent(activeType)) {
+                    return 'unShowByOption';
                 }
                 const processor = this.processor[activeType];
                 if (!processor.shouldHandleTooltip(params, mouseEventData.tooltipInfo[activeType])) {
@@ -95951,7 +95950,7 @@
                         }, this._spec.hideTimer);
                     }
                 }
-                const vchart = (_b = this._option) === null || _b === void 0 ? void 0 : _b.globalInstance;
+                const vchart = (_a = this._option) === null || _a === void 0 ? void 0 : _a.globalInstance;
                 if (success && VChart.globalConfig.uniqueTooltip && vchart) {
                     VChart.hideTooltip(vchart.id);
                 }
@@ -96176,6 +96175,19 @@
             }
             return throttle(callback, wait);
         }
+        _showContentByEvent(activeType) {
+            var _a;
+            if ((_a = this._option) === null || _a === void 0 ? void 0 : _a.componentShowContent) {
+                if (this._option.componentShowContent.tooltip === false) {
+                    return false;
+                }
+                if (isObject$2(this._option.componentShowContent.tooltip) &&
+                    this._option.componentShowContent.tooltip[activeType] === false) {
+                    return false;
+                }
+            }
+            return true;
+        }
         reInit(spec) {
             var _a, _b, _c;
             super.reInit(spec);
@@ -96206,6 +96218,7 @@
             const result = showTooltip(datum, options, this);
             if (result !== 'none') {
                 this._alwaysShow = !!(options === null || options === void 0 ? void 0 : options.alwaysShow);
+                this._cacheActiveType = result;
             }
             return result;
         }
@@ -96532,7 +96545,7 @@
         }
         _registerEvent(eventName, isOut, click) {
             var _a;
-            if (!isOut && ((_a = this._option.componentShowContent) === null || _a === void 0 ? void 0 : _a.crosshair) === false) {
+            if (((_a = this._option.componentShowContent) === null || _a === void 0 ? void 0 : _a.crosshair) === false) {
                 return;
             }
             const handler = isOut ? this._handleOutEvent : click ? this._handleClickInEvent : this._handleHoverInEvent;