@visactor/vchart 1.12.19-alpha.0 → 1.12.19

package/build/index.js

@@ -8577,7 +8577,7 @@
           default:
             if (this._t <= 0) this.context.lineTo(this._x, y, !1 !== this._lastDefined && !1 !== p.defined, this.lastPoint), this.context.lineTo(x, y, !1 !== this._lastDefined && !1 !== p.defined, p);else {
               const x1 = this._x * (1 - this._t) + x * this._t;
-              this.context.lineTo(x1, this._y, !1 !== this._lastDefined && !1 !== p.defined, this.lastPoint), this.context.lineTo(x1, y, !1 !== this._lastDefined && !1 !== p.defined, p);
+              .5 === this._t ? this.context.lineTo(x1, this._y, !1 !== this._lastDefined, this.lastPoint) : this.context.lineTo(x1, this._y, !1 !== this._lastDefined && !1 !== p.defined, this.lastPoint), this.context.lineTo(x1, y, !1 !== this._lastDefined && !1 !== p.defined, p);
             }
         }
         this._lastDefined = p.defined, this._x = x, this._y = y, this.lastPoint = p;
@@ -17343,7 +17343,7 @@
         this._draw(line, lineAttribute, !1, drawContext, params);
       }
       drawSegmentItem(context, cache, fill, stroke, fillOpacity, strokeOpacity, attribute, defaultAttribute, clipRange, clipRangeByDimension, offsetX, offsetY, line, fillCb, strokeCb) {
-        var _a, _b, _c, _d, _e;
+        var _a;
         if (!cache) return;
         context.beginPath();
         const z = null !== (_a = this.z) && void 0 !== _a ? _a : 0;
@@ -17356,27 +17356,7 @@
           x: originX = 0,
           x: originY = 0
         } = attribute;
-        !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), !1 !== stroke && (strokeCb ? strokeCb(context, attribute, defaultAttribute) : strokeOpacity && (context.setStrokeStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.stroke()));
-        let {
-          connectedType: connectedType,
-          connectedX: connectedX,
-          connectedY: connectedY,
-          connectedStyle: connectedStyle
-        } = attribute;
-        if (isArray$1(defaultAttribute) ? (connectedType = null !== (_b = null != connectedType ? connectedType : defaultAttribute[0].connectedType) && void 0 !== _b ? _b : defaultAttribute[1].connectedType, connectedX = null !== (_c = null != connectedX ? connectedX : defaultAttribute[0].connectedX) && void 0 !== _c ? _c : defaultAttribute[1].connectedX, connectedY = null !== (_d = null != connectedY ? connectedY : defaultAttribute[0].connectedY) && void 0 !== _d ? _d : defaultAttribute[1].connectedY, connectedStyle = null !== (_e = null != connectedStyle ? connectedStyle : defaultAttribute[0].connectedStyle) && void 0 !== _e ? _e : defaultAttribute[1].connectedStyle) : (connectedType = null != connectedType ? connectedType : defaultAttribute.connectedType, connectedX = null != connectedX ? connectedX : defaultAttribute.connectedX, connectedY = null != connectedY ? connectedY : defaultAttribute.connectedY, connectedStyle = null != connectedStyle ? connectedStyle : defaultAttribute.connectedStyle), "connect" !== connectedType && "zero" !== connectedType && (connectedType = "none"), "none" !== connectedType) {
-          context.beginPath(), drawSegments(context.camera ? context : context.nativeContext, cache, clipRange, clipRangeByDimension, {
-            offsetX: offsetX,
-            offsetY: offsetY,
-            offsetZ: z,
-            drawConnect: !0,
-            mode: connectedType,
-            zeroX: connectedX,
-            zeroY: connectedY
-          });
-          const da = [];
-          isArray$1(defaultAttribute) ? defaultAttribute.forEach(i => da.push(i)) : da.push(defaultAttribute), da.push(attribute), !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da), context.fill())), !1 !== stroke && (strokeCb ? strokeCb(context, attribute, defaultAttribute) : strokeOpacity && (context.setStrokeStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da), context.stroke()));
-        }
-        return !1;
+        return !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), !1 !== stroke && (strokeCb ? strokeCb(context, attribute, defaultAttribute) : strokeOpacity && (context.setStrokeStyle(line, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.stroke())), !1;
       }
       drawLinearLineHighPerformance(line, context, fill, stroke, fillOpacity, strokeOpacity, offsetX, offsetY, lineAttribute, drawContext, params, fillCb, strokeCb) {
         var _a;
@@ -17408,7 +17388,8 @@
             segments: segments,
             points: points,
             closePath: closePath,
-            curveTension = lineAttribute.curveTension
+            curveTension = lineAttribute.curveTension,
+            connectedType = lineAttribute.connectedType
           } = line.attribute;
         if (!this.valid(line, lineAttribute, fillCb, strokeCb)) return;
         let {
@@ -17420,6 +17401,9 @@
           clipRangeByDimension = lineAttribute.clipRangeByDimension
         } = line.attribute;
         if (1 === clipRange && !segments && !points.some(p => !1 === p.defined) && "linear" === curveType) return this.drawLinearLineHighPerformance(line, context, !!fill, !!stroke, fillOpacity, strokeOpacity, x, y, lineAttribute, drawContext, params, fillCb, strokeCb);
