@visactor/vchart 1.4.2 → 1.4.3

package/build/index.js

@@ -63472,7 +63472,7 @@
 	VChart.useMark([ComponentMark, GroupMark, ImageMark]);
 	Factory.registerRegion('region', Region);
 	Factory.registerLayout('base', Layout);
-	const version = "1.4.2";
+	const version = "1.4.3";
 	Logger.getInstance(LoggerLevel.Error);
 
 	const WordCloud3dAnimation = (params) => {
@@ -66369,7 +66369,7 @@
 	        return [`${this.type}_${this.id}`];
 	    }
 	    getSeriesStyle(datum) {
-	        return (attribute) => { var _a, _b; return (_b = (_a = this._seriesMark) === null || _a === void 0 ? void 0 : _a.getAttribute(attribute, datum)) !== null && _b !== void 0 ? _b : null; };
+	        return (attribute) => { var _a, _b; return (_b = (_a = this._seriesMark) === null || _a === void 0 ? void 0 : _a.getAttribute(attribute, datum)) !== null && _b !== void 0 ? _b : undefined; };
 	    }
 	    _getSeriesInfo(field, keys) {
 	        const defaultShapeType = this.getDefaultShapeType();
@@ -67228,6 +67228,23 @@
 	    getDefaultShapeType() {
 	        return 'square';
 	    }
+	    getActiveMarks() {
+	        return [this._areaMark, this._symbolMark, this._lineMark];
+	    }
+	    getSeriesStyle(datum) {
+	        return (attribute) => {
+	            var _a, _b, _c, _d;
+	            let result = (_b = (_a = this._seriesMark) === null || _a === void 0 ? void 0 : _a.getAttribute(attribute, datum)) !== null && _b !== void 0 ? _b : undefined;
+	            if (attribute === 'fill' && !result) {
+	                attribute = 'stroke';
+	                result = (_d = (_c = this._seriesMark) === null || _c === void 0 ? void 0 : _c.getAttribute(attribute, datum)) !== null && _d !== void 0 ? _d : undefined;
+	            }
+	            if (attribute === 'stroke' && isArray$4(result)) {
+	                return result[0];
+	            }
+	            return result;
+	        };
+	    }
 	}
 	AreaSeries.type = SeriesTypeEnum.area;
 	AreaSeries.mark = areaSeriesMark;
@@ -69166,6 +69183,9 @@
 	    getDefaultShapeType() {
 	        return 'square';
 	    }
+	    getActiveMarks() {
+	        return [this._rectMark];
+	    }
 	}
 	BarSeries.type = SeriesTypeEnum.bar;
 	BarSeries.mark = barSeriesMark;
@@ -69724,6 +69744,9 @@
 	    getDefaultShapeType() {
 	        return 'square';
 	    }
+	    getActiveMarks() {
+	        return [this._boxPlotMark];
+	    }
 	}
 	BoxPlotSeries.type = SeriesTypeEnum.boxPlot;
 	BoxPlotSeries.mark = boxPlotSeriesMark;
@@ -70950,6 +70973,9 @@
 	    _noAnimationDataKey(datum, index) {
 	        return undefined;
 	    }
+	    getActiveMarks() {
+	        return [this._circlePackingMark];
+	    }
 	}
 	CirclePackingSeries.type = SeriesTypeEnum.circlePacking;
 	CirclePackingSeries.mark = circlePackingSeriesMark;
@@ -71786,6 +71812,9 @@
 	    getDefaultShapeType() {
 	        return 'square';
 	    }
+	    getActiveMarks() {
+	        return [this._funnelMark];
+	    }
 	}
 	FunnelSeries.type = SeriesTypeEnum.funnel;
 	FunnelSeries.mark = funnelSeriesMark;
@@ -72466,6 +72495,9 @@
 	    getDefaultShapeType() {
 	        return 'circle';
 	    }
+	    getActiveMarks() {
+	        return [];
+	    }
 	}
 	GaugePointerSeries.type = SeriesTypeEnum.gaugePointer;
 	GaugePointerSeries.mark = gaugePointerSeriesMark;
@@ -72666,6 +72698,9 @@
 	    getDefaultShapeType() {
 	        return 'circle';
 	    }
+	    getActiveMarks() {
+	        return [];
+	    }
 	}
 	GaugeSeries.type = SeriesTypeEnum.gauge;
 	GaugeSeries.mark = gaugeSeriesMark;
