@visactor/vchart 1.1.0 → 1.1.1

package/build/index.js

@@ -8617,9 +8617,9 @@
 	    return new OrdinalScale().domain(this._domain).range(this._ordinalRange).unknown(this._unknown);
 	  }
 	  scale(d) {
-	    const special = this._getSpecifiedValue(d);
-	    if (!isNil(special)) return special;
-	    const key = `${d}`;
+	    const key = `${d}`,
+	      special = this._getSpecifiedValue(key);
+	    if (void 0 !== special) return special;
 	    let i = this._index.get(key);
 	    if (!i) {
 	      if (this._unknown !== implicit) return this._unknown;
@@ -9078,12 +9078,33 @@
 	    } else z = ticks$1(i, j, Math.min(j - i, count)).map(this._pows);
 	    return r ? z.reverse() : z;
 	  }
+	  forceTicks() {
+	    let count = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 10;
+	    const d = this.calculateVisibleDomain(this._range);
+	    return forceTicks(d[0], d[d.length - 1], count);
+	  }
+	  stepTicks(step) {
+	    const d = this.calculateVisibleDomain(this._range);
+	    return stepTicks(d[0], d[d.length - 1], step);
+	  }
 	  nice() {
 	    return this.domain(nice(this.domain(), {
 	      floor: x => this._pows(Math.floor(this._logs(x))),
 	      ceil: x => this._pows(Math.ceil(this._logs(x)))
 	    }));
 	  }
+	  niceMin() {
+	    const maxD = this._domain[this._domain.length - 1];
+	    this.nice();
+	    const niceDomain = cloneDeep(this._domain);
+	    return this._domain && (niceDomain[niceDomain.length - 1] = maxD, this.domain(niceDomain)), this;
+	  }
+	  niceMax() {
+	    const minD = this._domain[0];
+	    this.nice();
+	    const niceDomain = cloneDeep(this._domain);
+	    return this._domain && (niceDomain[0] = minD, this.domain(niceDomain)), this;
+	  }
 	}
 
 	class PointScale extends BandScale {
@@ -25603,7 +25624,18 @@
 	    Array.isArray(text) ? graphic.updateMultilineAABBBounds(text) : graphic.updateSingallineAABBBounds(text);
 	    const tb1 = this.tempAABBBounds1,
 	      tb2 = this.tempAABBBounds2;
-	    return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), transformBoundsWithMatrix(aabbBounds, aabbBounds, graphic.transMatrix), aabbBounds;
+	    tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2);
+	    const {
+	      scaleX = textTheme.scaleX,
+	      scaleY = textTheme.scaleY,
+	      shadowBlur = textTheme.shadowBlur,
+	      strokeBoundsBuffer = textTheme.strokeBoundsBuffer
+	    } = attribute;
+	    if (shadowBlur) {
+	      const shadowBlurHalfWidth = shadowBlur / Math.abs(scaleX + scaleY);
+	      boundStroke(tb1, shadowBlurHalfWidth, !0, strokeBoundsBuffer), aabbBounds.union(tb1);
+	    }
+	    return this.combindShadowAABBBounds(aabbBounds, graphic), transformBoundsWithMatrix(aabbBounds, aabbBounds, graphic.transMatrix), aabbBounds;
 	  }
 	  updatePathAABBBounds(attribute, pathTheme, aabbBounds, graphic) {
 	    this.updatePathProxyAABBBounds(aabbBounds, graphic) || this.updatePathAABBBoundsImprecise(attribute, pathTheme, aabbBounds, graphic);
@@ -26587,21 +26619,21 @@
 	      x: originX = 0,
 	      x: originY = 0
 	    } = attribute;
