@visactor/vchart 1.11.7 → 1.11.8

package/build/index.js

@@ -11886,7 +11886,7 @@
           const stage = this.target.stage;
           stage && stage.renderNextFrame();
         }
-        return 1 === this.subAnimates.length && this.tailAnimate.duration === customAnimate.duration && this.trySetAttribute(customAnimate.getFromProps(), customAnimate.mode), this;
+        return 1 === this.subAnimates.length && this.tailAnimate.totalDuration === customAnimate.duration && this.trySetAttribute(customAnimate.getFromProps(), customAnimate.mode), this;
       }
       trySetAttribute(attr) {
         let mode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Animate.mode;
@@ -32666,10 +32666,9 @@
         }, this._handleRelatedGraphicSetState = e => {
           var _a, _b, _c, _d, _e;
           if ((null === (_a = e.detail) || void 0 === _a ? void 0 : _a.type) === AttributeUpdateType.STATE || (null === (_b = e.detail) || void 0 === _b ? void 0 : _b.type) === AttributeUpdateType.ANIMATE_UPDATE && (null === (_c = e.detail.animationState) || void 0 === _c ? void 0 : _c.isFirstFrameOfStep)) {
-            const currentStates = null !== (_e = null === (_d = e.target) || void 0 === _d ? void 0 : _d.currentStates) && void 0 !== _e ? _e : [];
-            (this._isCollectionBase ? [...this._graphicToText.values()] : [this._graphicToText.get(e.target)]).forEach(label => {
-              label && (label.text && label.text.useStates(currentStates), label.labelLine && label.labelLine.useStates(currentStates));
-            });
+            const currentStates = null !== (_e = null === (_d = e.target) || void 0 === _d ? void 0 : _d.currentStates) && void 0 !== _e ? _e : [],
+              labels = this._isCollectionBase ? [...this._graphicToText.values()] : [this._graphicToText.get(e.target)];
+            this.updateStatesOfLabels(labels, currentStates);
           }
         };
       }
@@ -32695,7 +32694,7 @@
         let data = this.attribute.data;
         isFunction$1(dataFilter) && (data = dataFilter(data));
         let labels = this._initText(data);
-        labels = isFunction$1(customLayoutFunc) ? customLayoutFunc(data, labels, this.getRelatedGraphic.bind(this), this._isCollectionBase ? d => this._idToPoint.get(d.id) : null) : this._layout(labels), isFunction$1(customOverlapFunc) ? labels = customOverlapFunc(labels, this.getRelatedGraphic.bind(this), this._isCollectionBase ? d => this._idToPoint.get(d.id) : null) : !1 !== overlap && (labels = this._overlapping(labels)), labels && labels.length && labels.forEach(label => {
+        labels = isFunction$1(customLayoutFunc) ? customLayoutFunc(data, labels, this.getRelatedGraphic.bind(this), this._isCollectionBase ? d => this._idToPoint.get(d.id) : null) : this._layout(labels), isFunction$1(customOverlapFunc) ? labels = customOverlapFunc(labels, this.getRelatedGraphic.bind(this), this._isCollectionBase ? d => this._idToPoint.get(d.id) : null) : !1 !== overlap && (labels = this._overlapping(labels)), isFunction$1(this.attribute.onAfterOverlapping) && this.attribute.onAfterOverlapping(labels, this.getRelatedGraphic.bind(this), this._isCollectionBase ? d => this._idToPoint.get(d.id) : null), labels && labels.length && labels.forEach(label => {
           this._bindEvent(label), this._setStatesOfText(label);
         }), !1 !== smartInvert && this._smartInvert(labels), this._renderLabels(labels);
       }
@@ -32887,7 +32886,7 @@
           }
           !hasPlace && !hideOnHit && result.push(text);
         }