@@ -73082,6 +73117,9 @@
 	    getMeasureField() {
 	        return this.getFieldValue();
 	    }
+	    getActiveMarks() {
+	        return [this._cellMark];
+	    }
 	}
 	HeatmapSeries.type = SeriesTypeEnum.heatmap;
 	HeatmapSeries.mark = heatmapSeriesMark;
@@ -73177,12 +73215,15 @@
 	            if (isLineAsSeriesMark) {
 	                attribute === 'fill' && (attribute = 'stroke');
 	            }
-	            return (_b = (_a = this._seriesMark) === null || _a === void 0 ? void 0 : _a.getAttribute(attribute, datum)) !== null && _b !== void 0 ? _b : null;
+	            return (_b = (_a = this._seriesMark) === null || _a === void 0 ? void 0 : _a.getAttribute(attribute, datum)) !== null && _b !== void 0 ? _b : undefined;
 	        };
 	    }
 	    getDefaultShapeType() {
 	        return 'circle';
 	    }
+	    getActiveMarks() {
+	        return [this._lineMark, this._symbolMark];
+	    }
 	}
 	LineSeries.type = SeriesTypeEnum.line;
 	LineSeries.mark = lineSeriesMark;
@@ -73539,6 +73580,9 @@
 	        (_a = this._mapViewData.getDataView()) === null || _a === void 0 ? void 0 : _a.reRunAllTransform();
 	        (_b = this._mapViewDataStatistics) === null || _b === void 0 ? void 0 : _b.reRunAllTransform();
 	    }
+	    getActiveMarks() {
+	        return [];
+	    }
 	}
 
 	const DEFAULT_MAP_LOOK_UP_KEY = `${PREFIX}_MAP_LOOK_UP_KEY`;
@@ -73809,6 +73853,9 @@
 	    _getDataIdKey() {
 	        return DEFAULT_DATA_INDEX;
 	    }
+	    getActiveMarks() {
+	        return [this._pathMark];
+	    }
 	}
 	MapSeries.type = SeriesTypeEnum.map;
 	MapSeries.mark = mapSeriesMark;
@@ -74312,6 +74359,9 @@
 	    _noAnimationDataKey(datum, index) {
 	        return index;
 	    }
+	    getActiveMarks() {
+	        return [this._pieMark];
+	    }
 	}
 	BasePieSeries.mark = pieSeriesMark;
 	class PieSeries extends BasePieSeries {
@@ -74568,6 +74618,9 @@
 	        }, appearPreset), userAnimationConfig(SeriesMarkNameEnum.progress, this._spec)));
 	        this._trackMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.progressBackground(), userAnimationConfig(SeriesMarkNameEnum.track, this._spec)));
 	    }
+	    getActiveMarks() {
+	        return [this._progressMark];
+	    }
 	}
 	CircularProgressSeries.type = SeriesTypeEnum.circularProgress;
 	CircularProgressSeries.mark = circularProgressSeriesMark;
@@ -74787,6 +74840,9 @@
 	    initTooltip() {
 	        this._tooltipHelper = new LinearProgressSeriesTooltipHelper(this);
 	    }
+	    getActiveMarks() {
+	        return [this._progressMark];
+	    }
 	}
 	LinearProgressSeries.type = SeriesTypeEnum.linearProgress;
 	LinearProgressSeries.mark = linearProgressSeriesMark;
@@ -75045,6 +75101,23 @@
 	    getDefaultShapeType() {
 	        return 'square';
 	    }
+	    getActiveMarks() {
+	        return [this._areaMark, this._symbolMark, this._lineMark];
+	    }
+	    getSeriesStyle(datum) {
+	        return (attribute) => {
+	            var _a, _b, _c, _d;
+	            let result = (_b = (_a = this._seriesMark) === null || _a === void 0 ? void 0 : _a.getAttribute(attribute, datum)) !== null && _b !== void 0 ? _b : undefined;
+	            if (attribute === 'fill' && !result) {
+	                attribute = 'stroke';
+	                result = (_d = (_c = this._seriesMark) === null || _c === void 0 ? void 0 : _c.getAttribute(attribute, datum)) !== null && _d !== void 0 ? _d : undefined;
+	            }
+	            if (attribute === 'stroke' && isArray$4(result)) {
+	                return result[0];
+	            }
+	            return result;
+	        };
+	    }
 	}
 	RadarSeries.type = SeriesTypeEnum.radar;
 	RadarSeries.mark = radarSeriesMark;
