@visactor/vchart 1.4.0 → 1.4.1-alpha.1

package/build/index.js

@@ -38138,8 +38138,7 @@
 	            textAlign: 'left',
 	            textBaseline: 'middle',
 	            fontSize: THEME_CONSTANTS.l5FontSize,
-	            lineHeight: THEME_CONSTANTS.l5LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily
+	            lineHeight: THEME_CONSTANTS.l5LineHeight
 	        }
 	    },
 	    subTitle: {
@@ -38147,8 +38146,7 @@
 	            textAlign: 'left',
 	            textBaseline: 'top',
 	            fontSize: THEME_CONSTANTS.l5FontSize,
-	            lineHeight: THEME_CONSTANTS.l5LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily
+	            lineHeight: THEME_CONSTANTS.l5LineHeight
 	        }
 	    }
 	};
@@ -38170,7 +38168,6 @@
 	        style: {
 	            fontSize: THEME_CONSTANTS.l4FontSize,
 	            lineHeight: THEME_CONSTANTS.l4LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fill: '#707070'
 	        },
 	        line: {
@@ -38183,7 +38180,6 @@
 	        style: {
 	            fontSize: THEME_CONSTANTS.l4FontSize,
 	            lineHeight: THEME_CONSTANTS.l4LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fill: '#707070',
 	            textBaseline: 'middle'
 	        }
@@ -38207,7 +38203,6 @@
 	        style: {
 	            fontSize: THEME_CONSTANTS.l4FontSize,
 	            lineHeight: THEME_CONSTANTS.l4LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fill: '#707070'
 	        },
 	        line: {
@@ -38220,7 +38215,6 @@
 	        style: {
 	            fontSize: THEME_CONSTANTS.l4FontSize,
 	            lineHeight: THEME_CONSTANTS.l4LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fill: '#707070',
 	            textBaseline: 'middle'
 	        }
@@ -38423,8 +38417,7 @@
 	        style: {
 	            fill: 'black',
 	            fontSize: THEME_CONSTANTS.l4FontSize,
-	            lineHeight: THEME_CONSTANTS.l4LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily
+	            lineHeight: THEME_CONSTANTS.l4LineHeight
 	        }
 	    },
 	    label: {
@@ -38469,8 +38462,7 @@
 	            textBaseline: 'middle',
 	            textAlign: 'center',
 	            fontSize: THEME_CONSTANTS.l5FontSize,
-	            lineHeight: THEME_CONSTANTS.l5LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily
+	            lineHeight: THEME_CONSTANTS.l5LineHeight
 	        }
 	    },
 	    nonLeafLabel: {
@@ -38481,7 +38473,6 @@
 	            lineWidth: 2,
 	            fontSize: THEME_CONSTANTS.l5FontSize,
 	            lineHeight: THEME_CONSTANTS.l5LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            textBaseline: 'middle',
 	            textAlign: 'center'
 	        }
@@ -40315,9 +40306,9 @@
 	      });
 	    (null === (_b = viewOptions.options3d) || void 0 === _b ? void 0 : _b.enable) && stage.set3dOptions(viewOptions.options3d), stage.enableIncrementalAutoRender(), this._viewBox = viewOptions.viewBox, this._view.emit(HOOK_EVENT.AFTER_CREATE_VRENDER_STAGE), this._view.emit(HOOK_EVENT.BEFORE_CREATE_VRENDER_LAYER);
 	    const layer = null !== (_c = viewOptions.layer) && void 0 !== _c ? _c : stage.defaultLayer;