-	    if (!1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), !1 !== stroke) if (strokeCb) strokeCb(context, attribute, defaultAttribute);else {
+	    if (!1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.fill())), this._areaRenderContribitions || (this._areaRenderContribitions = this.areaRenderContribitions.getContributions() || []), this._areaRenderContribitions.forEach(c => {
+	      c.time === BaseRenderContributionTime.afterFillStroke && c.drawShape(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: stroke
 	      } = attribute;
-	      isArray$3(stroke) && stroke[0] && !1 === stroke[1] && (context.beginPath(), drawSegments(context.camera ? context : context.nativeContext, cache.top, clipRange, "auto", {
+	      isArray$3(stroke) && (stroke[0] || stroke[2]) && !1 === stroke[1] && (context.beginPath(), drawSegments(context.camera ? context : context.nativeContext, stroke[0] ? cache.top : cache.bottom, clipRange, "auto", {
 	        offsetX: offsetX,
 	        offsetY: offsetY,
 	        offsetZ: offsetZ
 	      })), context.setStrokeStyle(area, attribute, originX - offsetX, originY - offsetY, defaultAttribute), context.stroke();
 	    }
-	    return this._areaRenderContribitions || (this._areaRenderContribitions = this.areaRenderContribitions.getContributions() || []), this._areaRenderContribitions.forEach(c => {
-	      c.time === BaseRenderContributionTime.afterFillStroke && c.drawShape(area, context, offsetX, offsetY, !!fillOpacity, !1, fill, !1, defaultAttribute, drawContext, fillCb, null, {
-	        attribute: attribute
-	      });
-	    }), !1;
+	    return !1;
 	  }
 	};
 	DefaultCanvasAreaRender = __decorate$1t([injectable(), __param$L(0, inject(ContributionProvider)), __param$L(0, named(AreaRenderContribution)), __metadata$_("design:paramtypes", [Object])], DefaultCanvasAreaRender);
@@ -34661,7 +34693,7 @@
 	          return this.viewBox.height();
 	        }
 	      }
