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

package/build/index.js

@@ -7979,11 +7979,12 @@
       for (let i = 0, len = paths.length; i < len; i++) if (currPath = paths[i], coordsStr = currPath.slice(1), commandChar = currPath[0], currCommandData = [commandChar], coordsStrArr = coordsStr.match(rePathCommand), null !== coordsStrArr) {
         for (let i = 0, len = coordsStrArr.length; i < len; i++) coordStr = coordsStrArr[i], coordNumber = parseFloat(coordStr), Number.isNaN(coordNumber) || currCommandData.push(coordNumber);
         if (standardCommandLen = commandLengths[commandChar], currCommandData.length - 1 > standardCommandLen) {
-          let subCommand;
+          let subCommand,
+            bestCommandChar = commandChar;
           for (let i = 1, len = currCommandData.length; i < len; i += standardCommandLen) {
-            subCommand = [commandChar];
+            subCommand = [bestCommandChar];
             for (let j = i, subLen = i + standardCommandLen; j < subLen; j++) subCommand.push(currCommandData[j]);
-            result.push(subCommand);
+            result.push(subCommand), "m" === bestCommandChar ? bestCommandChar = "l" : "M" === bestCommandChar && (bestCommandChar = "L");
           }
         } else result.push(currCommandData);
       } else result.push(currCommandData);
@@ -9194,6 +9195,7 @@
       zIndex: 0,
       layout: null,
       boundsPadding: 0,
+      fillStrokeOrder: 0,
       renderStyle: "default",
       pickMode: "accurate",
       customPickShape: null,
@@ -9264,6 +9266,7 @@
     });
     const DefaultPathAttribute = Object.assign(Object.assign({}, DefaultAttribute), {
       path: new CustomPath2D(),
+      fillStrokeOrder: 1,
       customPath: () => {
         Logger.getInstance().warn("空函数");
       }
@@ -10286,7 +10289,7 @@
       }
       hasSubView() {
         const viewBox = this._handler.getViewBox();
-        return !(0 === viewBox.x1 && 0 === viewBox.y1 && this.width === viewBox.width() && this.height === viewBox.height());
+        return !(0 === viewBox.x1 && 0 === viewBox.y1 && isNumberClose(this.width, viewBox.width()) && isNumberClose(this.height, viewBox.height()));
       }
       isVisible(bbox) {
         return this._handler.isVisible(bbox);
@@ -17037,7 +17040,8 @@
             fill = arcAttribute.fill,
             stroke = arcAttribute.stroke,
             x: originX = arcAttribute.x,
-            y: originY = arcAttribute.y
+            y: originY = arcAttribute.y,
+            fillStrokeOrder = arcAttribute.fillStrokeOrder
           } = arc.attribute,
           data = this.valid(arc, arcAttribute, fillCb, strokeCb);
         if (!data) return;
@@ -17073,7 +17077,17 @@
           isFullStroke: isFullStroke,
           stroke: arrayStroke
         } = parseStroke(stroke);
-        if ((doFill || isFullStroke) && (context.beginPath(), drawArcPath$1(arc, context, x, y, outerRadius, innerRadius), beforeRenderContribitionsRuned = !0, context.setShadowBlendStyle && context.setShadowBlendStyle(arc, arc.attribute, arcAttribute), this.beforeRenderStep(arc, context, x, y, doFill, doStroke, fVisible, sVisible, arcAttribute, drawContext, fillCb, strokeCb), doFill && (fillCb ? fillCb(context, arc.attribute, arcAttribute) : fVisible && (context.setCommonStyle(arc, arc.attribute, originX - x, originY - y, arcAttribute), context.fill())), doStroke && isFullStroke && (strokeCb ? strokeCb(context, arc.attribute, arcAttribute) : sVisible && (context.setStrokeStyle(arc, arc.attribute, originX - x, originY - y, arcAttribute), context.stroke()))), !isFullStroke && doStroke) {
+        if (doFill || isFullStroke) {
+          context.beginPath(), drawArcPath$1(arc, context, x, y, outerRadius, innerRadius), beforeRenderContribitionsRuned = !0, context.setShadowBlendStyle && context.setShadowBlendStyle(arc, arc.attribute, arcAttribute), this.beforeRenderStep(arc, context, x, y, doFill, doStroke, fVisible, sVisible, arcAttribute, drawContext, fillCb, strokeCb);
+          const _runFill = () => {
+              doFill && (fillCb ? fillCb(context, arc.attribute, arcAttribute) : fVisible && (context.setCommonStyle(arc, arc.attribute, originX - x, originY - y, arcAttribute), context.fill()));
+            },
+            _runStroke = () => {
+              doStroke && isFullStroke && (strokeCb ? strokeCb(context, arc.attribute, arcAttribute) : sVisible && (context.setStrokeStyle(arc, arc.attribute, originX - x, originY - y, arcAttribute), context.stroke()));
+            };
+          fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke());
+        }
+        if (!isFullStroke && doStroke) {
           context.beginPath();
           drawArcPath$1(arc, context, x, y, outerRadius, innerRadius, arrayStroke);
           beforeRenderContribitionsRuned || this.beforeRenderStep(arc, context, x, y, doFill, doStroke, fVisible, sVisible, arcAttribute, drawContext, fillCb, strokeCb), strokeCb ? strokeCb(context, arc.attribute, arcAttribute) : sVisible && (context.setStrokeStyle(arc, arc.attribute, x, y, arcAttribute), context.stroke());
@@ -17091,14 +17105,20 @@
                 fill = arcAttribute.fill
               } = arc.attribute,
               startAngle = endAngle;