-	    if (this._view.emit(HOOK_EVENT.AFTER_CREATE_VRENDER_LAYER), (null === (_d = this._eventConfig) || void 0 === _d ? void 0 : _d.drag) && (this._dragController = new DragNDrop(layer)), null === (_e = this._eventConfig) || void 0 === _e ? void 0 : _e.gesture) {
+	    if (this._view.emit(HOOK_EVENT.AFTER_CREATE_VRENDER_LAYER), (null === (_d = this._eventConfig) || void 0 === _d ? void 0 : _d.drag) && (this._dragController = new DragNDrop(stage)), null === (_e = this._eventConfig) || void 0 === _e ? void 0 : _e.gesture) {
 	      const gestureConfig = isObject$g(this._eventConfig.gesture) ? this._eventConfig.gesture : {};
-	      this._gestureController = new Gesture(layer, gestureConfig);
+	      this._gestureController = new Gesture(stage, gestureConfig);
 	    }
 	    return {
 	      stage: stage,
@@ -53995,8 +53986,11 @@
 	const generateLabelAttributes = (marks, groupSize, encoder, labelStyle, parameters, theme) => {
 	  var _a;
 	  const labelTheme = null === (_a = null == theme ? void 0 : theme.components) || void 0 === _a ? void 0 : _a.dataLabel,
-	    dataLabels = marks.map(mark => {
+	    dataLabels = marks.map((mark, index) => {
 	      var _a, _b, _c, _d, _e, _f;
+	      const labelParameters = Object.assign(Object.assign({}, parameters), {
+	        labelIndex: index
+	      });
 	      let currentTheme = {};
 	      switch (mark.markType) {
 	        case GrammarMarkType.line:
@@ -54024,12 +54018,12 @@
 	      mark.elements.forEach(element => {
 	        var _a, _b;
 	        if ("willRelease" !== element.getGraphicItem().releaseStatus) {
-	          const attributes = invokeEncoder(encoder, element.getDatum(), element, parameters),
+	          const attributes = invokeEncoder(encoder, element.getDatum(), element, labelParameters),
 	            datum = merge$1({}, null !== (_b = null === (_a = null == currentTheme ? void 0 : currentTheme.data) || void 0 === _a ? void 0 : _a[0]) && void 0 !== _b ? _b : {}, attributes);
 	          data.push(datum);
 	        }
 	      });
-	      const addition = invokeFunctionType(labelStyle, parameters, mark),
+	      const addition = invokeFunctionType(labelStyle, labelParameters, mark),
 	        graphicItemName = null === (_f = mark.graphicItem) || void 0 === _f ? void 0 : _f.name;
 	      return merge$1({}, currentTheme, {
 	        data: data,
@@ -55412,8 +55406,7 @@
 	            cursor: 'pointer',
 	            fill: { type: 'palette', key: 'primaryFontColor' },
 	            fontSize: THEME_CONSTANTS.l5FontSize,
-	            lineHeight: THEME_CONSTANTS.l5LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily
+	            lineHeight: THEME_CONSTANTS.l5LineHeight
 	        }
 	    }
 	};
@@ -55466,8 +55459,7 @@
 	            stroke: 'white',
 	            lineWidth: 2,
 	            fontSize: THEME_CONSTANTS.l5FontSize,
-	            lineHeight: THEME_CONSTANTS.l5LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily
+	            lineHeight: THEME_CONSTANTS.l5LineHeight
 	        }
 	    }
 	};
@@ -55552,7 +55544,6 @@
 	        style: {
 	            fontSize: THEME_CONSTANTS.l4FontSize,
 	            lineHeight: THEME_CONSTANTS.l4LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fontWeight: 'normal',
 	            fillOpacity: 1
 	        }
@@ -55562,7 +55553,6 @@
 	    label: {
 	        style: {
 	            fontSize: THEME_CONSTANTS.l4FontSize,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fontWeight: 'normal',
 	            fillOpacity: 1
 	        }
@@ -55705,7 +55695,6 @@
 	        space: 10,
 	        style: {
 	            fontSize: THEME_CONSTANTS.l5FontSize,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fill: { type: 'palette', key: 'axisFontColor' },
 	            fontWeight: 'normal',
 	            fillOpacity: 1
@@ -55716,7 +55705,6 @@
 	        style: {
 	            fontSize: THEME_CONSTANTS.l5FontSize,
 	            lineHeight: THEME_CONSTANTS.l5LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fill: { type: 'palette', key: 'secondaryFontColor' },
 	            fontWeight: 'normal',
 	            fillOpacity: 1
@@ -55784,8 +55772,7 @@
 	    style: {
 	        fontWeight: 'normal',
 	        fill: { type: 'palette', key: 'labelReverseFontColor' },
-	        fontSize: THEME_CONSTANTS.l5FontSize,
-	        fontFamily: THEME_CONSTANTS.defaultFontFamily
+	        fontSize: THEME_CONSTANTS.l5FontSize
 	    },
 	    labelBackground: {
 	        padding: {
@@ -55928,7 +55915,6 @@
 	        style: {
 	            fontSize: THEME_CONSTANTS.l5FontSize,
 	            lineHeight: THEME_CONSTANTS.l5LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fill: { type: 'palette', key: 'secondaryFontColor', default: '#89909d' }
 	        }
 	    },
@@ -55937,7 +55923,6 @@
 	        style: {
 	            fontSize: THEME_CONSTANTS.l5FontSize,
 	            lineHeight: THEME_CONSTANTS.l5LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fill: { type: 'palette', key: 'secondaryFontColor', default: '#89909d' }
 	        }
 	    },
@@ -55964,7 +55949,6 @@
 	        autoFit: false,
 	        style: {
 	            fontSize: THEME_CONSTANTS.l1FontSize,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fill: { type: 'palette', key: ['titleFontColor', 'primaryFontColor'] },
 	            fontWeight: 'normal',
 	            fillOpacity: 1,
@@ -55976,7 +55960,6 @@
 	        visible: true,
 	        style: {
 	            fontSize: THEME_CONSTANTS.l2FontSize,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fill: { type: 'palette', key: 'secondaryFontColor' },
 	            fontWeight: 'normal',
 	            fillOpacity: 1,
@@ -55996,7 +55979,6 @@
 	        textStyle: {
 	            fontSize: THEME_CONSTANTS.l5FontSize,
 	            lineHeight: THEME_CONSTANTS.l5LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fontWeight: 'normal',
 	            fill: { type: 'palette', key: ['titleFontColor', 'primaryFontColor'] }
 	        },
@@ -56009,7 +55991,6 @@
 	        style: {
 	            fontSize: THEME_CONSTANTS.l5FontSize,
 	            lineHeight: THEME_CONSTANTS.l5LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fontWeight: 'normal',
 	            fill: { type: 'palette', key: 'secondaryFontColor', default: '#89909d' }
 	        },
@@ -56019,7 +56000,6 @@
 	        style: {
 	            fontSize: THEME_CONSTANTS.l5FontSize,
 	            lineHeight: THEME_CONSTANTS.l5LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fontWeight: 'normal',
 	            fill: { type: 'palette', key: 'secondaryFontColor', default: '#89909d' }
 	        },
@@ -56029,7 +56009,6 @@
 	        style: {
 	            fontSize: THEME_CONSTANTS.l5FontSize,
 	            lineHeight: THEME_CONSTANTS.l5LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fontWeight: 'normal',
 	            fill: { type: 'palette', key: 'secondaryFontColor', default: '#89909d' }
 	        },
@@ -56079,7 +56058,6 @@
 	        textStyle: {
 	            fontSize: THEME_CONSTANTS.l5FontSize,
 	            lineHeight: THEME_CONSTANTS.l5LineHeight,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fill: { type: 'palette', key: ['titleFontColor', 'primaryFontColor'] },
 	            fontWeight: 'normal'
 	        },
@@ -56120,7 +56098,6 @@
 	                fill: { type: 'palette', key: 'secondaryFontColor', default: '#89909d' },
 	                fontSize: THEME_CONSTANTS.l5FontSize,
 	                lineHeight: THEME_CONSTANTS.l5LineHeight,
-	                fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	                opacity: 1
 	            },
 	            state: {
@@ -56186,8 +56163,7 @@
 	            textBaseline: 'middle',
 	            textAlign: 'left',
 	            fill: 'black',
-	            fontSize: THEME_CONSTANTS.l6FontSize,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily
+	            fontSize: THEME_CONSTANTS.l6FontSize
 	        }
 	    },
 	    valueLabel: {
@@ -56196,8 +56172,7 @@
 	            textBaseline: 'middle',
 	            textAlign: 'left',
 	            fill: 'black',
-	            fontSize: THEME_CONSTANTS.l6FontSize,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily
+	            fontSize: THEME_CONSTANTS.l6FontSize
 	        }
 	    },
 	    background: {
@@ -56228,7 +56203,6 @@
 	    label: {
 	        style: {
 	            fontSize: THEME_CONSTANTS.l4FontSize,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fontWeight: 'normal',
 	            fontStyle: 'normal',
 	            fill: { type: 'palette', key: 'labelReverseFontColor' },
@@ -56281,7 +56255,6 @@
 	        refY: 5,
 	        style: {
 	            fontSize: THEME_CONSTANTS.l4FontSize,
-	            fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	            fontWeight: 'normal',
 	            fontStyle: 'normal',
 	            fill: { type: 'palette', key: 'labelReverseFontColor' },
@@ -56399,13 +56372,11 @@
 	    textStyle: {
 	        fontSize: THEME_CONSTANTS.l3FontSize,
 	        lineHeight: THEME_CONSTANTS.l3LineHeight,
-	        fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	        fill: { type: 'palette', key: ['titleFontColor', 'primaryFontColor'] }
 	    },
 	    subtextStyle: {
 	        fontSize: THEME_CONSTANTS.l4FontSize,
 	        lineHeight: THEME_CONSTANTS.l4LineHeight,
-	        fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	        fill: { type: 'palette', key: 'secondaryFontColor' }
 	    }
 	};
@@ -56440,7 +56411,6 @@
 	    titleLabel: {
 	        fontSize: THEME_CONSTANTS.l4FontSize,
 	        lineHeight: THEME_CONSTANTS.l4LineHeight,
-	        fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	        fontColor: { type: 'palette', key: ['titleFontColor', 'primaryFontColor'] },
 	        fontWeight: 'bold',
 	        textAlign: 'left',
@@ -56454,7 +56424,6 @@
 	    keyLabel: {
 	        fontSize: THEME_CONSTANTS.l4FontSize,
 	        lineHeight: THEME_CONSTANTS.l4LineHeight,
-	        fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	        fontColor: { type: 'palette', key: 'secondaryFontColor' },
 	        textAlign: 'left',
 	        textBaseline: 'middle',
@@ -56463,7 +56432,6 @@
 	    valueLabel: {
 	        fontSize: THEME_CONSTANTS.l4FontSize,
 	        lineHeight: THEME_CONSTANTS.l4LineHeight,
-	        fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	        fontColor: { type: 'palette', key: ['titleFontColor', 'primaryFontColor'] },
 	        fontWeight: 'bold',
 	        textBaseline: 'middle',
@@ -56477,13 +56445,11 @@
 	    padding: 8,
 	    titleStyle: {
 	        fontSize: THEME_CONSTANTS.l5FontSize,
-	        fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	        fontWeight: 'bold',
 	        fill: { type: 'palette', key: ['titleFontColor', 'primaryFontColor'] }
 	    },
 	    contentStyle: {
 	        fontSize: THEME_CONSTANTS.l5FontSize,
-	        fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	        fill: { type: 'palette', key: 'secondaryFontColor' }
 	    },
 	    panel: {
@@ -56511,7 +56477,6 @@
 	    animation: false,
 	    style: {
 	        fontSize: THEME_CONSTANTS.l4FontSize,
-	        fontFamily: THEME_CONSTANTS.defaultFontFamily,
 	        fill: { type: 'palette', key: ['titleFontColor', 'primaryFontColor'] }
 	    }
 	};
@@ -59809,8 +59774,10 @@
 	                spec = specTransform(spec);
 	                const lastSpec = this._spec;
 	                this._spec = spec;
-	                this._updateCurrentTheme();
-	                (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setCurrentTheme(this._currentTheme, true);
+	                if (!isEqual$1(lastSpec.theme, spec.theme)) {
+	                    this._updateCurrentTheme();
+	                    (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setCurrentTheme(this._currentTheme, false);
+	                }
 	                const reSize = this._updateChartConfiguration(lastSpec);
 	                (_c = (_b = this._compiler) === null || _b === void 0 ? void 0 : _b.getVGrammarView()) === null || _c === void 0 ? void 0 : _c.updateLayoutTag();
 	                return mergeUpdateResult(this._chart.updateSpec(spec, morphConfig), {
@@ -61163,6 +61130,9 @@
 	        this._theme = theme;
 	        this._mergeMarkTheme();
 	    }
+	    setTheme(theme) {
+	        this._theme = theme;
+	    }
 	    _mergeMarkTheme() {
 	        var _a, _b;
 	        const globalTheme = (_b = (_a = this._option).getTheme) === null || _b === void 0 ? void 0 : _b.call(_a);
@@ -63462,7 +63432,7 @@
 	VChart.useMark([ComponentMark, GroupMark, ImageMark]);
 	Factory.registerRegion('region', Region);
 	Factory.registerLayout('base', Layout);
-	const version = "1.4.0";
+	const version = "1.4.1-alpha.1";
 	Logger.getInstance(LoggerLevel.Error);
 
 	const WordCloud3dAnimation = (params) => {
@@ -67836,6 +67806,7 @@
 	        this.setLayoutTag(true);
 	    }
 	    updateViewBox(viewBox, reLayout) {
+	        this._option.viewBox = viewBox;
 	        this._updateLayoutRect(viewBox);
 	        this.setLayoutTag(true, null, reLayout);
 	    }
@@ -68071,7 +68042,18 @@
 	        this.getAllModels().forEach(model => model.onDataUpdate());
 	    }
 	    updateFullData(data, updateGlobalScale = true) {
-	        this._chartData.updateData(data);
+	        array(data).forEach(d => {
+	            const dv = this._dataSet.getDataView(d.id);
+	            if (dv) {
+	                dv.markRunning();
+	            }
+	        });
+	        array(data).forEach(d => {
+	            const dv = this._dataSet.getDataView(d.id);
+	            if (dv) {
+	                updateDataViewInData(dv, d, true);
+	            }
+	        });
 	        if (updateGlobalScale) {
 	            this.updateGlobalScaleDomain();
 	        }
@@ -68320,28 +68302,28 @@
 	    getCurrentTheme() {
 	        return this._theme;
 	    }
-	    setCurrentTheme(theme) {
+	    setCurrentTheme(theme, reInit = true) {
 	        this._theme = theme;
 	        this.setLayoutTag(true);
 	        this.transformSpec(this._spec);
 	        this.updateGlobalScaleTheme();
-	        this.setRegionTheme();
-	        this.setComponentTheme(theme);
-	        this.setSeriesTheme(theme);
+	        this.setRegionTheme(reInit);
+	        this.setComponentTheme(theme, reInit);
+	        this.setSeriesTheme(theme, reInit);
 	    }
-	    setRegionTheme() {
+	    setRegionTheme(reInit = true) {
 	        this._regions.forEach(r => {
-	            r.reInit();
+	            reInit ? r.reInit() : r.setTheme();
 	        });
 	    }
-	    setComponentTheme(theme) {
+	    setComponentTheme(theme, reInit = true) {
 	        this._components.forEach(c => {
-	            c.setCurrentTheme(theme.series[c.type], true);
+	            reInit ? c.setCurrentTheme(theme.component[c.type], true) : c.setTheme(theme.component[c.type]);
 	        });
 	    }
-	    setSeriesTheme(theme) {
+	    setSeriesTheme(theme, reInit = true) {
 	        this._series.forEach((s) => __awaiter$i(this, void 0, void 0, function* () {
-	            yield s.setCurrentTheme(theme.series[s.type], true);
+	            reInit ? yield s.setCurrentTheme(theme.series[s.type], true) : s.setTheme(theme.series[s.type]);
 	        }));
 	    }
 	    clear() {
@@ -75718,10 +75700,10 @@
 	                x: () => this.angleAxisHelper.center().x,
 	                y: () => this.angleAxisHelper.center().y,
 	                startAngle: (datum) => this.angleAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields())) -
-	                    this.angleAxisHelper.getBandwidth(0) * 0.5,
+	                    this.angleAxisHelper.getBandwidth(this.getGroupFields().length - 1) * 0.5,
 	                endAngle: (datum) => this.angleAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields())) +
 	                    this.getRoseAngle() -
-	                    this.angleAxisHelper.getBandwidth(0) * 0.5,
+	                    this.angleAxisHelper.getBandwidth(this.getGroupFields().length - 1) * 0.5,
 	                fill: this.getColorAttribute(),
 	                outerRadius: (datum) => valueInScaleRange(this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]), this.radiusAxisHelper.getScale(0)),
 	                innerRadius: (datum) => {
@@ -75792,6 +75774,9 @@
 	                    axis[configName] = { visible: false };
 	                }
 	            });
+	            if (axis.orient === 'angle' && isNil$1(axis.bandPosition)) {
+	                axis.bandPosition = 0.5;
+	            }
 	        });
 	        spec.crosshair = array(spec.crosshair || {}).map(crosshairCfg => {
 	            return mergeSpec({
@@ -82616,7 +82601,7 @@
 	        }
 	    }
 	    initMarkStyle() {
-	        var _a, _b, _c;
+	        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
 	        const wordMark = this._wordMark;
 	        const fillingWordMark = this._fillingWordMark;
 	        const textField = ((_a = this._spec.word) === null || _a === void 0 ? void 0 : _a.formatMethod) ? WORD_CLOUD_TEXT : this._nameField;
@@ -82635,6 +82620,9 @@
 	                angle: (datum) => datum.angle,
 	                visible: (datum) => !datum.isFillingWord
 	            }, 'normal', AttributeLevel.Series);
+	            this.setMarkStyle(wordMark, {
+	                fontFamily: (_d = (_c = (_b = this._spec.word) === null || _b === void 0 ? void 0 : _b.style) === null || _c === void 0 ? void 0 : _c.fontFamily) !== null && _d !== void 0 ? _d : (_f = (_e = this._option) === null || _e === void 0 ? void 0 : _e.getTheme()) === null || _f === void 0 ? void 0 : _f.fontFamily
+	            }, 'normal', AttributeLevel.User_Mark);
 	        }
 	        if (fillingWordMark) {
 	            this.setMarkStyle(fillingWordMark, {
@@ -82651,11 +82639,14 @@
 	                angle: (datum) => datum.angle,
 	                visible: (datum) => datum.isFillingWord
 	            }, 'normal', AttributeLevel.Series);
+	            this.setMarkStyle(fillingWordMark, {
+	                fontFamily: (_j = (_h = (_g = this._spec.word) === null || _g === void 0 ? void 0 : _g.style) === null || _h === void 0 ? void 0 : _h.fontFamily) !== null && _j !== void 0 ? _j : (_l = (_k = this._option) === null || _k === void 0 ? void 0 : _k.getTheme()) === null || _l === void 0 ? void 0 : _l.fontFamily
+	            }, 'normal', AttributeLevel.User_Mark);
 	        }
 	        this._trigger.registerMark(wordMark);
-	        (_b = this._tooltipHelper) === null || _b === void 0 ? void 0 : _b.activeTriggerSet.mark.add(wordMark);
+	        (_m = this._tooltipHelper) === null || _m === void 0 ? void 0 : _m.activeTriggerSet.mark.add(wordMark);
 	        this._trigger.registerMark(fillingWordMark);
-	        (_c = this._tooltipHelper) === null || _c === void 0 ? void 0 : _c.activeTriggerSet.mark.add(fillingWordMark);
+	        (_o = this._tooltipHelper) === null || _o === void 0 ? void 0 : _o.activeTriggerSet.mark.add(fillingWordMark);
 	    }
 	    initAnimation() {
 	        [this._wordMark, this._fillingWordMark].forEach(mark => {
@@ -82691,7 +82682,7 @@
 	        return (datum) => colorList[0];
 	    }
 	    compile() {
-	        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23;
+	        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32;
 	        super.compile();
 	        const { width, height } = this._region.getLayoutRect();
 	        if (!isValidNumber$1(width) || !isValidNumber$1(height) || !(height > 0 && width > 0)) {
@@ -82752,9 +82743,9 @@
 	                fontSizeRange: this._fontSizeRange,
 	                padding: this._fontPadding,
 	                rotate: { field: WORD_CLOUD_ANGLE },
-	                fontFamily: (_d = this._fontFamilyField) !== null && _d !== void 0 ? _d : (_f = (_e = this._spec.word) === null || _e === void 0 ? void 0 : _e.style) === null || _f === void 0 ? void 0 : _f.fontFamily,
+	                fontFamily: (_g = (_d = this._fontFamilyField) !== null && _d !== void 0 ? _d : (_f = (_e = this._spec.word) === null || _e === void 0 ? void 0 : _e.style) === null || _f === void 0 ? void 0 : _f.fontFamily) !== null && _g !== void 0 ? _g : (_j = (_h = this._option) === null || _h === void 0 ? void 0 : _h.getTheme()) === null || _j === void 0 ? void 0 : _j.fontFamily,
 	                fontWeight: fontWeightField ? { field: fontWeightField } : valueField ? { field: WORD_CLOUD_WEIGHT } : null,
-	                fontStyle: (_g = this._fontStyleField) !== null && _g !== void 0 ? _g : (_j = (_h = this._spec.word) === null || _h === void 0 ? void 0 : _h.style) === null || _j === void 0 ? void 0 : _j.fontStyle,
+	                fontStyle: (_k = this._fontStyleField) !== null && _k !== void 0 ? _k : (_m = (_l = this._spec.word) === null || _l === void 0 ? void 0 : _l.style) === null || _m === void 0 ? void 0 : _m.fontStyle,
 	                randomVisible: this._random,
 	                clip: this._wordCloudConfig.drawOutOfBound === 'clip',
 	                shrink: this._wordCloudConfig.zoomToFit.shrink,
@@ -82771,39 +82762,39 @@
 	                dataIndexKey: DEFAULT_DATA_KEY,
 	                size: [width, height],
 	                shape: this._maskShape,
-	                text: { field: ((_k = this._spec.word) === null || _k === void 0 ? void 0 : _k.formatMethod) ? WORD_CLOUD_TEXT : this._nameField },
+	                text: { field: ((_o = this._spec.word) === null || _o === void 0 ? void 0 : _o.formatMethod) ? WORD_CLOUD_TEXT : this._nameField },
 	                fontSize: valueField ? { field: valueField } : this._fontSizeRange[0],
 	                fontSizeRange: this._fontSizeRange,
 	                padding: this._fontPadding,
 	                rotateList: rotateAngles,
-	                fontFamily: (_l = this._fontFamilyField) !== null && _l !== void 0 ? _l : (_o = (_m = this._spec.word) === null || _m === void 0 ? void 0 : _m.style) === null || _o === void 0 ? void 0 : _o.fontFamily,
+	                fontFamily: (_s = (_p = this._fontFamilyField) !== null && _p !== void 0 ? _p : (_r = (_q = this._spec.word) === null || _q === void 0 ? void 0 : _q.style) === null || _r === void 0 ? void 0 : _r.fontFamily) !== null && _s !== void 0 ? _s : (_u = (_t = this._option) === null || _t === void 0 ? void 0 : _t.getTheme()) === null || _u === void 0 ? void 0 : _u.fontFamily,
 	                fontWeight: fontWeightField ? { field: fontWeightField } : valueField ? { field: WORD_CLOUD_WEIGHT } : null,
-	                fontStyle: (_p = this._fontStyleField) !== null && _p !== void 0 ? _p : (_r = (_q = this._spec.word) === null || _q === void 0 ? void 0 : _q.style) === null || _r === void 0 ? void 0 : _r.fontStyle,
-	                fillingFontFamily: (_t = (_s = this._wordCloudShapeConfig) === null || _s === void 0 ? void 0 : _s.fillingFontFamilyField) !== null && _t !== void 0 ? _t : (_v = (_u = this._spec.word) === null || _u === void 0 ? void 0 : _u.style) === null || _v === void 0 ? void 0 : _v.fontFamily,
+	                fontStyle: (_v = this._fontStyleField) !== null && _v !== void 0 ? _v : (_x = (_w = this._spec.word) === null || _w === void 0 ? void 0 : _w.style) === null || _x === void 0 ? void 0 : _x.fontStyle,
+	                fillingFontFamily: (_2 = (_z = (_y = this._wordCloudShapeConfig) === null || _y === void 0 ? void 0 : _y.fillingFontFamilyField) !== null && _z !== void 0 ? _z : (_1 = (_0 = this._spec.word) === null || _0 === void 0 ? void 0 : _0.style) === null || _1 === void 0 ? void 0 : _1.fontFamily) !== null && _2 !== void 0 ? _2 : (_4 = (_3 = this._option) === null || _3 === void 0 ? void 0 : _3.getTheme()) === null || _4 === void 0 ? void 0 : _4.fontFamily,
 	                fillingPadding: this._fillingFontPadding,
-	                fillingFontStyle: (_x = (_w = this._wordCloudShapeConfig) === null || _w === void 0 ? void 0 : _w.fillingFontStyleField) !== null && _x !== void 0 ? _x : (_z = (_y = this._spec.word) === null || _y === void 0 ? void 0 : _y.style) === null || _z === void 0 ? void 0 : _z.fontStyle,
-	                fillingFontWeight: (_1 = (_0 = this._wordCloudShapeConfig) === null || _0 === void 0 ? void 0 : _0.fillingFontWeightField) !== null && _1 !== void 0 ? _1 : (_3 = (_2 = this._spec.word) === null || _2 === void 0 ? void 0 : _2.style) === null || _3 === void 0 ? void 0 : _3.fontWeight,
+	                fillingFontStyle: (_6 = (_5 = this._wordCloudShapeConfig) === null || _5 === void 0 ? void 0 : _5.fillingFontStyleField) !== null && _6 !== void 0 ? _6 : (_8 = (_7 = this._spec.word) === null || _7 === void 0 ? void 0 : _7.style) === null || _8 === void 0 ? void 0 : _8.fontStyle,
+	                fillingFontWeight: (_10 = (_9 = this._wordCloudShapeConfig) === null || _9 === void 0 ? void 0 : _9.fillingFontWeightField) !== null && _10 !== void 0 ? _10 : (_12 = (_11 = this._spec.word) === null || _11 === void 0 ? void 0 : _11.style) === null || _12 === void 0 ? void 0 : _12.fontWeight,
 	                fillingRotateList: fillingRotateAngles,
-	                fillingTimes: (_4 = this._wordCloudShapeConfig) === null || _4 === void 0 ? void 0 : _4.fillingTimes,
-	                fillingXStep: (_5 = this._wordCloudShapeConfig) === null || _5 === void 0 ? void 0 : _5.fillingXStep,
-	                fillingYStep: (_6 = this._wordCloudShapeConfig) === null || _6 === void 0 ? void 0 : _6.fillingYStep,
-	                fillingXRatioStep: (_7 = this._wordCloudShapeConfig) === null || _7 === void 0 ? void 0 : _7.fillingXRatioStep,
-	                fillingYRatioStep: (_8 = this._wordCloudShapeConfig) === null || _8 === void 0 ? void 0 : _8.fillingYRatioStep,
-	                fillingInitialOpacity: (_9 = this._wordCloudShapeConfig) === null || _9 === void 0 ? void 0 : _9.fillingInitialOpacity,
-	                fillingDeltaOpacity: (_10 = this._wordCloudShapeConfig) === null || _10 === void 0 ? void 0 : _10.fillingDeltaOpacity,
-	                fillingInitialFontSize: (_11 = this._wordCloudShapeConfig) === null || _11 === void 0 ? void 0 : _11.fillingInitialFontSize,
-	                fillingDeltaFontSize: (_12 = this._wordCloudShapeConfig) === null || _12 === void 0 ? void 0 : _12.fillingDeltaFontSize,
-	                ratio: (_13 = this._wordCloudShapeConfig) === null || _13 === void 0 ? void 0 : _13.ratio,
-	                fillingRatio: (_14 = this._wordCloudShapeConfig) === null || _14 === void 0 ? void 0 : _14.fillingRatio,
-	                removeWhiteBorder: (_15 = this._wordCloudShapeConfig) === null || _15 === void 0 ? void 0 : _15.removeWhiteBorder,
-	                textLayoutTimes: (_16 = this._wordCloudShapeConfig) === null || _16 === void 0 ? void 0 : _16.textLayoutTimes,
-	                fontSizeShrinkFactor: (_17 = this._wordCloudShapeConfig) === null || _17 === void 0 ? void 0 : _17.fontSizeShrinkFactor,
-	                stepFactor: (_18 = this._wordCloudShapeConfig) === null || _18 === void 0 ? void 0 : _18.stepFactor,
-	                layoutMode: (_19 = this._wordCloudShapeConfig) === null || _19 === void 0 ? void 0 : _19.layoutMode,
-	                importantWordCount: (_20 = this._wordCloudShapeConfig) === null || _20 === void 0 ? void 0 : _20.importantWordCount,
-	                globalShinkLimit: (_21 = this._wordCloudShapeConfig) === null || _21 === void 0 ? void 0 : _21.globalShinkLimit,
-	                fontSizeEnlargeFactor: (_22 = this._wordCloudShapeConfig) === null || _22 === void 0 ? void 0 : _22.fontSizeEnlargeFactor,
-	                fillingDeltaFontSizeFactor: (_23 = this._wordCloudShapeConfig) === null || _23 === void 0 ? void 0 : _23.fillingDeltaFontSizeFactor
+	                fillingTimes: (_13 = this._wordCloudShapeConfig) === null || _13 === void 0 ? void 0 : _13.fillingTimes,
+	                fillingXStep: (_14 = this._wordCloudShapeConfig) === null || _14 === void 0 ? void 0 : _14.fillingXStep,
+	                fillingYStep: (_15 = this._wordCloudShapeConfig) === null || _15 === void 0 ? void 0 : _15.fillingYStep,
+	                fillingXRatioStep: (_16 = this._wordCloudShapeConfig) === null || _16 === void 0 ? void 0 : _16.fillingXRatioStep,
+	                fillingYRatioStep: (_17 = this._wordCloudShapeConfig) === null || _17 === void 0 ? void 0 : _17.fillingYRatioStep,
+	                fillingInitialOpacity: (_18 = this._wordCloudShapeConfig) === null || _18 === void 0 ? void 0 : _18.fillingInitialOpacity,
+	                fillingDeltaOpacity: (_19 = this._wordCloudShapeConfig) === null || _19 === void 0 ? void 0 : _19.fillingDeltaOpacity,
+	                fillingInitialFontSize: (_20 = this._wordCloudShapeConfig) === null || _20 === void 0 ? void 0 : _20.fillingInitialFontSize,
+	                fillingDeltaFontSize: (_21 = this._wordCloudShapeConfig) === null || _21 === void 0 ? void 0 : _21.fillingDeltaFontSize,
+	                ratio: (_22 = this._wordCloudShapeConfig) === null || _22 === void 0 ? void 0 : _22.ratio,
+	                fillingRatio: (_23 = this._wordCloudShapeConfig) === null || _23 === void 0 ? void 0 : _23.fillingRatio,
+	                removeWhiteBorder: (_24 = this._wordCloudShapeConfig) === null || _24 === void 0 ? void 0 : _24.removeWhiteBorder,
+	                textLayoutTimes: (_25 = this._wordCloudShapeConfig) === null || _25 === void 0 ? void 0 : _25.textLayoutTimes,
+	                fontSizeShrinkFactor: (_26 = this._wordCloudShapeConfig) === null || _26 === void 0 ? void 0 : _26.fontSizeShrinkFactor,
+	                stepFactor: (_27 = this._wordCloudShapeConfig) === null || _27 === void 0 ? void 0 : _27.stepFactor,
+	                layoutMode: (_28 = this._wordCloudShapeConfig) === null || _28 === void 0 ? void 0 : _28.layoutMode,
+	                importantWordCount: (_29 = this._wordCloudShapeConfig) === null || _29 === void 0 ? void 0 : _29.importantWordCount,
+	                globalShinkLimit: (_30 = this._wordCloudShapeConfig) === null || _30 === void 0 ? void 0 : _30.globalShinkLimit,
+	                fontSizeEnlargeFactor: (_31 = this._wordCloudShapeConfig) === null || _31 === void 0 ? void 0 : _31.fontSizeEnlargeFactor,
+	                fillingDeltaFontSizeFactor: (_32 = this._wordCloudShapeConfig) === null || _32 === void 0 ? void 0 : _32.fillingDeltaFontSizeFactor
 	            });
 	        }
 	        this._data.getProduct().transform(wordCloudTransforms);
@@ -82885,7 +82876,7 @@
 	        this.type = SeriesTypeEnum.wordCloud3d;
 	    }
 	    compile() {
-	        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24;
+	        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33;
 	        super.compile();
 	        const wordCloudTransforms = [];
 	        const valueField = this._valueField;
@@ -82943,9 +82934,9 @@
 	                fontSizeRange: this._fontSizeRange,
 	                padding: this._fontPadding,
 	                rotate: { field: WORD_CLOUD_ANGLE },
-	                fontFamily: (_e = this._fontFamilyField) !== null && _e !== void 0 ? _e : (_g = (_f = this._spec.word) === null || _f === void 0 ? void 0 : _f.style) === null || _g === void 0 ? void 0 : _g.fontFamily,
+	                fontFamily: (_h = (_e = this._fontFamilyField) !== null && _e !== void 0 ? _e : (_g = (_f = this._spec.word) === null || _f === void 0 ? void 0 : _f.style) === null || _g === void 0 ? void 0 : _g.fontFamily) !== null && _h !== void 0 ? _h : (_k = (_j = this._option) === null || _j === void 0 ? void 0 : _j.getTheme()) === null || _k === void 0 ? void 0 : _k.fontFamily,
 	                fontWeight: fontWeightField ? { field: fontWeightField } : valueField ? { field: WORD_CLOUD_WEIGHT } : null,
-	                fontStyle: (_h = this._fontStyleField) !== null && _h !== void 0 ? _h : (_k = (_j = this._spec.word) === null || _j === void 0 ? void 0 : _j.style) === null || _k === void 0 ? void 0 : _k.fontStyle,
+	                fontStyle: (_l = this._fontStyleField) !== null && _l !== void 0 ? _l : (_o = (_m = this._spec.word) === null || _m === void 0 ? void 0 : _m.style) === null || _o === void 0 ? void 0 : _o.fontStyle,
 	                depth_3d: this._spec.depth_3d,
 	                randomVisible: this._random,
 	                clip: this._wordCloudConfig.drawOutOfBound === 'clip',
@@ -82962,42 +82953,42 @@
 	                type: 'wordcloudShape',
 	                size: [this._region.getLayoutRect().width, this._region.getLayoutRect().height],
 	                shape: this._maskShape,
-	                postProjection: (_l = this._spec.postProjection) !== null && _l !== void 0 ? _l : 'StereographicProjection',
+	                postProjection: (_p = this._spec.postProjection) !== null && _p !== void 0 ? _p : 'StereographicProjection',
 	                dataIndexKey: DEFAULT_DATA_KEY,
 	                text: { field: textField },
 	                fontSize: valueField ? { field: valueField } : this._fontSizeRange[0],
 	                fontSizeRange: this._fontSizeRange,
 	                padding: this._fontPadding,
 	                rotateList: rotateAngles,
-	                fontFamily: (_m = this._fontFamilyField) !== null && _m !== void 0 ? _m : (_p = (_o = this._spec.word) === null || _o === void 0 ? void 0 : _o.style) === null || _p === void 0 ? void 0 : _p.fontFamily,
+	                fontFamily: (_t = (_q = this._fontFamilyField) !== null && _q !== void 0 ? _q : (_s = (_r = this._spec.word) === null || _r === void 0 ? void 0 : _r.style) === null || _s === void 0 ? void 0 : _s.fontFamily) !== null && _t !== void 0 ? _t : (_v = (_u = this._option) === null || _u === void 0 ? void 0 : _u.getTheme()) === null || _v === void 0 ? void 0 : _v.fontFamily,
 	                fontWeight: fontWeightField ? { field: fontWeightField } : valueField ? { field: WORD_CLOUD_WEIGHT } : null,
-	                fontStyle: (_q = this._fontStyleField) !== null && _q !== void 0 ? _q : (_s = (_r = this._spec.word) === null || _r === void 0 ? void 0 : _r.style) === null || _s === void 0 ? void 0 : _s.fontStyle,
+	                fontStyle: (_w = this._fontStyleField) !== null && _w !== void 0 ? _w : (_y = (_x = this._spec.word) === null || _x === void 0 ? void 0 : _x.style) === null || _y === void 0 ? void 0 : _y.fontStyle,
 	                depth_3d: this._spec.depth_3d,
-	                fillingFontFamily: (_u = (_t = this._wordCloudShapeConfig) === null || _t === void 0 ? void 0 : _t.fillingFontFamilyField) !== null && _u !== void 0 ? _u : (_w = (_v = this._spec.word) === null || _v === void 0 ? void 0 : _v.style) === null || _w === void 0 ? void 0 : _w.fontFamily,
+	                fillingFontFamily: (_3 = (_0 = (_z = this._wordCloudShapeConfig) === null || _z === void 0 ? void 0 : _z.fillingFontFamilyField) !== null && _0 !== void 0 ? _0 : (_2 = (_1 = this._spec.word) === null || _1 === void 0 ? void 0 : _1.style) === null || _2 === void 0 ? void 0 : _2.fontFamily) !== null && _3 !== void 0 ? _3 : (_5 = (_4 = this._option) === null || _4 === void 0 ? void 0 : _4.getTheme()) === null || _5 === void 0 ? void 0 : _5.fontFamily,
 	                fillingPadding: this._fillingFontPadding,
-	                fillingFontStyle: (_y = (_x = this._wordCloudShapeConfig) === null || _x === void 0 ? void 0 : _x.fillingFontStyleField) !== null && _y !== void 0 ? _y : (_0 = (_z = this._spec.word) === null || _z === void 0 ? void 0 : _z.style) === null || _0 === void 0 ? void 0 : _0.fontStyle,
-	                fillingFontWeight: (_2 = (_1 = this._wordCloudShapeConfig) === null || _1 === void 0 ? void 0 : _1.fillingFontWeightField) !== null && _2 !== void 0 ? _2 : (_4 = (_3 = this._spec.word) === null || _3 === void 0 ? void 0 : _3.style) === null || _4 === void 0 ? void 0 : _4.fontWeight,
+	                fillingFontStyle: (_7 = (_6 = this._wordCloudShapeConfig) === null || _6 === void 0 ? void 0 : _6.fillingFontStyleField) !== null && _7 !== void 0 ? _7 : (_9 = (_8 = this._spec.word) === null || _8 === void 0 ? void 0 : _8.style) === null || _9 === void 0 ? void 0 : _9.fontStyle,
+	                fillingFontWeight: (_11 = (_10 = this._wordCloudShapeConfig) === null || _10 === void 0 ? void 0 : _10.fillingFontWeightField) !== null && _11 !== void 0 ? _11 : (_13 = (_12 = this._spec.word) === null || _12 === void 0 ? void 0 : _12.style) === null || _13 === void 0 ? void 0 : _13.fontWeight,
 	                fillingRotateList: fillingRotateAngles,
-	                fillingTimes: (_5 = this._wordCloudShapeConfig) === null || _5 === void 0 ? void 0 : _5.fillingTimes,
-	                fillingXStep: (_6 = this._wordCloudShapeConfig) === null || _6 === void 0 ? void 0 : _6.fillingXStep,
-	                fillingYStep: (_7 = this._wordCloudShapeConfig) === null || _7 === void 0 ? void 0 : _7.fillingYStep,
-	                fillingXRatioStep: (_8 = this._wordCloudShapeConfig) === null || _8 === void 0 ? void 0 : _8.fillingXRatioStep,
-	                fillingYRatioStep: (_9 = this._wordCloudShapeConfig) === null || _9 === void 0 ? void 0 : _9.fillingYRatioStep,
-	                fillingInitialOpacity: (_10 = this._wordCloudShapeConfig) === null || _10 === void 0 ? void 0 : _10.fillingInitialOpacity,
-	                fillingDeltaOpacity: (_11 = this._wordCloudShapeConfig) === null || _11 === void 0 ? void 0 : _11.fillingDeltaOpacity,
-	                fillingInitialFontSize: (_12 = this._wordCloudShapeConfig) === null || _12 === void 0 ? void 0 : _12.fillingInitialFontSize,
-	                fillingDeltaFontSize: (_13 = this._wordCloudShapeConfig) === null || _13 === void 0 ? void 0 : _13.fillingDeltaFontSize,
-	                ratio: (_14 = this._wordCloudShapeConfig) === null || _14 === void 0 ? void 0 : _14.ratio,
-	                fillingRatio: (_15 = this._wordCloudShapeConfig) === null || _15 === void 0 ? void 0 : _15.fillingRatio,
-	                removeWhiteBorder: (_16 = this._wordCloudShapeConfig) === null || _16 === void 0 ? void 0 : _16.removeWhiteBorder,
-	                textLayoutTimes: (_17 = this._wordCloudShapeConfig) === null || _17 === void 0 ? void 0 : _17.textLayoutTimes,
-	                fontSizeShrinkFactor: (_18 = this._wordCloudShapeConfig) === null || _18 === void 0 ? void 0 : _18.fontSizeShrinkFactor,
-	                stepFactor: (_19 = this._wordCloudShapeConfig) === null || _19 === void 0 ? void 0 : _19.stepFactor,
-	                layoutMode: (_20 = this._wordCloudShapeConfig) === null || _20 === void 0 ? void 0 : _20.layoutMode,
-	                importantWordCount: (_21 = this._wordCloudShapeConfig) === null || _21 === void 0 ? void 0 : _21.importantWordCount,
-	                globalShinkLimit: (_22 = this._wordCloudShapeConfig) === null || _22 === void 0 ? void 0 : _22.globalShinkLimit,
-	                fontSizeEnlargeFactor: (_23 = this._wordCloudShapeConfig) === null || _23 === void 0 ? void 0 : _23.fontSizeEnlargeFactor,
-	                fillingDeltaFontSizeFactor: (_24 = this._wordCloudShapeConfig) === null || _24 === void 0 ? void 0 : _24.fillingDeltaFontSizeFactor
+	                fillingTimes: (_14 = this._wordCloudShapeConfig) === null || _14 === void 0 ? void 0 : _14.fillingTimes,
+	                fillingXStep: (_15 = this._wordCloudShapeConfig) === null || _15 === void 0 ? void 0 : _15.fillingXStep,
+	                fillingYStep: (_16 = this._wordCloudShapeConfig) === null || _16 === void 0 ? void 0 : _16.fillingYStep,
+	                fillingXRatioStep: (_17 = this._wordCloudShapeConfig) === null || _17 === void 0 ? void 0 : _17.fillingXRatioStep,
+	                fillingYRatioStep: (_18 = this._wordCloudShapeConfig) === null || _18 === void 0 ? void 0 : _18.fillingYRatioStep,
+	                fillingInitialOpacity: (_19 = this._wordCloudShapeConfig) === null || _19 === void 0 ? void 0 : _19.fillingInitialOpacity,
+	                fillingDeltaOpacity: (_20 = this._wordCloudShapeConfig) === null || _20 === void 0 ? void 0 : _20.fillingDeltaOpacity,
+	                fillingInitialFontSize: (_21 = this._wordCloudShapeConfig) === null || _21 === void 0 ? void 0 : _21.fillingInitialFontSize,
+	                fillingDeltaFontSize: (_22 = this._wordCloudShapeConfig) === null || _22 === void 0 ? void 0 : _22.fillingDeltaFontSize,
+	                ratio: (_23 = this._wordCloudShapeConfig) === null || _23 === void 0 ? void 0 : _23.ratio,
+	                fillingRatio: (_24 = this._wordCloudShapeConfig) === null || _24 === void 0 ? void 0 : _24.fillingRatio,
+	                removeWhiteBorder: (_25 = this._wordCloudShapeConfig) === null || _25 === void 0 ? void 0 : _25.removeWhiteBorder,
+	                textLayoutTimes: (_26 = this._wordCloudShapeConfig) === null || _26 === void 0 ? void 0 : _26.textLayoutTimes,
+	                fontSizeShrinkFactor: (_27 = this._wordCloudShapeConfig) === null || _27 === void 0 ? void 0 : _27.fontSizeShrinkFactor,
+	                stepFactor: (_28 = this._wordCloudShapeConfig) === null || _28 === void 0 ? void 0 : _28.stepFactor,
+	                layoutMode: (_29 = this._wordCloudShapeConfig) === null || _29 === void 0 ? void 0 : _29.layoutMode,
+	                importantWordCount: (_30 = this._wordCloudShapeConfig) === null || _30 === void 0 ? void 0 : _30.importantWordCount,
+	                globalShinkLimit: (_31 = this._wordCloudShapeConfig) === null || _31 === void 0 ? void 0 : _31.globalShinkLimit,
+	                fontSizeEnlargeFactor: (_32 = this._wordCloudShapeConfig) === null || _32 === void 0 ? void 0 : _32.fontSizeEnlargeFactor,
+	                fillingDeltaFontSizeFactor: (_33 = this._wordCloudShapeConfig) === null || _33 === void 0 ? void 0 : _33.fillingDeltaFontSizeFactor
 	            });
 	        }
 	        this._data.getProduct().transform(wordCloudTransforms);
@@ -83017,7 +83008,7 @@
 	        }
 	    }
 	    initMarkStyle() {
-	        var _a, _b;
+	        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
 	        const wordMark = this._wordMark;
 	        const fillingWordMark = this._fillingWordMark;
 	        if (wordMark) {
@@ -83036,6 +83027,9 @@
 	                angle: (datum) => datum.angle,
 	                visible: (datum) => !datum.isFillingWord
 	            }, 'normal', AttributeLevel.Series);
+	            this.setMarkStyle(wordMark, {
+	                fontFamily: (_c = (_b = (_a = this._spec.word) === null || _a === void 0 ? void 0 : _a.style) === null || _b === void 0 ? void 0 : _b.fontFamily) !== null && _c !== void 0 ? _c : (_e = (_d = this._option) === null || _d === void 0 ? void 0 : _d.getTheme()) === null || _e === void 0 ? void 0 : _e.fontFamily
+	            }, 'normal', AttributeLevel.User_Mark);
 	        }
 	        if (fillingWordMark) {
 	            this.setMarkStyle(fillingWordMark, {
@@ -83053,11 +83047,14 @@
 	                angle: (datum) => datum.angle,
 	                visible: (datum) => datum.isFillingWord
 	            }, 'normal', AttributeLevel.Series);
+	            this.setMarkStyle(fillingWordMark, {
+	                fontFamily: (_h = (_g = (_f = this._spec.word) === null || _f === void 0 ? void 0 : _f.style) === null || _g === void 0 ? void 0 : _g.fontFamily) !== null && _h !== void 0 ? _h : (_k = (_j = this._option) === null || _j === void 0 ? void 0 : _j.getTheme()) === null || _k === void 0 ? void 0 : _k.fontFamily
+	            }, 'normal', AttributeLevel.User_Mark);
 	        }
 	        this._trigger.registerMark(wordMark);
-	        (_a = this._tooltipHelper) === null || _a === void 0 ? void 0 : _a.activeTriggerSet.mark.add(wordMark);
+	        (_l = this._tooltipHelper) === null || _l === void 0 ? void 0 : _l.activeTriggerSet.mark.add(wordMark);
 	        this._trigger.registerMark(fillingWordMark);
-	        (_b = this._tooltipHelper) === null || _b === void 0 ? void 0 : _b.activeTriggerSet.mark.add(fillingWordMark);
+	        (_m = this._tooltipHelper) === null || _m === void 0 ? void 0 : _m.activeTriggerSet.mark.add(fillingWordMark);
 	    }
 	    initAnimation() {
 	        if (this._wordMark) {
@@ -84340,7 +84337,7 @@
 	                }, orient: this._orient, size: {
 	                    width: this.getLayoutRect().width,
 	                    height: this.getLayoutRect().height
-	                }, showDetail: (_a = this._spec) === null || _a === void 0 ? void 0 : _a.showDetail, brushSelect: (_c = (_b = this._spec) === null || _b === void 0 ? void 0 : _b.brushSelect) !== null && _c !== void 0 ? _c : false, previewData: this._data.getLatestData(), previewCallbackX: isNeedPreview && this._dataToPositionX, previewCallbackY: isNeedPreview && this._dataToPositionY }, this._getComponentAttrs()));
+	                }, showDetail: (_a = this._spec) === null || _a === void 0 ? void 0 : _a.showDetail, brushSelect: (_c = (_b = this._spec) === null || _b === void 0 ? void 0 : _b.brushSelect) !== null && _c !== void 0 ? _c : false, previewData: isNeedPreview && this._data.getLatestData(), previewCallbackX: isNeedPreview && this._dataToPositionX, previewCallbackY: isNeedPreview && this._dataToPositionY }, this._getComponentAttrs()));
 	            if (this._isHorizontal) {
 	                isNeedPreview && this._component.setPreviewCallbackY1(this._dataToPositionY2);
 	            }