-	    })), params.autoRender && this.enableAutoRender(), !1 === params.disableDirtyBounds && this.enableDirtyBounds(), this.hooks.beforeRender.tap("constructor", this.beforeRender), this.hooks.afterRender.tap("constructor", this.afterRender), this._beforeRender = params.beforeRender, this._afterRender = params.afterRender, this.ticker = params.ticker || defaultTicker, !1 !== params.interactiveLayer && this.initInteractiveLayer();
+	    })), params.autoRender && this.enableAutoRender(), !1 === params.disableDirtyBounds && this.enableDirtyBounds(), this.hooks.beforeRender.tap("constructor", this.beforeRender), this.hooks.afterRender.tap("constructor", this.afterRender), this._beforeRender = params.beforeRender, this._afterRender = params.afterRender, this.ticker = params.ticker || defaultTicker, this.supportInteractiveLayer = !1 !== params.interactiveLayer;
 	  }
 	  get3dOptions(options) {
 	    const {
@@ -34797,8 +34829,8 @@
 	  removeLayer(ILayerId) {
 	    return this.removeChild(this.findChildByUid(ILayerId));
 	  }
-	  initInteractiveLayer() {
-	    this.interactiveLayer = this.createLayer(), this.interactiveLayer.name = "_builtin_interactive";
+	  tryInitInteractiveLayer() {
+	    this.supportInteractiveLayer && !this.interactiveLayer && (this.interactiveLayer = this.createLayer(), this.interactiveLayer.name = "_builtin_interactive");
 	  }
 	  clearViewBox(color) {
 	    this.window.clearViewBox(this._viewBox, color);
@@ -36050,7 +36082,7 @@
 	}(LayoutState || (LayoutState = {}));
 	var HOOK_EVENT;
 	!function (HOOK_EVENT) {
-	  HOOK_EVENT.BEFORE_PARSE_VIEW = "beforeParseView", HOOK_EVENT.AFTER_PARSE_VIEW = "afterParseView", HOOK_EVENT.BEFORE_TRANSFORM = "beforeTransform", HOOK_EVENT.AFTER_TRANSFORM = "afterTransform", HOOK_EVENT.BEFORE_CREATE_VRENDER_STAGE = "beforeCreateVRenderStage", HOOK_EVENT.AFTER_CREATE_VRENDER_STAGE = "afterCreateVRenderStage", HOOK_EVENT.BEFORE_CREATE_VRENDER_LAYER = "beforeCreateVRenderLayer", HOOK_EVENT.AFTER_CREATE_VRENDER_LAYER = "afterCreateVRenderLayer", HOOK_EVENT.BEFORE_VRENDER_DRAW = "beforeVRenderDraw", HOOK_EVENT.AFTER_VRENDER_DRAW = "afterVRenderDraw", HOOK_EVENT.BEFORE_MARK_JOIN = "beforeMarkJoin", HOOK_EVENT.AFTER_MARK_JOIN = "afterMarkJoin", HOOK_EVENT.BEFORE_MARK_UPDATE = "beforeMarkUpdate", HOOK_EVENT.AFTER_MARK_UPDATE = "afterMarkUpdate", HOOK_EVENT.BEFORE_MARK_STATE = "beforeMarkState", HOOK_EVENT.AFTER_MARK_STATE = "afterMarkState", HOOK_EVENT.BEFORE_MARK_ENCODE = "beforeMarkEncode", HOOK_EVENT.AFTER_MARK_ENCODE = "afterMarkEncode", HOOK_EVENT.BEFORE_DO_LAYOUT = "beforeDoLayout", HOOK_EVENT.AFTER_DO_LAYOUT = "afterDoLayout", HOOK_EVENT.BEFORE_MARK_LAYOUT_END = "beforeMarkLayoutEnd", HOOK_EVENT.AFTER_MARK_LAYOUT_END = "afterMarkLayoutEnd", HOOK_EVENT.BEFORE_DO_RENDER = "beforeDoRender", HOOK_EVENT.AFTER_DO_RENDER = "afterDoRender", HOOK_EVENT.BEFORE_MARK_RENDER_END = "beforeMarkRenderEnd", HOOK_EVENT.AFTER_MARK_RENDER_END = "afterMarkRenderEnd", HOOK_EVENT.BEFORE_CREATE_VRENDER_MARK = "beforeCreateVRenderMark", HOOK_EVENT.AFTER_CREATE_VRENDER_MARK = "afterCreateVRenderMark", HOOK_EVENT.BEFORE_ADD_VRENDER_MARK = "beforeAddVRenderMark", HOOK_EVENT.AFTER_ADD_VRENDER_MARK = "afterAddVRenderMark", HOOK_EVENT.AFTER_VRENDER_NEXT_RENDER = "afterVRenderNextRender", HOOK_EVENT.BEFORE_ELEMENT_UPDATE_DATA = "beforeElementUpdateData", HOOK_EVENT.AFTER_ELEMENT_UPDATE_DATA = "afterElementUpdateData", HOOK_EVENT.BEFORE_ELEMENT_STATE = "beforeElementState", HOOK_EVENT.AFTER_ELEMENT_STATE = "afterElementState", HOOK_EVENT.BEFORE_ELEMENT_ENCODE = "beforeElementEncode", HOOK_EVENT.AFTER_ELEMENT_ENCODE = "afterElementEncode", HOOK_EVENT.ANIMATION_START = "animationStart", HOOK_EVENT.ANIMATION_END = "animationEnd", HOOK_EVENT.ELEMENT_ANIMATION_START = "elementAnimationStart", HOOK_EVENT.ELEMENT_ANIMATION_END = "elementAnimationEnd";
+	  HOOK_EVENT.BEFORE_PARSE_VIEW = "beforeParseView", HOOK_EVENT.AFTER_PARSE_VIEW = "afterParseView", HOOK_EVENT.BEFORE_TRANSFORM = "beforeTransform", HOOK_EVENT.AFTER_TRANSFORM = "afterTransform", HOOK_EVENT.BEFORE_CREATE_VRENDER_STAGE = "beforeCreateVRenderStage", HOOK_EVENT.AFTER_CREATE_VRENDER_STAGE = "afterCreateVRenderStage", HOOK_EVENT.BEFORE_CREATE_VRENDER_LAYER = "beforeCreateVRenderLayer", HOOK_EVENT.AFTER_CREATE_VRENDER_LAYER = "afterCreateVRenderLayer", HOOK_EVENT.BEFORE_VRENDER_DRAW = "beforeVRenderDraw", HOOK_EVENT.AFTER_VRENDER_DRAW = "afterVRenderDraw", HOOK_EVENT.BEFORE_MARK_JOIN = "beforeMarkJoin", HOOK_EVENT.AFTER_MARK_JOIN = "afterMarkJoin", HOOK_EVENT.BEFORE_MARK_UPDATE = "beforeMarkUpdate", HOOK_EVENT.AFTER_MARK_UPDATE = "afterMarkUpdate", HOOK_EVENT.BEFORE_MARK_STATE = "beforeMarkState", HOOK_EVENT.AFTER_MARK_STATE = "afterMarkState", HOOK_EVENT.BEFORE_MARK_ENCODE = "beforeMarkEncode", HOOK_EVENT.AFTER_MARK_ENCODE = "afterMarkEncode", HOOK_EVENT.BEFORE_DO_LAYOUT = "beforeDoLayout", HOOK_EVENT.AFTER_DO_LAYOUT = "afterDoLayout", HOOK_EVENT.BEFORE_MARK_LAYOUT_END = "beforeMarkLayoutEnd", HOOK_EVENT.AFTER_MARK_LAYOUT_END = "afterMarkLayoutEnd", HOOK_EVENT.BEFORE_DO_RENDER = "beforeDoRender", HOOK_EVENT.AFTER_DO_RENDER = "afterDoRender", HOOK_EVENT.BEFORE_MARK_RENDER_END = "beforeMarkRenderEnd", HOOK_EVENT.AFTER_MARK_RENDER_END = "afterMarkRenderEnd", HOOK_EVENT.BEFORE_CREATE_VRENDER_MARK = "beforeCreateVRenderMark", HOOK_EVENT.AFTER_CREATE_VRENDER_MARK = "afterCreateVRenderMark", HOOK_EVENT.BEFORE_ADD_VRENDER_MARK = "beforeAddVRenderMark", HOOK_EVENT.AFTER_ADD_VRENDER_MARK = "afterAddVRenderMark", HOOK_EVENT.AFTER_VRENDER_NEXT_RENDER = "afterVRenderNextRender", HOOK_EVENT.BEFORE_ELEMENT_UPDATE_DATA = "beforeElementUpdateData", HOOK_EVENT.AFTER_ELEMENT_UPDATE_DATA = "afterElementUpdateData", HOOK_EVENT.BEFORE_ELEMENT_STATE = "beforeElementState", HOOK_EVENT.AFTER_ELEMENT_STATE = "afterElementState", HOOK_EVENT.BEFORE_ELEMENT_ENCODE = "beforeElementEncode", HOOK_EVENT.AFTER_ELEMENT_ENCODE = "afterElementEncode", HOOK_EVENT.ANIMATION_START = "animationStart", HOOK_EVENT.ANIMATION_END = "animationEnd", HOOK_EVENT.ELEMENT_ANIMATION_START = "elementAnimationStart", HOOK_EVENT.ELEMENT_ANIMATION_END = "elementAnimationEnd", HOOK_EVENT.ALL_ANIMATION_START = "allAnimationStart", HOOK_EVENT.ALL_ANIMATION_END = "allAnimationEnd";
 	}(HOOK_EVENT || (HOOK_EVENT = {}));
 	var GrammarTypeEnum;
 	!function (GrammarTypeEnum) {
@@ -38886,6 +38918,12 @@
 	  recordEnd() {
 	    return this;
 	  }
+	  isAnimating() {
+	    let isAnimating = !1;
+	    return this.animators.forEach(animators => {
+	      isAnimating = isAnimating || animators.some(animator => animator.isAnimating);
+	    }), isAnimating;
+	  }
 	  isElementAnimating(element) {
 	    var _a;
 	    const stateAnimationCounts = null === (_a = this.elementRecorder.get(element)) || void 0 === _a ? void 0 : _a.count;
@@ -38943,7 +38981,7 @@
 	        },
 	        mergedParameters = Object.assign({
 	          [DefaultAnimationParameters]: animationParameters
-	        }, animationParameters),
+	        }, parameters),
 	        animationUnit = this.getAnimationUnit(config.timeline, element, index, animatedElements.length, parameters);
 	      animators.push(this.animateElement(config, animationUnit, element, animationParameters, mergedParameters));
 	    })), animators;
