@visactor/vchart 1.13.11-alpha.2 → 1.13.12

package/build/index.js

@@ -7846,11 +7846,14 @@
     const ContributionProvider = Symbol("ContributionProvider");
     class ContributionProviderCache {
       constructor(serviceIdentifier, container) {
-        this.serviceIdentifier = serviceIdentifier, this.container = container;
+        this.serviceIdentifier = serviceIdentifier, this.container = container, ContributionStore.setStore(this.serviceIdentifier, this);
       }
       getContributions() {
         return this.caches || (this.caches = [], this.container && this.container.isBound(this.serviceIdentifier) && this.caches.push(...this.container.getAll(this.serviceIdentifier))), this.caches;
       }
+      refresh() {
+        this.caches && (this.caches.length = 0, this.container && this.container.isBound(this.serviceIdentifier) && this.caches.push(...this.container.getAll(this.serviceIdentifier)));
+      }
     }
     function bindContributionProvider(bind, id) {
       bind(ContributionProvider).toDynamicValue(_ref => {
@@ -7868,6 +7871,20 @@
         return new ContributionProviderCache(id, container);
       }).whenTargetNamed(id);
     }
+    class ContributionStore {
+      static getStore(id) {
+        return this.store.get(id);
+      }
+      static setStore(id, cache) {
+        this.store.set(id, cache);
+      }
+      static refreshAllContributions() {
+        this.store.forEach(cache => {
+          cache.refresh();
+        });
+      }
+    }
+    ContributionStore.store = new Map();
 
     class Hook {
       constructor(args, name) {
@@ -7934,6 +7951,48 @@
     const VGlobal = Symbol.for("VGlobal");
     const DEFAULT_TEXT_FONT_FAMILY$1 = "PingFang SC,Helvetica Neue,Microsoft Yahei,system-ui,-apple-system,segoe ui,Roboto,Helvetica,Arial,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol";
 
+    class EventListenerManager {
+      constructor() {
+        this._listenerMap = new Map(), this._eventListenerTransformer = event => event;
+      }
+      setEventListenerTransformer(transformer) {
+        this._eventListenerTransformer = transformer || (event => event);
+      }
+      addEventListener(type, listener, options) {
+        if (!listener) return;
+        const wrappedListener = event => {
+          const transformedEvent = this._eventListenerTransformer(event);
+          "function" == typeof listener ? listener(transformedEvent) : listener.handleEvent && listener.handleEvent(transformedEvent);
+        };
+        this._listenerMap.has(type) || this._listenerMap.set(type, new Map()), this._listenerMap.get(type).set(listener, wrappedListener), this._nativeAddEventListener(type, wrappedListener, options);
+      }
+      removeEventListener(type, listener, options) {
+        var _a;
+        if (!listener) return;
+        const wrappedListener = null === (_a = this._listenerMap.get(type)) || void 0 === _a ? void 0 : _a.get(listener);
+        wrappedListener && (this._nativeRemoveEventListener(type, wrappedListener, options), this._listenerMap.get(type).delete(listener), 0 === this._listenerMap.get(type).size && this._listenerMap.delete(type));
+      }
+      dispatchEvent(event) {
+        return this._nativeDispatchEvent(event);
+      }
+      clearAllEventListeners() {
+        this._listenerMap.forEach((listenersMap, type) => {
+          listenersMap.forEach((wrappedListener, originalListener) => {
+            this._nativeRemoveEventListener(type, wrappedListener, void 0);
+          });
+        }), this._listenerMap.clear();
+      }
+      _nativeAddEventListener(type, listener, options) {
+        throw new Error("_nativeAddEventListener must be implemented by derived classes");
+      }
+      _nativeRemoveEventListener(type, listener, options) {
+        throw new Error("_nativeRemoveEventListener must be implemented by derived classes");
+      }
+      _nativeDispatchEvent(event) {
+        throw new Error("_nativeDispatchEvent must be implemented by derived classes");
+      }
+    }
+
     var __decorate$1B = undefined && undefined.__decorate || function (decorators, target, key, desc) {
         var d,
           c = arguments.length,
@@ -7974,7 +8033,7 @@
           step((generator = generator.apply(thisArg, _arguments || [])).next());
         });
       };