-        return isFunction$1(this.onAfterLabelOverlap) && this.onAfterLabelOverlap(bitmap), result;
+        return result;
       }
       getBaseMarkGroup() {
         const {
@@ -32926,7 +32925,10 @@
       }
       _renderWithAnimation(labels) {
         var _a;
-        const currentTextMap = new Map(),
+        const {
+            syncState: syncState
+          } = this.attribute,
+          currentTextMap = new Map(),
           prevTextMap = this._graphicToText || new Map(),
           texts = [],
           labelLines = [],
@@ -32934,12 +32936,18 @@
             visible: showLabelLine
           } = null !== (_a = this.attribute.line) && void 0 !== _a ? _a : {};
         labels && labels.forEach((text, index) => {
+          var _a;
           const relatedGraphic = this.getRelatedGraphic(text.attribute),
             textId = text.attribute.id,
             textKey = this._isCollectionBase ? textId : relatedGraphic,
             state = (null == prevTextMap ? void 0 : prevTextMap.get(textKey)) ? "update" : "enter";
           let labelLine;
-          if (showLabelLine && (labelLine = this._createLabelLine(text, relatedGraphic)), "enter" === state) {
+          if (showLabelLine && (labelLine = this._createLabelLine(text, relatedGraphic)), syncState && this.updateStatesOfLabels([labelLine ? {
+            text: text,
+            labelLine: labelLine
+          } : {
+            text: text
+          }], null !== (_a = relatedGraphic.currentStates) && void 0 !== _a ? _a : []), "enter" === state) {
             if (texts.push(text), currentTextMap.set(textKey, labelLine ? {
               text: text,
               labelLine: labelLine
@@ -32975,17 +32983,26 @@
       }
       _renderWithOutAnimation(labels) {
         var _a;
-        const currentTextMap = new Map(),
+        const {
+            syncState: syncState
+          } = this.attribute,
+          currentTextMap = new Map(),
           prevTextMap = this._graphicToText || new Map(),
           {
             visible: showLabelLine
           } = null !== (_a = this.attribute.line) && void 0 !== _a ? _a : {};
         labels && labels.forEach(text => {
+          var _a;
           const relatedGraphic = this.getRelatedGraphic(text.attribute),
             state = (null == prevTextMap ? void 0 : prevTextMap.get(relatedGraphic)) ? "update" : "enter",
             textKey = this._isCollectionBase ? text.attribute.id : relatedGraphic;
           let labelLine;
-          if (showLabelLine && (labelLine = this._createLabelLine(text, relatedGraphic)), "enter" === state) currentTextMap.set(textKey, labelLine ? {
+          if (showLabelLine && (labelLine = this._createLabelLine(text, relatedGraphic)), syncState && this.updateStatesOfLabels([labelLine ? {
+            text: text,
+            labelLine: labelLine
+          } : {
+            text: text
+          }], null !== (_a = relatedGraphic.currentStates) && void 0 !== _a ? _a : []), "enter" === state) currentTextMap.set(textKey, labelLine ? {
             text: text,
             labelLine: labelLine
           } : {
@@ -32998,6 +33015,11 @@
           this.removeChild(label.text), label.labelLine && this.removeChild(label.labelLine);
         }), this._graphicToText = currentTextMap;
       }
+      updateStatesOfLabels(labels, currentStates) {
+        labels.forEach(label => {
+          label && (label.text && label.text.useStates(currentStates), label.labelLine && label.labelLine.useStates(currentStates));
+        });
+      }
       _syncStateWithRelatedGraphic(relatedGraphic) {
         this.attribute.syncState && relatedGraphic.on("afterAttributeUpdate", this._handleRelatedGraphicSetState);
       }
@@ -33266,11 +33288,14 @@
           textBoundsArray = labels.map(label => this.getGraphicBounds(label)),
           ellipsisLabelAttribute = Object.assign(Object.assign({}, this.attribute.textStyle), {
             text: "…"
-          }),
-          ellipsisText = this._createLabelText(ellipsisLabelAttribute),
-          ellipsisTextBounds = this.getGraphicBounds(ellipsisText),
-          ellipsisWidth = ellipsisTextBounds.x2 - ellipsisTextBounds.x1,
-          data = labels.map(label => label.attribute),
+          });
+        let ellipsisWidth = 1 / 0;
+        if (!1 !== ellipsisLabelAttribute.ellipsis) {
+          const ellipsisText = this._createLabelText(ellipsisLabelAttribute),
+            ellipsisTextBounds = this.getGraphicBounds(ellipsisText);
+          ellipsisWidth = ellipsisTextBounds.x2 - ellipsisTextBounds.x1;
+        }
+        const data = labels.map(label => label.attribute),
           arcs = this.layoutArcLabels(this.attribute.position, this.attribute, Array.from(this._idToGraphic.values()), data, textBoundsArray, ellipsisWidth);
         for (let i = 0; i < data.length; i++) {
           const textData = data[i],
@@ -66479,7 +66504,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         registerComponentPlugin(CanvasTooltipHandler);
     };
 
-    const version = "1.11.7";
+    const version = "1.11.8";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -93696,6 +93721,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 })) {
                     return false;
                 }
+                if (this._timer) {
+                    clearTimeout(this._timer);
+                }
                 let success;
                 if (useCache) {
                     success = !processor.showTooltip(this._cacheInfo, params, true);
@@ -93716,9 +93744,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                         this._clickLock = true;
                     }
                     else if (Number.isFinite(this._spec.hideTimer)) {
-                        if (this._timer) {
-                            clearTimeout(this._timer);
-                        }
                         this._timer = setTimeout(() => {
                             this._handleChartMouseOut();
                         }, this._spec.hideTimer);