+        function parsePoint(points, connectedType) {
+          return "none" === connectedType ? points : points.filter(p => !1 !== p.defined);
+        }
         if (line.shouldUpdateShape()) {
           const {
               points: points,
@@ -17441,7 +17425,7 @@
                 y: lastSeg.endY,
                 defined: lastSeg.curves[lastSeg.curves.length - 1].defined
               } : index > 1 && (startPoint.x = lastSeg.endX, startPoint.y = lastSeg.endY, startPoint.defined = lastSeg.curves[lastSeg.curves.length - 1].defined);
-              const data = calcLineCache(seg.points, curveType, {
+              const data = calcLineCache(parsePoint(seg.points, connectedType), curveType, {
                 startPoint: startPoint,
                 curveTension: curveTension
               });
@@ -17460,7 +17444,7 @@
             }
           } else {
             if (!points || !points.length) return line.cache = null, void line.clearUpdateShapeTag();
-            line.cache = calcLineCache(_points, curveType, {
+            line.cache = calcLineCache(parsePoint(_points, connectedType), curveType, {
               curveTension: curveTension
             });
           }
@@ -17492,11 +17476,6 @@
 
     function drawAreaSegments(path, segPath, percent, params) {
       var _a;
-      const {
-        drawConnect = !1,
-        mode = "none"
-      } = params || {};
-      if (drawConnect && "none" === mode) return;
       const {
         top: top,
         bottom: bottom
@@ -17506,34 +17485,11 @@
         const topList = [],
           bottomList = [];
         let lastDefined = !0;
-        if (drawConnect) {
-          let lastCurve,
-            lastBottomCurve,
-            defined0 = !0;
-          const n = top.curves.length;
-          top.curves.forEach((curve, i) => {
-            const bototmCurve = bottom.curves[n - i - 1];
-            let currentTopCurve = curve,
-              currentBottomCurve = bototmCurve;
-            if (curve.originP1 === curve.originP2) return lastCurve = curve, void (lastBottomCurve = bototmCurve);
-            if (lastCurve && lastCurve.originP1 === lastCurve.originP2 && (currentTopCurve = lastCurve, currentBottomCurve = lastBottomCurve), curve.defined) defined0 || (topList.push(currentTopCurve), bottomList.push(currentBottomCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0, defined0 = !defined0);else {
-              const {
-                originP1: originP1,
-                originP2: originP2
-              } = curve;
-              let validTopCurve, validBottomCurve;
-              originP1 && !1 !== originP1.defined ? (validTopCurve = currentTopCurve, validBottomCurve = currentBottomCurve) : originP1 && !1 !== originP2.defined && (validTopCurve = curve, validBottomCurve = bototmCurve), defined0 ? (defined0 = !defined0, topList.push(validTopCurve || curve), bottomList.push(validBottomCurve || bototmCurve)) : validTopCurve && (defined0 = !defined0, topList.push(validTopCurve || curve), bottomList.push(validBottomCurve || bototmCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0);
-            }
-            lastCurve = curve;
-          }), drawAreaConnectBlock(path, topList, bottomList, params);
-        } else {
-          for (let i = 0, n = top.curves.length; i < n; i++) {
-            const topCurve = top.curves[i];
-            lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1])), lastDefined = !lastDefined) : lastDefined && (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1]));
-          }
-          drawAreaBlock(path, topList, bottomList, params);
+        for (let i = 0, n = top.curves.length; i < n; i++) {
+          const topCurve = top.curves[i];
+          lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1])), lastDefined = !lastDefined) : lastDefined && (topList.push(topCurve), bottomList.push(bottom.curves[n - i - 1]));
         }