-    let DefaultGlobal = class {
+    let DefaultGlobal = class extends EventListenerManager {
       get env() {
         return this._env;
       }
@@ -8018,10 +8077,19 @@
         this._env || this.setEnv("browser"), this.envContribution.applyStyles = support;
       }
       constructor(contributions) {
-        this.contributions = contributions, this._isImageAnonymous = !0, this.id = Generator.GenAutoIncrementId(), this.hooks = {
+        super(), this.contributions = contributions, this._isImageAnonymous = !0, this.eventListenerTransformer = event => event, this.id = Generator.GenAutoIncrementId(), this.hooks = {
           onSetEnv: new SyncHook(["lastEnv", "env", "global"])
         }, this.measureTextMethod = "native", this.optimizeVisible = !1;
       }
+      _nativeAddEventListener(type, listener, options) {
+        return this._env || this.setEnv("browser"), this.envContribution.addEventListener(type, listener, options);
+      }
+      _nativeRemoveEventListener(type, listener, options) {
+        return this._env || this.setEnv("browser"), this.envContribution.removeEventListener(type, listener, options);
+      }
+      _nativeDispatchEvent(event) {
+        return this._env || this.setEnv("browser"), this.envContribution.dispatchEvent(event);
+      }
       bindContribution(params) {
         const promiseArr = [];
         if (this.contributions.getContributions().forEach(contribution => {
@@ -8062,15 +8130,6 @@
       releaseCanvas(canvas) {
         return this._env || this.setEnv("browser"), this.envContribution.releaseCanvas(canvas);
       }
-      addEventListener(type, listener, options) {
-        return this._env || this.setEnv("browser"), this.envContribution.addEventListener(type, listener, options);
-      }
-      removeEventListener(type, listener, options) {
-        return this._env || this.setEnv("browser"), this.envContribution.removeEventListener(type, listener, options);
-      }
-      dispatchEvent(event) {
-        return this._env || this.setEnv("browser"), this.envContribution.dispatchEvent(event);
-      }
       getRequestAnimationFrame() {
         return this._env || this.setEnv("browser"), this.envContribution.getRequestAnimationFrame();
       }
@@ -11099,7 +11158,7 @@
       };
     const VWindow = Symbol.for("VWindow");
     const WindowHandlerContribution = Symbol.for("WindowHandlerContribution");
-    let DefaultWindow = class {
+    let DefaultWindow = class extends EventListenerManager {
       get width() {
         if (this._handler) {
           const wh = this._handler.getWH();
@@ -11118,7 +11177,7 @@
         return this._handler.getDpr();
       }
       constructor() {
-        this.hooks = {
+        super(), this.hooks = {
           onChange: new SyncHook(["x", "y", "width", "height"])
         }, this.active = () => {
           const global = this.global;
@@ -11126,6 +11185,15 @@
           container.getNamed(WindowHandlerContribution, global.env).configure(this, global), this.actived = !0;
         }, this._uid = Generator.GenAutoIncrementId(), this.global = application.global, this.postInit();
       }
+      _nativeAddEventListener(type, listener, options) {
+        return this._handler.addEventListener(type, listener, options);
+      }
+      _nativeRemoveEventListener(type, listener, options) {
+        return this._handler.removeEventListener(type, listener, options);
+      }
+      _nativeDispatchEvent(event) {
+        return this._handler.dispatchEvent(event);
+      }
       postInit() {
         this.global.hooks.onSetEnv.tap("window", this.active), this.active();
       }
@@ -11165,7 +11233,7 @@
         throw new Error("暂不支持");
       }
       release() {
-        return this.global.hooks.onSetEnv.unTap("window", this.active), this._handler.releaseWindow();
+        return this.global.hooks.onSetEnv.unTap("window", this.active), this.clearAllEventListeners(), this._handler.releaseWindow();
       }
       getContext() {
         return this._handler.getContext();
@@ -11176,15 +11244,6 @@
       getImageBuffer(type) {
         return this._handler.getImageBuffer ? this._handler.getImageBuffer(type) : null;
       }
-      addEventListener(type, listener, options) {
-        return this._handler.addEventListener(type, listener, options);
-      }
-      removeEventListener(type, listener, options) {
-        return this._handler.removeEventListener(type, listener, options);
-      }
-      dispatchEvent(event) {
-        return this._handler.dispatchEvent(event);
-      }
       getBoundingClientRect() {
         return this._handler.getBoundingClientRect();
       }
@@ -12393,19 +12452,17 @@
           globalObj: globalObj,
           domElement: domElement
         } = this;
-        this.supportsPointerEvents ? (globalObj.getDocument() ? (globalObj.getDocument().addEventListener("pointermove", this.onPointerMove, !0), globalObj.getDocument().addEventListener("pointerup", this.onPointerUp, !0)) : (domElement.addEventListener("pointermove", this.onPointerMove, !0), domElement.addEventListener("pointerup", this.onPointerUp, !0)), domElement.addEventListener("pointerdown", this.onPointerDown, !0), domElement.addEventListener("pointerleave", this.onPointerOverOut, !0), domElement.addEventListener("pointerover", this.onPointerOverOut, !0)) : (globalObj.getDocument() ? (globalObj.getDocument().addEventListener("mousemove", this.onPointerMove, !0), globalObj.getDocument().addEventListener("mouseup", this.onPointerUp, !0)) : (domElement.addEventListener("mousemove", this.onPointerMove, !0), domElement.addEventListener("mouseup", this.onPointerUp, !0)), domElement.addEventListener("mousedown", this.onPointerDown, !0), domElement.addEventListener("mouseout", this.onPointerOverOut, !0), domElement.addEventListener("mouseover", this.onPointerOverOut, !0)), this.supportsTouchEvents && (domElement.addEventListener("touchstart", this.onPointerDown, !0), domElement.addEventListener("touchend", this.onPointerUp, !0), domElement.addEventListener("touchmove", this.onPointerMove, !0)), domElement.addEventListener("wheel", this.onWheel, {
+        this.supportsPointerEvents ? (globalObj.getDocument() ? (globalObj.addEventListener("pointermove", this.onPointerMove, !0), globalObj.addEventListener("pointerup", this.onPointerUp, !0)) : (domElement.addEventListener("pointermove", this.onPointerMove, !0), domElement.addEventListener("pointerup", this.onPointerUp, !0)), domElement.addEventListener("pointerdown", this.onPointerDown, !0), domElement.addEventListener("pointerleave", this.onPointerOverOut, !0), domElement.addEventListener("pointerover", this.onPointerOverOut, !0)) : (globalObj.getDocument() ? (globalObj.addEventListener("mousemove", this.onPointerMove, !0), globalObj.addEventListener("mouseup", this.onPointerUp, !0)) : (domElement.addEventListener("mousemove", this.onPointerMove, !0), domElement.addEventListener("mouseup", this.onPointerUp, !0)), domElement.addEventListener("mousedown", this.onPointerDown, !0), domElement.addEventListener("mouseout", this.onPointerOverOut, !0), domElement.addEventListener("mouseover", this.onPointerOverOut, !0)), this.supportsTouchEvents && (domElement.addEventListener("touchstart", this.onPointerDown, !0), domElement.addEventListener("touchend", this.onPointerUp, !0), domElement.addEventListener("touchmove", this.onPointerMove, !0)), domElement.addEventListener("wheel", this.onWheel, {
           capture: !0
         }), this.eventsAdded = !0;
       }
       removeEvents() {
-        var _a;
         if (!this.eventsAdded || !this.domElement) return;
         const {
-            globalObj: globalObj,
-            domElement: domElement
-          } = this,
-          globalDocument = null !== (_a = globalObj.getDocument()) && void 0 !== _a ? _a : domElement;
-        this.supportsPointerEvents ? (globalDocument.removeEventListener("pointermove", this.onPointerMove, !0), globalDocument.removeEventListener("pointerup", this.onPointerUp, !0), domElement.removeEventListener("pointerdown", this.onPointerDown, !0), domElement.removeEventListener("pointerleave", this.onPointerOverOut, !0), domElement.removeEventListener("pointerover", this.onPointerOverOut, !0)) : (globalDocument.removeEventListener("mousemove", this.onPointerMove, !0), globalDocument.removeEventListener("mouseup", this.onPointerUp, !0), domElement.removeEventListener("mousedown", this.onPointerDown, !0), domElement.removeEventListener("mouseout", this.onPointerOverOut, !0), domElement.removeEventListener("mouseover", this.onPointerOverOut, !0)), this.supportsTouchEvents && (domElement.removeEventListener("touchstart", this.onPointerDown, !0), domElement.removeEventListener("touchend", this.onPointerUp, !0), domElement.removeEventListener("touchmove", this.onPointerMove, !0)), domElement.removeEventListener("wheel", this.onWheel, !0), this.domElement = null, this.eventsAdded = !1;
+          globalObj: globalObj,
+          domElement: domElement
+        } = this;
+        this.supportsPointerEvents ? (globalObj.getDocument() ? (globalObj.removeEventListener("pointermove", this.onPointerMove, !0), globalObj.removeEventListener("pointerup", this.onPointerUp, !0)) : (domElement.removeEventListener("pointermove", this.onPointerMove, !0), domElement.removeEventListener("pointerup", this.onPointerUp, !0)), domElement.removeEventListener("pointerdown", this.onPointerDown, !0), domElement.removeEventListener("pointerleave", this.onPointerOverOut, !0), domElement.removeEventListener("pointerover", this.onPointerOverOut, !0)) : (globalObj.getDocument() ? (globalObj.removeEventListener("mousemove", this.onPointerMove, !0), globalObj.removeEventListener("mouseup", this.onPointerUp, !0)) : (domElement.removeEventListener("mousemove", this.onPointerMove, !0), domElement.removeEventListener("mouseup", this.onPointerUp, !0)), domElement.removeEventListener("mousedown", this.onPointerDown, !0), domElement.removeEventListener("mouseout", this.onPointerOverOut, !0), domElement.removeEventListener("mouseover", this.onPointerOverOut, !0)), this.supportsTouchEvents && (domElement.removeEventListener("touchstart", this.onPointerDown, !0), domElement.removeEventListener("touchend", this.onPointerUp, !0), domElement.removeEventListener("touchmove", this.onPointerMove, !0)), domElement.removeEventListener("wheel", this.onWheel, !0), this.domElement = null, this.eventsAdded = !1;
       }
       mapToViewportPoint(event) {
         return this.domElement.pointTransform ? this.domElement.pointTransform(event.x, event.y) : event;
@@ -13659,23 +13716,27 @@
         isValidNumber$1(lastClipRange * this.clipRange) && (this.clipRange *= lastClipRange);
       }
       onUpdate(end, ratio, out) {
-        if (this.points = this.points.map((point, index) => {
-          const newPoint = pointInterpolation(this.interpolatePoints[index][0], this.interpolatePoints[index][1], ratio);
-          return newPoint.context = point.context, newPoint;
-        }), this.clipRange) {
-          if (this.shrinkClipRange) return void (end ? (out.points = this.toPoints, out.clipRange = 1) : (out.points = this.fromPoints, out.clipRange = this.clipRange - (this.clipRange - this.shrinkClipRange) * ratio));
-          out.clipRange = this.clipRange + (1 - this.clipRange) * ratio;
-        }
-        if (this.segmentsCache && this.to.segments) {
-          let start = 0;
-          out.segments = this.to.segments.map((segment, index) => {
-            const end = start + this.segmentsCache[index],
-              points = this.points.slice(start, end);
-            return start = end, Object.assign(Object.assign({}, segment), {
-              points: points
+        if (end) Object.keys(this.to).forEach(k => {
+          out[k] = this.to[k];
+        });else {
+          if (this.points = this.points.map((point, index) => {
+            const newPoint = pointInterpolation(this.interpolatePoints[index][0], this.interpolatePoints[index][1], ratio);
+            return newPoint.context = point.context, newPoint;
+          }), this.clipRange) {
+            if (this.shrinkClipRange) return void (end ? (out.points = this.toPoints, out.clipRange = 1) : (out.points = this.fromPoints, out.clipRange = this.clipRange - (this.clipRange - this.shrinkClipRange) * ratio));
+            out.clipRange = this.clipRange + (1 - this.clipRange) * ratio;
+          }
+          if (this.segmentsCache && this.to.segments) {
+            let start = 0;
+            out.segments = this.to.segments.map((segment, index) => {
+              const end = start + this.segmentsCache[index],
+                points = this.points.slice(start, end);
+              return start = end, Object.assign(Object.assign({}, segment), {
+                points: points
+              });
             });
-          });
-        } else out.points = this.points;
+          } else out.points = this.points;
+        }
       }
     }
     class ClipGraphicAnimate extends ACustomAnimate {
@@ -21080,6 +21141,9 @@
       init(contributions) {
         contributions && (this._renderContribitions = contributions.getContributions()), this._renderContribitions || (this._renderContribitions = []), this.builtinContributions || (this.builtinContributions = []), this.builtinContributions.push(defaultBaseClipRenderBeforeContribution), this.builtinContributions.push(defaultBaseClipRenderAfterContribution), this.builtinContributions.forEach(item => this._renderContribitions.push(item)), this._renderContribitions.length && (this._renderContribitions.sort((a, b) => b.order - a.order), this._beforeRenderContribitions = this._renderContribitions.filter(c => c.time === BaseRenderContributionTime.beforeFillStroke), this._afterRenderContribitions = this._renderContribitions.filter(c => c.time === BaseRenderContributionTime.afterFillStroke));
       }
+      reInit() {
+        this.init(this.graphicRenderContributions);
+      }
       beforeRenderStep(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb, params) {
         this._beforeRenderContribitions && this._beforeRenderContribitions.forEach(c => {
           if (c.supportedAppName && graphic.stage && graphic.stage.params && graphic.stage.params.context && graphic.stage.params.context.appName) {
@@ -21249,8 +21313,8 @@
         };
       };
     let DefaultCanvasArcRender = class extends BaseRender {
-      constructor(arcRenderContribitions) {
-        super(), this.arcRenderContribitions = arcRenderContribitions, this.numberType = ARC_NUMBER_TYPE, this.builtinContributions = [defaultArcRenderContribution, defaultArcBackgroundRenderContribution, defaultArcTextureRenderContribution], this.init(arcRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = ARC_NUMBER_TYPE, this.builtinContributions = [defaultArcRenderContribution, defaultArcBackgroundRenderContribution, defaultArcTextureRenderContribution], this.init(graphicRenderContributions);
       }
       drawArcTailCapPath(arc, context, cx, cy, outerRadius, innerRadius, _sa, _ea) {
         const capAngle = _ea - _sa,
@@ -21425,8 +21489,8 @@
         };
       };
     let DefaultCanvasCircleRender = class extends BaseRender {
-      constructor(circleRenderContribitions) {
-        super(), this.circleRenderContribitions = circleRenderContribitions, this.numberType = CIRCLE_NUMBER_TYPE, this.builtinContributions = [defaultCircleRenderContribution, defaultCircleBackgroundRenderContribution, defaultCircleTextureRenderContribution], this.init(circleRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = CIRCLE_NUMBER_TYPE, this.builtinContributions = [defaultCircleRenderContribution, defaultCircleBackgroundRenderContribution, defaultCircleTextureRenderContribution], this.init(graphicRenderContributions);
       }
       drawShape(circle, context, x, y, drawContext, params, fillCb, strokeCb) {
         const circleAttribute = getTheme$1(circle, null == params ? void 0 : params.theme).circle,
@@ -21812,8 +21876,8 @@
         };
       };
     let DefaultCanvasAreaRender = class extends BaseRender {
-      constructor(areaRenderContribitions) {
-        super(), this.areaRenderContribitions = areaRenderContribitions, this.numberType = AREA_NUMBER_TYPE, this.builtinContributions = [defaultAreaTextureRenderContribution, defaultAreaBackgroundRenderContribution], this.init(areaRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = AREA_NUMBER_TYPE, this.builtinContributions = [defaultAreaTextureRenderContribution, defaultAreaBackgroundRenderContribution], this.init(graphicRenderContributions);
       }
       drawLinearAreaHighPerformance(area, context, fill, stroke, fillOpacity, strokeOpacity, offsetX, offsetY, areaAttribute, drawContext, params, fillCb, strokeCb) {
         var _a, _b, _c;
@@ -22056,8 +22120,8 @@
         };
       };
     let DefaultCanvasPathRender = class extends BaseRender {
-      constructor(pathRenderContribitions) {
-        super(), this.pathRenderContribitions = pathRenderContribitions, this.numberType = PATH_NUMBER_TYPE, this.builtinContributions = [defaultPathBackgroundRenderContribution, defaultPathTextureRenderContribution], this.init(pathRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = PATH_NUMBER_TYPE, this.builtinContributions = [defaultPathBackgroundRenderContribution, defaultPathTextureRenderContribution], this.init(graphicRenderContributions);
       }
       drawShape(path, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a, _b, _c;
@@ -22112,8 +22176,8 @@
         };
       };
     let DefaultCanvasRectRender = class extends BaseRender {
-      constructor(rectRenderContribitions) {
-        super(), this.rectRenderContribitions = rectRenderContribitions, this.type = "rect", this.numberType = RECT_NUMBER_TYPE, this.builtinContributions = [defaultRectRenderContribution, defaultRectBackgroundRenderContribution, defaultRectTextureRenderContribution], this.init(rectRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.type = "rect", this.numberType = RECT_NUMBER_TYPE, this.builtinContributions = [defaultRectRenderContribution, defaultRectBackgroundRenderContribution, defaultRectTextureRenderContribution], this.init(graphicRenderContributions);
       }
       drawShape(rect, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a;
@@ -22184,8 +22248,8 @@
         };
       };
     let DefaultCanvasSymbolRender = class extends BaseRender {
-      constructor(symbolRenderContribitions) {
-        super(), this.symbolRenderContribitions = symbolRenderContribitions, this.numberType = SYMBOL_NUMBER_TYPE, this.builtinContributions = [defaultSymbolRenderContribution, defaultSymbolBackgroundRenderContribution, defaultSymbolTextureRenderContribution, defaultSymbolClipRangeStrokeRenderContribution], this.init(symbolRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = SYMBOL_NUMBER_TYPE, this.builtinContributions = [defaultSymbolRenderContribution, defaultSymbolBackgroundRenderContribution, defaultSymbolTextureRenderContribution, defaultSymbolClipRangeStrokeRenderContribution], this.init(graphicRenderContributions);
       }
       drawShape(symbol, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a;
@@ -22356,8 +22420,8 @@
         };
       };
     let DefaultCanvasTextRender = class extends BaseRender {
-      constructor(textRenderContribitions) {
-        super(), this.textRenderContribitions = textRenderContribitions, this.numberType = TEXT_NUMBER_TYPE, this.builtinContributions = [defaultTextBackgroundRenderContribution], this.init(textRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = TEXT_NUMBER_TYPE, this.builtinContributions = [defaultTextBackgroundRenderContribution], this.init(graphicRenderContributions);
       }
       drawShape(text, context, x, y, drawContext, params, fillCb, strokeCb) {
         var _a, _b, _c;
@@ -22561,8 +22625,8 @@
         };
       };
     let DefaultCanvasPolygonRender = class extends BaseRender {
-      constructor(polygonRenderContribitions) {
-        super(), this.polygonRenderContribitions = polygonRenderContribitions, this.numberType = POLYGON_NUMBER_TYPE, this.builtinContributions = [defaultPolygonBackgroundRenderContribution, defaultPolygonTextureRenderContribution], this.init(polygonRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = POLYGON_NUMBER_TYPE, this.builtinContributions = [defaultPolygonBackgroundRenderContribution, defaultPolygonTextureRenderContribution], this.init(graphicRenderContributions);
       }
       drawShape(polygon, context, x, y, drawContext, params, fillCb, strokeCb) {
         const polygonAttribute = getTheme$1(polygon, null == params ? void 0 : params.theme).polygon,
@@ -22617,6 +22681,9 @@
       constructor(groupRenderContribitions) {
         this.groupRenderContribitions = groupRenderContribitions, this.numberType = GROUP_NUMBER_TYPE;
       }
+      reInit() {
+        this._groupRenderContribitions = this.groupRenderContribitions.getContributions() || [], this._groupRenderContribitions.push(defaultGroupBackgroundRenderContribution);
+      }
       drawShape(group, context, x, y, drawContext, params, fillCb, strokeCb) {
         const groupAttribute = getTheme$1(group, null == params ? void 0 : params.theme).group,
           {
@@ -22747,8 +22814,8 @@
       };
     const repeatStr = ["", "repeat-x", "repeat-y", "repeat"];
     let DefaultCanvasImageRender = class extends BaseRender {
-      constructor(imageRenderContribitions) {
-        super(), this.imageRenderContribitions = imageRenderContribitions, this.numberType = IMAGE_NUMBER_TYPE, this.builtinContributions = [defaultImageRenderContribution, defaultImageBackgroundRenderContribution], this.init(imageRenderContribitions);
+      constructor(graphicRenderContributions) {
+        super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = IMAGE_NUMBER_TYPE, this.builtinContributions = [defaultImageRenderContribution, defaultImageBackgroundRenderContribution], this.init(graphicRenderContributions);
       }
       drawShape(image, context, x, y, drawContext, params, fillCb, strokeCb) {
         const imageAttribute = getTheme$1(image).image,
@@ -23075,6 +23142,9 @@
       afterDraw(params) {
         this.drawContribution.afterDraw && this.drawContribution.afterDraw(this, Object.assign({}, this.drawParams));
       }
+      reInit() {
+        this.drawContribution.reInit();
+      }
       render(groups, params) {
         this.renderTreeRoots = groups, this.drawParams = params;
         const updateBounds = params.updateBounds;
@@ -23476,6 +23546,11 @@
       constructor(contributions, drawItemInterceptorContributions) {
         this.contributions = contributions, this.drawItemInterceptorContributions = drawItemInterceptorContributions, this.currentRenderMap = new Map(), this.defaultRenderMap = new Map(), this.styleRenderMap = new Map(), this.dirtyBounds = new Bounds(), this.backupDirtyBounds = new Bounds(), this.global = application.global, this.layerService = application.layerService, isArray$1(this.contributions) || (this.contributions = [this.contributions]), this.init();
       }
+      reInit() {
+        this.init(), this.contributions.forEach(item => {
+          item.reInit();
+        });
+      }
       init() {
         this.contributions.forEach(item => {
           if (item.style) {
@@ -24595,6 +24670,9 @@
       getPickerService() {
         return this.pickerService || (this.pickerService = container.get(PickerService)), this.pickerService;
       }
+      reInit() {
+        this.renderService.reInit(), this.pickerService.reInit();
+      }
     }
 
     function createStage(params) {
@@ -25192,6 +25270,9 @@
       constructor(pickItemInterceptorContributions, pickServiceInterceptorContributions) {
         this.pickItemInterceptorContributions = pickItemInterceptorContributions, this.pickServiceInterceptorContributions = pickServiceInterceptorContributions, this.type = "default", this.global = application.global;
       }
+      reInit() {
+        this._init();
+      }
       _init() {
         this.InterceptorContributions = this.pickItemInterceptorContributions.getContributions().sort((a, b) => a.order - b.order), this.pickerServiceInterceptorContributions = this.pickServiceInterceptorContributions.getContributions().sort((a, b) => a.order - b.order);
       }
@@ -25360,6 +25441,7 @@
       constructor() {
         this.numberType = GLYPH_NUMBER_TYPE;
       }
+      reInit() {}
       drawShape(glyph, context, x, y, drawContext, params, fillCb, strokeCb) {
         drawContext.drawContribution && glyph.getSubGraphic().forEach(item => {
           const renderer = drawContext.drawContribution.getRenderContribution(item);
@@ -26584,6 +26666,18 @@
         const changeEvent = new CustomEvent(eventName, details);
         changeEvent.manager = null === (_a = this.stage) || void 0 === _a ? void 0 : _a.eventSystem.manager, this.dispatchEvent(changeEvent);
       }
+      eventPosToStagePos(e) {
+        var _a, _b;
+        const result = {
+            x: 0,
+            y: 0
+          },
+          stagePoints = null !== (_b = null === (_a = this.stage) || void 0 === _a ? void 0 : _a.eventPointTransform(e)) && void 0 !== _b ? _b : {
+            x: 0,
+            y: 0
+          };
+        return this.globalTransMatrix.transformPoint(stagePoints, result), result;
+      }
     }
 
     const MathPickerContribution = Symbol.for("MathPickerContribution");
@@ -35348,7 +35442,7 @@
     const MIN_TICK_GAP = 12;
     const calculateFlushPos = (basePosition, size, rangePosition, otherEnd) => rangePosition < basePosition ? Math.max(basePosition - size / 2, rangePosition) : rangePosition > basePosition ? Math.min(basePosition - size / 2, rangePosition - size) : rangePosition < otherEnd ? rangePosition : rangePosition - size;
     const getCartesianLabelBounds = (scale, domain, op) => {
-      var _a;
+      var _a, _b, _c;
       const {
         labelStyle: labelStyle,
         axisOrientType: axisOrientType,
@@ -35364,27 +35458,32 @@
         scaleY = 0;
       isHorizontal || (isVertical ? (scaleX = 0, scaleY = 1) : startAngle && (scaleX = Math.cos(startAngle), scaleY = -Math.sin(startAngle)));
       const textMeasure = initTextMeasure$1(labelStyle),
-        range = scale.range(),
-        labelBoundsList = domain.map((v, i) => {
-          var _a, _b;
-          const str = labelFormatter ? labelFormatter(v) : `${v}`,
-            {
-              width: width,
-              height: height
-            } = textMeasure.quickMeasure(str),
-            textWidth = Math.max(width, 12),
-            textHeight = Math.max(height, 12),
-            pos = scale.scale(v),
-            baseTextX = scaleX * pos,
-            baseTextY = scaleY * pos;
-          let align,
-            baseline,
-            textX = baseTextX,
-            textY = baseTextY;
-          labelFlush && isHorizontal && 0 === i ? textX = calculateFlushPos(baseTextX, textWidth, range[0], range[range.length - 1]) : labelFlush && isHorizontal && i === domain.length - 1 ? textX = calculateFlushPos(baseTextX, textWidth, range[range.length - 1], range[0]) : align = null !== (_a = labelStyle.textAlign) && void 0 !== _a ? _a : "center", "right" === align ? textX -= textWidth : "center" === align && (textX -= textWidth / 2), labelFlush && isVertical && 0 === i ? textY = calculateFlushPos(baseTextY, textHeight, range[0], range[range.length - 1]) : labelFlush && isVertical && i === domain.length - 1 ? textY = calculateFlushPos(baseTextY, textHeight, range[range.length - 1], range[0]) : baseline = null !== (_b = labelStyle.textBaseline) && void 0 !== _b ? _b : "middle", "bottom" === baseline ? textY -= textHeight : "middle" === baseline && (textY -= textHeight / 2);
-          const bounds = new AABBBounds().set(textX, textY, textX + textWidth, textY + textHeight);
-          return labelAngle && bounds.rotate(labelAngle, baseTextX, baseTextY), bounds;
-        });
+        range = scale.range();
+      let labelBoundsList = [];
+      for (let i = 0; i < domain.length; i++) {
+        const v = domain[i],
+          str = labelFormatter ? labelFormatter(v) : `${v}`;
+        if (isPlainObject$1(str)) {
+          labelBoundsList = void 0;
+          break;
+        }
+        const {
+            width: width,
+            height: height
+          } = textMeasure.quickMeasure(str),
+          textWidth = Math.max(width, 12),
+          textHeight = Math.max(height, 12),
+          pos = scale.scale(v),
+          baseTextX = scaleX * pos,
+          baseTextY = scaleY * pos;
+        let align,
+          baseline,
+          textX = baseTextX,
+          textY = baseTextY;
+        labelFlush && isHorizontal && 0 === i ? textX = calculateFlushPos(baseTextX, textWidth, range[0], range[range.length - 1]) : labelFlush && isHorizontal && i === domain.length - 1 ? textX = calculateFlushPos(baseTextX, textWidth, range[range.length - 1], range[0]) : align = null !== (_b = labelStyle.textAlign) && void 0 !== _b ? _b : "center", "right" === align ? textX -= textWidth : "center" === align && (textX -= textWidth / 2), labelFlush && isVertical && 0 === i ? textY = calculateFlushPos(baseTextY, textHeight, range[0], range[range.length - 1]) : labelFlush && isVertical && i === domain.length - 1 ? textY = calculateFlushPos(baseTextY, textHeight, range[range.length - 1], range[0]) : baseline = null !== (_c = labelStyle.textBaseline) && void 0 !== _c ? _c : "middle", "bottom" === baseline ? textY -= textHeight : "middle" === baseline && (textY -= textHeight / 2);
+        const bounds = new AABBBounds().set(textX, textY, textX + textWidth, textY + textHeight);
+        labelAngle && bounds.rotate(labelAngle, baseTextX, baseTextY), labelBoundsList.push(bounds);
+      }
       return labelBoundsList;
     };
     const isAxisHorizontal = axisOrientType => ["bottom", "top", "z"].includes(axisOrientType);
@@ -36433,7 +36532,7 @@
       }
     }
     const continuousTicks = (scale, op) => {
-      var _a, _b;
+      var _a, _b, _c, _d;
       if (!isContinuous(scale.type)) return convertDomainToTickData(scale.domain());
       const range = scale.range(),
         rangeSize = Math.abs(range[range.length - 1] - range[0]);
@@ -36485,23 +36584,25 @@
             step = Math.floor(scaleTicks.length * MIN_FONT_SIZE / rangeSize);
           scaleTicks.forEach((tick, index) => {
             index % step != 0 && index !== scaleTicks.length - 1 || samplingScaleTicks.push(tick);
-          }), items = getCartesianLabelBounds(scale, samplingScaleTicks, op).map((bounds, i) => ({
+          }), items = null === (_c = getCartesianLabelBounds(scale, samplingScaleTicks, op)) || void 0 === _c ? void 0 : _c.map((bounds, i) => ({
             AABBBounds: bounds,
             value: samplingScaleTicks[i]
           }));
-        } else items = getCartesianLabelBounds(scale, scaleTicks, op).map((bounds, i) => ({
+        } else items = null === (_d = getCartesianLabelBounds(scale, scaleTicks, op)) || void 0 === _d ? void 0 : _d.map((bounds, i) => ({
           AABBBounds: bounds,
           value: scaleTicks[i]
         }));
-        const firstSourceItem = items[0],
-          lastSourceItem = last(items),
-          samplingMethod = breakData && breakData() ? methods$1.greedy : methods$1.parity;
-        for (; items.length >= 3 && hasOverlap$1(items, labelGap);) items = samplingMethod(items, labelGap);
-        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;
+        if (items) {
+          const firstSourceItem = items[0],
+            lastSourceItem = last(items),
+            samplingMethod = breakData && breakData() ? methods$1.greedy : methods$1.parity;
+          for (; items.length >= 3 && hasOverlap$1(items, labelGap);) items = samplingMethod(items, labelGap);
+          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;
+        }
       }
       return convertDomainToTickData(scaleTicks);
     };
@@ -36515,7 +36616,10 @@
       }
     };
 
-    const getOneDimensionalLabelBounds = (scale, domain, op, isHorizontal) => getCartesianLabelBounds(scale, domain, op).map(bounds => isHorizontal ? [bounds.x1, bounds.x2, bounds.width()] : [bounds.y1, bounds.y2, bounds.height()]),
+    const getOneDimensionalLabelBounds = (scale, domain, op, isHorizontal) => {
+        const labelBoundsList = getCartesianLabelBounds(scale, domain, op);
+        return labelBoundsList && labelBoundsList.map(bounds => isHorizontal ? [bounds.x1, bounds.x2, bounds.width()] : [bounds.y1, bounds.y2, bounds.height()]);
+      },
       boundsOverlap = function (prevBounds, nextBounds) {
         let gap = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
         return Math.max(prevBounds[0], nextBounds[0]) - gap / 2 <= Math.min(prevBounds[1], nextBounds[1]) + gap / 2;
@@ -36549,23 +36653,27 @@
           rangeStart = minInArray(range),
           rangeEnd = maxInArray(range);
         if (domain.length <= rangeSize / fontSize) {
-          const incrementUnit = (rangeEnd - rangeStart) / domain.length,
-            labelBoundsList = getOneDimensionalLabelBounds(scale, domain, op, isHorizontal),
-            minBoundsLength = Math.min(...labelBoundsList.map(bounds => bounds[2])),
-            stepResult = getStep$1(domain, labelBoundsList, labelGap, op.labelLastVisible, Math.floor(minBoundsLength / incrementUnit), !1);
-          scaleTicks = scale.stepTicks(stepResult.step), op.labelLastVisible && (stepResult.delCount && (scaleTicks = scaleTicks.slice(0, scaleTicks.length - stepResult.delCount)), scaleTicks.push(domain[domain.length - 1]));
+          const labelBoundsList = getOneDimensionalLabelBounds(scale, domain, op, isHorizontal);
+          if (labelBoundsList) {
+            const minBoundsLength = Math.min(...labelBoundsList.map(bounds => bounds[2])),
+              incrementUnit = (rangeEnd - rangeStart) / domain.length,
+              stepResult = getStep$1(domain, labelBoundsList, labelGap, op.labelLastVisible, Math.floor(minBoundsLength / incrementUnit), !1);
+            scaleTicks = scale.stepTicks(stepResult.step), op.labelLastVisible && (stepResult.delCount && (scaleTicks = scaleTicks.slice(0, scaleTicks.length - stepResult.delCount)), scaleTicks.push(domain[domain.length - 1]));
+          }
         } else {
           const tempDomain = [domain[0], domain[Math.floor(domain.length / 2)], domain[domain.length - 1]],
             tempList = getOneDimensionalLabelBounds(scale, tempDomain, op, isHorizontal);
-          let maxBounds = null;
-          tempList.forEach(current => {
-            maxBounds ? maxBounds[2] < current[2] && (maxBounds = current) : maxBounds = current;
-          });
-          const step = rangeEnd - rangeStart - labelGap > 0 ? Math.ceil(domain.length * (labelGap + maxBounds[2]) / (rangeEnd - rangeStart - labelGap)) : domain.length - 1;
-          scaleTicks = scale.stepTicks(step), !op.labelLastVisible || scaleTicks.length && scaleTicks[scaleTicks.length - 1] === domain[domain.length - 1] || (scaleTicks.length && Math.abs(scale.scale(scaleTicks[scaleTicks.length - 1]) - scale.scale(domain[domain.length - 1])) < maxBounds[2] && (scaleTicks = scaleTicks.slice(0, -1)), scaleTicks.push(domain[domain.length - 1]));
+          if (tempList) {
+            let maxBounds = null;
+            tempList.forEach(current => {
+              maxBounds ? maxBounds[2] < current[2] && (maxBounds = current) : maxBounds = current;
+            });
+            const step = rangeEnd - rangeStart - labelGap > 0 ? Math.ceil(domain.length * (labelGap + maxBounds[2]) / (rangeEnd - rangeStart - labelGap)) : domain.length - 1;
+            scaleTicks = scale.stepTicks(step), !op.labelLastVisible || scaleTicks.length && scaleTicks[scaleTicks.length - 1] === domain[domain.length - 1] || (scaleTicks.length && Math.abs(scale.scale(scaleTicks[scaleTicks.length - 1]) - scale.scale(domain[domain.length - 1])) < maxBounds[2] && (scaleTicks = scaleTicks.slice(0, -1)), scaleTicks.push(domain[domain.length - 1]));
+          }
         }
-      } else scaleTicks = scale.domain();
-      return convertDomainToTickData(scaleTicks);
+      }
+      return isNil$1(scaleTicks) && (scaleTicks = scale.domain()), convertDomainToTickData(scaleTicks);
     };
     const getStep$1 = (domain, labelBoundsList, labelGap, labelLastVisible, defaultStep, areAllBoundsSame) => {
       let resultDelCount = 0,
@@ -39531,13 +39639,6 @@
           end: end
         }));
       }
-      eventPosToStagePos(e) {
-        var _a, _b;
-        return null !== (_b = null === (_a = this.stage) || void 0 === _a ? void 0 : _a.eventPointTransform(e)) && void 0 !== _b ? _b : {
-          x: 0,
-          y: 0
-        };
-      }
       _clearDragEvents() {
         const evtTarget = "browser" === vglobal.env ? vglobal : this.stage,
           triggers = getEndTriggersOfDrag();
@@ -39696,7 +39797,13 @@
           } = this.attribute.startTextStyle;
         if (new Bounds().set(x1, y1, x2, y2).intersects(endTextBounds)) {
           const direction = "bottom" === this.attribute.orient || "right" === this.attribute.orient ? -1 : 1;
-          this._isHorizontal ? this._startText.setAttribute("dy", startTextDy + direction * Math.abs(endTextBounds.y1 - endTextBounds.y2)) : this._startText.setAttribute("dx", startTextDx + direction * Math.abs(endTextBounds.x1 - endTextBounds.x2));
+          if (this._isHorizontal) {
+            const boundsYDiff = Math.abs(endTextBounds.y1 - endTextBounds.y2);
+            this._startText.setAttribute("dy", startTextDy + direction * (Number.isFinite(boundsYDiff) ? boundsYDiff : 0));
+          } else {
+            const boundsXDiff = Math.abs(endTextBounds.x1 - endTextBounds.x2);
+            this._startText.setAttribute("dx", startTextDx + direction * (Number.isFinite(boundsXDiff) ? boundsXDiff : 0));
+          }
         } else this._isHorizontal ? this._startText.setAttribute("dy", startTextDy) : this._startText.setAttribute("dx", startTextDx);
       }
       getLayoutAttrFromConfig() {
@@ -44891,8 +44998,7 @@
     loadBrushComponent();
     let Brush$1 = class Brush extends AbstractComponent {
       constructor(attributes, options) {
-        super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, Brush.defaultAttributes, attributes)), this.name = "brush", this._activeDrawState = !1, this._cacheDrawPoints = [], this._activeMoveState = !1, this._operatingMaskMoveDx = 0, this._operatingMaskMoveDy = 0, this._operatingMaskMoveRangeX = [-1 / 0, 1 / 0], this._operatingMaskMoveRangeY = [-1 / 0, 1 / 0], this._brushMaskAABBBoundsDict = {}, this._firstUpdate = !0, this._onBrushStart = e => {
-          if (this._outOfInteractiveRange(e)) return void (this._isEmptyMask() || (this._clearMask(), this._dispatchBrushEvent(IOperateType.brushClear, e)));
+        super((null == options ? void 0 : options.skipDefault) ? attributes : merge$1({}, Brush.defaultAttributes, attributes)), this.name = "brush", this._activeBrushState = !1, this._activeDrawState = !1, this._cacheDrawPoints = [], this._activeMoveState = !1, this._operatingMaskMoveDx = 0, this._operatingMaskMoveDy = 0, this._operatingMaskMoveRangeX = [-1 / 0, 1 / 0], this._operatingMaskMoveRangeY = [-1 / 0, 1 / 0], this._brushMaskAABBBoundsDict = {}, this._firstUpdate = !0, this._onBrushStart = e => {
           const {
             updateTrigger = DEFAULT_BRUSH_ATTRIBUTES.updateTrigger,
             endTrigger = DEFAULT_BRUSH_ATTRIBUTES.endTrigger,
@@ -44920,7 +45026,7 @@
             brushMode: brushMode
           } = this.attribute,
           pos = this.eventPosToStagePos(e);
-        this._cacheDrawPoints.push(pos), "single" === brushMode && this._clearMask(), this._addBrushMask(), this._dispatchBrushEvent(IOperateType.drawStart, e), 1 === Object.keys(this._brushMaskAABBBoundsDict).length && this._dispatchBrushEvent(IOperateType.brushActive, e);
+        this._cacheDrawPoints.push(pos), "single" === brushMode && this._clearMask(), this._addBrushMask(), this._dispatchBrushEvent(IOperateType.drawStart, e), this._activeBrushState = !1;
       }
       _initMove(e) {
         var _a, _b;
@@ -44950,7 +45056,8 @@
         var _a;
         const pos = this.eventPosToStagePos(e),
           {
-            brushType: brushType
+            brushType: brushType,
+            sizeThreshold = DEFAULT_SIZE_THRESHOLD
           } = this.attribute,
           cacheLength = this._cacheDrawPoints.length;
         if (cacheLength > 0) {
@@ -44959,7 +45066,16 @@
         }
         "polygon" === brushType || cacheLength <= 1 ? this._cacheDrawPoints.push(pos) : this._cacheDrawPoints[cacheLength - 1] = pos;
         const maskPoints = this._computeMaskPoints();
-        this._operatingMask.setAttribute("points", maskPoints), this._dispatchBrushEvent(IOperateType.drawing, e);
+        this._operatingMask.setAttribute("points", maskPoints);
+        const {
+            x: x1,
+            y: y1
+          } = this._startPos,
+          {
+            x: x2,
+            y: y2
+          } = this.eventPosToStagePos(e);
+        (Math.abs(x2 - x1) > sizeThreshold || Math.abs(y1 - y2) > sizeThreshold) && (1 !== Object.keys(this._brushMaskAABBBoundsDict).length || this._activeBrushState ? this._dispatchBrushEvent(IOperateType.drawing, e) : (this._activeBrushState = !0, this._dispatchBrushEvent(IOperateType.brushActive, e)));
       }
       _moving(e) {
         const startPos = this._cacheMovePoint,
@@ -45099,9 +45215,6 @@
           pos = this.eventPosToStagePos(e);
         return pos.x > maxX || pos.x < minX || pos.y > maxY || pos.y < minY;
       }
-      eventPosToStagePos(e) {
-        return this.stage.eventPointTransform(e);
-      }
       _dispatchBrushEvent(operateType, e) {
         this._dispatchEvent(operateType, {
           operateMask: this._operatingMask,
@@ -45110,7 +45223,7 @@
         });
       }
       _clearMask() {
-        this._brushMaskAABBBoundsDict = {}, this._container.incrementalClearChild(), this._operatingMask = null;
+        this._brushMaskAABBBoundsDict = {}, this._container.removeAllChild(), this._operatingMask = null;
       }
       _isEmptyMask() {
         return isEmpty(this._brushMaskAABBBoundsDict) || Object.keys(this._brushMaskAABBBoundsDict).every(key => this._brushMaskAABBBoundsDict[key].empty());
@@ -64123,7 +64236,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.13.11-alpha.2";
+    const version = "1.13.12";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -67712,7 +67825,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     const getCartesianCrosshairTheme = (chartTheme, chartSpec) => {
         var _a, _b;
         const axes = array((_a = chartSpec.axes) !== null && _a !== void 0 ? _a : []);
-        const { bandField, linearField, xField, yField } = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, chartTheme)) !== null && _b !== void 0 ? _b : {};
+        const crosshairTheme = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, chartTheme)) !== null && _b !== void 0 ? _b : {};
+        const { bandField, linearField, xField, yField, trigger, triggerOff } = crosshairTheme;
         const xAxis = axes.find(axis => isXAxis(axis.orient));
         let newXField;
         if (isValid$1(xAxis)) {
@@ -67731,13 +67845,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         return {
             xField: newXField,
-            yField: newYField
+            yField: newYField,
+            trigger,
+            triggerOff
         };
     };
     const getPolarCrosshairTheme = (chartTheme, chartSpec) => {
         var _a, _b;
         const axes = array((_a = chartSpec.axes) !== null && _a !== void 0 ? _a : []);
-        const { bandField, linearField, categoryField, valueField } = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, chartTheme)) !== null && _b !== void 0 ? _b : {};
+        const { bandField, linearField, categoryField, valueField, trigger, triggerOff } = (_b = getComponentThemeFromOption(ComponentTypeEnum.crosshair, chartTheme)) !== null && _b !== void 0 ? _b : {};
         const angleAxis = axes.find(axis => axis.orient === 'angle');
         let newAngleField;
         if (isValid$1(angleAxis)) {
@@ -67756,7 +67872,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         return {
             categoryField: newAngleField,
-            valueField: newRadiusField
+            valueField: newRadiusField,
+            trigger,
+            triggerOff
         };
     };
 
@@ -72742,6 +72860,26 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._barMarkType = "rect";
             this.transformerConstructor = BarSeriesSpecTransformer;
             this._bandPosition = 0;
+            this._getLinearBarRange = (start, end) => {
+                let [x, x1] = [start, end].sort((a, b) => a - b);
+                const realBarWidth = x1 - x;
+                if (this._spec.barGap) {
+                    const halfBarGap = this._spec.barGap * 0.5;
+                    const tempX = x + halfBarGap;
+                    const tempX1 = x1 - halfBarGap;
+                    x = tempX;
+                    x1 = tempX1;
+                }
+                const curBarWidth = x1 - x;
+                const barMinWidth = getActualNumValue(this._spec.barMinWidth || 2, realBarWidth);
+                if (curBarWidth < barMinWidth) {
+                    const widthDiff = barMinWidth - curBarWidth;
+                    const halfWidthDiff = widthDiff / 2;
+                    x -= halfWidthDiff;
+                    x1 += halfWidthDiff;
+                }
+                return [x, x1];
+            };
             this._getBarXStart = (datum, scale, useWholeRange) => {
                 if (this._shouldDoPreCalculate()) {
                     this._calculateStackRectPosition(false);
@@ -72759,6 +72897,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }
                 return valueInScaleRange(this._dataToPosX1(datum), scale, useWholeRange);
             };
+            this._getLinearBarXRange = (datum, scale, useWholeRange) => {
+                const x = valueInScaleRange(this._dataToPosX(datum), scale, useWholeRange);
+                const x1 = valueInScaleRange(this._dataToPosX1(datum), scale, useWholeRange);
+                return this._getLinearBarRange(x, x1);
+            };
             this._getBarYStart = (datum, scale) => {
                 if (this._shouldDoPreCalculate()) {
                     this._calculateStackRectPosition(true);
@@ -72776,6 +72919,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }
                 return valueInScaleRange(this._dataToPosY1(datum), scale);
             };
+            this._getLinearBarYRange = (datum, scale, useWholeRange) => {
+                const y = valueInScaleRange(this._dataToPosY(datum), scale, useWholeRange);
+                const y1 = valueInScaleRange(this._dataToPosY1(datum), scale, useWholeRange);
+                return this._getLinearBarRange(y, y1);
+            };
             this._getBarBackgroundXStart = (scale) => {
                 const range = scale.range();
                 const min = Math.min(range[0], range[range.length - 1]);
@@ -73143,8 +73291,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             if (this.direction === "horizontal") {
                 const yChannels = isValid$1(this._fieldY2)
                     ? {
-                        y: (datum) => valueInScaleRange(this._dataToPosY(datum), yScale, true),
-                        y1: (datum) => valueInScaleRange(this._dataToPosY1(datum), yScale, true)
+                        y: (datum) => this._getLinearBarYRange(datum, yScale, true)[0],
+                        y1: (datum) => this._getLinearBarYRange(datum, yScale, true)[1]
                     }
                     : {
                         y: (datum) => valueInScaleRange(this._dataToPosY(datum) - this._getBarWidth(this._yAxisHelper) / 2, yScale, true),
@@ -73156,8 +73304,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             else {
                 const xChannels = isValid$1(this._fieldX2)
                     ? {
-                        x: (datum) => valueInScaleRange(this._dataToPosX(datum), xScale, true),
-                        x1: (datum) => valueInScaleRange(this._dataToPosX1(datum), xScale, true)
+                        x: (datum) => this._getLinearBarXRange(datum, xScale, true)[0],
+                        x1: (datum) => this._getLinearBarXRange(datum, xScale, true)[1]
                     }
                     : {
                         x: (datum) => valueInScaleRange(this._dataToPosX(datum) - this._getBarWidth(this._xAxisHelper) / 2, xScale, true),
@@ -91661,7 +91809,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             spec.axes.forEach((axis) => (axis.type = 'linear'));
         }
         _getDefaultSeriesSpec(spec) {
-            return super._getDefaultSeriesSpec(spec, ['x2Field', 'y2Field', 'barMinHeight', 'barBackground']);
+            return super._getDefaultSeriesSpec(spec, ['x2Field', 'y2Field', 'barMinHeight', 'barBackground', 'barGap']);
         }
     }
 
@@ -94182,11 +94330,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return false;
         }
         _initTheme(spec, chartSpec) {
-            var _a;
+            var _a, _b, _c;
             const { spec: newSpec, theme } = super._initTheme(spec, chartSpec);
             newSpec.style = mergeSpec({}, this._theme, newSpec.style);
             newSpec.offset = mergeSpec({}, theme.offset, spec.offset);
             newSpec.transitionDuration = (_a = spec.transitionDuration) !== null && _a !== void 0 ? _a : theme.transitionDuration;
+            newSpec.trigger = (_b = spec.trigger) !== null && _b !== void 0 ? _b : theme.trigger;
+            newSpec.triggerOff = (_c = spec.triggerOff) !== null && _c !== void 0 ? _c : theme.triggerOff;
             return { spec: newSpec, theme };
         }
         _transformSpecAfterMergingTheme(spec, chartSpec, chartSpecInfo) {
@@ -95139,7 +95289,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
         }
         _parseField(field, fieldName) {
-            var _a, _b;
+            var _a, _b, _c;
             const hair = {};
             const { line = {}, label = {}, visible } = field;
             hair.visible = visible;
@@ -95150,7 +95300,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             else {
                 const style = line.style || {};
                 const { stroke, fill, lineWidth } = style;
-                const _c = style, { strokeOpacity, fillOpacity, opacity } = _c, restStyle = __rest$e(_c, ["strokeOpacity", "fillOpacity", "opacity"]);
+                const _d = style, { strokeOpacity, fillOpacity, opacity } = _d, restStyle = __rest$e(_d, ["strokeOpacity", "fillOpacity", "opacity"]);
                 const isLineType = hair.type === 'line';
                 let finalOpacity = isLineType ? strokeOpacity : fillOpacity;
                 if (isNumber$1(opacity)) {
@@ -95178,8 +95328,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             if (!!label.visible) {
                 const labelBackground = label.labelBackground || {};
+                const syncAxisLabelAngle = (_c = label.syncAxisLabelAngle) !== null && _c !== void 0 ? _c : false;
                 const labelStyle = label.style || {};
-                const _d = labelBackground.style || {}, { fill: rectFill = 'rgba(47, 59, 82, 0.9)', stroke: rectStroke, outerBorder } = _d, rectStyle = __rest$e(_d, ["fill", "stroke", "outerBorder"]);
+                const _e = labelBackground.style || {}, { fill: rectFill = 'rgba(47, 59, 82, 0.9)', stroke: rectStroke, outerBorder } = _e, rectStyle = __rest$e(_e, ["fill", "stroke", "outerBorder"]);
                 hair.label = {
                     visible: true,
                     formatMethod: label.formatMethod,
@@ -95187,6 +95338,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     minWidth: labelBackground.minWidth,
                     maxWidth: labelBackground.maxWidth,
                     padding: labelBackground.padding,
+                    syncAxisLabelAngle,
                     textStyle: Object.assign(Object.assign({ fontSize: 14, pickable: false }, labelStyle), { fill: labelStyle.fill || '#fff', stroke: get$1(labelStyle, 'stroke') }),
                     panel: (isBoolean$1(labelBackground.visible) ? labelBackground.visible : !!labelBackground)
                         ? Object.assign({ visible: true, pickable: false, fill: rectFill, stroke: rectStroke, outerBorder: Object.assign({ stroke: rectFill, distance: 0, lineWidth: 3 }, outerBorder) }, rectStyle) : { visible: false },
@@ -95279,9 +95431,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             layoutStartPoint = { x: 0, y: 0 };
         }
         Object.keys(stateByField).forEach(field => {
+            var _a, _b, _c, _d, _e;
             const { currentValue, cacheInfo, labelsComp, attributes, coordKey } = stateByField[field];
             let axis = null;
             let coord = 0;
+            let axisLabel = null;
             if (currentValue.size) {
                 const item = Array.from(currentValue.values())[0];
                 coord =
@@ -95289,6 +95443,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                         item.axis.getLayoutStartPoint()[coordKey] -
                         layoutStartPoint[coordKey];
                 axis = item.axis;
+                axisLabel = (_e = (_d = (_c = (_b = (_a = axis
+                    .getVRenderComponents()[0]) === null || _a === void 0 ? void 0 : _a.children[0]) === null || _b === void 0 ? void 0 : _b.children[0]) === null || _c === void 0 ? void 0 : _c.getChildByName('axis-label-container')) === null || _d === void 0 ? void 0 : _d.getChildByName('axis-label-container-layer-0')) === null || _e === void 0 ? void 0 : _e.children[0];
             }
             const isVisible = !!currentValue.size && Number.isFinite(coord) && !Number.isNaN(coord);
             const useCache = enableRemain && !isVisible && isValid$1(cacheInfo);
@@ -95306,7 +95462,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                         }, {})
                         : null,
                     visible: isVisible,
-                    axis
+                    axis,
+                    axisLabel: axisLabel
                 };
             if (newCacheInfo) {
                 newCacheInfo._isCache = useCache;
@@ -95315,7 +95472,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             let offsetSize = 0;
             if (attributes) {
                 currentValue.forEach(({ axis, datum: value = '' }) => {
-                    var _a;
+                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
                     let niceLabelFormatter = null;
                     const scale = axis.getScale();
                     if (isDiscrete(scale.type)) {
@@ -95344,36 +95501,37 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     if (newCacheInfo && ((_a = attributes.label) === null || _a === void 0 ? void 0 : _a.visible) && !useCache) {
                         const labelOffset = getAxisLabelOffset(axis.getSpec());
                         const axisOrient = axis.getOrient();
+                        const syncAxisLabelAngle = (_b = attributes.label) === null || _b === void 0 ? void 0 : _b.syncAxisLabelAngle;
                         if (newCacheInfo.labels[axisOrient]) {
                             newCacheInfo.labels[axisOrient].visible = true;
                             newCacheInfo.labels[axisOrient].text = value;
                             if (axisOrient === 'left') {
                                 newCacheInfo.labels[axisOrient].dx = -labelOffset;
                                 newCacheInfo.labelsTextStyle[axisOrient] = {
-                                    textAlign: 'right',
-                                    textBaseline: 'middle'
+                                    textAlign: syncAxisLabelAngle && axisLabel ? ((_c = axisLabel.attribute.textAlign) !== null && _c !== void 0 ? _c : 'right') : 'right',
+                                    textBaseline: syncAxisLabelAngle && axisLabel ? ((_d = axisLabel.attribute.textBaseline) !== null && _d !== void 0 ? _d : 'middle') : 'middle'
                                 };
                             }
                             else if (axisOrient === 'right') {
                                 newCacheInfo.labels[axisOrient].dx = labelOffset;
                                 newCacheInfo.labelsTextStyle[axisOrient] = {
-                                    textAlign: 'left',
-                                    textBaseline: 'middle'
+                                    textAlign: syncAxisLabelAngle && axisLabel ? ((_e = axisLabel.attribute.textAlign) !== null && _e !== void 0 ? _e : 'left') : 'left',
+                                    textBaseline: syncAxisLabelAngle && axisLabel ? ((_f = axisLabel.attribute.textBaseline) !== null && _f !== void 0 ? _f : 'middle') : 'middle'
                                 };
                             }
                             else if (axisOrient === 'top') {
                                 newCacheInfo.labels[axisOrient].y = 0;
                                 newCacheInfo.labels[axisOrient].dy = -labelOffset;
                                 newCacheInfo.labelsTextStyle[axisOrient] = {
-                                    textAlign: 'center',
-                                    textBaseline: 'bottom'
+                                    textAlign: syncAxisLabelAngle && axisLabel ? ((_g = axisLabel.attribute.textAlign) !== null && _g !== void 0 ? _g : 'center') : 'center',
+                                    textBaseline: syncAxisLabelAngle && axisLabel ? ((_h = axisLabel.attribute.textBaseline) !== null && _h !== void 0 ? _h : 'bottom') : 'bottom'
                                 };
                             }
                             else if (axisOrient === 'bottom') {
                                 newCacheInfo.labels[axisOrient].dy = labelOffset;
                                 newCacheInfo.labelsTextStyle[axisOrient] = {
-                                    textAlign: 'center',
-                                    textBaseline: 'top'
+                                    textAlign: syncAxisLabelAngle && axisLabel ? ((_j = axisLabel.attribute.textAlign) !== null && _j !== void 0 ? _j : 'center') : 'center',
+                                    textBaseline: syncAxisLabelAngle && axisLabel ? ((_k = axisLabel.attribute.textBaseline) !== null && _k !== void 0 ? _k : 'top') : 'top'
                                 };
                             }
                             newCacheInfo.labels[axisOrient].defaultFormatter = niceLabelFormatter;
@@ -95617,9 +95775,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 const positionAttribute = layoutCrosshair$1(this._stateByField[field]);
                 this._updateCrosshairByField(field, positionAttribute);
                 Object.keys(labels).forEach(labelKey => {
-                    var _a;
+                    var _a, _b, _c;
                     if (labels[labelKey].visible) {
-                        const updateAttrs = Object.assign(Object.assign(Object.assign({ [coordKey]: coord + bandSize / 2 }, labels[labelKey]), attributes.label), { textStyle: Object.assign(Object.assign({}, (_a = attributes.label) === null || _a === void 0 ? void 0 : _a.textStyle), labelsTextStyle[labelKey]), zIndex: this.labelZIndex, visible: true });
+                        const updateAttrs = Object.assign(Object.assign(Object.assign({ [coordKey]: coord + bandSize / 2 }, labels[labelKey]), attributes.label), { angle: attributes.label.syncAxisLabelAngle ? ((_b = (_a = cacheInfo.axisLabel) === null || _a === void 0 ? void 0 : _a.attribute.angle) !== null && _b !== void 0 ? _b : 0) : 0, textStyle: Object.assign(Object.assign({}, (_c = attributes.label) === null || _c === void 0 ? void 0 : _c.textStyle), labelsTextStyle[labelKey]), zIndex: this.labelZIndex, visible: true });
                         this._updateCrosshairLabel(labelsComp[labelKey], updateAttrs, label => {
                             label.name = `crosshair-${field.replace('Field', '')}-${labelKey}-label`;
                             labelsComp[labelKey] = label;
@@ -96035,10 +96193,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         return data.filter(filter);
     };
     const dataFilterComputeDomain = (data, op) => {
-        const { stateFields, valueFields, dataCollection } = op.input;
+        const { stateFields, valueFields, dataCollection, isCategoryState } = op.input;
         const { stateField, valueField } = op.output;
         const resultObj = {};
         const resultData = [];
+        const stateValues = [];
+        let hasLockDomain = false;
         dataCollection.forEach((dv, i) => {
             var _a;
             if (isNil$1(stateFields[i])) {
@@ -96046,14 +96206,19 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             const stateFieldInfo = (_a = dv.getFields()) === null || _a === void 0 ? void 0 : _a[stateFields[i]];
             if (stateFieldInfo && stateFieldInfo.lockStatisticsByDomain) {
+                hasLockDomain = true;
                 stateFieldInfo.domain.forEach((d) => {
-                    resultObj[d] = 0;
+                    if (isNil$1(resultObj[d])) {
+                        stateValues.push(d);
+                        resultObj[d] = 0;
+                    }
                 });
             }
             dv.latestData.forEach((d) => {
                 array(stateFields[i]).forEach(state => {
                     if (!isNil$1(d[state])) {
                         if (isNil$1(resultObj[d[state]])) {
+                            stateValues.push(d[state]);
                             resultObj[d[state]] = 0;
                         }
                         if (!isNil$1(valueFields[i])) {
@@ -96063,10 +96228,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 });
             });
         });
-        Object.keys(resultObj).forEach((d, i) => {
-            const res = { [stateField]: d };
+        const sortedStateValues = hasLockDomain
+            ? stateValues
+            : isCategoryState === false
+                ? stateValues.sort((a, b) => a - b)
+                : Object.keys(resultObj);
+        sortedStateValues.forEach(state => {
+            const res = { [stateField]: state };
             if (valueField) {
-                res[valueField] = resultObj[d];
+                res[valueField] = resultObj[state];
             }
             resultData.push(res);
         });
@@ -96416,6 +96586,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             const dataCollection = [];
             const stateFields = [];
             const valueFields = [];
+            let isCategoryState;
             if (this._relatedAxisComponent) {
                 const originalStateFields = {};
                 eachSeries(this._regions, s => {
@@ -96441,8 +96612,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                                 ? xAxisHelper
                                 : yAxisHelper;
                     const valueAxisHelper = stateAxisHelper === xAxisHelper ? yAxisHelper : xAxisHelper;
-                    const isValidateValueAxis = isContinuous(valueAxisHelper.getScale(0).type);
-                    const isValidateStateAxis = isContinuous(stateAxisHelper.getScale(0).type);
                     dataCollection.push(s.getRawData());
                     const seriesSpec = s.getSpec();
                     const xField = s.coordinate === 'cartesian'
@@ -96453,7 +96622,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                         : array((_b = seriesSpec.radiusField) !== null && _b !== void 0 ? _b : seriesSpec.valueField);
                     originalStateFields[s.id] =
                         s.type === 'link' ? ['from_xField'] : stateAxisHelper === xAxisHelper ? xField : yField;
-                    if (isValidateStateAxis) {
+                    if (isContinuous(stateAxisHelper.getScale(0).type)) {
+                        isCategoryState = false;
                         stateFields.push(originalStateFields[s.id]);
                     }
                     else {
@@ -96461,7 +96631,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     }
                     if (this._valueField) {
                         const valueField = s.type === 'link' ? ['from_yField'] : valueAxisHelper === xAxisHelper ? xField : yField;
-                        if (isValidateValueAxis) {
+                        if (isContinuous(valueAxisHelper.getScale(0).type)) {
                             valueFields.push(...valueField);
                         }
                     }
@@ -96493,7 +96663,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     input: {
                         dataCollection: dataCollection,
                         stateFields,
-                        valueFields
+                        valueFields,
+                        isCategoryState
                     },
                     output: {
                         stateField: this._stateField,
@@ -97612,7 +97783,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             x = convertPercentToValue(datum.x, regionWidth) + regionStartLayoutStartPoint.x;
         }
         else {
-            x = relativeSeries.getXAxisHelper().dataToPosition([datum.x]) + regionStartLayoutStartPoint.x;
+            x =
+                convertDatumToValue(relativeSeries.getXAxisHelper(), [datum.x]) +
+                    regionStartLayoutStartPoint.x;
         }
         return x;
     }
@@ -97627,7 +97800,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             y = convertPercentToValue(datum.y, regionHeight) + regionStartLayoutStartPoint.y;
         }
         else {
-            y = relativeSeries.getYAxisHelper().dataToPosition([datum.y]) + regionStartLayoutStartPoint.y;
+            y =
+                convertDatumToValue(relativeSeries.getYAxisHelper(), [datum.y]) +
+                    regionStartLayoutStartPoint.y;
         }
         return y;
     }
@@ -97637,7 +97812,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         isNumber$1(datum.angle) &&
             isNeedExtendDomain(angleDomain, datum.angle, autoRange) &&
             ((_b = (_a = relativeSeries.angleAxisHelper) === null || _a === void 0 ? void 0 : _a.setExtendDomain) === null || _b === void 0 ? void 0 : _b.call(_a, 'marker_angleAxis_extend', datum.angle));
-        return relativeSeries.angleAxisHelper.dataToPosition([datum.angle]);
+        return convertDatumToValue(relativeSeries.angleAxisHelper, [datum.angle]);
     }
     function getRadiusValue(datum, radiusDomain, autoRange, refSeries) {
         var _a, _b;
@@ -97645,11 +97820,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         isNumber$1(datum.radius) &&
             isNeedExtendDomain(radiusDomain, datum.radius, autoRange) &&
             ((_b = (_a = relativeSeries.radiusAxisHelper) === null || _a === void 0 ? void 0 : _a.setExtendDomain) === null || _b === void 0 ? void 0 : _b.call(_a, 'marker_radiusAxis_extend', datum.radius));
-        return relativeSeries.radiusAxisHelper.dataToPosition([datum.radius]);
+        return convertDatumToValue(relativeSeries.radiusAxisHelper, [datum.radius]);
     }
     function convertPercentToValue(percent, relativeLength) {
         return (Number(percent.substring(0, percent.length - 1)) * relativeLength) / 100;
     }
+    function convertDatumToValue(axisHelper, datum) {
+        const scale = axisHelper.getScale(0);
+        if (isContinuous(scale.type) && scale.domain()[0] === scale.domain()[1] && datum[0] !== scale.domain()[0]) {
+            return NaN;
+        }
+        return axisHelper.dataToPosition(datum);
+    }
     function isAggrSpec(spec) {
         return AGGR_TYPE.includes(spec);
     }
@@ -97814,8 +97996,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 isNeedExtendDomain(yDomain, yValue[0], autoRange) &&
                 ((_d = (_c = refRelativeSeries.getYAxisHelper()) === null || _c === void 0 ? void 0 : _c.setExtendDomain) === null || _d === void 0 ? void 0 : _d.call(_c, 'marker_yAxis_extend', yValue[0]));
             points.push({
-                x: refRelativeSeries.getXAxisHelper().dataToPosition(xValue) + regionStartLayoutStartPoint.x + offsetX,
-                y: refRelativeSeries.getYAxisHelper().dataToPosition(yValue) + regionStartLayoutStartPoint.y + offsetY
+                x: convertDatumToValue(refRelativeSeries.getXAxisHelper(), xValue) + regionStartLayoutStartPoint.x + offsetX,
+                y: convertDatumToValue(refRelativeSeries.getYAxisHelper(), yValue) + regionStartLayoutStartPoint.y + offsetY
             });
         });
         return points;
@@ -97839,8 +98021,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 isNeedExtendDomain(radiusDomain, radiusValue[0], autoRange) &&
                 ((_d = (_c = refRelativeSeries.radiusAxisHelper) === null || _c === void 0 ? void 0 : _c.setExtendDomain) === null || _d === void 0 ? void 0 : _d.call(_c, 'marker_yAxis_extend', radiusValue[0]));
             points.push({
-                angle: refRelativeSeries.angleAxisHelper.dataToPosition(angleValue),
-                radius: refRelativeSeries.radiusAxisHelper.dataToPosition(radiusValue)
+                angle: convertDatumToValue(refRelativeSeries.angleAxisHelper, angleValue),
+                radius: convertDatumToValue(refRelativeSeries.radiusAxisHelper, radiusValue)
             });
         });
         return points;
@@ -100594,7 +100776,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._linkedInBrushElementsMap = {};
             this._linkedOutOfBrushElementsMap = {};
             this._cacheInteractiveRangeAttrs = [];
-            this._needDisablePickable = false;
             this._releatedAxes = [];
             this._regionAxisMap = {};
             this._axisDataZoomMap = {};
@@ -100750,34 +100931,36 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 this._emitEvent(ChartEvent.brushActive, region);
             });
             brush.addEventListener(IOperateType.drawStart, (e) => {
+                this._setRegionMarkPickable(region, true);
                 this._emitEvent(ChartEvent.brushStart, region);
             });
             brush.addEventListener(IOperateType.moveStart, (e) => {
+                this._setRegionMarkPickable(region, true);
                 this._emitEvent(ChartEvent.brushStart, region);
             });
             brush.addEventListener(IOperateType.drawing, (e) => {
-                this._needDisablePickable = true;
+                this._setRegionMarkPickable(region, false);
                 this._handleBrushChange(region, e);
                 this._emitEvent(ChartEvent.brushChange, region);
             });
             brush.addEventListener(IOperateType.moving, (e) => {
+                this._setRegionMarkPickable(region, false);
                 this._handleBrushChange(region, e);
                 this._emitEvent(ChartEvent.brushChange, region);
             });
             brush.addEventListener(IOperateType.brushClear, (e) => {
+                this._setRegionMarkPickable(region, true);
                 this._initMarkBrushState(componentIndex, '');
-                this._needDisablePickable = false;
                 this._emitEvent(ChartEvent.brushClear, region);
             });
             brush.addEventListener(IOperateType.drawEnd, (e) => {
                 var _a;
-                this._needDisablePickable = false;
+                this._setRegionMarkPickable(region, true);
                 const { operateMask } = e.detail;
                 if ((_a = this._spec) === null || _a === void 0 ? void 0 : _a.onBrushEnd) {
                     if (this._spec.onBrushEnd(e) === true) {
                         this.clearGraphic();
                         this._initMarkBrushState(componentIndex, '');
-                        this._needDisablePickable = false;
                         this._emitEvent(ChartEvent.brushClear, region);
                     }
                     else {
@@ -100794,6 +100977,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }
             });
             brush.addEventListener(IOperateType.moveEnd, (e) => {
+                this._setRegionMarkPickable(region, true);
                 const { operateMask } = e.detail;
                 const inBrushData = this._extendDataInBrush(this._inBrushElementsMap);
                 if (!this._spec.zoomWhenEmpty && inBrushData.length > 0) {
@@ -100921,7 +101105,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                         this._outOfBrushElementsMap[elementKey] = el;
                         delete this._inBrushElementsMap[operateMask.name][elementKey];
                     }
-                    graphicItem.setAttribute('pickable', !this._needDisablePickable);
                 });
             });
         }
@@ -100980,7 +101163,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                                 el.addState(OUT_BRUSH_STATE);
                                 this._linkedOutOfBrushElementsMap[elementKey] = el;
                             }
-                            graphicItem.setAttribute('pickable', !this._needDisablePickable);
                         });
                     });
                 }
@@ -101062,6 +101244,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 });
             });
         }
+        _setRegionMarkPickable(region, pickable) {
+            region
+                .getGroupMark()
+                .getProduct()
+                .elements.forEach(el => el.getGraphicItem().setAttribute('childrenPickable', pickable));
+        }
         _stateClamp(state) {
             return Math.min(Math.max(0, state), 1);
         }
@@ -101141,7 +101329,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 const container = this.getContainer();
                 this._brushComponents.forEach((brush, index) => {
                     this._initMarkBrushState(index, '');
-                    this._needDisablePickable = false;
                     brush.removeAllChild();
                     brush.releaseBrushEvents();
                     if (container) {
@@ -103074,12 +103261,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             const rowStyle = this._domStyle.row;
             const chilren = [...this._rootDom.children];
             let titleDom = chilren.find(child => child.className.includes(TOOLTIP_TITLE_CLASS_NAME));
+            let contentDom = chilren.find(child => child.className.includes(TOOLTIP_CONTENT_BOX_CLASS_NAME));
             if (!titleDom && title.visible !== false) {
                 titleDom = document.createElement('h2');
                 const span = document.createElement('span');
                 titleDom.appendChild(span);
                 titleDom.classList.add(TOOLTIP_TITLE_CLASS_NAME);
-                this._rootDom.appendChild(titleDom);
+                if (this._rootDom.firstChild) {
+                    this._rootDom.insertBefore(titleDom, this._rootDom.firstChild);
+                }
+                else {
+                    this._rootDom.appendChild(titleDom);
+                }
             }
             if (titleDom && title.visible !== false) {
                 setStyleToDom(titleDom, Object.assign(Object.assign(Object.assign({}, this._domStyle.title), (hasContent ? rowStyle : { marginBottom: '0px' })), { marginTop: '0px' }));
@@ -103088,7 +103281,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             else if (titleDom && title.visible === false) {
                 titleDom.parentNode.removeChild(titleDom);
             }
-            let contentDom = chilren.find(child => child.className.includes(TOOLTIP_CONTENT_BOX_CLASS_NAME));
             const columns = ['shape', 'key', 'value'];
             if (!contentDom && hasContent) {
                 contentDom = document.createElement('div');