@@ -75798,6 +75871,9 @@
 	    getDefaultShapeType() {
 	        return 'circle';
 	    }
+	    getActiveMarks() {
+	        return [this._roseMark];
+	    }
 	}
 	RoseSeries.type = SeriesTypeEnum.rose;
 	RoseSeries.mark = roseSeriesMark;
@@ -77602,6 +77678,9 @@
 	    _noAnimationDataKey(datum, index) {
 	        return undefined;
 	    }
+	    getActiveMarks() {
+	        return [this._nodeMark, this._linkMark];
+	    }
 	}
 	SankeySeries.type = SeriesTypeEnum.sankey;
 	SankeySeries.mark = sankeySeriesMark;
@@ -77876,6 +77955,9 @@
 	    getDefaultShapeType() {
 	        return 'circle';
 	    }
+	    getActiveMarks() {
+	        return [this._symbolMark];
+	    }
 	}
 	ScatterSeries.type = SeriesTypeEnum.scatter;
 	ScatterSeries.mark = scatterSeriesMark;
@@ -78217,6 +78299,9 @@
 	        var _a, _b;
 	        return (_b = ((_a = this._linkMark) !== null && _a !== void 0 ? _a : this._arrowMark)) === null || _b === void 0 ? void 0 : _b.getData();
 	    }
+	    getActiveMarks() {
+	        return [this._linkMark, this._arrowMark];
+	    }
 	}
 	LinkSeries.type = SeriesTypeEnum.link;
 	LinkSeries.mark = linkSeriesMark;
@@ -78655,6 +78740,9 @@
 	    getStackValueField() {
 	        return null;
 	    }
+	    getActiveMarks() {
+	        return [this._dotMark];
+	    }
 	}
 	DotSeries.type = SeriesTypeEnum.dot;
 	DotSeries.mark = dotSeriesMark;
@@ -79218,6 +79306,9 @@
 	    _noAnimationDataKey(datum, index) {
 	        return undefined;
 	    }
+	    getActiveMarks() {
+	        return [this._sunburstMark];
+	    }
 	}
 	SunburstSeries.type = SeriesTypeEnum.sunburst;
 	SunburstSeries.mark = sunburstSeriesMark;
@@ -79897,6 +79988,9 @@
 	    getDefaultShapeType() {
 	        return 'square';
 	    }
+	    getActiveMarks() {
+	        return [this._nonLeafMark, this._leafMark];
+	    }
 	}
 	TreemapSeries.type = SeriesTypeEnum.treemap;
 	TreemapSeries.mark = treemapSeriesMark;
@@ -82899,6 +82993,9 @@
 	        super.onLayoutEnd(ctx);
 	        this.compile();
 	    }
+	    getActiveMarks() {
+	        return [this._wordMark, this._fillingWordMark];
+	    }
 	}
 	BaseWordCloudSeries.mark = wordCloudSeriesMark;
 
@@ -84578,6 +84675,8 @@
 	}
 	CustomMark.type = ComponentTypeEnum.customMark;
 
