@visactor/vchart 1.2.2-alpha.0 → 1.2.2-beta.2

package/build/index.js

@@ -54684,6 +54684,9 @@
 	        this._view.resize(width, height);
 	        return this.reRenderAsync({ morph: false });
 	    }
+	    setBackground(color) {
+	        this._view?.background(color);
+	    }
 	    reRenderAsync(morphConfig) {
 	        if (this.isInited) {
 	            if (this._rafId) {
@@ -54979,7 +54982,6 @@
 	        this._currentThemeName = ThemeManager.getCurrentThemeName();
 	        this._setSpec(spec);
 	        this._updateCurrentTheme();
-	        const specBackground = typeof spec.background === 'string' ? spec.background : null;
 	        this._compiler = new Compiler({
 	            dom: this._container ?? 'none',
 	            canvas: renderCanvas
@@ -54988,7 +54990,7 @@
 	            stage,
 	            pluginList: poptip !== false ? ['poptipForText'] : [],
 	            ...restOptions,
-	            background: specBackground || this._currentTheme.background || this._option.background,
+	            background: this._getBackground(),
 	            onError: this._onError
 	        });
 	        this._eventDispatcher = new EventDispatcher(this, this._compiler);
@@ -55150,10 +55152,8 @@
 	            this._compiler?.releaseGrammar();
 	        }
 	        else {
-	            if (updateResult.reCompile) {
-	                this.getComponents().forEach(c => c.clear());
-	                this._compiler?.compile({ chart: this._chart, vChart: this }, {});
-	            }
+	            this.getComponents().forEach(c => c.clear());
+	            this._compiler?.compile({ chart: this._chart, vChart: this }, {});
 	        }
 	    }
 	    renderSync(morphConfig) {
@@ -55392,6 +55392,11 @@
 	            this._currentTheme = merge$2({}, ThemeManager.getTheme(this._currentThemeName), this._spec?.theme ?? {});
 	        }
 	        setPoptipTheme(merge$2({}, this._currentTheme.component?.poptip));
+	        this._compiler?.setBackground(this._getBackground());
+	    }
+	    _getBackground() {
+	        const specBackground = typeof this._spec.background === 'string' ? this._spec.background : null;
+	        return specBackground || this._currentTheme.background || this._option.background;
 	    }
 	    getCurrentTheme() {
 	        return this._currentTheme;
@@ -58413,7 +58418,7 @@
 	VChart.useMark([ComponentMark, GroupMark, ImageMark]);
 	Factory.registerRegion('region', Region);
 	Factory.registerLayout('base', Layout);
-	const version = "1.2.2-alpha.0";
+	const version = "1.2.2-beta.2";
 	Logger.getInstance(LoggerLevel.Error);
 
 	var SeriesMarkNameEnum;
@@ -61013,6 +61018,7 @@
 	                },
 	                content: [
 	                    {
+	                        seriesId: this.series.id,
 	                        key: this.contentKeyCallback,
 	                        value: this.contentValueCallback,
 	                        hasShape: true,
@@ -83771,7 +83777,7 @@
 	        };
 	    }
 	    _getTitleAttrs() {
-	        const realWidth = this._spec.width ?? this.getLayoutRect().width;
+	        const realWidth = Math.max(0, this._spec.width ?? this.getLayoutRect().width);
 	        return {
 	            text: this._spec.text ?? '',
 	            subtext: this._spec.subtext ?? '',
@@ -86712,8 +86718,6 @@
 	        ...globalSpec,
 	        activeType
 	    };
-	    let defaultPattern = {};
-	    let userPattern = {};
 	    if (activeType === 'mark' && series) {
 	        const seriesSpec = (series.tooltipHelper?.spec ?? {});
 	        if (isValid(seriesSpec.visible) || isValid(seriesSpec.activeType)) {
@@ -86729,11 +86733,9 @@
 	        if (finalSpec.handler?.showTooltip) {
 	            return finalSpec;
 	        }
-	        defaultPattern = makeDefaultPattern(series, 'mark') ?? {};
-	        userPattern = merge$2({}, cloneDeep(globalSpec.mark), cloneDeep(seriesSpec.mark));
 	    }
 	    else if (activeType === 'dimension' && dimensionInfo?.length) {
-	        const seriesList = dimensionInfo.reduce((list, cur) => list.concat(cur.data.map(data => data.series).filter(isValid)), []);
+	        const seriesList = getSeriesListFromDimensionInfo(dimensionInfo);
 	        if (seriesList.every(series => !getTooltipActualActiveType(series.tooltipHelper?.spec).includes('dimension'))) {
 	            finalSpec.visible = false;
 	        }
@@ -86747,6 +86749,83 @@
 	        if (finalSpec.handler?.showTooltip) {
 	            return finalSpec;
 	        }
+	    }
+	    const defaultPattern = getDefaultTooltipPattern(activeType, series, dimensionInfo);
+	    const seriesPattern = getSeriesTooltipPattern(activeType, series, dimensionInfo);
+	    const userPattern = merge$2({}, cloneDeep(globalSpec[activeType]), seriesPattern);
+	    const defaultPatternTitle = defaultPattern.title;
+	    const titleShape = getShapePattern(undefined, userPattern, undefined, defaultPatternTitle);
+	    if (isValid(userPattern.title)) {
+	        if (!isFunction(userPattern.title)) {
+	            userPattern.title = {
+	                ...defaultPattern.title,
+	                ...titleShape,
+	                ...userPattern.title
+	            };
+	        }
+	        else {
+	            const userPatternTitle = userPattern.title;
+	            userPattern.title = (data, params) => {
+	                const userResult = userPatternTitle(data, params) ?? {};
+	                return {
+	                    ...titleShape,
+	                    ...userResult
+	                };
+	            };
+	        }
+	    }
+	    else {
+	        userPattern.title = {
+	            ...defaultPattern.title,
+	            ...titleShape
+	        };
+	    }
+	    const defaultPatternContent = array(defaultPattern.content);
+	    if (isValid(userPattern.content)) {
+	        const shapePatternMap = getShapePatternMapOfEachSeries(defaultPatternContent);
+	        if (!isFunction(userPattern.content)) {
+	            const newPatternContent = [];
+	            array(userPattern.content).forEach(userLine => {
+	                newPatternContent.push({
+	                    ...getShapePattern(userLine, userPattern, shapePatternMap),
+	                    ...userLine
+	                });
+	            });
+	            userPattern.content = newPatternContent;
+	        }
+	        else {
+	            const userPatternContent = userPattern.content;
+	            userPattern.content = (data, params) => {
+	                const newPatternContent = [];
+	                array(userPatternContent(data, params) ?? []).forEach(userLine => {
+	                    newPatternContent.push({
+	                        ...getShapePattern(userLine, userPattern, shapePatternMap),
+	                        ...userLine
+	                    });
+	                });
+	                return newPatternContent;
+	            };
+	        }
+	    }
+	    else {
+	        userPattern.content = defaultPatternContent.map(line => ({
+	            ...line,
+	            ...getShapePattern(undefined, userPattern, undefined, line)
+	        }));
+	    }
+	    finalSpec[activeType] = {
+	        ...defaultPattern,
+	        ...userPattern,
+	        activeType
+	    };
+	    return finalSpec;
+	};
+	const getDefaultTooltipPattern = (activeType, series, dimensionInfo) => {
+	    let defaultPattern = {};
+	    if (activeType === 'mark' && series) {
+	        defaultPattern = makeDefaultPattern(series, 'mark') ?? {};
+	    }
+	    else if (activeType === 'dimension' && dimensionInfo?.length) {
 	        const patternList = [];
 	        dimensionInfo[0].data.forEach(data => {
 	            const { series } = data;
@@ -86774,16 +86853,23 @@
 	            ...patternList[0],
 	            content: defaultPatternContent
 	        };
-	        let seriesDimensionPattern = {};
+	    }
+	    return defaultPattern;
+	};
+	const getSeriesTooltipPattern = (activeType, series, dimensionInfo) => {
+	    let seriesPattern = {};
+	    if (activeType === 'mark' && series) {
+	        const seriesSpec = (series.tooltipHelper?.spec ?? {});
+	        seriesPattern = seriesSpec.mark ? cloneDeep(seriesSpec.mark) : {};
+	    }
+	    else if (activeType === 'dimension' && dimensionInfo?.length) {
+	        const seriesList = getSeriesListFromDimensionInfo(dimensionInfo);
 	        const seriesPatternList = seriesList
 	            .filter(series => {
 	            const spec = series.tooltipHelper?.spec;
 	            return isValid(spec?.dimension) && getTooltipActualActiveType(spec).includes('dimension');
 	        })
-	            .map(series => {
-	            const pattern = series.tooltipHelper.spec.dimension;
-	            return pattern;
-	        });
+	            .map(series => series.tooltipHelper.spec.dimension);
 	        if (seriesPatternList.length) {
 	            let seriesPatternContent = [];
 	            if (seriesPatternList.every(({ content }) => isNil(content))) {
@@ -86802,86 +86888,38 @@
 	                    }
 	                });
 	            }
-	            seriesDimensionPattern = {
+	            seriesPattern = {
 	                ...seriesPatternList[0],
 	                content: seriesPatternContent
 	            };
 	        }
-	        userPattern = merge$2({}, cloneDeep(globalSpec.dimension), seriesDimensionPattern);
 	    }
-	    const defaultPatternTitle = defaultPattern.title;
-	    const titleShape = {
-	        hasShape: userPattern.hasShape ?? defaultPatternTitle?.hasShape,
-	        shapeType: userPattern.shapeType ?? defaultPatternTitle?.shapeType,
-	        shapeColor: userPattern.shapeColor ?? defaultPatternTitle?.shapeColor
-	    };
-	    if (isValid(userPattern.title)) {
-	        if (!isFunction(userPattern.title)) {
-	            userPattern.title = {
-	                ...defaultPattern.title,
-	                ...titleShape,
-	                ...userPattern.title
-	            };
-	        }
-	        else {
-	            const userPatternTitle = userPattern.title;
-	            userPattern.title = (data, params) => {
-	                const userResult = userPatternTitle(data, params) ?? {};
-	                return {
-	                    ...titleShape,
-	                    ...userResult
-	                };
-	            };
+	    return seriesPattern;
+	};
+	const getSeriesListFromDimensionInfo = (dimensionInfo) => {
+	    return dimensionInfo.reduce((list, cur) => list.concat(cur.data.map(data => data.series).filter(isValid)), []);
+	};
+	const getShapePatternMapOfEachSeries = (content) => {
+	    const shapePatternMap = {};
+	    content.forEach(line => {
+	        const key = line.seriesId ?? 0;
+	        if (!shapePatternMap[key]) {
+	            shapePatternMap[key] = line;
 	        }
-	    }
-	    else {
-	        userPattern.title = {
-	            ...defaultPattern.title,
-	            ...titleShape
-	        };
-	    }
-	    const getContentShape = (defaultContentLine) => ({
-	        hasShape: userPattern.hasShape ?? defaultContentLine?.hasShape,
-	        shapeType: userPattern.shapeType ?? defaultContentLine?.shapeType,
-	        shapeColor: userPattern.shapeColor ?? defaultContentLine?.shapeColor
 	    });
-	    const defaultPatternContent = array(defaultPattern.content);
-	    if (isValid(userPattern.content)) {
-	        if (!isFunction(userPattern.content)) {
-	            const userPatternContent = array(userPattern.content);
-	            userPatternContent.forEach((line, i) => {
-	                userPatternContent[i] = {
-	                    ...getContentShape(defaultPatternContent[0]),
-	                    ...line
-	                };
-	            });
-	        }
-	        else {
-	            const userPatternContent = userPattern.content;
-	            userPattern.content = (data, params) => {
-	                const userResult = array(userPatternContent(data, params) ?? []);
-	                userResult.forEach((line, i) => {
-	                    userResult[i] = {
-	                        ...getContentShape(defaultPatternContent[0]),
-	                        ...line
-	                    };
-	                });
-	                return userResult;
-	            };
+	    return shapePatternMap;
+	};
+	const getShapePattern = (userLinePattern, userPattern, shapePatternMap, defaultShapePattern) => {
+	    const shapePatternFromMap = shapePatternMap?.[userLinePattern?.seriesId ?? 0] ?? shapePatternMap?.[0];
+	    const shapeKeys = ['hasShape', 'shapeType', 'shapeColor'];
+	    const shapePattern = {};
+	    shapeKeys.forEach(key => {
+	        const value = userLinePattern?.[key] ?? userPattern?.[key] ?? shapePatternFromMap?.[key] ?? defaultShapePattern?.[key];
+	        if (value !== undefined) {
+	            shapePattern[key] = value;
 	        }
-	    }
-	    else {
-	        userPattern.content = defaultPatternContent.map(line => ({
-	            ...line,
-	            ...getContentShape(line)
-	        }));
-	    }
-	    finalSpec[activeType] = {
-	        ...defaultPattern,
-	        ...userPattern,
-	        activeType
-	    };
-	    return finalSpec;
+	    });
+	    return shapePattern;
 	};
 
 	const getActualTooltipPositionValue = (position, event) => {