-        return;
+        return void drawAreaBlock(path, topList, bottomList, params);
       }
       if (percent <= 0) return;
       let {
@@ -17551,51 +17507,17 @@
         lastDefined = !0;
       const topList = [],
         bottomList = [];
-      let lastTopCurve,
-        lastBottomCurve,
-        defined0 = !0;
       for (let i = 0, n = top.curves.length; i < n; i++) {
         const topCurve = top.curves[i],
           curCurveLength = topCurve.getLength(direction),
           percent = (totalDrawLength - drawedLengthUntilLast) / curCurveLength;
         if (percent < 0) break;
-        if (drawedLengthUntilLast += curCurveLength, drawConnect) {
-          const bototmCurve = bottom.curves[n - i - 1];
-          let currentTopCurve = topCurve,
-            currentBottomCurve = bototmCurve;
-          if (topCurve.originP1 === topCurve.originP2) {
-            lastTopCurve = topCurve, lastBottomCurve = bototmCurve;
-            continue;
-          }
-          if (lastTopCurve && lastTopCurve.originP1 === lastTopCurve.originP2 && (currentTopCurve = lastTopCurve, currentBottomCurve = lastBottomCurve), topCurve.defined) defined0 || (topList.push(currentTopCurve), bottomList.push(currentBottomCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0, defined0 = !defined0);else {
-            const {
-              originP1: originP1,
-              originP2: originP2
-            } = topCurve;
-            let validTopCurve, validBottomCurve;
-            originP1 && !1 !== originP1.defined ? (validTopCurve = currentTopCurve, validBottomCurve = currentBottomCurve) : originP1 && !1 !== originP2.defined && (validTopCurve = topCurve, validBottomCurve = bototmCurve), defined0 ? (defined0 = !defined0, topList.push(validTopCurve || topCurve), bottomList.push(validBottomCurve || bototmCurve)) : validTopCurve && (defined0 = !defined0, topList.push(validTopCurve || topCurve), bottomList.push(validBottomCurve || bototmCurve), drawAreaConnectBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0);
-          }
-          lastTopCurve = topCurve;
-        } else {
-          let tc = null,
-            bc = null;
-          lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (tc = topCurve, bc = bottom.curves[n - i - 1]), lastDefined = !lastDefined) : lastDefined && (tc = topCurve, bc = bottom.curves[n - i - 1]), tc && bc && (percent < 1 && (tc = tc.p2 && tc.p3 ? divideCubic(tc, percent)[0] : divideLinear(tc, percent)[0], bc = bc.p2 && bc.p3 ? divideCubic(bc, 1 - percent)[1] : divideLinear(bc, 1 - percent)[1]), tc.defined = lastDefined, bc.defined = lastDefined, topList.push(tc), bottomList.push(bc)), tc = null, bc = null;
-        }
+        drawedLengthUntilLast += curCurveLength;
+        let tc = null,
+          bc = null;
+        lastDefined !== topCurve.defined ? (lastDefined ? (drawAreaBlock(path, topList, bottomList, params), topList.length = 0, bottomList.length = 0) : (tc = topCurve, bc = bottom.curves[n - i - 1]), lastDefined = !lastDefined) : lastDefined && (tc = topCurve, bc = bottom.curves[n - i - 1]), tc && bc && (percent < 1 && (tc = tc.p2 && tc.p3 ? divideCubic(tc, percent)[0] : divideLinear(tc, percent)[0], bc = bc.p2 && bc.p3 ? divideCubic(bc, 1 - percent)[1] : divideLinear(bc, 1 - percent)[1]), tc.defined = lastDefined, bc.defined = lastDefined, topList.push(tc), bottomList.push(bc)), tc = null, bc = null;
       }
-      drawConnect ? drawAreaConnectBlock(path, topList, bottomList, params) : drawAreaBlock(path, topList, bottomList, params);
-    }
-    function drawAreaConnectBlock(path, topList, bottomList, params) {
-      if (topList.length < 2) return;
-      const {
-        offsetX = 0,
-        offsetY = 0,
-        offsetZ = 0,
-        mode: mode
-      } = params || {};
-      let curve = topList[0];
-      path.moveTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), curve = topList[topList.length - 1];
-      let end = curve.p3 || curve.p1;
-      path.lineTo(end.x + offsetX, end.y + offsetY, offsetZ), curve = bottomList[bottomList.length - 1], path.lineTo(curve.p0.x + offsetX, curve.p0.y + offsetY, offsetZ), curve = bottomList[0], end = curve.p3 || curve.p1, path.lineTo(end.x + offsetX, end.y + offsetY, offsetZ), path.closePath();
+      drawAreaBlock(path, topList, bottomList, params);
     }
     function drawAreaBlock(path, topList, bottomList, params) {
       const {
@@ -17696,7 +17618,8 @@
             fillOpacity = areaAttribute.fillOpacity,
             z = areaAttribute.z,
             strokeOpacity = areaAttribute.strokeOpacity,
-            curveTension = areaAttribute.curveTension
+            curveTension = areaAttribute.curveTension,
+            connectedType = areaAttribute.connectedType
           } = area.attribute,
           data = this.valid(area, areaAttribute, fillCb, strokeCb);
         if (!data) return;
@@ -17713,6 +17636,9 @@
         let {
           curveType = areaAttribute.curveType
         } = area.attribute;
+        function parsePoint(points, connectedType) {
+          return "connect" !== connectedType ? points : points.filter(p => !1 !== p.defined);
+        }
         if (closePath && "linear" === curveType && (curveType = "linearClosed"), 1 === clipRange && !segments && !points.some(p => !1 === p.defined) && "linear" === curveType) return this.drawLinearAreaHighPerformance(area, context, !!fill, doStroke, fillOpacity, strokeOpacity, x, y, areaAttribute, drawContext, params, fillCb, strokeCb);
         if (area.shouldUpdateShape()) {
           if (segments && segments.length) {
@@ -17726,7 +17652,7 @@
                 x: lastTopSeg.endX,
                 y: lastTopSeg.endY
               } : index > 1 && (startPoint.x = lastTopSeg.endX, startPoint.y = lastTopSeg.endY);
-              const data = calcLineCache(seg.points, curveType, {
+              const data = calcLineCache(parsePoint(seg.points, connectedType), curveType, {
                 startPoint: startPoint,
                 curveTension: curveTension
               });
@@ -17749,7 +17675,7 @@
                   y: null !== (_d = endPoint.y1) && void 0 !== _d ? _d : endPoint.y
                 });
               }
-              bottomPoints.length > 1 && (lastBottomSeg = calcLineCache(bottomPoints, "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType, {
+              bottomPoints.length > 1 && (lastBottomSeg = calcLineCache(parsePoint(bottomPoints, connectedType), "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType, {
                 curveTension: curveTension
               }), bottomCaches.unshift(lastBottomSeg));
             }
@@ -17760,11 +17686,11 @@
           } else {
             if (!points || !points.length) return area.cacheArea = null, void area.clearUpdateShapeTag();
             {
-              const topPoints = points,
+              const topPoints = parsePoint(points, connectedType),
                 bottomPoints = [];
-              for (let i = points.length - 1; i >= 0; i--) bottomPoints.push({
-                x: null !== (_e = points[i].x1) && void 0 !== _e ? _e : points[i].x,
-                y: null !== (_f = points[i].y1) && void 0 !== _f ? _f : points[i].y
+              for (let i = topPoints.length - 1; i >= 0; i--) bottomPoints.push({
+                x: null !== (_e = points[i].x1) && void 0 !== _e ? _e : topPoints[i].x,
+                y: null !== (_f = points[i].y1) && void 0 !== _f ? _f : topPoints[i].y
               });
               const topCache = calcLineCache(topPoints, curveType, {
                   curveTension: curveTension
@@ -17806,20 +17732,10 @@
         this._draw(area, areaAttribute, !1, drawContext, params);
       }
       drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb) {
-        let ret = !1;
-        return ret = ret || this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, !1, fillCb, strokeCb), ret = ret || this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, !0, fillCb, strokeCb), ret;
+        return this._drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb);
       }
-      _drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, connect, fillCb, strokeCb) {
-        var _a, _b, _c, _d;
+      _drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb) {
         if (!(cache && cache.top && cache.bottom && cache.top.curves && cache.top.curves.length && cache.bottom.curves && cache.bottom.curves.length)) return;
-        let {
-          connectedType: connectedType,
-          connectedX: connectedX,
-          connectedY: connectedY,
-          connectedStyle: connectedStyle
-        } = attribute;
-        const da = [];
-        if (connect && (isArray$1(defaultAttribute) ? (connectedType = null !== (_a = null != connectedType ? connectedType : defaultAttribute[0].connectedType) && void 0 !== _a ? _a : defaultAttribute[1].connectedType, connectedX = null !== (_b = null != connectedX ? connectedX : defaultAttribute[0].connectedX) && void 0 !== _b ? _b : defaultAttribute[1].connectedX, connectedY = null !== (_c = null != connectedY ? connectedY : defaultAttribute[0].connectedY) && void 0 !== _c ? _c : defaultAttribute[1].connectedY, connectedStyle = null !== (_d = null != connectedStyle ? connectedStyle : defaultAttribute[0].connectedStyle) && void 0 !== _d ? _d : defaultAttribute[1].connectedStyle) : (connectedType = null != connectedType ? connectedType : defaultAttribute.connectedType, connectedX = null != connectedX ? connectedX : defaultAttribute.connectedX, connectedY = null != connectedY ? connectedY : defaultAttribute.connectedY, connectedStyle = null != connectedStyle ? connectedStyle : defaultAttribute.connectedStyle), "connect" !== connectedType && "zero" !== connectedType && (connectedType = "none"), isArray$1(defaultAttribute) ? defaultAttribute.forEach(i => da.push(i)) : da.push(defaultAttribute), da.push(attribute)), connect && "none" === connectedType) return !1;
         context.beginPath();
         const {
           points: points,
@@ -17838,11 +17754,7 @@
           offsetX: offsetX,
           offsetY: offsetY,
           offsetZ: offsetZ,
-          direction: direction,
-          drawConnect: connect,
-          mode: connectedType,
-          zeroX: connectedX,
-          zeroY: connectedY
+          direction: direction
         }), this.beforeRenderStep(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, drawContext, fillCb, null, {
           attribute: attribute
         }), context.setShadowBlendStyle && context.setShadowBlendStyle(area, attribute, defaultAttribute);