-            if (this.drawArcTailCapPath(arc, context, x, y, outerRadius, innerRadius, startAngle, startAngle + capAngle), beforeRenderContribitionsRuned || this.beforeRenderStep(arc, context, x, y, doFill, doStroke, fVisible, sVisible, arcAttribute, drawContext, fillCb, strokeCb), doFill) {
-              const color = fill;
-              if ("conical" === color.gradient) {
-                const lastColor = getConicGradientAt(0, 0, endAngle, color);
-                fillCb || fillVisible && (context.setCommonStyle(arc, arc.attribute, x, y, arcAttribute), context.fillStyle = lastColor, context.fill());
-              }
-            }
-            doStroke && (strokeCb || sVisible && (context.setStrokeStyle(arc, arc.attribute, x, y, arcAttribute), context.stroke()));
+            this.drawArcTailCapPath(arc, context, x, y, outerRadius, innerRadius, startAngle, startAngle + capAngle), beforeRenderContribitionsRuned || this.beforeRenderStep(arc, context, x, y, doFill, doStroke, fVisible, sVisible, arcAttribute, drawContext, fillCb, strokeCb);
+            const _runFill = () => {
+                if (doFill) {
+                  const color = fill;
+                  if ("conical" === color.gradient) {
+                    const lastColor = getConicGradientAt(0, 0, endAngle, color);
+                    fillCb || fillVisible && (context.setCommonStyle(arc, arc.attribute, x, y, arcAttribute), context.fillStyle = lastColor, context.fill());
+                  }
+                }
+              },
+              _runStroke = () => {
+                doStroke && (strokeCb || sVisible && (context.setStrokeStyle(arc, arc.attribute, x, y, arcAttribute), context.stroke()));
+              };
+            _runFill(), _runStroke();
           }
         }
         this.afterRenderStep(arc, context, x, y, doFill, doStroke, fVisible, sVisible, arcAttribute, drawContext, fillCb, strokeCb), tempChangeConicalColor && (fill.startAngle += conicalOffset, fill.endAngle += conicalOffset);
@@ -17136,7 +17156,8 @@
             startAngle = circleAttribute.startAngle,
             endAngle = circleAttribute.endAngle,
             x: originX = circleAttribute.x,
-            y: originY = circleAttribute.y
+            y: originY = circleAttribute.y,
+            fillStrokeOrder = circleAttribute.fillStrokeOrder
           } = circle.attribute,
           data = this.valid(circle, circleAttribute, fillCb, strokeCb);
         if (!data) return;
@@ -17146,7 +17167,14 @@
           doFill: doFill,
           doStroke: doStroke
         } = data;
-        context.beginPath(), context.arc(x, y, radius, startAngle, endAngle), context.closePath(), context.setShadowBlendStyle && context.setShadowBlendStyle(circle, circle.attribute, circleAttribute), this.beforeRenderStep(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, drawContext, fillCb, strokeCb), doFill && (fillCb ? fillCb(context, circle.attribute, circleAttribute) : fVisible && (context.setCommonStyle(circle, circle.attribute, originX - x, originY - y, circleAttribute), context.fill())), doStroke && (strokeCb ? strokeCb(context, circle.attribute, circleAttribute) : sVisible && (context.setStrokeStyle(circle, circle.attribute, originX - x, originY - y, circleAttribute), context.stroke())), this.afterRenderStep(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, drawContext, fillCb, strokeCb);
+        context.beginPath(), context.arc(x, y, radius, startAngle, endAngle), context.closePath(), context.setShadowBlendStyle && context.setShadowBlendStyle(circle, circle.attribute, circleAttribute), this.beforeRenderStep(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, drawContext, fillCb, strokeCb);
+        const _runFill = () => {
+            doFill && (fillCb ? fillCb(context, circle.attribute, circleAttribute) : fVisible && (context.setCommonStyle(circle, circle.attribute, originX - x, originY - y, circleAttribute), context.fill()));
+          },
+          _runStroke = () => {
+            doStroke && (strokeCb ? strokeCb(context, circle.attribute, circleAttribute) : sVisible && (context.setStrokeStyle(circle, circle.attribute, originX - x, originY - y, circleAttribute), context.stroke()));
+          };
+        fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, drawContext, fillCb, strokeCb);
       }
       draw(circle, renderService, drawContext, params) {
         const circleAttribute = getTheme$1(circle, null == params ? void 0 : params.theme).circle;
@@ -17587,7 +17615,7 @@
         super(), this.areaRenderContribitions = areaRenderContribitions, this.numberType = AREA_NUMBER_TYPE, this.builtinContributions = [defaultAreaTextureRenderContribution, defaultAreaBackgroundRenderContribution], this.init(areaRenderContribitions);
       }
       drawLinearAreaHighPerformance(area, context, fill, stroke, fillOpacity, strokeOpacity, offsetX, offsetY, areaAttribute, drawContext, params, fillCb, strokeCb) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         const {
           points: points
         } = area.attribute;
@@ -17611,28 +17639,31 @@
           x: originX = 0,
           x: originY = 0
         } = area.attribute;
-        if (!1 !== fill && (fillCb ? fillCb(context, area.attribute, areaAttribute) : fillOpacity && (context.setCommonStyle(area, area.attribute, originX - offsetX, originY - offsetY, areaAttribute), context.fill())), this.afterRenderStep(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, areaAttribute, drawContext, fillCb, null, {
+        !1 !== fill && (fillCb ? fillCb(context, area.attribute, areaAttribute) : fillOpacity && (context.setCommonStyle(area, area.attribute, originX - offsetX, originY - offsetY, areaAttribute), context.fill())), this.afterRenderStep(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, areaAttribute, drawContext, fillCb, null, {
           attribute: area.attribute
-        }), stroke) {
-          const {
-            stroke = areaAttribute && areaAttribute.stroke
-          } = area.attribute;
-          if (isArray$1(stroke) && (stroke[0] || stroke[2]) && !1 === stroke[1]) if (context.beginPath(), stroke[0]) {
-            context.moveTo(startP.x + offsetX, startP.y + offsetY, z);
-            for (let i = 1; i < points.length; i++) {
-              const p = points[i];
-              context.lineTo(p.x + offsetX, p.y + offsetY, z);
-            }
-          } else if (stroke[2]) {
-            const endP = points[points.length - 1];
-            context.moveTo(endP.x + offsetX, endP.y + offsetY, z);
-            for (let i = points.length - 2; i >= 0; i--) {
-              const p = points[i];
-              context.lineTo((null !== (_d = p.x1) && void 0 !== _d ? _d : p.x) + offsetX, (null !== (_e = p.y1) && void 0 !== _e ? _e : p.y) + offsetY, z);
+        }), (() => {
+          var _a, _b;
+          if (stroke) {
+            const {
+              stroke = areaAttribute && areaAttribute.stroke
+            } = area.attribute;
+            if (isArray$1(stroke) && (stroke[0] || stroke[2]) && !1 === stroke[1]) if (context.beginPath(), stroke[0]) {
+              context.moveTo(startP.x + offsetX, startP.y + offsetY, z);
+              for (let i = 1; i < points.length; i++) {
+                const p = points[i];
+                context.lineTo(p.x + offsetX, p.y + offsetY, z);
+              }
+            } else if (stroke[2]) {
+              const endP = points[points.length - 1];
+              context.moveTo(endP.x + offsetX, endP.y + offsetY, z);
+              for (let i = points.length - 2; i >= 0; i--) {
+                const p = points[i];
+                context.lineTo((null !== (_a = p.x1) && void 0 !== _a ? _a : p.x) + offsetX, (null !== (_b = p.y1) && void 0 !== _b ? _b : p.y) + offsetY, z);
+              }
             }
+            strokeCb ? strokeCb(context, area.attribute, areaAttribute) : (context.setStrokeStyle(area, area.attribute, originX - offsetX, originY - offsetY, areaAttribute), context.stroke());
           }
-          strokeCb ? strokeCb(context, area.attribute, areaAttribute) : (context.setStrokeStyle(area, area.attribute, originX - offsetX, originY - offsetY, areaAttribute), context.stroke());
-        }
+        })();
       }
       drawShape(area, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a, _b, _c, _d, _e, _f;
@@ -17797,23 +17828,24 @@
           x: originX = 0,
           x: originY = 0
         } = attribute;
-        if (!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, 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, {
           attribute: attribute
-        }), !1 !== stroke) if (strokeCb) strokeCb(context, attribute, defaultAttribute);else {
-          const {
-            stroke = defaultAttribute && defaultAttribute[1] && defaultAttribute[1].stroke
-          } = attribute;
-          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();
-        }
-        return !1;
+        }), (() => {
+          if (!1 !== stroke) if (strokeCb) strokeCb(context, attribute, defaultAttribute);else {
+            const {
+              stroke = defaultAttribute && defaultAttribute[1] && defaultAttribute[1].stroke
+            } = attribute;
+            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();
+          }
+        })(), !1;
       }
     };
     DefaultCanvasAreaRender = __decorate$1o([injectable(), __param$I(0, inject(ContributionProvider)), __param$I(0, named(AreaRenderContribution)), __metadata$13("design:paramtypes", [Object])], DefaultCanvasAreaRender);