@@ -86970,6 +86967,7 @@
 
 	const DEFAULT_BAND_INNER_PADDING$1 = 0.1;
 	const DEFAULT_BAND_OUTER_PADDING$1 = 0.3;
+	const DEFAULT_BAND_POSITION$1 = 0.5;
 
 	class BandAxisMixin {
 	    valueToPosition(value) {
@@ -87083,12 +87081,12 @@
 	        };
 	    }
 	    dataToPosition(values, cfg = {}) {
-	        var _a;
+	        var _a, _b;
 	        if (values.length === 0 || this._scales.length === 0) {
 	            return 0;
 	        }
 	        const { position, bandScale } = this.getPosition(values);
-	        return position + bandScale.bandwidth() * ((_a = cfg.bandPosition) !== null && _a !== void 0 ? _a : 0.5);
+	        return (position + bandScale.bandwidth() * ((_b = (_a = cfg.bandPosition) !== null && _a !== void 0 ? _a : this.getSpec().bandPosition) !== null && _b !== void 0 ? _b : DEFAULT_BAND_POSITION$1));
 	    }
 	    transformScaleDomain() {
 	        this.updateFixedWholeLength();
@@ -87271,6 +87269,10 @@
 	CartesianSymlogAxis.type = ComponentTypeEnum.cartesianSymlogAxis;
 	mixin(CartesianSymlogAxis, LinearAxisMixin);
 
+	const DEFAULT_BAND_INNER_PADDING = 0;
+	const DEFAULT_BAND_OUTER_PADDING = 0;
+	const DEFAULT_BAND_POSITION = 0;
+
 	class PolarAxis extends AxisComponent {
 	    constructor() {
 	        super(...arguments);
@@ -87532,6 +87534,7 @@
 	        return this._scale.scale(values);
 	    }
 	    positionToData(position) {
+	        var _a;
 	        const coord = this.pointToCoord(position);
 	        if (this.getOrient() === 'radius') {
 	            return this._scale.invert(coord.radius);
@@ -87539,12 +87542,14 @@
 	        if (this._scale.type === 'band') {
 	            const range = this._scale.range();
 	            const rangeValue = range[range.length - 1] - range[0];
+	            const bandPosition = (_a = this.getSpec().bandPosition) !== null && _a !== void 0 ? _a : DEFAULT_BAND_POSITION;
+	            const offset = bandPosition === 0.5 ? 0 : this._scale.bandwidth() / 2;
 	            if (range[0] < 0) {
-	                const angle = coord.angle + this._scale.bandwidth() / 2;
+	                const angle = coord.angle + offset;
 	                const transformedAngle = ((angle + Math.abs(range[0])) % rangeValue) - Math.abs(range[0]);
 	                return this._scale.invert(transformedAngle);
 	            }
-	            return this._scale.invert((coord.angle + this._scale.bandwidth() / 2) % rangeValue);
+	            return this._scale.invert((coord.angle + offset) % rangeValue);
 	        }
 	        return this._scale.invert(coord.angle);
 	    }
@@ -87736,9 +87741,6 @@
 	PolarLinearAxis.type = ComponentTypeEnum.polarLinearAxis;
 	mixin(PolarLinearAxis, LinearAxisMixin);
 
-	const DEFAULT_BAND_INNER_PADDING = 0;
-	const DEFAULT_BAND_OUTER_PADDING = 0;
-
 	class PolarBandAxis extends PolarAxis {
 	    constructor() {
 	        super(...arguments);
@@ -87748,12 +87750,13 @@
 	    computeDomain(data) {
 	        return this.computeBandDomain(data);
 	    }
-	    dataToPosition(values) {
+	    dataToPosition(values, cfg = {}) {
+	        var _a, _b;
 	        if (values.length === 0 || this._scales.length === 0) {
 	            return 0;
 	        }
-	        const { position } = this.getPosition(values);
-	        return position;
+	        const { position, bandScale } = this.getPosition(values);
+	        return (position + bandScale.bandwidth() * ((_b = (_a = cfg.bandPosition) !== null && _a !== void 0 ? _a : this.getSpec().bandPosition) !== null && _b !== void 0 ? _b : DEFAULT_BAND_POSITION));
 	    }
 	    updateScaleRange() {
 	        super.updateScaleRange();
@@ -94274,40 +94277,49 @@
 	        });
 	    }
 	    _updateMultiLabelAttribute(labelInfo, labelComponent) {
-	        this._updateLabelComponentAttribute(labelComponent.getProduct(), labelInfo.map(({ baseMark }) => baseMark.getProduct()), labelInfo[0]);
+	        this._updateLabelComponentAttribute(labelComponent.getProduct(), labelInfo.map(({ baseMark }) => baseMark.getProduct()), labelInfo);
 	    }
 	    _updateSingleLabelAttribute(labelInfo, labelComponent) {
 	        const { baseMark } = labelInfo;
-	        this._updateLabelComponentAttribute(labelComponent.getProduct(), baseMark.getProduct(), labelInfo);
+	        this._updateLabelComponentAttribute(labelComponent.getProduct(), baseMark.getProduct(), [labelInfo]);
 	    }
-	    _updateLabelComponentAttribute(component, target, labelInfo) {
-	        const { baseMark, labelSpec, series, labelMark } = labelInfo;
+	    _updateLabelComponentAttribute(component, target, labelInfos) {
 	        const dependCmp = this._option.getAllComponents().filter(cmp => cmp.type === 'totalLabel');
 	        component
 	            .target(target)
 	            .configure({ interactive: false })
 	            .depend(dependCmp.map(cmp => cmp.getMarks()[0].getProduct()))
-	            .labelStyle(() => {
+	            .labelStyle((mark, params) => {
 	            var _a, _b, _c;
-	            const rule = labelMark.getRule() || baseMark.type;
-	            const configFunc = (_a = labelRuleMap[rule]) !== null && _a !== void 0 ? _a : labelRuleMap.point;
-	            const interactive = this._interactiveConfig(labelSpec);
-	            const passiveLabelSpec = pickWithout(labelSpec, ['position', 'style', 'state']);
-	            const centerOffset = (_c = (_b = this._spec) === null || _b === void 0 ? void 0 : _b.centerOffset) !== null && _c !== void 0 ? _c : 0;
-	            return mergeSpec({
-	                textStyle: Object.assign({ pickable: labelSpec.interactive === true }, labelSpec.style),
-	                overlap: {
-	                    avoidMarks: this._option
-	                        .getAllComponents()
-	                        .filter(cmp => cmp.type === 'totalLabel')
-	                        .map(cmp => cmp.getMarks()[0].getProductId())
-	                }
-	            }, configFunc(labelInfo), Object.assign(Object.assign(Object.assign({}, passiveLabelSpec), interactive), { centerOffset }));
+	            const labelInfo = labelInfos[params.labelIndex];
+	            if (labelInfo) {
+	                const { baseMark, labelSpec, labelMark } = labelInfo;
+	                const rule = labelMark.getRule() || baseMark.type;
+	                const configFunc = (_a = labelRuleMap[rule]) !== null && _a !== void 0 ? _a : labelRuleMap.point;
+	                const interactive = this._interactiveConfig(labelSpec);
+	                const passiveLabelSpec = pickWithout(labelSpec, ['position', 'style', 'state']);
+	                const centerOffset = (_c = (_b = this._spec) === null || _b === void 0 ? void 0 : _b.centerOffset) !== null && _c !== void 0 ? _c : 0;
+	                return mergeSpec({
+	                    textStyle: Object.assign({ pickable: labelSpec.interactive === true }, labelSpec.style),
+	                    overlap: {
+	                        avoidMarks: this._option
+	                            .getAllComponents()
+	                            .filter(cmp => cmp.type === 'totalLabel')
+	                            .map(cmp => cmp.getMarks()[0].getProductId())
+	                    }
+	                }, configFunc(labelInfo), Object.assign(Object.assign(Object.assign({}, passiveLabelSpec), interactive), { centerOffset }));
+	            }
 	        })
-	            .encode(datum => {
-	            return labelMark.skipEncode ? { data: datum } : textAttribute(labelInfo, datum, labelSpec.formatMethod);
+	            .encode((datum, element, params) => {
+	            const labelInfo = labelInfos[params.labelIndex];
+	            if (labelInfo) {
+	                const { labelSpec, labelMark } = labelInfos[params.labelIndex];
+	                return labelMark.skipEncode
+	                    ? { data: datum }
+	                    : textAttribute(labelInfos[params.labelIndex], datum, labelSpec.formatMethod);
+	            }
 	        })
-	            .size(() => series.getRegion().getLayoutRect());
+	            .size(() => labelInfos[0].series.getRegion().getLayoutRect());
 	    }
 	    compileMarks() {
 	        this.getMarks().forEach(m => {