@@ -17850,7 +17762,7 @@
           x: originX = 0,
           x: originY = 0
         } = attribute;
-        return !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(area, connect ? connectedStyle : attribute, originX - offsetX, originY - offsetY, connect ? da : defaultAttribute), context.fill())), this.afterRenderStep(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, drawContext, fillCb, null, {
+        return !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), this.afterRenderStep(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, drawContext, fillCb, null, {
           attribute: attribute
         }), (() => {
           if (!1 !== stroke) if (strokeCb) strokeCb(context, attribute, defaultAttribute);else {
@@ -17860,12 +17772,8 @@
             isArray$1(stroke) && (stroke[0] || stroke[2]) && !1 === stroke[1] && (context.beginPath(), drawSegments(context.camera ? context : context.nativeContext, stroke[0] ? cache.top : cache.bottom, clipRange, direction === Direction$1.ROW ? "x" : "y", {
               offsetX: offsetX,
               offsetY: offsetY,
-              offsetZ: offsetZ,
-              drawConnect: connect,
-              mode: connectedType,
-              zeroX: connectedX,
-              zeroY: connectedY
-            })), context.setStrokeStyle(area, connect ? connectedStyle : attribute, originX - offsetX, originY - offsetY, connect ? da : defaultAttribute), context.stroke();
+              offsetZ: offsetZ
+            })), context.setStrokeStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.stroke();
           }
         })(), !1;
       }