@@ -17845,7 +17877,8 @@
         const pathAttribute = null !== (_a = this.tempTheme) && void 0 !== _a ? _a : getTheme$1(path, null == params ? void 0 : params.theme).path,
           {
             x: originX = pathAttribute.x,
-            y: originY = pathAttribute.y
+            y: originY = pathAttribute.y,
+            fillStrokeOrder = pathAttribute.fillStrokeOrder
           } = path.attribute,
           z = null !== (_b = this.z) && void 0 !== _b ? _b : 0,
           data = this.valid(path, pathAttribute, fillCb, strokeCb);
@@ -17860,7 +17893,14 @@
           const path2D = null !== (_c = path.attribute.path) && void 0 !== _c ? _c : pathAttribute.path;
           renderCommandList(path2D.commandList, context, x, y, 1, 1, z);
         }
-        context.setShadowBlendStyle && context.setShadowBlendStyle(path, path.attribute, pathAttribute), this.beforeRenderStep(path, context, x, y, doFill, doStroke, fVisible, sVisible, pathAttribute, drawContext, fillCb, strokeCb), doStroke && (strokeCb ? strokeCb(context, path.attribute, pathAttribute) : sVisible && (context.setStrokeStyle(path, path.attribute, originX - x, originY - y, pathAttribute), context.stroke())), doFill && (fillCb ? fillCb(context, path.attribute, pathAttribute) : fVisible && (context.setCommonStyle(path, path.attribute, originX - x, originY - y, pathAttribute), context.fill())), this.afterRenderStep(path, context, x, y, doFill, doStroke, fVisible, sVisible, pathAttribute, drawContext, fillCb, strokeCb);
+        context.setShadowBlendStyle && context.setShadowBlendStyle(path, path.attribute, pathAttribute), this.beforeRenderStep(path, context, x, y, doFill, doStroke, fVisible, sVisible, pathAttribute, drawContext, fillCb, strokeCb);
+        const _runStroke = () => {
+            doStroke && (strokeCb ? strokeCb(context, path.attribute, pathAttribute) : sVisible && (context.setStrokeStyle(path, path.attribute, originX - x, originY - y, pathAttribute), context.stroke()));
+          },
+          _runFill = () => {
+            doFill && (fillCb ? fillCb(context, path.attribute, pathAttribute) : fVisible && (context.setCommonStyle(path, path.attribute, originX - x, originY - y, pathAttribute), context.fill()));
+          };
+        fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(path, context, x, y, doFill, doStroke, fVisible, sVisible, pathAttribute, drawContext, fillCb, strokeCb);
       }
       draw(path, renderService, drawContext, params) {
         const pathAttribute = getTheme$1(path, null == params ? void 0 : params.theme).path;
@@ -17904,7 +17944,8 @@
             x1: x1,
             y1: y1,
             x: originX = rectAttribute.x,
-            y: originY = rectAttribute.y
+            y: originY = rectAttribute.y,
+            fillStrokeOrder = rectAttribute.fillStrokeOrder
           } = rect.attribute;
         let {
           width: width,
@@ -17923,7 +17964,14 @@
           doFill: doFill,
           doStroke: doStroke
         };
-        context.setShadowBlendStyle && context.setShadowBlendStyle(rect, rect.attribute, rectAttribute), this.beforeRenderStep(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb, doFillOrStroke), doFillOrStroke.doFill && (fillCb ? fillCb(context, rect.attribute, rectAttribute) : fVisible && (context.setCommonStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute), context.fill())), doFillOrStroke.doStroke && (strokeCb ? strokeCb(context, rect.attribute, rectAttribute) : sVisible && (context.setStrokeStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute), context.stroke())), this.afterRenderStep(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
+        context.setShadowBlendStyle && context.setShadowBlendStyle(rect, rect.attribute, rectAttribute), this.beforeRenderStep(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb, doFillOrStroke);
+        const _runFill = () => {
+            doFillOrStroke.doFill && (fillCb ? fillCb(context, rect.attribute, rectAttribute) : fVisible && (context.setCommonStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute), context.fill()));
+          },
+          _runStroke = () => {
+            doFillOrStroke.doStroke && (strokeCb ? strokeCb(context, rect.attribute, rectAttribute) : sVisible && (context.setStrokeStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute), context.stroke()));
+          };
+        fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
       }
       draw(rect, renderService, drawContext, params) {
         const rectAttribute = getTheme$1(rect, null == params ? void 0 : params.theme).rect;
@@ -17959,7 +18007,8 @@
             x: originX = symbolAttribute.x,
             y: originY = symbolAttribute.y,
             scaleX = symbolAttribute.scaleX,
-            scaleY = symbolAttribute.scaleY
+            scaleY = symbolAttribute.scaleY,
+            fillStrokeOrder = symbolAttribute.fillStrokeOrder
           } = symbol.attribute,
           data = this.valid(symbol, symbolAttribute, fillCb, strokeCb);
         if (!data) return;
