@visactor/vchart 1.12.4 → 1.12.5

package/build/index.js

@@ -20829,7 +20829,13 @@
     const RICHTEXT_UPDATE_TAG_KEY = ["width", "height", "ellipsis", "wordBreak", "verticalDirection", "maxHeight", "maxWidth", "textAlign", "textBaseline", "textConfig", "layoutDirection", "fill", "stroke", "fontSize", ...GRAPHIC_UPDATE_TAG_KEY];
     class RichText extends Graphic {
       constructor(params) {
-        super(params), this.type = "richtext", this._currentHoverIcon = null, this.numberType = RICHTEXT_NUMBER_TYPE;
+        super(params), this.type = "richtext", this._currentHoverIcon = null, this.numberType = RICHTEXT_NUMBER_TYPE, this.onBeforeAttributeUpdate = (val, attributes, key) => {
+          for (const key in val) if ("hoverIconId" === key) {
+            if (val[key] === attributes[key]) continue;
+            const icon = this._frameCache.icons.get(val[key]);
+            this.updateHoverIconState(icon);
+          }
+        };
       }
       get width() {
         var _a;
@@ -21000,8 +21006,9 @@
           paragraphs = [],
           textConfig = null != tc ? tc : _tc;
         for (let i = 0; i < textConfig.length; i++) if ("image" in textConfig[i]) {
-          const config = this.combinedStyleToCharacter(textConfig[i]),
-            iconCache = config.id && this._frameCache && this._frameCache.icons && this._frameCache.icons.get(config.id);
+          const config = this.combinedStyleToCharacter(textConfig[i]);
+          config.lineWidth = void 0;
+          const iconCache = config.id && this._frameCache && this._frameCache.icons && this._frameCache.icons.get(config.id);
           if (iconCache) paragraphs.push(iconCache);else {
             const icon = new RichTextIcon(config);
             icon.successCallback = () => {
@@ -21051,14 +21058,16 @@
       }
       bindIconEvent() {
         this.addEventListener("pointermove", e => {
-          var _a, _b, _c, _d, _e;
           const pickedIcon = this.pickIcon(e.global);
-          pickedIcon && pickedIcon === this._currentHoverIcon || (pickedIcon ? (null === (_a = this._currentHoverIcon) || void 0 === _a || _a.setHoverState(!1), this._currentHoverIcon = pickedIcon, this._currentHoverIcon.setHoverState(!0), null === (_b = this.stage) || void 0 === _b || _b.setCursor(pickedIcon.attribute.cursor), null === (_c = this.stage) || void 0 === _c || _c.renderNextFrame()) : !pickedIcon && this._currentHoverIcon && (this._currentHoverIcon.setHoverState(!1), this._currentHoverIcon = null, null === (_d = this.stage) || void 0 === _d || _d.setCursor(), null === (_e = this.stage) || void 0 === _e || _e.renderNextFrame()));
+          pickedIcon && pickedIcon === this._currentHoverIcon || (pickedIcon ? this.setAttribute("hoverIconId", pickedIcon.richtextId) : !pickedIcon && this._currentHoverIcon && this.setAttribute("hoverIconId", void 0));
         }), this.addEventListener("pointerleave", e => {
-          var _a, _b;
-          this._currentHoverIcon && (this._currentHoverIcon.setHoverState(!1), this._currentHoverIcon = null, null === (_a = this.stage) || void 0 === _a || _a.setCursor(), null === (_b = this.stage) || void 0 === _b || _b.renderNextFrame());
+          this._currentHoverIcon && this.setAttribute("hoverIconId", void 0);
         });
       }
+      updateHoverIconState(pickedIcon) {
+        var _a, _b, _c, _d, _e;
+        pickedIcon ? (null === (_a = this._currentHoverIcon) || void 0 === _a || _a.setHoverState(!1), this._currentHoverIcon = pickedIcon, this._currentHoverIcon.setHoverState(!0), null === (_b = this.stage) || void 0 === _b || _b.setCursor(pickedIcon.attribute.cursor), null === (_c = this.stage) || void 0 === _c || _c.renderNextFrame()) : (this._currentHoverIcon.setHoverState(!1), this._currentHoverIcon = null, null === (_d = this.stage) || void 0 === _d || _d.setCursor(), null === (_e = this.stage) || void 0 === _e || _e.renderNextFrame());
+      }
       pickIcon(point) {
         const frameCache = this.getFrameCache(),
           {
@@ -21066,7 +21075,7 @@
             f: y
           } = this.globalTransMatrix;
         let pickIcon;
-        return frameCache.icons.forEach(icon => {
+        return frameCache.icons.forEach((icon, key) => {
           var _a, _b;
           const bounds = icon.AABBBounds.clone();
           bounds.translate(icon._marginArray[3], icon._marginArray[0]), bounds.containsPoint({
@@ -22712,7 +22721,8 @@
         });
       }
       pauseRender() {
-        this._skipRender = -1;
+        let sr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
+        this._skipRender = sr;
       }
       resumeRender() {
         this._skipRender = 0;
@@ -23019,8 +23029,7 @@
       }
       pick(x, y) {
         if ("released" === this.releaseStatus) return;
-        this.pickerService || (this.pickerService = container.get(PickerService));
-        const result = this.pickerService.pick(this.children, new Point(x, y), {
+        const result = this.getPickerService().pick(this.children, new Point(x, y), {
           bounds: this.AABBBounds
         });
         return !(!(null == result ? void 0 : result.graphic) && !(null == result ? void 0 : result.group)) && result;
@@ -23105,6 +23114,9 @@
       resumeTriggerEvent() {
         this._eventSystem && this._eventSystem.resumeTriggerEvent();
       }
+      getPickerService() {
+        return this.pickerService || (this.pickerService = container.get(PickerService)), this.pickerService;
+      }
     }
 
     function createStage(params) {
@@ -32252,7 +32264,7 @@
             default:
               if (this._isCollectionBase) {
                 const point = this._idToPoint.get(text.attribute.id);
-                !point || text.animates && text.animates.has("label-animate") || !relatedGraphic.containsPoint(point.x, point.y, IContainPointMode.LOCAL, null === (_c = this.stage) || void 0 === _c ? void 0 : _c.pickerService) || (text.animate({
+                !point || text.animates && text.animates.has("label-animate") || !relatedGraphic.containsPoint(point.x, point.y, IContainPointMode.LOCAL, null === (_c = this.stage) || void 0 === _c ? void 0 : _c.getPickerService()) || (text.animate({
                   onStart: onStart
                 }).wait(delay).to(to, duration, easing), labelLine && labelLine.animate().wait(delay).to(to, duration, easing));
               } else detail.animationState.isFirstFrameOfStep && (text.animate({
@@ -42844,6 +42856,9 @@
         }
         return seats.map(entry => entry / digits);
     }
+    function isValidPoint(p) {
+        return isValidNumber$1(p.x) && isValidNumber$1(p.y);
+    }
 
     function eachSeries(regions, callback, filter) {
         let flag = false;
@@ -44212,11 +44227,13 @@
         },
         word: {
             style: {
+                fontWeight: null,
                 fontSize: null
             }
         },
         fillingWord: {
             style: {
+                fontWeight: null,
                 fontSize: null
             }
         },
@@ -50793,7 +50810,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         if (this._progressiveMarks && this._progressiveMarks.some(mark => mark.isDoingProgressive())) {
           const raf = vglobal.getRequestAnimationFrame();
           this._progressiveRafId = raf(this.handleProgressiveFrame);
-        } else this._progressiveMarks && this._progressiveMarks.every(mark => mark.canAnimateAfterProgressive()) ? this.animate.animate() : this._progressiveMarks && (this._progressiveMarks = null);
+        } else this._progressiveMarks && this.animate && this._progressiveMarks.every(mark => mark.canAnimateAfterProgressive()) ? this.animate.animate() : this._progressiveMarks && (this._progressiveMarks = null);
       }
       clearProgressive() {
         if (this._progressiveRafId) {
@@ -55108,15 +55125,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         discreteLegend: 'legend',
         continuousLegend: 'legend',
         colorLegend: 'legend',
-        sizeLegend: 'legend',
-        label: 'label',
-        markLine: 'markLine',
-        markArea: 'markArea',
-        markPoint: 'markPoint',
-        polarMarkLine: 'polarMarkLine',
-        polarMarkArea: 'polarMarkArea',
-        polarMarkPoint: 'polarMarkPoint',
-        geoMarkPoint: 'geoMarkPoint'
+        sizeLegend: 'legend'
     };
     class EventDispatcher {
         constructor(vchart, compiler) {
@@ -58862,12 +58871,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         setSupport3d(support3d) {
             this._support3d = support3d;
         }
-        getFacet() {
-            return this._facet;
-        }
-        setFacet(facet) {
-            this._facet = facet;
-        }
         getInteractive() {
             return this._interactive;
         }
@@ -59047,14 +59050,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return `${this.name}_${this.id}`;
         }
         compileData() {
-            var _a;
             if (isNil$1(this._data)) {
                 return;
             }
             this._data.compile();
             const dataProduct = this._data.getProduct();
             if (isValid$1(this._product) && isValid$1(dataProduct)) {
-                this._product.join(dataProduct, this.key, undefined, (_a = this._groupKey) !== null && _a !== void 0 ? _a : this._facet);
+                this._product.join(dataProduct, this.key, undefined, this.getGroupKey());
             }
         }
         updateStaticEncode() {
@@ -59073,7 +59075,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 if (this._unCompileChannel[key]) {
                     return;
                 }
-                if (this._option.noSeparateStyle || isStateAttrChangeable(key, normalStyle, this.getFacet())) {
+                if (this._option.noSeparateStyle || isStateAttrChangeable(key, normalStyle, this.getGroupKey())) {
                     updateStyles[key] = {
                         callback: this.compileCommonAttributeCallback(key, 'normal'),
                         dependency: [this.stateKeyToSignalName('markUpdateRank')]
@@ -61143,7 +61145,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.12.4";
+    const version = "1.12.5";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -62004,16 +62006,19 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 this.stack = true;
             }
         }
-        _addMarkLabelSpec(spec, markName, labelSpecKey = 'label', styleHandlerName = 'initLabelMarkStyle', hasAnimation, head) {
+        _addMarkLabelSpec(spec, markName, labelSpecKey = 'label', styleHandlerName = 'initLabelMarkStyle', hasAnimation = true, head) {
             if (!spec) {
                 return;
             }
             const labels = array(spec[labelSpecKey]);
             labels.forEach(labelSpec => {
-                var _a, _b, _c, _d;
+                var _a, _b, _c;
                 if (labelSpec && labelSpec.visible) {
-                    const animationEnabled = (_d = (_c = (_b = (_a = this._option) === null || _a === void 0 ? void 0 : _a.animation) !== null && _b !== void 0 ? _b : spec.animation) !== null && _c !== void 0 ? _c : labelSpec.animation) !== null && _d !== void 0 ? _d : true;
-                    this.addLabelSpec(markName, Object.assign(Object.assign({}, labelSpec), { animation: animationEnabled && hasAnimation, getStyleHandler: (series) => { var _a; return (_a = series[styleHandlerName]) === null || _a === void 0 ? void 0 : _a.bind(series); } }), head);
+                    const { animation = true, animationUpdate: labelAnimationUpdate = true, animationEnter: labelAnimationEnter = true, animationExit: labelAnimationExit = true } = labelSpec;
+                    const { animationUpdate = true, animationEnter = true, animationExit = true } = spec;
+                    const animationEnabled = (_c = (_b = (_a = this._option) === null || _a === void 0 ? void 0 : _a.animation) !== null && _b !== void 0 ? _b : spec.animation) !== null && _c !== void 0 ? _c : labelSpec.animation;
+                    const labelAnimationEnabled = !!animationEnabled && !!hasAnimation;
+                    this.addLabelSpec(markName, Object.assign(Object.assign({}, labelSpec), { animation: labelAnimationEnabled ? animation : false, animationUpdate: labelAnimationEnabled && animationUpdate && labelAnimationUpdate ? animationUpdate : false, animationEnter: labelAnimationEnabled && animationEnter && labelAnimationEnter ? animationEnter : false, animationExit: labelAnimationEnabled && animationEnter && labelAnimationExit ? animationExit : false, getStyleHandler: (series) => { var _a; return (_a = series[styleHandlerName]) === null || _a === void 0 ? void 0 : _a.bind(series); } }), head);
                 }
             });
         }
@@ -62128,13 +62133,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         setSeriesField(field) {
             if (isValid$1(field)) {
                 this._seriesField = field;
-                this.getMarks()
-                    .filter(m => {
-                    return m.getDataView() === this.getViewData();
-                })
-                    .forEach(m => {
-                    m.setFacet(this._seriesField);
-                });
             }
         }
         getGroups() {
@@ -62533,7 +62531,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         _createExtensionMark(spec, parentMark, namePrefix, index, options) {
             var _a;
-            const mark = this._createMark({ type: spec.type, name: `${namePrefix}_${index}` }, {
+            const mark = this._createMark({ type: spec.type, name: isValid$1(spec.name) ? `${spec.name}` : `${namePrefix}_${index}` }, {
                 skipBeforeLayouted: true,
                 markSpec: spec,
                 parent: parentMark,
@@ -62546,6 +62544,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             if (!mark) {
                 return;
             }
+            if (isValid$1(spec.id)) {
+                mark.setUserId(spec.id);
+            }
             if (options.hasAnimation) {
                 const config = animationConfig({}, userAnimationConfig(spec.type, spec, this._markAttributeContext));
                 mark.setAnimationConfig(config);
@@ -64343,6 +64344,25 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         return {};
     }
+    const getSpecInfo = (chartSpec, specKey, compType, filter) => {
+        if (isNil$1(chartSpec[specKey])) {
+            return undefined;
+        }
+        const isArraySpec = isArray$1(chartSpec[specKey]);
+        const spec = isArraySpec ? chartSpec[specKey] : [chartSpec[specKey]];
+        const specInfos = [];
+        spec.forEach((s, i) => {
+            if (s && (!filter || filter(s))) {
+                specInfos.push({
+                    spec: s,
+                    specPath: isArraySpec ? [specKey, i] : [specKey],
+                    specInfoPath: ['component', specKey, i],
+                    type: compType
+                });
+            }
+        });
+        return specInfos;
+    };
 
     const DEFAULT_TITLE_STYLE = {
         left: {
@@ -65846,7 +65866,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 },
                 items,
                 verticalLimitSize: this._verticalLimitSize,
-                verticalMinSize
+                verticalMinSize,
+                label: {
+                    overflowLimitLength: this._getLabelOverflowLimit(isX)
+                }
             };
             if (!ignoreGrid) {
                 attrs.grid = {
@@ -65990,6 +66013,35 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         _getNeedClearVRenderComponents() {
             return this._unitText ? [this._unitText] : [];
         }
+        _getLabelOverflowLimit(isX) {
+            var _a, _b;
+            if (isX && ((_a = this._spec.label) === null || _a === void 0 ? void 0 : _a.visible) !== false && ((_b = this._spec.label) === null || _b === void 0 ? void 0 : _b.autoLimit) === true) {
+                const axesComponents = this._option.getComponentsByKey('axes');
+                const relativeRegions = this.getRegions();
+                const relativeAxes = axesComponents.filter(item => {
+                    const orient = item.getOrient();
+                    return ((orient === 'left' || orient === 'right') &&
+                        item.getRegions().some(region => relativeRegions.includes(region)));
+                });
+                let leftLimitLength = 0;
+                let rightLimitLength = 0;
+                const startX = this.getLayoutStartPoint().x;
+                const endX = startX + this.getLayoutRect().width;
+                relativeAxes.forEach(axis => {
+                    const relativeStartX = axis.getLayoutStartPoint().x;
+                    if (axis.getOrient() === 'left' && relativeStartX === startX) {
+                        const leftAxisWidth = axis.getLayoutRect().width;
+                        leftLimitLength = Math.max(leftLimitLength, leftAxisWidth);
+                    }
+                    else if (relativeStartX === endX) {
+                        const rightAxisWidth = axis.getLayoutRect().width;
+                        rightLimitLength = Math.max(rightLimitLength, rightAxisWidth);
+                    }
+                });
+                return { left: leftLimitLength, right: rightLimitLength };
+            }
+            return undefined;
+        }
     }
     CartesianAxis.type = ComponentTypeEnum.cartesianAxis;
     CartesianAxis.specKey = 'axes';
@@ -68574,13 +68626,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             otherComponents.forEach(C => {
                 var _a;
-                (_a = C.getSpecInfo(chartSpec, chartSpecInfo)) === null || _a === void 0 ? void 0 : _a.forEach(info => {
+                (_a = (C.getSpecInfo ? C.getSpecInfo(chartSpec, chartSpecInfo) : getSpecInfo(chartSpec, C.specKey, C.type))) === null || _a === void 0 ? void 0 : _a.forEach(info => {
                     results.push(callbackfn(C, info, chartSpecInfo));
                 });
             });
-            (_c = tooltip === null || tooltip === void 0 ? void 0 : tooltip.getSpecInfo(chartSpec, chartSpecInfo)) === null || _c === void 0 ? void 0 : _c.forEach(info => {
-                results.push(callbackfn(tooltip, info, chartSpecInfo));
-            });
+            if (tooltip) {
+                (_c = getSpecInfo(chartSpec, tooltip.specKey, tooltip.type)) === null || _c === void 0 ? void 0 : _c.forEach(info => {
+                    results.push(callbackfn(tooltip, info, chartSpecInfo));
+                });
+            }
             return results;
         }
         transformSeriesSpec(spec) {
@@ -73929,8 +73983,16 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             if (isNil$1(angleValue) || isNil$1(radiusValue) || !this.angleAxisHelper || !this.radiusAxisHelper) {
                 return { x: Number.NaN, y: Number.NaN };
             }
-            const angle = this.angleAxisHelper.dataToPosition(array(angleValue));
             const radius = this.radiusAxisHelper.dataToPosition(array(radiusValue));
+            if (radius < 0) {
+                if (this._invalidType === 'break' || this._invalidType === 'link') {
+                    return { x: Number.NaN, y: Number.NaN };
+                }
+                else if (this._invalidType === 'zero') {
+                    return this.angleAxisHelper.center();
+                }
+            }
+            const angle = this.angleAxisHelper.dataToPosition(array(angleValue));
             return this.angleAxisHelper.coordToPoint({ angle, radius });
         }
         dataToPosition(datum, checkInViewData) {
@@ -74403,7 +74465,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                         y: chartSpec === null || chartSpec === void 0 ? void 0 : chartSpec.centerY
                     }
                     : undefined,
-            outerRadius: (_f = (_e = (_d = spec.radius) !== null && _d !== void 0 ? _d : chartSpec.outerRadius) !== null && _e !== void 0 ? _e : chartSpec.radius) !== null && _f !== void 0 ? _f : POLAR_DEFAULT_RADIUS,
+            outerRadius: (_f = (_e = (_d = spec.outerRadius) !== null && _d !== void 0 ? _d : spec.radius) !== null && _e !== void 0 ? _e : chartSpec.outerRadius) !== null && _f !== void 0 ? _f : chartSpec.radius,
             layoutRadius: chartSpec.layoutRadius
         };
     };
@@ -74982,30 +75044,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return this._groupScales;
         }
         static getSpecInfo(chartSpec) {
-            const axesSpec = chartSpec[this.specKey];
-            if (!axesSpec) {
+            if (!chartSpec[this.specKey]) {
                 return null;
             }
-            if (!isArray$1(axesSpec)) {
-                if (!isValidPolarAxis(axesSpec)) {
-                    return null;
-                }
-                const { axisType, componentName, startAngle, endAngle, center, outerRadius, layoutRadius } = getPolarAxisInfo(axesSpec, chartSpec);
-                axesSpec.center = center;
-                axesSpec.startAngle = startAngle;
-                axesSpec.endAngle = endAngle;
-                axesSpec.outerRadius = outerRadius;
-                axesSpec.type = axisType;
-                axesSpec.layoutRadius = layoutRadius;
-                return [
-                    {
-                        spec: axesSpec,
-                        specPath: [this.specKey],
-                        specInfoPath: ['component', this.specKey, 0],
-                        type: componentName
-                    }
-                ];
-            }
+            const isArraySpec = isArray$1(chartSpec[this.specKey]);
+            const axesSpec = isArraySpec ? chartSpec[this.specKey] : [chartSpec[this.specKey]];
             const specInfos = [];
             let angleAxisIndex;
             let radiusAxisIndex;
@@ -75024,7 +75067,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 s.layoutRadius = layoutRadius;
                 const info = {
                     spec: s,
-                    specPath: [this.specKey, i],
+                    specPath: isArraySpec ? [this.specKey, i] : [this.specKey],
                     specInfoPath: ['component', this.specKey, i],
                     type: componentName
                 };
@@ -75670,33 +75713,33 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             });
             out.points = this.points;
         }
+        _interpolationSinglePoint(pointA, pointB, ratio) {
+            if (!isValidPoint(pointA) && !isValidPoint(pointB)) {
+                return pointB;
+            }
+            const polarPointA = this._pointToCoord(pointA);
+            const polarPointB = this._pointToCoord(pointB);
+            let angleA = normalizeAngle(polarPointA.angle);
+            let angleB = normalizeAngle(polarPointB.angle);
+            if (!isValidNumber$1(angleA) && isValidNumber$1(angleB)) {
+                angleA = angleB;
+            }
+            if (isValidNumber$1(angleA) && !isValidNumber$1(angleB)) {
+                angleB = angleA;
+            }
+            const angle = angleA + (angleB - angleA) * ratio;
+            const radius = polarPointA.radius + (polarPointB.radius - polarPointA.radius) * ratio;
+            return this._coordToPoint({ angle, radius });
+        }
         polarPointInterpolation(pointA, pointB, ratio) {
-            const polarPointA0 = this._pointToCoord(pointA);
-            const polarPointA1 = this._pointToCoord({ x: pointA.x1, y: pointA.y1 });
-            let angleA0 = normalizeAngle(polarPointA0.angle);
-            let angleA1 = normalizeAngle(polarPointA1.angle);
-            const polarPointB0 = this._pointToCoord(pointB);
-            const polarPointB1 = this._pointToCoord({ x: pointB.x1, y: pointB.y1 });
-            let angleB0 = normalizeAngle(polarPointB0.angle);
-            let angleB1 = normalizeAngle(polarPointB1.angle);
-            if (!isValidNumber$1(angleA0) && isValidNumber$1(angleB0)) {
-                angleA0 = angleB0;
-            }
-            if (isValidNumber$1(angleA0) && !isValidNumber$1(angleB0)) {
-                angleB0 = angleA0;
-            }
-            if (!isValidNumber$1(angleA1) && isValidNumber$1(angleB1)) {
-                angleA1 = angleB1;
-            }
-            if (isValidNumber$1(angleA1) && !isValidNumber$1(angleB1)) {
-                angleB1 = angleA1;
-            }
-            const angle0 = angleA0 + (angleB0 - angleA0) * ratio;
-            const radius0 = polarPointA0.radius + (polarPointB0.radius - polarPointA0.radius) * ratio;
-            const angle1 = angleA1 + (angleB1 - angleA1) * ratio;
-            const radius1 = polarPointA1.radius + (polarPointB1.radius - polarPointA1.radius) * ratio;
-            const { x, y } = this._coordToPoint({ angle: angle0, radius: radius0 });
-            const { x: x1, y: y1 } = this._coordToPoint({ angle: angle1, radius: radius1 });
+            const { x, y } = this._interpolationSinglePoint(pointA, pointB, ratio);
+            const { x: x1, y: y1 } = this._interpolationSinglePoint({
+                x: pointA.x1,
+                y: pointA.y1
+            }, {
+                x: pointB.x1,
+                y: pointB.y1
+            }, ratio);
             const point = new Point(x, y, x1, y1);
             point.defined = pointB.defined;
             return point;
@@ -75853,6 +75896,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         initAreaMark(progressive, isSeriesMark) {
             var _a, _b;
             this._areaMark = this._createMark(RadarSeries.mark.area, {
+                groupKey: this._seriesField,
                 progressive,
                 isSeriesMark,
                 customShape: (_a = this._spec.area) === null || _a === void 0 ? void 0 : _a.customShape,
@@ -76124,14 +76168,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 level: TransformLevel.dotObjFlat
             }, false);
         }
-        setSeriesField(field) {
-            if (isValid$1(field)) {
-                this._seriesField = field;
-                this.getMarksInType(["line", "area"]).forEach(m => {
-                    m.setFacet(this._seriesField);
-                });
-            }
-        }
         getStatisticFields() {
             return [{ key: this._fieldY[0], operations: ['values'], customize: this._xDimensionStatisticsDomain }];
         }
@@ -77617,7 +77653,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._wordMark.getProduct().transform(wordCloudTransforms);
         }
         _getCommonTransformOptions() {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var _a, _b, _c, _d, _e, _f;
             const { width, height } = this._region.getLayoutRect();
             const wordSpec = (_a = this._spec.word) !== null && _a !== void 0 ? _a : {};
             const wordStyleSpec = (_b = wordSpec.style) !== null && _b !== void 0 ? _b : {};
@@ -77637,13 +77673,17 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 fontSize: this._valueField ? { field: this._valueField } : this._fontSizeRange[0],
                 fontSizeRange: this._fontSizeRange === 'auto' ? null : this._fontSizeRange,
                 padding: (_e = (_d = this._spec.word) === null || _d === void 0 ? void 0 : _d.padding) !== null && _e !== void 0 ? _e : DEFAULT_FONT_PADDING,
-                fontFamily: (_g = (_f = this._spec.fontFamilyField) !== null && _f !== void 0 ? _f : wordStyleSpec.fontFamily) !== null && _g !== void 0 ? _g : this._defaultFontFamily,
-                fontWeight: this._spec.fontWeightField
+                fontFamily: isValid$1(this._spec.fontFamilyField)
+                    ? { field: this._spec.fontFamilyField }
+                    : (_f = wordStyleSpec.fontFamily) !== null && _f !== void 0 ? _f : this._defaultFontFamily,
+                fontWeight: isValid$1(this._spec.fontWeightField)
                     ? { field: this._spec.fontWeightField }
-                    : this._valueField
-                        ? this._calculateFontWeight
-                        : wordStyleSpec.fontWeight,
-                fontStyle: (_h = this._spec.fontStyleField) !== null && _h !== void 0 ? _h : wordStyleSpec.fontStyle
+                    : isValid$1(wordStyleSpec.fontWeight)
+                        ? wordStyleSpec.fontWeight
+                        : isValid$1(this._valueField)
+                            ? this._calculateFontWeight
+                            : 'normal',
+                fontStyle: isValid$1(this._spec.fontStyleField) ? { field: this._spec.fontStyleField } : wordStyleSpec.fontStyle
             };
         }
         _wordCloudTransformOption() {
@@ -77651,10 +77691,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return Object.assign(Object.assign({}, this._getCommonTransformOptions()), { layoutType: this._wordCloudConfig.layoutMode, rotate: this._rotateAngles, randomVisible: (_a = this._spec.random) !== null && _a !== void 0 ? _a : DEFAULT_RANDOM, clip: this._wordCloudConfig.drawOutOfBound === 'clip', shrink: this._wordCloudConfig.zoomToFit.shrink, enlarge: this._wordCloudConfig.zoomToFit.enlarge, minFontSize: this._wordCloudConfig.zoomToFit.fontSizeLimitMin, progressiveTime: this._wordCloudConfig.progressiveTime, progressiveStep: this._wordCloudConfig.progressiveStep, repeatFill: this._wordCloudConfig.zoomToFit.repeat });
         }
         _wordCloudShapeTransformOption() {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            var _a, _b, _c, _d, _e, _f;
             const fillingWordStyleSpec = (_b = (_a = this._spec.fillingWord) === null || _a === void 0 ? void 0 : _a.style) !== null && _b !== void 0 ? _b : {};
             const wordCloudShapeConfig = (_c = this._wordCloudShapeConfig) !== null && _c !== void 0 ? _c : {};
-            return Object.assign(Object.assign(Object.assign({}, wordCloudShapeConfig), this._getCommonTransformOptions()), { rotateList: this._rotateAngles, fillingRotateList: wordCloudShapeConfig.fillingRotateAngles, fillingFontFamily: (_e = (_d = wordCloudShapeConfig.fillingFontFamilyField) !== null && _d !== void 0 ? _d : fillingWordStyleSpec.fontFamily) !== null && _e !== void 0 ? _e : this._defaultFontFamily, fillingPadding: (_g = (_f = this._spec.fillingWord) === null || _f === void 0 ? void 0 : _f.padding) !== null && _g !== void 0 ? _g : DEFAULT_FONT_PADDING, fillingFontStyle: (_h = wordCloudShapeConfig.fillingFontStyleField) !== null && _h !== void 0 ? _h : fillingWordStyleSpec.fontStyle, fillingFontWeight: (_j = wordCloudShapeConfig.fillingFontWeightField) !== null && _j !== void 0 ? _j : fillingWordStyleSpec.fontWeight });
+            return Object.assign(Object.assign(Object.assign({}, wordCloudShapeConfig), this._getCommonTransformOptions()), { rotateList: this._rotateAngles, fillingRotateList: wordCloudShapeConfig.fillingRotateAngles, fillingFontFamily: isValid$1(wordCloudShapeConfig.fillingFontFamilyField)
+                    ? { field: wordCloudShapeConfig.fillingFontFamilyField }
+                    : (_d = fillingWordStyleSpec.fontFamily) !== null && _d !== void 0 ? _d : this._defaultFontFamily, fillingPadding: (_f = (_e = this._spec.fillingWord) === null || _e === void 0 ? void 0 : _e.padding) !== null && _f !== void 0 ? _f : DEFAULT_FONT_PADDING, fillingFontStyle: isValid$1(wordCloudShapeConfig.fillingFontStyleField)
+                    ? { field: wordCloudShapeConfig.fillingFontStyleField }
+                    : fillingWordStyleSpec.fontStyle, fillingFontWeight: isValid$1(wordCloudShapeConfig.fillingFontWeightField)
+                    ? {
+                        field: wordCloudShapeConfig.fillingFontWeightField
+                    }
+                    : fillingWordStyleSpec.fontWeight });
         }
         getStatisticFields() {
             const fields = [];
@@ -77820,7 +77868,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             maxFailCount = Math.min(this.options.maxFailCount, this.originalData.length);
           for (; i < this.data.length && this.failCount < maxFailCount;) {
             const drawn = this.layoutWord(i);
-            if (curWordTryCount++, (drawn || curWordTryCount >= maxSingleWordTryCount) && (i++, curWordTryCount = 0, this.failCount = drawn ? 0 : this.failCount + 1), this.progressiveIndex = i, this.exceedTime()) break;
+            if (curWordTryCount++, (drawn || curWordTryCount > maxSingleWordTryCount) && (i++, curWordTryCount = 0, this.failCount = drawn ? 0 : this.failCount + 1), this.progressiveIndex = i, this.exceedTime()) break;
             i === this.data.length && this.failCount < maxFailCount && this.options.repeatFill && this.canRepeat() && (this.data = [...this.data, ...this.originalData.map(entry => Object.assign(Object.assign({}, entry), {
               isFill: !0
             }))], this.isTryRepeatFill = !0);
@@ -88891,35 +88939,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this.name = ComponentTypeEnum.discreteLegend;
         }
         static getSpecInfo(chartSpec) {
-            const legendSpec = chartSpec[this.specKey];
-            if (!legendSpec) {
-                return undefined;
-            }
-            if (!isArray$1(legendSpec)) {
-                if (!legendSpec.type || legendSpec.type === 'discrete') {
-                    return [
-                        {
-                            spec: legendSpec,
-                            specPath: [this.specKey],
-                            specInfoPath: ['component', this.specKey, 0],
-                            type: ComponentTypeEnum.discreteLegend
-                        }
-                    ];
-                }
-                return undefined;
-            }
-            const specInfos = [];
-            legendSpec.forEach((s, i) => {
-                if (!s.type || s.type === 'discrete') {
-                    specInfos.push({
-                        spec: s,
-                        specPath: [this.specKey, i],
-                        specInfoPath: ['component', this.specKey, i],
-                        type: ComponentTypeEnum.discreteLegend
-                    });
-                }
+            return getSpecInfo(chartSpec, this.specKey, this.type, (s) => {
+                return !s.type || s.type === 'discrete';
             });
-            return specInfos;
         }
         init(option) {
             super.init(option);
@@ -89220,35 +89242,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     const SIZE = [2, 10];
     class ContinuousLegend extends BaseLegend {
         static getSpecInfo(chartSpec) {
-            const legendSpec = chartSpec[this.specKey];
-            if (!legendSpec) {
-                return undefined;
-            }
-            if (!isArray$1(legendSpec)) {
-                if (isContinuousLegend(legendSpec.type)) {
-                    return [
-                        {
-                            spec: legendSpec,
-                            specPath: [this.specKey],
-                            specInfoPath: ['component', this.specKey, 0],
-                            type: legendSpec.type === 'color' ? ComponentTypeEnum.colorLegend : ComponentTypeEnum.sizeLegend
-                        }
-                    ];
-                }
-                return undefined;
-            }
-            const specInfos = [];
-            legendSpec.forEach((s, i) => {
-                if (isContinuousLegend(s.type)) {
-                    specInfos.push({
-                        spec: s,
-                        specPath: [this.specKey, i],
-                        specInfoPath: ['component', this.specKey, i],
-                        type: s.type === 'color' ? ComponentTypeEnum.colorLegend : ComponentTypeEnum.sizeLegend
-                    });
-                }
+            const infos = getSpecInfo(chartSpec, this.specKey, this.type, (s) => {
+                return isContinuousLegend(s.type);
             });
-            return specInfos;
+            if (infos) {
+                infos.forEach(info => {
+                    info.type = info.spec.type === 'color' ? ComponentTypeEnum.colorLegend : ComponentTypeEnum.sizeLegend;
+                });
+            }
+            return infos;
         }
         constructor(spec, options) {
             super(spec, options);
@@ -90649,32 +90651,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 return 1;
             };
         }
-        static getSpecInfo(chartSpec) {
-            const tooltipSpec = chartSpec[this.specKey];
-            if (!tooltipSpec) {
-                return null;
-            }
-            if (!isArray$1(tooltipSpec)) {
-                return [
-                    {
-                        spec: tooltipSpec,
-                        specPath: [this.specKey],
-                        specInfoPath: ['component', this.specKey, 0],
-                        type: ComponentTypeEnum.tooltip
-                    }
-                ];
-            }
-            const specInfos = [];
-            tooltipSpec.forEach((s, i) => {
-                specInfos.push({
-                    spec: s,
-                    specPath: [this.specKey, i],
-                    specInfoPath: ['component', this.specKey, i],
-                    type: ComponentTypeEnum.tooltip
-                });
-            });
-            return specInfos;
-        }
         isTooltipShown() {
             return this._isTooltipShown;
         }
@@ -91611,36 +91587,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
 
     class CartesianCrossHair extends BaseCrossHair {
         static getSpecInfo(chartSpec) {
-            const crosshairSpec = chartSpec[this.specKey];
-            if (isNil$1(crosshairSpec)) {
-                return undefined;
-            }
-            if (!isArray$1(crosshairSpec)) {
-                if ((crosshairSpec.xField && crosshairSpec.xField.visible !== false) ||
-                    (crosshairSpec.yField && crosshairSpec.yField.visible !== false)) {
-                    return [
-                        {
-                            spec: crosshairSpec,
-                            specPath: [this.specKey],
-                            specInfoPath: ['component', this.specKey, 0],
-                            type: ComponentTypeEnum.cartesianCrosshair
-                        }
-                    ];
-                }
-                return undefined;
-            }
-            const specInfos = [];
-            crosshairSpec.forEach((s, i) => {
-                if ((s.xField && s.xField.visible !== false) || (s.yField && s.yField.visible !== false)) {
-                    specInfos.push({
-                        spec: s,
-                        specPath: [this.specKey, i],
-                        specInfoPath: ['component', this.specKey, i],
-                        type: ComponentTypeEnum.cartesianCrosshair
-                    });
-                }
+            return getSpecInfo(chartSpec, this.specKey, this.type, (s) => {
+                return (s.xField && s.xField.visible !== false) || (s.yField && s.yField.visible !== false);
             });
-            return specInfos;
         }
         constructor(spec, options) {
             super(spec, options);
@@ -92107,36 +92056,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
 
     class PolarCrossHair extends BaseCrossHair {
         static getSpecInfo(chartSpec) {
-            const crosshairSpec = chartSpec[this.specKey];
-            if (isNil$1(crosshairSpec)) {
-                return undefined;
-            }
-            if (!isArray$1(crosshairSpec)) {
-                if ((crosshairSpec.categoryField && crosshairSpec.categoryField.visible !== false) ||
-                    (crosshairSpec.valueField && crosshairSpec.valueField.visible !== false)) {
-                    return [
-                        {
-                            spec: crosshairSpec,
-                            specPath: [this.specKey],
-                            specInfoPath: ['component', this.specKey, 0],
-                            type: ComponentTypeEnum.polarCrosshair
-                        }
-                    ];
-                }
-                return undefined;
-            }
-            const specInfos = [];
-            crosshairSpec.forEach((s, i) => {
-                if ((s.categoryField && s.categoryField.visible !== false) || (s.valueField && s.valueField.visible !== false)) {
-                    specInfos.push({
-                        spec: s,
-                        specPath: [this.specKey, i],
-                        specInfoPath: ['component', this.specKey, i],
-                        type: ComponentTypeEnum.polarCrosshair
-                    });
-                }
+            return getSpecInfo(chartSpec, this.specKey, this.type, (s) => {
+                return (s.categoryField && s.categoryField.visible !== false) || (s.valueField && s.valueField.visible !== false);
             });
-            return specInfos;
         }
         constructor(spec, options) {
             super(spec, options);
@@ -93248,32 +93170,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     }
 
     class DataZoom extends DataFilterBaseComponent {
-        static getSpecInfo(chartSpec) {
-            const compSpec = chartSpec[this.specKey];
-            if (isNil$1(compSpec)) {
-                return undefined;
-            }
-            if (!isArray$1(compSpec)) {
-                return [
-                    {
-                        spec: compSpec,
-                        specPath: [this.specKey],
-                        specInfoPath: ['component', this.specKey, 0],
-                        type: ComponentTypeEnum.dataZoom
-                    }
-                ];
-            }
-            const specInfos = [];
-            compSpec.forEach((s, i) => {
-                specInfos.push({
-                    spec: s,
-                    specPath: [this.specKey, i],
-                    specInfoPath: ['component', this.specKey, i],
-                    type: ComponentTypeEnum.dataZoom
-                });
-            });
-            return specInfos;
-        }
         constructor(spec, options) {
             var _a;
             super(spec, options);
@@ -93625,32 +93521,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
 
     class ScrollBar extends DataFilterBaseComponent {
-        static getSpecInfo(chartSpec) {
-            const compSpec = chartSpec[this.specKey];
-            if (isNil$1(compSpec)) {
-                return undefined;
-            }
-            if (!isArray$1(compSpec)) {
-                return [
-                    {
-                        spec: compSpec,
-                        specPath: [this.specKey],
-                        specInfoPath: ['component', this.specKey, 0],
-                        type: ComponentTypeEnum.scrollBar
-                    }
-                ];
-            }
-            const specInfos = [];
-            compSpec.forEach((s, i) => {
-                specInfos.push({
-                    spec: s,
-                    specPath: [this.specKey, i],
-                    specInfoPath: ['component', this.specKey, i],
-                    type: ComponentTypeEnum.scrollBar
-                });
-            });
-            return specInfos;
-        }
         constructor(spec, options) {
             var _a;
             super(spec, options);
@@ -93829,35 +93699,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._activeDatum = null;
         }
         static getSpecInfo(chartSpec) {
-            if (this.type !== Indicator.type) {
-                return null;
-            }
-            const indicatorSpec = chartSpec[this.specKey];
-            if (!isArray$1(indicatorSpec)) {
-                if (indicatorSpec.visible === false) {
-                    return [];
-                }
-                return [
-                    {
-                        spec: indicatorSpec,
-                        specPath: [this.specKey],
-                        specInfoPath: ['component', this.specKey, 0],
-                        type: ComponentTypeEnum.indicator
-                    }
-                ];
-            }
-            const specInfos = [];
-            indicatorSpec.forEach((s, i) => {
-                if (s && s.visible !== false) {
-                    specInfos.push({
-                        spec: s,
-                        specPath: [this.specKey, i],
-                        specInfoPath: ['component', this.specKey, i],
-                        type: ComponentTypeEnum.indicator
-                    });
-                }
+            return getSpecInfo(chartSpec, this.specKey, this.type, (s) => {
+                return s && s.visible !== false;
             });
-            return specInfos;
         }
         created() {
             super.created();
@@ -94754,34 +94598,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return 'cartesian';
         }
         static getSpecInfo(chartSpec) {
-            const markerSpec = chartSpec[this.specKey];
-            if (isEmpty(markerSpec)) {
-                return undefined;
-            }
-            if (!isArray$1(markerSpec) &&
-                markerSpec.visible !== false &&
-                this._getMarkerCoordinateType(markerSpec) === this.coordinateType) {
-                return [
-                    {
-                        spec: markerSpec,
-                        specPath: [this.specKey],
-                        specInfoPath: ['component', this.specKey, 0],
-                        type: this.type
-                    }
-                ];
-            }
-            const specInfos = [];
-            array(markerSpec).forEach((m, i) => {
-                if (m.visible !== false && this._getMarkerCoordinateType(m) === this.coordinateType) {
-                    specInfos.push({
-                        spec: m,
-                        specPath: [this.specKey, i],
-                        specInfoPath: ['component', this.specKey, i],
-                        type: this.type
-                    });
-                }
+            return getSpecInfo(chartSpec, this.specKey, this.type, (s) => {
+                return s.visible !== false && this._getMarkerCoordinateType(s) === this.coordinateType;
             });
-            return specInfos;
         }
         created() {
             super.created();
@@ -95449,32 +95268,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._layout && (this._layout.layoutOrient = this._orient);
         }
         static getSpecInfo(chartSpec) {
-            const titleSpec = chartSpec[this.specKey];
-            if (!titleSpec || titleSpec.visible === false) {
-                return null;
-            }
-            if (!isArray$1(titleSpec)) {
-                return [
-                    {
-                        spec: titleSpec,
-                        specPath: [this.specKey],
-                        specInfoPath: ['component', this.specKey, 0],
-                        type: ComponentTypeEnum.title
-                    }
-                ];
-            }
-            const specInfos = [];
-            titleSpec.forEach((s, i) => {
-                if (s.visible !== false) {
-                    specInfos.push({
-                        spec: s,
-                        specPath: [this.specKey, i],
-                        specInfoPath: ['component', this.specKey, i],
-                        type: ComponentTypeEnum.title
-                    });
-                }
+            return getSpecInfo(chartSpec, this.specKey, ComponentTypeEnum.title, (s) => {
+                return s.visible !== false;
             });
-            return specInfos;
         }
         onRender(ctx) {
         }
@@ -96084,20 +95880,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         set layoutOrient(v) {
             this._orient = v;
         }
-        static getSpecInfo(chartSpec) {
-            const playerSpec = chartSpec[this.specKey];
-            if (isNil$1(playerSpec)) {
-                return null;
-            }
-            return [
-                {
-                    spec: playerSpec,
-                    specPath: [this.specKey],
-                    specInfoPath: ['component', this.specKey, 0],
-                    type: ComponentTypeEnum.player
-                }
-            ];
-        }
         setAttrFromSpec() {
             var _a, _b, _c, _d, _e, _f, _g, _h;
             super.setAttrFromSpec();
@@ -97076,18 +96858,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             });
         }
         static getSpecInfo(chartSpec) {
-            const brushSpec = chartSpec[this.specKey];
-            if (isNil$1(brushSpec) || brushSpec.visible === false) {
-                return undefined;
-            }
-            return [
-                {
-                    spec: brushSpec,
-                    specPath: [this.specKey],
-                    specInfoPath: ['component', this.specKey, 0],
-                    type: ComponentTypeEnum.brush
-                }
-            ];
+            return getSpecInfo(chartSpec, this.specKey, this.type, (s) => {
+                return s.visible !== false;
+            });
         }
         created() {
             super.created();
@@ -97606,30 +97379,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this.layoutZIndex = LayoutZIndex.CustomMark;
             this.layoutLevel = LayoutLevel.CustomMark;
         }
-        static getSpecInfo(chartSpec) {
-            const spec = chartSpec[this.specKey];
-            if (!spec) {
-                return null;
-            }
-            if (!isArray$1(spec)) {
-                return [
-                    {
-                        spec,
-                        specPath: [this.specKey],
-                        specInfoPath: ['component', this.specKey, 0],
-                        type: ComponentTypeEnum.customMark
-                    }
-                ];
-            }
-            return spec.map((specItem, i) => {
-                return {
-                    spec: specItem,
-                    specPath: [this.specKey, i],
-                    specInfoPath: ['component', this.specKey, i],
-                    type: ComponentTypeEnum.customMark
-                };
-            });
-        }
         created() {
             super.created();
             this.initMarks();
@@ -97673,7 +97422,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             var _a;
             const mark = this._createMark({
                 type: spec.type,
-                name: `${namePrefix}_${index}`
+                name: isValid$1(spec.name) ? `${spec.name}` : `${namePrefix}_${index}`
             }, {
                 skipBeforeLayouted: true,
                 attributeContext: this._getMarkAttributeContext(),
@@ -97683,6 +97432,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             if (!mark) {
                 return;
             }
+            if (isValid$1(spec.id)) {
+                mark.setUserId(spec.id);
+            }
             if (options.hasAnimation && spec.animation) {
                 const config = animationConfig({}, userAnimationConfig(spec.type, spec, this._markAttributeContext));
                 mark.setAnimationConfig(config);
@@ -97973,18 +97725,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._activeDatum = [];
         }
         static getSpecInfo(chartSpec) {
-            const labelSpec = chartSpec[this.specKey];
-            if (!labelSpec || !labelSpec.visible || isValid$1(labelSpec.series)) {
-                return null;
-            }
-            return [
-                {
-                    spec: labelSpec,
-                    specPath: [this.specKey],
-                    specInfoPath: ['component', this.specKey, 0],
-                    type: ComponentTypeEnum.mapLabel
-                }
-            ];
+            return getSpecInfo(chartSpec, this.specKey, this.type, (s) => {
+                return s.visible && isValid$1(s.seriesId);
+            });
         }
         setAttrFromSpec() {
             var _a, _b, _c, _d;