@@ -39655,7 +39693,7 @@
 	    if (this.renderContext = this.parseRenderContext(data, parameters), this.init(stage, parameters), this.renderContext.progressive) this.differ.reset(), this.elementMap.clear(), this.evaluateProgressive();else {
 	      const transformData = this.evaluateTransformSync(this._getTransformsBeforeJoin(), null != data ? data : DefaultMarkData, parameters);
 	      let inputData = transformData;
-	      transformData.progressive && (this.renderContext.parameters = parameters, this.renderContext.beforeTransformProgressive = transformData.progressive, inputData = transformData.progressive.output()), this.emit(HOOK_EVENT.BEFORE_MARK_JOIN), this.evaluateJoin(inputData), this.emit(HOOK_EVENT.AFTER_MARK_JOIN), this.emit(HOOK_EVENT.BEFORE_MARK_STATE), this.evaluateState(this.elements, this.spec.state, parameters), this.emit(HOOK_EVENT.AFTER_MARK_STATE), this.emit(HOOK_EVENT.BEFORE_MARK_ENCODE), this.evaluateEncode(this.elements, this._getEncoders(), parameters), this.emit(HOOK_EVENT.AFTER_MARK_ENCODE);
+	      (null == transformData ? void 0 : transformData.progressive) && (this.renderContext.parameters = parameters, this.renderContext.beforeTransformProgressive = transformData.progressive, inputData = transformData.progressive.output()), this.emit(HOOK_EVENT.BEFORE_MARK_JOIN), this.evaluateJoin(inputData), this.emit(HOOK_EVENT.AFTER_MARK_JOIN), this.emit(HOOK_EVENT.BEFORE_MARK_STATE), this.evaluateState(this.elements, this.spec.state, parameters), this.emit(HOOK_EVENT.AFTER_MARK_STATE), this.emit(HOOK_EVENT.BEFORE_MARK_ENCODE), this.evaluateEncode(this.elements, this._getEncoders(), parameters), this.emit(HOOK_EVENT.AFTER_MARK_ENCODE);
 	    }
 	    return this.emit(HOOK_EVENT.BEFORE_MARK_UPDATE), this.update(this.spec), this.emit(HOOK_EVENT.AFTER_MARK_UPDATE), this;
 	  }