@@ -17982,14 +18031,27 @@
             const obj = Object.assign({}, a);
             obj.fill = null !== (_a = a.fill) && void 0 !== _a ? _a : symbol.attribute.fill, obj.opacity = null !== (_b = a.opacity) && void 0 !== _b ? _b : symbol.attribute.opacity, obj.fillOpacity = symbol.attribute.fillOpacity, obj.stroke = null !== (_c = a.stroke) && void 0 !== _c ? _c : symbol.attribute.stroke, a = obj;
           }
-          a.fill && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : (context.setCommonStyle(symbol, a, originX - x, originY - y, symbolAttribute), context.fill())), a.stroke && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : (context.setStrokeStyle(symbol, a, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute), context.stroke()));
+          const _runFill = () => {
+              a.fill && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : (context.setCommonStyle(symbol, a, originX - x, originY - y, symbolAttribute), context.fill()));
+            },
+            _runStroke = () => {
+              a.stroke && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : (context.setStrokeStyle(symbol, a, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute), context.stroke()));
+            };
+          fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke());
         };
         if (keepDirIn3d && context.camera && context.project) {
           const p = context.project(x, y, z),
             camera = context.camera;
           context.camera = null, !1 === parsedPath.draw(context, isArray$1(size) ? [size[0] * scaleX, size[1] * scaleY] : size * scaleX, p.x, p.y, void 0, callback) && context.closePath(), context.camera = camera;
         } else !1 === parsedPath.draw(context, size, x, y, z, callback) && context.closePath();
-        context.setShadowBlendStyle && context.setShadowBlendStyle(symbol, symbol.attribute, symbolAttribute), this.beforeRenderStep(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, drawContext, fillCb, strokeCb), doFill && !parsedPath.isSvg && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : fVisible && (context.setCommonStyle(symbol, symbol.attribute, originX - x, originY - y, symbolAttribute), context.fill())), doStroke && !parsedPath.isSvg && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : sVisible && (context.setStrokeStyle(symbol, symbol.attribute, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute), context.stroke())), this.afterRenderStep(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, drawContext, fillCb, strokeCb);
+        context.setShadowBlendStyle && context.setShadowBlendStyle(symbol, symbol.attribute, symbolAttribute), this.beforeRenderStep(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, drawContext, fillCb, strokeCb);
+        const _runFill = () => {
+            doFill && !parsedPath.isSvg && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : fVisible && (context.setCommonStyle(symbol, symbol.attribute, originX - x, originY - y, symbolAttribute), context.fill()));
+          },
+          _runStroke = () => {
+            doStroke && !parsedPath.isSvg && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : sVisible && (context.setStrokeStyle(symbol, symbol.attribute, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute), context.stroke()));
+          };
+        fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, drawContext, fillCb, strokeCb);
       }
       draw(symbol, renderService, drawContext, params) {
         const symbolAttribute = getTheme$1(symbol, null == params ? void 0 : params.theme).symbol;
@@ -18366,7 +18428,8 @@
             cornerRadius = polygonAttribute.cornerRadius,
             x: originX = polygonAttribute.x,
             y: originY = polygonAttribute.y,
-            closePath = polygonAttribute.closePath
+            closePath = polygonAttribute.closePath,
+            fillStrokeOrder = polygonAttribute.fillStrokeOrder
           } = polygon.attribute,
           data = this.valid(polygon, polygonAttribute, fillCb, strokeCb);
         if (!data) return;
@@ -18376,7 +18439,14 @@
           doFill: doFill,
           doStroke: doStroke
         } = data;
-        context.beginPath(), cornerRadius <= 0 || isArray$1(cornerRadius) && cornerRadius.every(num => 0 === num) ? drawPolygon(context.camera ? context : context.nativeContext, points, x, y) : drawRoundedPolygon(context.camera ? context : context.nativeContext, points, x, y, cornerRadius, closePath), closePath && context.closePath(), context.setShadowBlendStyle && context.setShadowBlendStyle(polygon, polygon.attribute, polygonAttribute), this.beforeRenderStep(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, drawContext, fillCb, strokeCb), doFill && (fillCb ? fillCb(context, polygon.attribute, polygonAttribute) : fVisible && (context.setCommonStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute), context.fill())), doStroke && (strokeCb ? strokeCb(context, polygon.attribute, polygonAttribute) : sVisible && (context.setStrokeStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute), context.stroke())), this.afterRenderStep(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, drawContext, fillCb, strokeCb);
+        context.beginPath(), cornerRadius <= 0 || isArray$1(cornerRadius) && cornerRadius.every(num => 0 === num) ? drawPolygon(context.camera ? context : context.nativeContext, points, x, y) : drawRoundedPolygon(context.camera ? context : context.nativeContext, points, x, y, cornerRadius, closePath), closePath && context.closePath(), context.setShadowBlendStyle && context.setShadowBlendStyle(polygon, polygon.attribute, polygonAttribute), this.beforeRenderStep(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, drawContext, fillCb, strokeCb);
+        const _runFill = () => {
+            doFill && (fillCb ? fillCb(context, polygon.attribute, polygonAttribute) : fVisible && (context.setCommonStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute), context.fill()));
+          },
+          _runStroke = () => {
+            doStroke && (strokeCb ? strokeCb(context, polygon.attribute, polygonAttribute) : sVisible && (context.setStrokeStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute), context.stroke()));
+          };
+        fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, drawContext, fillCb, strokeCb);
       }
       draw(polygon, renderService, drawContext, params) {
         const polygonAttribute = getTheme$1(polygon, null == params ? void 0 : params.theme).polygon;
@@ -18419,7 +18489,8 @@
             cornerRadius = groupAttribute.cornerRadius,
             path = groupAttribute.path,
             lineWidth = groupAttribute.lineWidth,
-            visible = groupAttribute.visible
+            visible = groupAttribute.visible,
+            fillStrokeOrder = groupAttribute.fillStrokeOrder
           } = group.attribute,
           fVisible = rectFillVisible(opacity, fillOpacity, width, height, fill),
           sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height),