+	const IN_BRUSH_STATE = 'inBrush';
+	const OUT_BRUSH_STATE = 'outOfBrush';
 	class Brush extends BaseComponent {
 	    constructor() {
 	        super(...arguments);
@@ -84594,7 +84693,20 @@
 	        this._linkedOutOfBrushElementsMap = {};
 	        this._needInitOutState = true;
 	        this._cacheInteractiveRangeAttrs = [];
-	        this._needEnablePickable = false;
+	        this._needEnablePickable = true;
+	    }
+	    init() {
+	        var _a, _b;
+	        const inBrushMarkAttr = this._transformBrushedMarkAttr((_a = this._spec) === null || _a === void 0 ? void 0 : _a.inBrush);
+	        const outOfBrushMarkAttr = this._transformBrushedMarkAttr((_b = this._spec) === null || _b === void 0 ? void 0 : _b.outOfBrush);
+	        this._option.getAllSeries().forEach((s) => {
+	            s.getActiveMarks().forEach((m) => {
+	                if (m) {
+	                    s.setMarkStyle(m, Object.assign({}, inBrushMarkAttr), IN_BRUSH_STATE, AttributeLevel.Series);
+	                    s.setMarkStyle(m, Object.assign({}, outOfBrushMarkAttr), OUT_BRUSH_STATE, AttributeLevel.Series);
+	                }
+	            });
+	        });
 	    }
 	    static createComponent(spec, options) {
 	        const brushSpec = spec.brush || options.defaultSpec;
@@ -84664,7 +84776,7 @@
 	            const { operateType, operateMask } = operateParams;
 	            let operateTypeCache = operateType;
 	            if (this._needInitOutState && brushMode === 'single' && operateType === IOperateType.drawing) {
-	                this._initMarkBrushState(componentIndex, 'outOfBrush');
+	                this._initMarkBrushState(componentIndex, OUT_BRUSH_STATE);
 	            }
 	            (_c = (_b = (_a = this._option) === null || _a === void 0 ? void 0 : _a.getChart()) === null || _b === void 0 ? void 0 : _b.getEvent()) === null || _c === void 0 ? void 0 : _c.on('click', p => {
 	                if (!p.mark && operateTypeCache === IOperateType.brushClear) {
@@ -84738,7 +84850,7 @@
 	                const graphicItem = el.getGraphicItem();
 	                const elementKey = mark.id + '_' + el.key;
 	                if (((_a = this._outOfBrushElementsMap) === null || _a === void 0 ? void 0 : _a[elementKey]) && this._isBrushContainItem(operateMask, graphicItem)) {
-	                    graphicItem.addState('inBrush');
+	                    el.addState(IN_BRUSH_STATE);
 	                    if (!this._inBrushElementsMap[operateMask === null || operateMask === void 0 ? void 0 : operateMask.name]) {
 	                        this._inBrushElementsMap[operateMask === null || operateMask === void 0 ? void 0 : operateMask.name] = {};
 	                    }
@@ -84747,8 +84859,8 @@
 	                }
 	                else if (((_c = (_b = this._inBrushElementsMap) === null || _b === void 0 ? void 0 : _b[operateMask === null || operateMask === void 0 ? void 0 : operateMask.name]) === null || _c === void 0 ? void 0 : _c[elementKey]) &&
 	                    !this._isBrushContainItem(operateMask, graphicItem)) {
-	                    graphicItem.removeState('inBrush');
-	                    graphicItem.addState('outOfBrush');
+	                    el.removeState(IN_BRUSH_STATE);
+	                    el.addState(OUT_BRUSH_STATE);
 	                    this._outOfBrushElementsMap[elementKey] = el;
 	                    delete this._inBrushElementsMap[operateMask.name][elementKey];
 	                }
@@ -84774,7 +84886,7 @@
 	                        const elementKey = mark.id + '_' + el.key;
 	                        if (((_a = this._linkedOutOfBrushElementsMap) === null || _a === void 0 ? void 0 : _a[elementKey]) &&
 	                            this._isBrushContainItem(operateMask, graphicItem, { dx: regionOffsetX, dy: regionOffsetY })) {
-	                            graphicItem.addState('inBrush');
+	                            el.addState(IN_BRUSH_STATE);
 	                            if (!this._linkedInBrushElementsMap[operateMask === null || operateMask === void 0 ? void 0 : operateMask.name]) {
 	                                this._linkedInBrushElementsMap[operateMask === null || operateMask === void 0 ? void 0 : operateMask.name] = {};
 	                            }
@@ -84783,8 +84895,8 @@
 	                        }
 	                        else if (((_c = (_b = this._linkedInBrushElementsMap) === null || _b === void 0 ? void 0 : _b[operateMask === null || operateMask === void 0 ? void 0 : operateMask.name]) === null || _c === void 0 ? void 0 : _c[elementKey]) &&
 	                            !this._isBrushContainItem(operateMask, graphicItem, { dx: regionOffsetX, dy: regionOffsetY })) {
-	                            graphicItem.removeState('inBrush');
-	                            graphicItem.addState('outOfBrush');
+	                            el.removeState(IN_BRUSH_STATE);
+	                            el.addState(OUT_BRUSH_STATE);
 	                            this._linkedOutOfBrushElementsMap[elementKey] = el;
 	                        }
 	                        graphicItem.setAttribute('pickable', !this._needEnablePickable);
@@ -84892,7 +85004,6 @@
 	        });
 	    }
 	    _initMarkBrushState(componentIndex, stateName) {
-	        var _a, _b;
 	        this._brushComponents.forEach((brush, index) => {
 	            if (index !== componentIndex) {
 	                brush.children[0].removeAllChild();
@@ -84902,8 +85013,6 @@
 	        this._outOfBrushElementsMap = {};
 	        this._linkedInBrushElementsMap = {};
 	        this._linkedOutOfBrushElementsMap = {};
-	        const inBrushMarkAttr = this._transformBrushedMarkAttr((_a = this._spec) === null || _a === void 0 ? void 0 : _a.inBrush);
-	        const outOfBrushMarkAttr = this._transformBrushedMarkAttr((_b = this._spec) === null || _b === void 0 ? void 0 : _b.outOfBrush);
 	        this._option.getAllSeries().forEach((s) => {
 	            s.getMarksWithoutRoot().forEach((mark) => {
 	                const grammarMark = mark.getProduct();
@@ -84912,18 +85021,10 @@
 	                }
 	                const elements = grammarMark.elements;
 	                elements.forEach((el) => {
-	                    const graphicItem = el.getGraphicItem();
 	                    const elementKey = mark.id + '_' + el.key;
-	                    graphicItem.stateProxy = (stateName) => {
-	                        if (stateName === 'inBrush') {
-	                            return inBrushMarkAttr;
-	                        }
-	                        if (stateName === 'outOfBrush') {
-	                            return outOfBrushMarkAttr;
-	                        }
-	                        return;
-	                    };
-	                    graphicItem.addState(stateName);
+	                    el.removeState(IN_BRUSH_STATE);
+	                    el.removeState(OUT_BRUSH_STATE);
+	                    el.addState(stateName);
 	                    this._outOfBrushElementsMap[elementKey] = el;
 	                    this._linkedOutOfBrushElementsMap[elementKey] = el;
 	                });
@@ -84983,7 +85084,7 @@
 	    }
 	}
 	Brush.type = ComponentTypeEnum.brush;
-	Brush.speckey = 'inBrush';
+	Brush.speckey = 'brush';
 
 	function overlap(a, b, sep = 0) {
 	    return sep > Math.max(b.x1 - a.x2, a.x1 - b.x2, b.y1 - a.y2, a.y1 - b.y2);
@@ -88286,33 +88387,29 @@
 	    }
 	    _getLegendItems() {
 	        const originData = (this._legendData.getLatestData() || []).map((datum) => {
-	            var _a;
-	            const fill = datum.style('fill') || datum.style('stroke');
-	            const stroke = datum.style('stroke');
-	            const lineWidth = datum.style('lineWidth');
-	            const symbolType = datum.style('symbolType');
+	            var _a, _b;
 	            const fillOpacity = datum.style('fillOpacity');
 	            const strokeOpacity = datum.style('strokeOpacity');
 	            const opacity = datum.style('opacity');
 	            const texture = datum.style('texture');
-	            const textureColor = datum.style('textureColor');
-	            const outerBorder = datum.style('outerBorder');
-	            const innerBorder = datum.style('innerBorder');
 	            return {
 	                label: datum.key,
 	                shape: {
-	                    fill,
-	                    symbolType: (_a = symbolType !== null && symbolType !== void 0 ? symbolType : datum.shapeType) !== null && _a !== void 0 ? _a : 'circle',
-	                    stroke: lineWidth === 0 || fill === stroke ? null : stroke,
+	                    symbolType: (_b = (_a = datum.style('symbolType')) !== null && _a !== void 0 ? _a : datum.shapeType) !== null && _b !== void 0 ? _b : 'circle',
 	                    fillOpacity: isValidNumber$1(fillOpacity) ? fillOpacity : 1,
 	                    strokeOpacity: isValidNumber$1(strokeOpacity) ? strokeOpacity : 1,
 	                    opacity: isValidNumber$1(opacity) ? opacity : 1,
-	                    texture: texture,
 	                    texturePadding: texture ? 1 : null,
 	                    textureSize: texture ? 4 : null,
-	                    textureColor,
-	                    innerBorder,
-	                    outerBorder
+	                    texture,
+	                    fill: datum.style('fill'),
+	                    stroke: datum.style('stroke'),
+	                    textureColor: datum.style('textureColor'),
+	                    innerBorder: datum.style('innerBorder'),
+	                    outerBorder: datum.style('outerBorder'),
+	                    lineDash: datum.style('lineDash'),
+	                    lineDashOffset: datum.style('lineDashOffset'),
+	                    lineWidth: datum.style('lineWidth')
 	                }
 	            };
 	        });