@@ -40870,7 +40908,7 @@
 	      }, poptip), {
 	        x: matrix.e,
 	        y: matrix.f
-	      }));
+	      })), drawContext.stage.tryInitInteractiveLayer();
 	      const interactiveLayer = drawContext.stage.getLayer("_builtin_interactive");
 	      interactiveLayer && interactiveLayer.add(this.poptipComponent);
 	    } else 2 === graphic._showPoptip && (graphic._showPoptip = 0, this.poptipComponent && this.poptipComponent.setAttributes({
@@ -50541,56 +50579,68 @@
 
 	class ViewAnimate {
 	  constructor(view) {
-	    this.view = view;
+	    this._animations = [], this._onAnimationStart = event => {
+	      0 === this._animations.length && this._view.emit(HOOK_EVENT.ALL_ANIMATION_START, {}), this._animations = this._animations.concat({
+	        config: event.animationConfig,
+	        mark: event.mark
+	      });
+	    }, this._onAnimationEnd = event => {
+	      this._animations = this._animations.filter(animation => animation.config !== event.animationConfig || animation.mark !== event.mark), 0 === this._animations.length && this._view.emit(HOOK_EVENT.ALL_ANIMATION_END, {});
+	    }, this._view = view, this._view.addEventListener(HOOK_EVENT.ANIMATION_START, this._onAnimationStart), this._view.addEventListener(HOOK_EVENT.ANIMATION_END, this._onAnimationEnd);
 	  }
 	  stop() {
-	    return this.view.traverseMarkTree(mark => {
-	      var _a;
-	      null === (_a = mark.animate) || void 0 === _a || _a.stop();
+	    return this._view.traverseMarkTree(mark => {
+	      var _a, _b;
+	      null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.stop) || void 0 === _b || _b.call(_a);
 	    }), this;
 	  }
 	  pause() {
-	    return this.view.traverseMarkTree(mark => {
-	      var _a;
-	      null === (_a = mark.animate) || void 0 === _a || _a.pause();
+	    return this._view.traverseMarkTree(mark => {
+	      var _a, _b;
+	      null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.pause) || void 0 === _b || _b.call(_a);
 	    }), this;
 	  }
 	  resume() {
-	    return this.view.traverseMarkTree(mark => {
-	      var _a;
-	      null === (_a = mark.animate) || void 0 === _a || _a.resume();
+	    return this._view.traverseMarkTree(mark => {
+	      var _a, _b;
+	      null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.resume) || void 0 === _b || _b.call(_a);
 	    }), this;
 	  }
 	  enable() {
-	    return this.view.traverseMarkTree(mark => {
-	      var _a;
-	      null === (_a = mark.animate) || void 0 === _a || _a.enable();
+	    return this._view.traverseMarkTree(mark => {
+	      var _a, _b;
+	      null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.enable) || void 0 === _b || _b.call(_a);
 	    }), this;
 	  }
 	  disable() {
-	    return this.view.traverseMarkTree(mark => {
-	      var _a;
-	      null === (_a = mark.animate) || void 0 === _a || _a.disable();
+	    return this._view.traverseMarkTree(mark => {
+	      var _a, _b;
+	      null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.disable) || void 0 === _b || _b.call(_a);
 	    }), this;
 	  }
 	  enableAnimationState(state) {
-	    return this.view.traverseMarkTree(mark => {
-	      var _a;
-	      null === (_a = mark.animate) || void 0 === _a || _a.enableAnimationState(state);
+	    return this._view.traverseMarkTree(mark => {
+	      var _a, _b;
+	      null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.enableAnimationState) || void 0 === _b || _b.call(_a, state);
 	    }), this;
 	  }
 	  disableAnimationState(state) {
-	    return this.view.traverseMarkTree(mark => {
-	      var _a;
-	      null === (_a = mark.animate) || void 0 === _a || _a.disableAnimationState(state);
+	    return this._view.traverseMarkTree(mark => {
+	      var _a, _b;
+	      null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.disableAnimationState) || void 0 === _b || _b.call(_a, state);
 	    }), this;
 	  }
+	  isAnimating() {
+	    return 0 !== this._animations.length;
+	  }
 	  animate() {
-	    return this.view.traverseMarkTree(mark => {
+	    return this._view.traverseMarkTree(mark => {
 	      mark.isUpdated && mark.animate && mark.animate.animate(), mark.cleanExitElements(), mark.isUpdated = !1;
 	    }, null, !0), this;
 	  }
-	  release() {}
+	  release() {
+	    this._view.removeEventListener(HOOK_EVENT.ALL_ANIMATION_START, this._onAnimationStart), this._view.removeEventListener(HOOK_EVENT.ALL_ANIMATION_END, this._onAnimationEnd);
+	  }
 	}
 
 	class Interval extends Mark {
@@ -54255,7 +54305,8 @@
 	            },
 	            doLayout: () => {
 	                this._compileChart?.onLayout(this._view);
-	            }
+	            },
+	            logLevel: Logger.getInstance().level()
 	        });
 	        this._setCanvasStyle();
 	        const interactive = this._option.interactive;
@@ -54556,6 +54607,9 @@
 	    static hideTooltip(excludeId = []) {
 	        InstanceManager.forEach(instance => instance?.hideTooltip?.(), excludeId);
 	    }
+	    static getLogger() {
+	        return Logger.getInstance();
+	    }
 	    static InstanceManager = InstanceManager;
 	    static ThemeManager = ThemeManager;
 	    static globalConfig = {
@@ -57694,6 +57748,11 @@
 	            });
 	        });
 	    }
+	    setPostProcess(key, postProcessFunc, state = 'normal') {
+	        if (this.stateStyle[state]?.[key]) {
+	            this.stateStyle[state][key].postProcess = postProcessFunc;
+	        }
+	    }
 	    getAttribute(key, datum, state = 'normal', opt) {
 	        return this._computeAttribute(key, datum, state, opt);
 	    }
@@ -57749,12 +57808,16 @@
 	        return style;
 	    }
 	    _computeAttribute(key, datum, state, opt) {
-	        let baseValue;
+	        let stateStyle;
 	        if (!this.stateStyle[state]?.[key]) {
-	            baseValue = this._computeStateAttribute(this.stateStyle.normal[key], key, datum, state, opt);
+	            stateStyle = this.stateStyle.normal[key];
 	        }
 	        else {
-	            baseValue = this._computeStateAttribute(this.stateStyle[state][key], key, datum, state, opt);
+	            stateStyle = this.stateStyle[state][key];
+	        }
+	        let baseValue = this._computeStateAttribute(stateStyle, key, datum, state, opt);
+	        if (isFunction(stateStyle?.postProcess)) {
+	            baseValue = stateStyle.postProcess(baseValue, datum, this._attributeContext, opt, this.getDataView());
 	        }
 	        if (key in this._computeExChannel) {
 	            return this._computeExChannel[key](key, datum, state, opt, baseValue);
@@ -57970,7 +58033,7 @@
 	VChart.useMark([ComponentMark, GroupMark, ImageMark]);
 	Factory.registerRegion('region', Region);
 	Factory.registerLayout('base', Layout);
-	const version = "1.1.0";
+	const version = "1.1.1";
 	Logger.getInstance(LoggerLevel.Error);
 
 	var SeriesMarkNameEnum;
@@ -65011,7 +65074,8 @@
 
 	const map = (data, opt) => {
 	    if (data.features) {
-	        data.features.forEach((f) => {
+	        data.features.forEach((f, index) => {
+	            f[DEFAULT_DATA_INDEX] = index;
 	            if (opt.nameMap) {
 	                f.name = opt.nameMap[f.properties?.[opt.nameProperty]];
 	            }
@@ -65125,6 +65189,7 @@
 	        });
 	        if (this._spec.label?.visible) {
 	            this._labelMark = this._createMark(MapSeries.mark.label, {
+	                parent: this.getRegion().getGroupMark(),
 	                skipBeforeLayouted: true,
 	                dataView: this._mapViewData.getDataView(),
 	                dataProductId: this._mapViewData.getProductId()
@@ -65139,10 +65204,16 @@
 	                    if (isValid(datum[this._seriesField ?? DEFAULT_DATA_SERIES_FIELD])) {
 	                        return (this._option.globalScale.getScale('color') ?? this.getDefaultColorScale()).scale(datum[this._seriesField ?? DEFAULT_DATA_SERIES_FIELD]);
 	                    }
-	                    return this._theme?.defaultFillColor;
+	                    return this._spec?.defaultFillColor;
 	                },
 	                path: this.getPath.bind(this)
 	            }, 'normal', AttributeLevel.Series);
+	            pathMark.setPostProcess('fill', result => {
+	                if (!isValid(result)) {
+	                    return this._spec.defaultFillColor;
+	                }
+	                return result;
+	            });
 	            this.setMarkStyle(pathMark, {
 	                smoothScale: true
 	            }, 'normal', AttributeLevel.Built_In);
@@ -65155,9 +65226,7 @@
 	                text: (datum) => {
 	                    return this._getDatumName(datum);
 	                },
-	                x: (datum) => {
-	                    return this.dataToPosition(datum)?.x;
-	                },
+	                x: (datum) => this.dataToPosition(datum)?.x,
 	                y: (datum) => this.dataToPosition(datum)?.y
 	            });
 	        }
@@ -65172,12 +65241,12 @@
 	        this._tooltipHelper = new MapSeriesTooltipHelper(this);
 	    }
 	    getPath(datum) {
-	        const area = this._areaCache.get(datum?.properties?.[this._nameProperty]);
+	        const area = this._areaCache.get(datum[DEFAULT_DATA_INDEX]);
 	        if (area) {
 	            return area.shape;
 	        }
 	        const shape = this._coordinateHelper?.shape(datum);
-	        this._areaCache.set(datum?.properties?.[this._nameProperty], {
+	        this._areaCache.set(datum[DEFAULT_DATA_INDEX], {
 	            shape
 	        });
 	        return shape;
@@ -65221,10 +65290,7 @@
 	            }
 	            const elements = vGrammarMark.elements;
 	            if (mark.type === MarkTypeEnum.path) {
-	                elements.forEach((el) => {
-	                    const graphicItem = el.getGraphicItem();
-	                    graphicItem.scale(scale, scale, scaleCenter);
-	                });
+	                vGrammarMark.group.getGroupGraphicItem().scale(scale, scale, scaleCenter);
 	            }
 	            else {
 	                elements.forEach((el) => {
@@ -65250,10 +65316,7 @@
 	            }
 	            const elements = vGrammarMark.elements;
 	            if (mark.type === MarkTypeEnum.path) {
-	                elements.forEach((el) => {
-	                    const graphicItem = el.getGraphicItem();
-	                    graphicItem.translate(delta[0], delta[1]);
-	                });
+	                vGrammarMark.group.getGroupGraphicItem().translate(delta[0], delta[1]);
 	            }
 	            else {
 	                elements.forEach((el, i) => {
@@ -65280,7 +65343,16 @@
 	        return [Number.NaN, Number.NaN];
 	    }
 	    _getDatumName(datum) {
-	        return datum[this.nameField] ?? datum.properties?.[this.nameField] ?? '';
+	        if (datum[this.nameField]) {
+	            return datum[this.nameField];
+	        }
+	        if (datum.properties?.[this._nameProperty]) {
+	            if (this._spec.nameMap) {
+	                return this._spec.nameMap[datum.properties[this._nameProperty]] ?? '';
+	            }
+	            return datum.properties[this._nameProperty] ?? '';
+	        }
+	        return '';
 	    }
 	    dataToPositionX(data) {
 	        throw new Error('Method not implemented.');
@@ -65294,7 +65366,7 @@
 	        this._mapViewData?.updateData();
 	    }
 	    _getDataIdKey() {
-	        return (datum) => datum?.properties?.[this._nameProperty];
+	        return DEFAULT_DATA_INDEX;
 	    }
 	}
 
@@ -76251,7 +76323,8 @@
 	            map: spec.map,
 	            nameProperty: spec.nameProperty,
 	            nameMap: spec.nameMap,
-	            area: spec.area
+	            area: spec.area,
+	            defaultFillColor: spec.defaultFillColor
 	        };
 	        return series;
 	    }
@@ -82562,6 +82635,7 @@
 	};
 
 	class Indicator extends BaseComponent {
+	    static speckey = 'indicator';
 	    static type = ComponentTypeEnum.indicator;
 	    type = ComponentTypeEnum.indicator;
 	    name = ComponentTypeEnum.indicator;
@@ -82582,7 +82656,7 @@
 	        const indicatorSpec = spec.indicator || options.defaultSpec;
 	        const indicators = array(indicatorSpec)
 	            .filter(s => s && s.visible !== false)
-	            .map(s => new Indicator(s, options));
+	            .map((s, index) => new Indicator(s, { ...options, specIndex: index, specKey: Indicator.speckey }));
 	        return indicators;
 	    }
 	    created() {
@@ -82732,9 +82806,12 @@
 	        return eachSeries(this._regions, s => model === s) || this._regions.includes(model);
 	    }
 	    clear() {
-	        super.clear();
-	        this._indicatorComponent = null;
+	        if (this._indicatorComponent) {
+	            this._container.removeChild(this._indicatorComponent);
+	            this._indicatorComponent = null;
+	        }
 	        this._cacheAttrs = null;
+	        super.clear();
 	    }
 	}