@@ -18445,7 +18516,14 @@
         };
         this._groupRenderContribitions.forEach(c => {
           c.time === BaseRenderContributionTime.beforeFillStroke && c.drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb, doFillOrStroke);
-        }), clip && context.clip(), context.setShadowBlendStyle && context.setShadowBlendStyle(group, group.attribute, groupAttribute), doFillOrStroke.doFill && (fillCb ? fillCb(context, group.attribute, groupAttribute) : fVisible && (context.setCommonStyle(group, group.attribute, x, y, groupAttribute), context.fill())), doFillOrStroke.doStroke && (strokeCb ? strokeCb(context, group.attribute, groupAttribute) : sVisible && (context.setStrokeStyle(group, group.attribute, x, y, groupAttribute), context.stroke())), this._groupRenderContribitions.forEach(c => {
+        }), clip && context.clip(), context.setShadowBlendStyle && context.setShadowBlendStyle(group, group.attribute, groupAttribute);
+        const _runFill = () => {
+            doFillOrStroke.doFill && (fillCb ? fillCb(context, group.attribute, groupAttribute) : fVisible && (context.setCommonStyle(group, group.attribute, x, y, groupAttribute), context.fill()));
+          },
+          _runStroke = () => {
+            doFillOrStroke.doStroke && (strokeCb ? strokeCb(context, group.attribute, groupAttribute) : sVisible && (context.setStrokeStyle(group, group.attribute, x, y, groupAttribute), context.stroke()));
+          };
+        fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this._groupRenderContribitions.forEach(c => {
           c.time === BaseRenderContributionTime.afterFillStroke && c.drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb);
         });
       }
@@ -18511,6 +18589,7 @@
             x: originX = imageAttribute.x,
             y: originY = imageAttribute.y,
             cornerRadius = imageAttribute.cornerRadius,
+            fillStrokeOrder = imageAttribute.fillStrokeOrder,
             image: url
           } = image.attribute,
           data = this.valid(image, imageAttribute, fillCb);
@@ -18521,20 +18600,26 @@
           doFill: doFill,
           doStroke: doStroke
         } = data;