@@ -20286,7 +20194,7 @@
           } = attribute,
           b = aabbBounds;
         return points.forEach(p => {
-          !1 === p.defined && "zero" !== connectedType && "connect" !== connectedType || b.add(p.x, p.y);
+          !1 === p.defined && "connect" !== connectedType || b.add(p.x, p.y);
         }), b;
       }
       updateLineAABBBoundsBySegments(attribute, lineTheme, aabbBounds, graphic) {
@@ -20297,7 +20205,7 @@
           b = aabbBounds;
         return segments.forEach(s => {
           s.points.forEach(p => {
-            !1 === p.defined && "zero" !== connectedType && "connect" !== connectedType || b.add(p.x, p.y);
+            !1 === p.defined && "connect" !== connectedType || b.add(p.x, p.y);
           });
         }), b;
       }
@@ -31799,11 +31707,11 @@
         maxX = Math.max(x1, x2),
         minY = Math.min(y1, y2),
         maxY = Math.max(y1, y2),
-        minXWithPadding = 0 - left,
-        minYWithPadding = 0 - top;
+        maxXWithPadding = width + right,
+        maxYWithPadding = height + bottom;
       let dx = 0,
         dy = 0;
-      return minX < minXWithPadding && maxX - minX <= width ? dx = -minX : maxX > width + right && minX - (maxX - width) >= minXWithPadding && (dx = width - maxX), minY < minYWithPadding && maxY - minY <= height ? dy = -minY : maxY > height + bottom && minY - (maxY - height) >= minYWithPadding && (dy = height - maxY), {
+      return minX < 0 - left ? dx = -minX : maxX > maxXWithPadding && (dx = maxXWithPadding - maxX), minY < 0 - top ? dy = -minY : maxY > maxYWithPadding && (dy = maxYWithPadding - maxY), {
         dx: dx,
         dy: dy
       };
@@ -32517,7 +32425,7 @@
             range = boundToRange(bmpTool, bounds, !0);
           if (canPlace(bmpTool, bitmap, bounds, clampForce, overlapPadding)) bitmap.setRange(range);else {
             if (clampForce) {
-              if (this._processClampForce(text, bmpTool, bitmap)) continue;
+              if (this._processClampForce(text, bmpTool, bitmap, overlapPadding)) continue;
             }
             hideOnHit ? text.setAttributes({
               visible: !1
@@ -32527,12 +32435,13 @@
         return result;
       }
       _processClampForce(text, bmpTool, bitmap) {
+        let overlapPadding = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
         const {
           dy = 0,
           dx = 0
         } = clampText(text, bmpTool.width, bmpTool.height, bmpTool.padding);
         if (0 === dx && 0 === dy) {
-          if (canPlace(bmpTool, bitmap, text.AABBBounds)) return bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), !0;
+          if (canPlace(bmpTool, bitmap, text.AABBBounds, !1, overlapPadding)) return bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), !0;
         } else if (canPlace(bmpTool, bitmap, {
           x1: text.AABBBounds.x1 + dx,
           x2: text.AABBBounds.x2 + dx,
@@ -32592,7 +32501,7 @@
             break;
           }
           if (!hasPlace && clampForce) {
-            if (this._processClampForce(text, bmpTool, bitmap)) {
+            if (this._processClampForce(text, bmpTool, bitmap, overlapPadding)) {
               result.push(text);
               continue;
             }
@@ -54719,7 +54628,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
       animate(animationParameters, parameters) {
         return this.isAnimating = !0, this.animateElement(animationParameters, parameters), 0 === this.runnings.length && this.animationEnd(), this;
       }
-      stop(stopState) {
+      stop() {
+        let stopState = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "end";
         let invokeCallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !0;
         return this.runnings.forEach(running => running.stop(stopState)), this.animationEnd(invokeCallback), this;
       }
@@ -54914,7 +54824,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           var _a;
           element.isReserved && element.diffState !== DiffState.exit && (element.isReserved = !1);
           const prevElementState = null === (_a = this.elementRecorder.get(element)) || void 0 === _a ? void 0 : _a.prevState;
-          (this.configs.some(config => prevElementState !== element.diffState && config.state === prevElementState && config.timeline.controlOptions.stopWhenStateChange) || element.diffState === DiffState.exit) && this.clearElementAnimation(element, !1);
+          this.configs.some(config => prevElementState !== element.diffState && config.state === prevElementState && config.timeline.controlOptions.stopWhenStateChange) && this.clearElementAnimation(element, !1);
         }), this.configs.forEach(config => {
           this.animateByTimeline(config, elements, parameters);
         }), this.mark.cleanExitElements(), this;
@@ -55040,12 +54950,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             elementCount: animatedElements.length,
             elementIndex: 0
           };
-          animatedElements.forEach(element => {
-            var _a;
-            (null !== (_a = this.animators.get(config.state)) && void 0 !== _a ? _a : []).filter(animator => animator.element === element && animator.animationOptions.id === config.id).forEach(animator => {
-              animator.stop(null, !1), this.handleAnimatorEnd(animator, !1);
-            });
-          }), animatedElements.forEach((element, index) => {
+          animatedElements.forEach((element, index) => {
             animationParameters.elementIndex = index;
             const mergedParameters = Object.assign({
                 [DefaultAnimationParameters]: animationParameters
@@ -61939,7 +61844,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.12.19-alpha.0";
+    const version = "1.12.19";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -64816,17 +64721,17 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this.setMarkStyle(symbolMark, {
                 fill: this.getColorAttribute()
             }, 'normal', AttributeLevel.Series);
-            if (this._invalidType !== 'zero') {
-                this.setMarkStyle(symbolMark, {
-                    visible: this._getInvalidDefined.bind(this)
-                }, 'normal', AttributeLevel.Series);
-            }
-            this.event.on(ChartEvent.viewDataStatisticsUpdate, { filter: param => param.model === this }, () => {
-                this.encodeDefined(symbolMark, 'visible');
-            });
             this.setMarkStyle(symbolMark, {
-                x: this.dataToPositionX.bind(this),
-                y: this.dataToPositionY.bind(this),
+                x: (datum) => {
+                    return this._invalidType !== 'zero' && !this._getInvalidDefined(datum)
+                        ? Number.NaN
+                        : this.dataToPositionX(datum);
+                },
+                y: (datum) => {
+                    return this._invalidType !== 'zero' && !this._getInvalidDefined(datum)
+                        ? Number.NaN
+                        : this.dataToPositionY(datum);
+                },
                 z: this._fieldZ ? this.dataToPositionZ.bind(this) : null
             }, 'normal', AttributeLevel.Series);
         }