-        if (context.setShadowBlendStyle && context.setShadowBlendStyle(image, imageAttribute), this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb), doFill) if (fillCb) fillCb(context, image.attribute, imageAttribute);else if (fVisible) {
-          if (!url || !image.resources) return;
-          const res = image.resources.get(url);
-          if ("success" !== res.state) return;
-          let needRestore = !1;
-          0 === cornerRadius || isArray$1(cornerRadius) && cornerRadius.every(num => 0 === num) || (context.beginPath(), createRectPath(context, x, y, width, height, cornerRadius), context.save(), context.clip(), needRestore = !0), context.setCommonStyle(image, image.attribute, x, y, imageAttribute);
-          let repeat = 0;
-          if ("repeat" === repeatX && (repeat |= 1), "repeat" === repeatY && (repeat |= 2), repeat) {
-            const pattern = context.createPattern(res.data, repeatStr[repeat]);
-            context.fillStyle = pattern, context.translate(x, y, !0), context.fillRect(0, 0, width, height), context.translate(-x, -y, !0);
-          } else context.drawImage(res.data, x, y, width, height);
-          needRestore && context.restore();
-        }
-        doStroke && (strokeCb ? strokeCb(context, image.attribute, imageAttribute) : sVisible && (context.setStrokeStyle(image, image.attribute, originX - x, originY - y, imageAttribute), context.stroke())), this.afterRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
+        context.setShadowBlendStyle && context.setShadowBlendStyle(image, imageAttribute), this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
+        const _runFill = () => {
+            if (doFill) if (fillCb) fillCb(context, image.attribute, imageAttribute);else if (fVisible) {
+              if (!url || !image.resources) return;
+              const res = image.resources.get(url);
+              if ("success" !== res.state) return;
+              let needRestore = !1;
+              0 === cornerRadius || isArray$1(cornerRadius) && cornerRadius.every(num => 0 === num) || (context.beginPath(), createRectPath(context, x, y, width, height, cornerRadius), context.save(), context.clip(), needRestore = !0), context.setCommonStyle(image, image.attribute, x, y, imageAttribute);
+              let repeat = 0;
+              if ("repeat" === repeatX && (repeat |= 1), "repeat" === repeatY && (repeat |= 2), repeat) {
+                const pattern = context.createPattern(res.data, repeatStr[repeat]);
+                context.fillStyle = pattern, context.translate(x, y, !0), context.fillRect(0, 0, width, height), context.translate(-x, -y, !0);
+              } else context.drawImage(res.data, x, y, width, height);
+              needRestore && context.restore();
+            }
+          },
+          _runStroke = () => {
+            doStroke && (strokeCb ? strokeCb(context, image.attribute, imageAttribute) : sVisible && (context.setStrokeStyle(image, image.attribute, originX - x, originY - y, imageAttribute), context.stroke()));
+          };
+        fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
       }
       draw(image, renderService, drawContext) {
         const {
@@ -31535,27 +31620,27 @@
         scale = _ => ~~(_ / ratio);
       return scale.bitmap = () => bitmap(w, h), scale.x = _ => ~~((_ + left) / ratio), scale.y = _ => ~~((_ + top) / ratio), scale.ratio = ratio, scale.padding = padding, scale.width = width, scale.height = height, scale;
     }
+    function clampRangeByBitmap($, range) {
+      const {
+          x1: x1,
+          x2: x2,
+          y1: y1,
+          y2: y2
+        } = range,
+        _x1 = clamp$1(x1, 0, $.width),
+        _x2 = clamp$1(x2, 0, $.width),
+        _y1 = clamp$1(y1, 0, $.height),
+        _y2 = clamp$1(y2, 0, $.height);
+      return {
+        x1: $.x(_x1),
+        x2: $.x(_x2),
+        y1: $.y(_y1),
+        y2: $.y(_y2)
+      };
+    }
     function boundToRange($, bound) {
       let clamp = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : !1;
-      if (clamp) {
-        const {
-            x1: x1,
-            x2: x2,
-            y1: y1,
-            y2: y2
-          } = bound,
-          _x1 = clamp$1(x1, 0, $.width),
-          _x2 = clamp$1(x2, 0, $.width),
-          _y1 = clamp$1(y1, 0, $.height),
-          _y2 = clamp$1(y2, 0, $.height);
-        return {
-          x1: $.x(_x1),
-          x2: $.x(_x2),
-          y1: $.y(_y1),
-          y2: $.y(_y2)
-        };
-      }
-      return {
+      return clamp ? clampRangeByBitmap($, bound) : {
         x1: $.x(bound.x1),
         x2: $.x(bound.x2),
         y1: $.y(bound.y1),
@@ -31573,7 +31658,8 @@
         y1: bound.y1 - pad,
         y2: bound.y2 + pad
       }), range = boundToRange($, range);
-      return !(checkBound && bitmap.outOfBounds(range)) && !bitmap.getRange(range);
+      const outOfBounds = bitmap.outOfBounds(range);
+      return (!checkBound || !outOfBounds) && (outOfBounds && (range = clampRangeByBitmap($, range)), !bitmap.getRange(range));
     }
     function placeToCandidates($, bitmap, text) {
       let candidates = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
@@ -31926,6 +32012,73 @@
       registerGroup(), registerText(), registerRichtext(), registerLine();
     }
 
+    function shiftY(texts) {
+      let option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      const {
+          maxIterations = 10,
+          maxError = .1,
+          padding = 1,
+          maxY = Number.MAX_VALUE
+        } = option,
+        n = texts.length;
+      if (n <= 1) return texts;
+      const isIntersect = (_ref, _ref2) => {
+          let [a, b] = _ref;
+          let [c, d] = _ref2;
+          return d > a && b > c;
+        },
+        textInformation = new Map(),
+        getY0 = text => textInformation.get(text).y0,
+        getY = text => textInformation.get(text).y,
+        getHeight = text => textInformation.get(text).height,
+        getX1 = text => textInformation.get(text).x1,
+        getX2 = text => textInformation.get(text).x2,
+        setY = (text, y) => {
+          textInformation.get(text).y = y;
+        };
+      for (const text of texts) {
+        const {
+          y1: y1,
+          y2: y2,
+          x1: x1,
+          x2: x2
+        } = text.AABBBounds;
+        textInformation.set(text, {
+          y0: y1,
+          y: y1,
+          height: y2 - y1,
+          x1: x1,
+          x2: x2
+        });
+      }
+      for (let iter = 0; iter < maxIterations; iter++) {
+        texts.sort((a, b) => getY(a) - getY(b));
+        let error = 0;
+        for (let i = 0; i < n - 1; i++) {
+          const curText = texts[i];
+          let nextText,
+            j = i + 1;
+          for (; (nextText = texts[j]) && !isIntersect([getX1(curText), getX2(curText)], [getX1(nextText), getX2(nextText)]);) j += 1;
+          if (nextText) {
+            const y0 = getY(curText),
+              h0 = getHeight(curText),
+              y1 = getY(nextText),
+              delta = y1 - (y0 + h0);
+            if (delta < padding) {
+              const newDelta = (padding - delta) / 2;
+              error = Math.max(error, newDelta), y1 + newDelta + getHeight(nextText) > maxY ? setY(curText, y0 - (padding - delta)) : y0 - newDelta < 0 ? setY(nextText, y1 + (padding - delta)) : (setY(curText, y0 - newDelta), setY(nextText, y1 + newDelta));
+            }
+          }
+        }
+        if (error < maxError) break;
+      }
+      for (const text of texts) {
+        const finalY = text.attribute.y + getY(text) - getY0(text);
+        text.setAttribute("y", finalY);
+      }
+      return texts;
+    }
+
     var __rest$b = undefined && undefined.__rest || function (s, e) {
       var t = {};
       for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0 && (t[p] = s[p]);
@@ -32132,16 +32285,57 @@
         return texts;
       }
       _overlapping(labels) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         if (0 === labels.length) return [];
         const option = isObject$2(this.attribute.overlap) ? this.attribute.overlap : {},
-          result = [],
           baseMarkGroup = this.getBaseMarkGroup(),
           size = null !== (_a = option.size) && void 0 !== _a ? _a : {
             width: null !== (_b = null == baseMarkGroup ? void 0 : baseMarkGroup.AABBBounds.width()) && void 0 !== _b ? _b : 0,
             height: null !== (_c = null == baseMarkGroup ? void 0 : baseMarkGroup.AABBBounds.height()) && void 0 !== _c ? _c : 0
           };
         if (0 === size.width || 0 === size.height) return labels;
+        const {
+            strategy: strategy,
+            priority: priority
+          } = option,
+          bmpTool = this._bmpTool || bitmapTool(size.width, size.height),
+          bitmap = this._bitmap || bmpTool.bitmap();
+        return priority && (labels = labels.sort((a, b) => priority(b.attribute.data) - priority(a.attribute.data))), "shiftY" === (null == strategy ? void 0 : strategy.type) ? this._overlapGlobal(labels, option, bmpTool, bitmap) : this._overlapByStrategy(labels, option, bmpTool, bitmap);
+      }
+      _overlapGlobal(labels, option, bmpTool, bitmap) {
+        let result = labels.filter(label => label.attribute.visible && 0 !== label.attribute.opacity);
+        const {
+          clampForce = !0,
+          hideOnHit = !0,
+          overlapPadding: overlapPadding,
+          strategy: strategy
+        } = option;
+        if (clampForce) for (let i = 0; i < result.length; i++) {
+          const text = labels[i],
+            {
+              dx = 0,
+              dy = 0
+            } = clampText(text, bmpTool.width, bmpTool.height);
+          0 === dx && 0 === dy || text.setAttributes({
+            x: text.attribute.x + dx,
+            y: text.attribute.y + dy
+          });
+        }
+        result = shiftY(result, Object.assign({
+          maxY: bmpTool.height
+        }, strategy));
+        for (let i = 0; i < result.length; i++) {
+          const text = result[i],
+            bounds = text.AABBBounds,
+            range = boundToRange(bmpTool, bounds, !0);
+          canPlace(bmpTool, bitmap, bounds, clampForce, overlapPadding) ? bitmap.setRange(range) : hideOnHit ? text.setAttributes({
+            visible: !1
+          }) : bitmap.setRange(range);
+        }
+        return result;
+      }
+      _overlapByStrategy(labels, option, bmpTool, bitmap) {
+        var _a;
         const {
             avoidBaseMark: avoidBaseMark,
             strategy = [],
@@ -32150,10 +32344,9 @@
             avoidMarks = [],
             overlapPadding: overlapPadding
           } = option,
-          bmpTool = this._bmpTool || bitmapTool(size.width, size.height),
-          bitmap = this._bitmap || bmpTool.bitmap(),
+          result = [],
           checkBounds = strategy.some(s => "bound" === s.type);
-        avoidBaseMark && (null === (_d = this._baseMarks) || void 0 === _d || _d.forEach(mark => {
+        avoidBaseMark && (null === (_a = this._baseMarks) || void 0 === _a || _a.forEach(mark => {
           mark.AABBBounds && bitmap.setRange(boundToRange(bmpTool, mark.AABBBounds, !0));
         })), avoidMarks.length > 0 && avoidMarks.forEach(avoid => {
           isString$1(avoid) ? getNoneGroupMarksByName(this.getRootNode(), avoid).forEach(avoidMark => {
@@ -32161,7 +32354,7 @@
           }) : avoid.AABBBounds && bitmap.setRange(boundToRange(bmpTool, avoid.AABBBounds, !0));
         });
         for (let i = 0; i < labels.length; i++) {
-          if (!1 === labels[i].visible) continue;
+          if (!1 === labels[i].attribute.visible) continue;
           const text = labels[i],
             baseMark = this.getRelatedGraphic(text.attribute);
           if (text.update(), !isRectIntersect(baseMark.AABBBounds, {
@@ -34042,12 +34235,15 @@
         do {
           items = reduce(items, sep);
         } while (items.length >= 3 && hasOverlap$1(items, sep));
-        const shouldCheck = (length, visibility) => length < 3 || visibility,
-          checkFirst = shouldCheck(items.length, config.firstVisible);
+        const shouldCheck = function (length, visibility) {
+            let checkLength = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : !0;
+            return checkLength && length < 3 || visibility;
+          },
+          checkFirst = shouldCheck(items.length, config.firstVisible, !1);
         let checkLast = shouldCheck(items.length, config.lastVisible);
         const firstSourceItem = source[0],
           lastSourceItem = last(source);
-        textIntersect(firstSourceItem, lastSourceItem, sep) && (lastSourceItem.setAttribute("opacity", 0), checkLast = !1), forceItemVisible$1(firstSourceItem, items, checkFirst, item => textIntersect(item, firstSourceItem, sep)), forceItemVisible$1(lastSourceItem, items, checkLast, item => textIntersect(item, lastSourceItem, sep) || !(!checkFirst || item === firstSourceItem) && textIntersect(item, firstSourceItem, sep), !0);
+        textIntersect(firstSourceItem, lastSourceItem, sep) && checkFirst && checkLast && (lastSourceItem.setAttribute("opacity", 0), checkLast = !1), forceItemVisible$1(firstSourceItem, items, checkFirst, item => textIntersect(item, firstSourceItem, sep)), forceItemVisible$1(lastSourceItem, items, checkLast, item => textIntersect(item, lastSourceItem, sep) || !(!checkFirst || item === firstSourceItem) && textIntersect(item, firstSourceItem, sep), !0);
       }
       source.forEach(item => {
         item.setAttribute("visible", !!item.attribute.opacity);
@@ -36271,10 +36467,9 @@
           lastSourceItem = last(source),
           samplingMethod = breakData && breakData() ? methods$1.greedy : methods$1.parity;
         for (; items.length >= 3 && hasOverlap$1(items, labelGap);) items = samplingMethod(items, labelGap);
-        const shouldCheck = (length, visibility) => length < 3 || visibility,
-          checkFirst = shouldCheck(items.length, op.labelFirstVisible);
-        let checkLast = shouldCheck(items.length, op.labelLastVisible);
-        textIntersect(firstSourceItem, lastSourceItem, labelGap) && items.includes(lastSourceItem) && items.length > 1 && (items.splice(items.indexOf(lastSourceItem), 1), checkLast = !1), forceItemVisible(firstSourceItem, items, checkFirst, item => textIntersect(item, firstSourceItem, labelGap)), forceItemVisible(lastSourceItem, items, checkLast, item => textIntersect(item, lastSourceItem, labelGap) || !(!checkFirst || item === firstSourceItem) && textIntersect(item, firstSourceItem, labelGap), !0);
+        const checkFirst = op.labelFirstVisible;
+        let checkLast = op.labelLastVisible;
+        textIntersect(firstSourceItem, lastSourceItem, labelGap) && items.includes(lastSourceItem) && items.length > 1 && checkFirst && checkLast && (items.splice(items.indexOf(lastSourceItem), 1), checkLast = !1), forceItemVisible(firstSourceItem, items, checkFirst, item => textIntersect(item, firstSourceItem, labelGap)), forceItemVisible(lastSourceItem, items, checkLast, item => textIntersect(item, lastSourceItem, labelGap) || !(!checkFirst || item === firstSourceItem) && textIntersect(item, firstSourceItem, labelGap), !0);
         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;
       }
@@ -47310,7 +47505,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
           Object.keys(nextGraphicAttributes).forEach(channel => {
             prevGraphicAttributes[channel] = this.getGraphicAttribute(channel), finalGraphicAttributes[channel] = nextGraphicAttributes[channel];
           }), this.setNextGraphicAttributes(nextGraphicAttributes), this.setPrevGraphicAttributes(prevGraphicAttributes), this.setFinalGraphicAttributes(finalGraphicAttributes);
-          const animateGraphicAttributes = ((null === (_c = this.mark.animate) || void 0 === _c ? void 0 : _c.getElementAnimators(this)) || []).reduce((attributes, animator) => Object.assign(attributes, animator.getEndAttributes()), {}),
+          const currentAnimators = null === (_c = this.mark.animate) || void 0 === _c ? void 0 : _c.getElementAnimators(this).filter(animator => {
+              var _a;
+              return !(null === (_a = animator.animationOptions.timeline.controlOptions) || void 0 === _a ? void 0 : _a.ignoreLoopFinalAttributes) || !animator.animationOptions.timeline.loop;
+            }),
+            animateGraphicAttributes = (currentAnimators || []).reduce((attributes, animator) => Object.assign(attributes, animator.getEndAttributes()), {}),
             currentGraphicAttributes = Object.assign({}, animateGraphicAttributes, finalGraphicAttributes);
           this.graphicItem.setAttributes(currentGraphicAttributes);
         } else this.graphicItem.setAttributes(graphicAttributes);
@@ -61446,7 +61645,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.12.9-alpha.0";
+    const version = "1.12.9-alpha.2";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -90318,9 +90517,44 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this.activeType = 'mark';
         }
         showTooltip(info, params, changePositionOnly) {
+            var _a, _b, _c;
             const { datum, series } = info;
+            const tooltipSpec = this.component.getSpec();
             const tooltipData = [{ datum: [datum], series }];
+            const helper = series.tooltipHelper;
+            const seriesSpec = (_a = series.getSpec()) === null || _a === void 0 ? void 0 : _a.tooltip;
+            const seriesCheckOverlap = (_b = seriesSpec === null || seriesSpec === void 0 ? void 0 : seriesSpec.mark) === null || _b === void 0 ? void 0 : _b.checkOverlap;
+            let checkOverlap = false;
+            if (seriesCheckOverlap === true || (((_c = tooltipSpec.mark) === null || _c === void 0 ? void 0 : _c.checkOverlap) === true && seriesCheckOverlap !== false)) {
+                const activeTriggers = helper === null || helper === void 0 ? void 0 : helper.activeTriggerSet.mark;
+                if (activeTriggers) {
+                    checkOverlap = true;
+                    const chart = this.component.getChart();
+                    const layer = chart.getCompiler().getStage().getLayer(undefined);
+                    const point = { x: params.event.viewX, y: params.event.viewY };
+                    layer.globalTransMatrix.transformPoint({ x: params.event.viewX, y: params.event.viewY }, point);
+                    activeTriggers.forEach(mark => {
+                        mark.getProductElements().forEach(el => {
+                            const graphic = el.getGraphicItem();
+                            if (el !== params.item &&
+                                graphic &&
+                                graphic.containsPoint(point.x, point.y, IContainPointMode.GLOBAL, graphic.stage.getPickerService())) {
+                                tooltipData[0].datum.push(el.getDatum());
+                            }
+                        });
+                    });
+                }
+            }
             const newParams = Object.assign(Object.assign({}, params), { changePositionOnly, tooltip: this.component });
+            if (changePositionOnly && checkOverlap) {
+                const cacheData = this._cacheActiveSpec && this._cacheActiveSpec.data;
+                if (!cacheData ||
+                    cacheData[0].series !== tooltipData[0].series ||
+                    cacheData[0].datum.length !== tooltipData[0].datum.length ||
+                    cacheData[0].datum.some((d, index) => d !== tooltipData[0].datum[index])) {
+                    newParams.changePositionOnly = false;
+                }
+            }
             return this._showTooltipByHandler(tooltipData, newParams);
         }
         getMouseEventData(params) {
@@ -90487,6 +90721,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                         this._handleChartMouseOut(params);
                     }, (_d = this._spec.showDelay) !== null && _d !== void 0 ? _d : DEFAULT_SHOW_DELAY);
                 }
+                else {
+                    this._handleChartMouseOut(params);
+                }
             };
             this._handleChartMouseOut = (params) => {
                 if (this._alwaysShow) {
@@ -90729,7 +90966,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             const container = (_b = (_a = this.tooltipHandler).getTooltipContainer) === null || _b === void 0 ? void 0 : _b.call(_a);
             const element = container === null || container === void 0 ? void 0 : container.firstChild;
             if (element) {
-                element.addEventListener('mouseenter', () => {
+                element.addEventListener('pointerenter', () => {
                     var _a;
                     const rect = (_a = element.getBoundingClientRect) === null || _a === void 0 ? void 0 : _a.call(element);
                     if (rect) {
@@ -90744,7 +90981,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                         this._showTimer = null;
                     }
                 });
-                element.addEventListener('mouseleave', () => {
+                element.addEventListener('pointerleave', () => {
                     var _a, _b;
                     if (this._cacheEnterableRect) {
                         const newRect = (_a = element.getBoundingClientRect) === null || _a === void 0 ? void 0 : _a.call(element);
@@ -90779,12 +91016,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             const trigger = array((_a = this._spec.trigger) !== null && _a !== void 0 ? _a : 'hover');
             const mode = this._option.mode;
             if (trigger.includes('hover')) {
-                this._mountEvent('pointermove', { source: 'chart' }, this._getMouseMoveHandler(false));
+                this._mountEvent('pointermove', { source: 'chart' }, this._throttle(this._getMouseMoveHandler(false)));
                 if (isMobileLikeMode(mode) || isMiniAppLikeMode(mode)) {
                     this._mountEvent('pointerdown', { source: 'chart' }, this._getMouseMoveHandler(false));
                     this._mountEvent('pointerup', { source: 'window' }, this._getMouseOutHandler(true));
                 }
-                this._mountEvent('pointerleave', { source: 'canvas' }, this._getMouseOutHandler(false));
+                this._mountEvent('pointerout', { source: 'chart' }, this._getMouseOutHandler(false));
             }
             if (trigger.includes('click')) {
                 this._mountEvent('pointertap', { source: 'chart' }, this._getMouseMoveHandler(true));
@@ -90794,6 +91031,21 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 this._mountEvent('pointertap', { source: 'chart' }, this._handleClickToLock);
             }
         }
+        _throttle(callback) {
+            let wait;
+            if (isNumber$1(this._spec.throttleInterval)) {
+                wait = this._spec.throttleInterval;
+            }
+            else {
+                if (this._spec.renderMode !== 'html' || !this._spec.transitionDuration) {
+                    wait = 10;
+                }
+                else {
+                    wait = 50;
+                }
+            }
+            return throttle(callback, wait);
+        }
         reInit(spec) {
             var _a, _b;
             super.reInit(spec);
@@ -98829,7 +99081,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }
                 return this.changeTooltip(true, params, data);
             };
-            this._changeTooltip = (visible, params, data) => {
+            this.changeTooltip = (visible, params, data) => {
                 if (this._isReleased) {
                     return 1;
                 }
@@ -98837,9 +99089,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     this._updateTooltip(false, params);
                     return 0;
                 }
-                return this._changeTooltipPosition(params, data);
+                return this.changeTooltipPosition(params, data);
             };
-            this._changeTooltipPosition = (params, data) => {
+            this.changeTooltipPosition = (params, data) => {
                 var _a, _b, _c, _d, _e;
                 if (this._isReleased) {
                     return 1;
@@ -99094,22 +99346,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._removeTooltip();
             this._isReleased = true;
         }
-        _throttle(callback) {
-            const tooltipSpec = this._component.getSpec();
-            let wait;
-            if (isNumber$1(tooltipSpec.throttleInterval)) {
-                wait = tooltipSpec.throttleInterval;
-            }
-            else {
-                if (tooltipSpec.renderMode !== 'html' || !tooltipSpec.transitionDuration) {
-                    wait = 10;
-                }
-                else {
-                    wait = 50;
-                }
-            }
-            return throttle(callback, wait);
-        }
         _getDefaultOption() {
             var _a, _b;
             const { offset } = this._component.getSpec();
@@ -99136,8 +99372,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         _initFromSpec() {
             this._option = this._getDefaultOption();
-            this.changeTooltip = this._throttle(this._changeTooltip);
-            this.changeTooltipPosition = this._throttle(this._changeTooltipPosition);
         }
         reInit() {
             this._initFromSpec();