@visactor/vchart 1.13.9-alpha.5 → 1.13.9

package/esm/component/brush/brush.d.ts

@@ -37,45 +37,23 @@ export declare class Brush<T extends IBrushSpec = IBrushSpec> extends BaseCompon
     protected _linkedOutOfBrushElementsMap: {
         [elementKey: string]: IElement;
     };
-    private _needInitOutState;
     private _cacheInteractiveRangeAttrs;
     private _needDisablePickable;
     private _releatedAxes;
     private _regionAxisMap;
     private _axisDataZoomMap;
     private _zoomRecord;
-    init(): void;
     static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]>;
+    init(): void;
+    private _initNeedOperatedItem;
     created(): void;
-    protected _extendDataInBrush(elementsMap: {
-        [brushName: string]: {
-            [elementKey: string]: IElement;
-        };
-    }): any[];
-    protected _extendDatumOutOfBrush(elementsMap: {
-        [elementKey: string]: IElement;
-    }): any[];
-    protected _getBrushInteractiveAttr(region: IRegion): BrushInteractiveRangeAttr;
-    protected _updateBrushComponent(region: IRegion, componentIndex: number): void;
-    protected _createBrushComponent(region: IRegion, componentIndex: number): void;
-    private _handleBrushChange;
-    private _emitEvent;
-    private _transformBrushedMarkAttr;
-    private _reconfigItem;
-    private _reconfigLinkedItem;
-    private _isBrushContainItem;
-    private _stateClamp;
-    private _setAxisAndDataZoom;
     protected _bindRegions(): void;
     protected _bindLinkedSeries(): void;
     private _initRegionAxisMap;
     private _initAxisDataZoomMap;
-    private _initNeedOperatedItem;
-    protected _initMarkBrushState(componentIndex: number, stateName: string): void;
     protected initEvent(): void;
     onRender(ctx: IModelRenderOption): void;
     changeRegions(regions: IRegion[]): void;
-    protected _getNeedClearVRenderComponents(): IGraphic[];
     _compareSpec(spec: T, prevSpec: T): {
         change: boolean;
         reMake: boolean;
@@ -84,6 +62,27 @@ export declare class Brush<T extends IBrushSpec = IBrushSpec> extends BaseCompon
         reCompile: boolean;
     };
     onLayoutEnd(ctx: any): void;
+    protected _updateBrushComponent(region: IRegion, componentIndex: number): void;
+    protected _createBrushComponent(region: IRegion, componentIndex: number): void;
+    protected _getBrushInteractiveAttr(region: IRegion): BrushInteractiveRangeAttr;
+    private _transformBrushedMarkAttr;
+    private _handleBrushChange;
+    protected _extendDataInBrush(elementsMap: {
+        [brushName: string]: {
+            [elementKey: string]: IElement;
+        };
+    }): any[];
+    protected _extendDatumOutOfBrush(elementsMap: {
+        [elementKey: string]: IElement;
+    }): any[];
+    private _emitEvent;
+    private _reconfigItem;
+    private _reconfigLinkedItem;
+    private _isBrushContainItem;
+    protected _initMarkBrushState(componentIndex: number, stateName: string): void;
+    private _stateClamp;
+    private _setAxisAndDataZoom;
+    protected _getNeedClearVRenderComponents(): IGraphic[];
     clearGraphic(): void;
     clear(): void;
 }

package/esm/component/brush/brush.js

@@ -28,8 +28,11 @@ export class Brush extends BaseComponent {
         this.name = ComponentTypeEnum.brush, this.specKey = "brush", this.layoutZIndex = LayoutZIndex.Brush, 
         this._linkedSeries = [], this._itemMap = {}, this._linkedItemMap = {}, this._inBrushElementsMap = {}, 
         this._outOfBrushElementsMap = {}, this._linkedInBrushElementsMap = {}, this._linkedOutOfBrushElementsMap = {}, 
-        this._needInitOutState = !0, this._cacheInteractiveRangeAttrs = [], this._needDisablePickable = !1, 
-        this._releatedAxes = [], this._regionAxisMap = {}, this._axisDataZoomMap = {}, this._zoomRecord = [];
+        this._cacheInteractiveRangeAttrs = [], this._needDisablePickable = !1, this._releatedAxes = [], 
+        this._regionAxisMap = {}, this._axisDataZoomMap = {}, this._zoomRecord = [];
+    }
+    static getSpecInfo(chartSpec) {
+        return getSpecInfo(chartSpec, this.specKey, this.type, (s => !1 !== s.visible));
     }
     init() {
         const inBrushMarkAttr = this._transformBrushedMarkAttr(this._spec.inBrush), outOfBrushMarkAttr = this._transformBrushedMarkAttr(this._spec.outOfBrush);
@@ -40,42 +43,67 @@ export class Brush extends BaseComponent {
             }));
         }));
     }
-    static getSpecInfo(chartSpec) {
-        return getSpecInfo(chartSpec, this.specKey, this.type, (s => !1 !== s.visible));
+    _initNeedOperatedItem() {
+        const seriesUserId = this._spec.seriesId, seriesIndex = this._spec.seriesIndex;
+        this._relativeRegions.forEach((r => {
+            const allMarks = [];
+            r.getSeries().forEach((s => {
+                (seriesUserId && array(seriesUserId).includes(s.userId.toString()) || seriesIndex && array(seriesIndex).includes(s.getSpecIndex()) || !seriesIndex && !seriesUserId) && allMarks.push(...s.getMarksWithoutRoot()), 
+                this._itemMap[r.id] = allMarks;
+            }));
+        })), this._linkedSeries.forEach((s => {
+            this._linkedItemMap[s.id] = s.getMarksWithoutRoot();
+        }));
     }
     created() {
         super.created(), this.initEvent(), this._bindRegions(), this._bindLinkedSeries(), 
         this._initRegionAxisMap(), this._initAxisDataZoomMap(), this._initNeedOperatedItem();
     }
-    _extendDataInBrush(elementsMap) {
-        var _a, _b;
-        const data = [];
-        for (const brushName in elementsMap) for (const elementKey in elementsMap[brushName]) data.push(Object.assign({}, null === (_b = null === (_a = elementsMap[brushName][elementKey]) || void 0 === _a ? void 0 : _a.data) || void 0 === _b ? void 0 : _b[0]));
-        return data;
+    _bindRegions() {
+        isValid(this._spec.regionId) || isValid(this._spec.regionIndex) ? this._relativeRegions = this._option.getRegionsInUserIdOrIndex(array(this._spec.regionId), array(this._spec.regionIndex)) : this._relativeRegions = this._option.getAllRegions();
     }
-    _extendDatumOutOfBrush(elementsMap) {
-        var _a;
-        const data = [];
-        for (const elementKey in elementsMap) data.push(null === (_a = elementsMap[elementKey].data) || void 0 === _a ? void 0 : _a[0]);
-        return data;
+    _bindLinkedSeries() {
+        (isValid(this._spec.brushLinkSeriesId) || isValid(this._spec.brushLinkSeriesIndex)) && (this._linkedSeries = this._option.getSeriesInUserIdOrIndex(array(this._spec.brushLinkSeriesId), array(this._spec.brushLinkSeriesIndex)));
     }
-    _getBrushInteractiveAttr(region) {
-        const regionLayoutPosition = region.getLayoutStartPoint(), regionLayoutRect = region.getLayoutRect(), seriesRegionStartX = regionLayoutPosition.x, seriesRegionEndX = seriesRegionStartX + regionLayoutRect.width, seriesRegionStartY = regionLayoutPosition.y, seriesRegionEndY = seriesRegionStartY + regionLayoutRect.height;
-        return {
-            interactiveRange: {
-                minY: seriesRegionStartY,
-                maxY: seriesRegionEndY,
-                minX: seriesRegionStartX,
-                maxX: seriesRegionEndX
-            },
-            xRange: [ seriesRegionStartX, seriesRegionEndX ],
-            yRange: [ seriesRegionStartY, seriesRegionEndY ]
-        };
+    _initRegionAxisMap() {
+        isValid(this._spec.axisId) ? array(this._spec.axisId).forEach((axisId => {
+            this._releatedAxes.push(this._option.getComponentByUserId(axisId));
+        })) : isValid(this._spec.axisIndex) ? array(this._spec.axisIndex).forEach((axisIndex => {
+            this._releatedAxes.push(this._option.getComponentByIndex("axes", axisIndex));
+        })) : this._releatedAxes = this._option.getComponentsByKey("axes"), this._releatedAxes.forEach((axis => {
+            null == axis || axis.getRegions().forEach((region => {
+                this._regionAxisMap["region_" + region.id] ? this._regionAxisMap["region_" + region.id].push(axis) : this._regionAxisMap["region_" + region.id] = [ axis ];
+            }));
+        }));
+    }
+    _initAxisDataZoomMap() {
+        this._option.getComponentsByKey("dataZoom").forEach((dz => {
+            dz.relatedAxisComponent && (this._axisDataZoomMap[dz.relatedAxisComponent.id] = dz);
+        }));
+    }
+    initEvent() {}
+    onRender(ctx) {}
+    changeRegions(regions) {}
+    _compareSpec(spec, prevSpec) {
+        this._brushComponents && this._relativeRegions.forEach(((region, index) => {
+            this._updateBrushComponent(region, index);
+        }));
+        const result = super._compareSpec(spec, prevSpec);
+        return isEqual(prevSpec, spec) || (result.reRender = !0, result.reMake = !0), result;
+    }
+    onLayoutEnd(ctx) {
+        var _a;
+        if (super.onLayoutEnd(ctx), this._option.disableTriggerEvent) return;
+        (null === (_a = this._spec.visible) || void 0 === _a || _a) && (this._brushComponents ? this._relativeRegions.forEach(((region, index) => {
+            this._updateBrushComponent(region, index);
+        })) : (this._brushComponents = [], this._relativeRegions.forEach(((region, index) => {
+            this._createBrushComponent(region, index);
+        }))));
     }
     _updateBrushComponent(region, componentIndex) {
         const interactiveAttr = this._getBrushInteractiveAttr(region), brushComponent = this._brushComponents[componentIndex];
         brushComponent.setAttributes(interactiveAttr), this._initMarkBrushState(componentIndex, ""), 
-        brushComponent.children[0].removeAllChild(), this._needInitOutState = !0;
+        brushComponent.children[0].removeAllChild();
     }
     _createBrushComponent(region, componentIndex) {
         var _a, _b;
@@ -86,43 +114,75 @@ export class Brush extends BaseComponent {
             disableTriggerEvent: this._option.disableTriggerEvent
         }));
         brush.id = null !== (_b = this._spec.id) && void 0 !== _b ? _b : `brush-${this.id}`, 
-        this.getContainer().add(brush);
-        const {brushMode: brushMode = "single"} = this._spec;
-        this._brushComponents.push(brush), this._cacheInteractiveRangeAttrs.push(interactiveAttr), 
-        brush.addEventListener(BrushEvent.drawStart, (e => {
+        this.getContainer().add(brush), this._brushComponents.push(brush), this._cacheInteractiveRangeAttrs.push(interactiveAttr), 
+        brush.addEventListener(BrushEvent.brushActive, (e => {
+            this._initMarkBrushState(componentIndex, "outOfBrush"), this._emitEvent(ChartEvent.brushActive, region);
+        })), brush.addEventListener(BrushEvent.drawStart, (e => {
             this._emitEvent(ChartEvent.brushStart, region);
         })), brush.addEventListener(BrushEvent.moveStart, (e => {
             this._emitEvent(ChartEvent.brushStart, region);
         })), brush.addEventListener(BrushEvent.drawing, (e => {
-            this._needInitOutState && "single" === brushMode && this._initMarkBrushState(componentIndex, "outOfBrush"), 
-            this._needInitOutState = !1, this._needDisablePickable = !0, this._handleBrushChange(ChartEvent.brushChange, region, e), 
-            this._emitEvent(ChartEvent.brushChange, region);
+            this._needDisablePickable = !0, this._handleBrushChange(region, e), this._emitEvent(ChartEvent.brushChange, region);
         })), brush.addEventListener(BrushEvent.moving, (e => {
-            this._handleBrushChange(ChartEvent.brushChange, region, e), this._emitEvent(ChartEvent.brushChange, region);
+            this._handleBrushChange(region, e), this._emitEvent(ChartEvent.brushChange, region);
         })), brush.addEventListener(BrushEvent.brushClear, (e => {
-            this._initMarkBrushState(componentIndex, ""), this._needInitOutState = !0, this._needDisablePickable = !1, 
-            this._handleBrushChange(ChartEvent.brushChange, region, e), this._handleBrushChange(ChartEvent.brushClear, region, e), 
-            this._emitEvent(ChartEvent.brushChange, region), this._emitEvent(ChartEvent.brushClear, region);
+            this._initMarkBrushState(componentIndex, ""), this._needDisablePickable = !1, this._emitEvent(ChartEvent.brushClear, region);
         })), brush.addEventListener(BrushEvent.drawEnd, (e => {
-            this._needInitOutState = !0, this._needDisablePickable = !1;
+            var _a;
+            this._needDisablePickable = !1;
             const {operateMask: operateMask} = e.detail;
-            this._handleBrushChange(ChartEvent.brushEnd, region, e);
-            const inBrushData = this._extendDataInBrush(this._inBrushElementsMap);
-            !this._spec.zoomWhenEmpty && inBrushData.length > 0 && this._setAxisAndDataZoom(operateMask, region), 
-            this._emitEvent(ChartEvent.brushEnd, region);
+            if (null === (_a = this._spec) || void 0 === _a ? void 0 : _a.onBrushEnd) !0 === this._spec.onBrushEnd(e) ? (this.clearGraphic(), 
+            this._initMarkBrushState(componentIndex, ""), this._needDisablePickable = !1, this._emitEvent(ChartEvent.brushClear, region)) : (this._spec.onBrushEnd(e), 
+            this._emitEvent(ChartEvent.brushEnd, region)); else {
+                const inBrushData = this._extendDataInBrush(this._inBrushElementsMap);
+                !this._spec.zoomWhenEmpty && inBrushData.length > 0 && this._setAxisAndDataZoom(operateMask, region), 
+                this._emitEvent(ChartEvent.brushEnd, region);
+            }
         })), brush.addEventListener(BrushEvent.moveEnd, (e => {
-            const {operateMask: operateMask} = e.detail;
-            this._handleBrushChange(ChartEvent.brushEnd, region, e);
-            const inBrushData = this._extendDataInBrush(this._inBrushElementsMap);
+            const {operateMask: operateMask} = e.detail, inBrushData = this._extendDataInBrush(this._inBrushElementsMap);
             !this._spec.zoomWhenEmpty && inBrushData.length > 0 && this._setAxisAndDataZoom(operateMask, region), 
             this._emitEvent(ChartEvent.brushEnd, region);
         }));
     }
-    _handleBrushChange(eventType, region, e) {
+    _getBrushInteractiveAttr(region) {
+        const regionLayoutPosition = region.getLayoutStartPoint(), regionLayoutRect = region.getLayoutRect(), seriesRegionStartX = regionLayoutPosition.x, seriesRegionEndX = seriesRegionStartX + regionLayoutRect.width, seriesRegionStartY = regionLayoutPosition.y, seriesRegionEndY = seriesRegionStartY + regionLayoutRect.height;
+        return {
+            interactiveRange: {
+                minY: seriesRegionStartY,
+                maxY: seriesRegionEndY,
+                minX: seriesRegionStartX,
+                maxX: seriesRegionEndX
+            },
+            xRange: [ seriesRegionStartX, seriesRegionEndX ],
+            yRange: [ seriesRegionStartY, seriesRegionEndY ]
+        };
+    }
+    _transformBrushedMarkAttr(brushedStyle) {
+        const styleResult = {};
+        return (null == brushedStyle ? void 0 : brushedStyle.symbol) && (styleResult.symbolType = brushedStyle.symbol), 
+        (null == brushedStyle ? void 0 : brushedStyle.symbolSize) && (styleResult.size = brushedStyle.symbolSize), 
+        (null == brushedStyle ? void 0 : brushedStyle.color) && (styleResult.fill = brushedStyle.color), 
+        (null == brushedStyle ? void 0 : brushedStyle.colorAlpha) && (styleResult.fillOpacity = brushedStyle.colorAlpha), 
+        Object.assign(Object.assign({}, transformToGraphic(brushedStyle)), styleResult);
+    }
+    _handleBrushChange(region, e) {
         const {operateMask: operateMask} = e.detail;
         this._reconfigItem(operateMask, region), this._reconfigLinkedItem(operateMask, region);
     }
+    _extendDataInBrush(elementsMap) {
+        var _a, _b;
+        const data = [];
+        for (const brushName in elementsMap) for (const elementKey in elementsMap[brushName]) data.push(Object.assign({}, null === (_b = null === (_a = elementsMap[brushName][elementKey]) || void 0 === _a ? void 0 : _a.data) || void 0 === _b ? void 0 : _b[0]));
+        return data;
+    }
+    _extendDatumOutOfBrush(elementsMap) {
+        var _a;
+        const data = [];
+        for (const elementKey in elementsMap) data.push(null === (_a = elementsMap[elementKey].data) || void 0 === _a ? void 0 : _a[0]);
+        return data;
+    }
     _emitEvent(eventType, region) {
+        var _a;
         this.event.emit(eventType, {
             model: this,
             value: {
@@ -137,102 +197,113 @@ export class Brush extends BaseComponent {
                 linkedInBrushElementsMap: this._linkedInBrushElementsMap,
                 linkedOutOfBrushElementsMap: this._linkedOutOfBrushElementsMap,
                 zoomRecord: this._zoomRecord
-            }
+            },
+            vchart: null === (_a = this._option) || void 0 === _a ? void 0 : _a.globalInstance
         });
     }
-    _transformBrushedMarkAttr(brushedStyle) {
-        const styleResult = {};
-        return (null == brushedStyle ? void 0 : brushedStyle.symbol) && (styleResult.symbolType = brushedStyle.symbol), 
-        (null == brushedStyle ? void 0 : brushedStyle.symbolSize) && (styleResult.size = brushedStyle.symbolSize), 
-        (null == brushedStyle ? void 0 : brushedStyle.color) && (styleResult.fill = brushedStyle.color), 
-        (null == brushedStyle ? void 0 : brushedStyle.colorAlpha) && (styleResult.fillOpacity = brushedStyle.colorAlpha), 
-        Object.assign(Object.assign({}, transformToGraphic(brushedStyle)), styleResult);
-    }
     _reconfigItem(operateMask, region) {
+        var _a, _b, _c;
+        if (!(null == operateMask ? void 0 : operateMask.globalTransMatrix) || !(null === (_a = null == operateMask ? void 0 : operateMask.attribute) || void 0 === _a ? void 0 : _a.points)) return;
+        const points = null !== (_c = null === (_b = null == operateMask ? void 0 : operateMask.attribute) || void 0 === _b ? void 0 : _b.points) && void 0 !== _c ? _c : [], {a: a, b: b, c: c, d: d, e: e, f: f} = operateMask.globalTransMatrix, pointsCoord = points.map((p => ({
+            x: a * p.x + c * p.y + e,
+            y: b * p.x + d * p.y + f
+        }))), {markTypeFilter: markTypeFilter = []} = this._spec;
         this._itemMap[region.id].forEach((mark => {
+            if (markTypeFilter.includes(mark.type)) return;
             const grammarMark = mark.getProduct();
             if (!grammarMark || !grammarMark.elements || !grammarMark.elements.length) return;
             grammarMark.elements.forEach((el => {
                 var _a, _b, _c;
-                const graphicItem = el.getGraphicItem(), elementKey = mark.id + "_" + el.key;
-                (null === (_a = this._outOfBrushElementsMap) || void 0 === _a ? void 0 : _a[elementKey]) && this._isBrushContainItem(operateMask, graphicItem) ? (el.addState("inBrush"), 
+                const graphicItem = el.getGraphicItem(), elementKey = mark.id + "_" + el.key, isBrushContainItem = this._isBrushContainItem(operateMask.globalAABBBounds, pointsCoord, graphicItem);
+                (null === (_a = this._outOfBrushElementsMap) || void 0 === _a ? void 0 : _a[elementKey]) && isBrushContainItem ? (el.addState("inBrush"), 
                 this._inBrushElementsMap[null == operateMask ? void 0 : operateMask.name] || (this._inBrushElementsMap[null == operateMask ? void 0 : operateMask.name] = {}), 
                 this._inBrushElementsMap[null == operateMask ? void 0 : operateMask.name][elementKey] = el, 
-                delete this._outOfBrushElementsMap[elementKey]) : (null === (_c = null === (_b = this._inBrushElementsMap) || void 0 === _b ? void 0 : _b[null == operateMask ? void 0 : operateMask.name]) || void 0 === _c ? void 0 : _c[elementKey]) && !this._isBrushContainItem(operateMask, graphicItem) && (el.removeState("inBrush"), 
+                delete this._outOfBrushElementsMap[elementKey]) : (null === (_c = null === (_b = this._inBrushElementsMap) || void 0 === _b ? void 0 : _b[null == operateMask ? void 0 : operateMask.name]) || void 0 === _c ? void 0 : _c[elementKey]) && !isBrushContainItem && (el.removeState("inBrush"), 
                 el.addState("outOfBrush"), this._outOfBrushElementsMap[elementKey] = el, delete this._inBrushElementsMap[operateMask.name][elementKey]), 
                 graphicItem.setAttribute("pickable", !this._needDisablePickable);
             }));
         }));
     }
     _reconfigLinkedItem(operateMask, region) {
+        var _a;
+        if (!(null == operateMask ? void 0 : operateMask.globalTransMatrix) || !(null === (_a = null == operateMask ? void 0 : operateMask.attribute) || void 0 === _a ? void 0 : _a.points)) return;
         const regionLayoutPos = region.getLayoutStartPoint(), seriesId = region.getSeries().map((s => s.id));
         this._linkedSeries.forEach((s => {
+            var _a, _b;
             if (!seriesId.includes(s.id)) {
-                const sRegionLayoutPos = s.getRegion().getLayoutStartPoint(), regionOffsetX = sRegionLayoutPos.x - regionLayoutPos.x, regionOffsetY = sRegionLayoutPos.y - regionLayoutPos.y;
+                const sRegionLayoutPos = s.getRegion().getLayoutStartPoint(), regionOffsetX = sRegionLayoutPos.x - regionLayoutPos.x, regionOffsetY = sRegionLayoutPos.y - regionLayoutPos.y, points = null !== (_b = null === (_a = null == operateMask ? void 0 : operateMask.attribute) || void 0 === _a ? void 0 : _a.points) && void 0 !== _b ? _b : [], {a: a, b: b, c: c, d: d, e: e, f: f} = operateMask.globalTransMatrix, dx = regionOffsetX || 0, dy = regionOffsetY || 0, pointsCoord = points.map((p => ({
+                    x: a * p.x + c * p.y + e + dx,
+                    y: b * p.x + d * p.y + f + dy
+                })));
+                operateMask.globalAABBBounds.clone().set(operateMask.globalAABBBounds.x1 + dx, operateMask.globalAABBBounds.y1 + dy, operateMask.globalAABBBounds.x2 + dx, operateMask.globalAABBBounds.y2 + dy);
+                const {markTypeFilter: markTypeFilter = []} = this._spec;
                 this._linkedItemMap[s.id].forEach((mark => {
+                    if (markTypeFilter.includes(mark.type)) return;
                     const grammarMark = mark.getProduct();
                     if (!grammarMark || !grammarMark.elements || !grammarMark.elements.length) return;
                     grammarMark.elements.forEach((el => {
                         var _a, _b, _c;
                         const graphicItem = el.getGraphicItem(), elementKey = mark.id + "_" + el.key;
-                        (null === (_a = this._linkedOutOfBrushElementsMap) || void 0 === _a ? void 0 : _a[elementKey]) && this._isBrushContainItem(operateMask, graphicItem, {
-                            dx: regionOffsetX,
-                            dy: regionOffsetY
-                        }) ? (el.addState("inBrush"), this._linkedInBrushElementsMap[null == operateMask ? void 0 : operateMask.name] || (this._linkedInBrushElementsMap[null == operateMask ? void 0 : operateMask.name] = {}), 
+                        (null === (_a = this._linkedOutOfBrushElementsMap) || void 0 === _a ? void 0 : _a[elementKey]) && this._isBrushContainItem(operateMask.globalAABBBounds, pointsCoord, graphicItem) ? (el.addState("inBrush"), 
+                        this._linkedInBrushElementsMap[null == operateMask ? void 0 : operateMask.name] || (this._linkedInBrushElementsMap[null == operateMask ? void 0 : operateMask.name] = {}), 
                         this._linkedInBrushElementsMap[null == operateMask ? void 0 : operateMask.name][elementKey] = el, 
-                        delete this._linkedOutOfBrushElementsMap[elementKey]) : (null === (_c = null === (_b = this._linkedInBrushElementsMap) || void 0 === _b ? void 0 : _b[null == operateMask ? void 0 : operateMask.name]) || void 0 === _c ? void 0 : _c[elementKey]) && !this._isBrushContainItem(operateMask, graphicItem, {
-                            dx: regionOffsetX,
-                            dy: regionOffsetY
-                        }) && (el.removeState("inBrush"), el.addState("outOfBrush"), this._linkedOutOfBrushElementsMap[elementKey] = el), 
+                        delete this._linkedOutOfBrushElementsMap[elementKey]) : (null === (_c = null === (_b = this._linkedInBrushElementsMap) || void 0 === _b ? void 0 : _b[null == operateMask ? void 0 : operateMask.name]) || void 0 === _c ? void 0 : _c[elementKey]) && !this._isBrushContainItem(operateMask.globalAABBBounds, pointsCoord, graphicItem) && (el.removeState("inBrush"), 
+                        el.addState("outOfBrush"), this._linkedOutOfBrushElementsMap[elementKey] = el), 
                         graphicItem.setAttribute("pickable", !this._needDisablePickable);
                     }));
                 }));
             }
         }));
     }
-    _isBrushContainItem(brushMask, item, linkedOffset) {
-        var _a, _b, _c;
-        if (!(null == brushMask ? void 0 : brushMask.globalTransMatrix) || !(null === (_a = null == brushMask ? void 0 : brushMask.attribute) || void 0 === _a ? void 0 : _a.points)) return !1;
-        const points = null !== (_c = null === (_b = null == brushMask ? void 0 : brushMask.attribute) || void 0 === _b ? void 0 : _b.points) && void 0 !== _c ? _c : [], {a: a, b: b, c: c, d: d, e: e, f: f} = brushMask.globalTransMatrix, dx = (null == linkedOffset ? void 0 : linkedOffset.dx) || 0, dy = (null == linkedOffset ? void 0 : linkedOffset.dy) || 0, pointsCoord = points.map((p => ({
-            x: a * p.x + c * p.y + e + dx,
-            y: b * p.x + d * p.y + f + dy
-        })));
-        brushMask.globalAABBBounds.clone().set(brushMask.globalAABBBounds.x1 + dx, brushMask.globalAABBBounds.y1 + dy, brushMask.globalAABBBounds.x2 + dx, brushMask.globalAABBBounds.y2 + dy);
-        const x = item.globalTransMatrix.e, y = item.globalTransMatrix.f;
+    _isBrushContainItem(brushMaskAABBBounds, brushMaskPointsCoord, item) {
         let itemBounds = [];
-        if ("symbol" === item.type) {
-            const {size: itemSize = 0} = null == item ? void 0 : item.attribute, size = array(itemSize)[0] / 2;
+        if ([ "symbol", "rect" ].includes(item.type)) {
+            const {x1: x1, x2: x2, y1: y1, y2: y2} = null == item ? void 0 : item.globalAABBBounds;
             return itemBounds = [ {
-                x: x - size,
-                y: y - size
+                x: x1,
+                y: y1
             }, {
-                x: x + size,
-                y: y - size
+                x: x2,
+                y: y1
             }, {
-                x: x + size,
-                y: y + size
+                x: x2,
+                y: y2
             }, {
-                x: x - size,
-                y: y + size
-            } ], polygonIntersectPolygon(pointsCoord, itemBounds);
+                x: x1,
+                y: y2
+            } ], polygonIntersectPolygon(brushMaskPointsCoord, itemBounds);
         }
-        if ("rect" === item.type) {
-            const {x1: x1, x2: x2, y1: y1, y2: y2} = null == item ? void 0 : item.AABBBounds, width = Math.abs(x1 - x2), height = Math.abs(y1 - y2);
-            return itemBounds = [ {
-                x: x,
-                y: y
-            }, {
-                x: x + width,
-                y: y
-            }, {
-                x: x + width,
-                y: y + height
-            }, {
-                x: x,
-                y: y + height
-            } ], polygonIntersectPolygon(pointsCoord, itemBounds);
-        }
-        return brushMask.globalAABBBounds.intersects(item.globalAABBBounds);
+        return brushMaskAABBBounds.intersects(item.globalAABBBounds);
+    }
+    _initMarkBrushState(componentIndex, stateName) {
+        this._brushComponents.forEach(((brush, index) => {
+            index !== componentIndex && brush.children[0].removeAllChild();
+        })), this._inBrushElementsMap = {}, this._outOfBrushElementsMap = {}, this._linkedInBrushElementsMap = {}, 
+        this._linkedOutOfBrushElementsMap = {};
+        const {markTypeFilter: markTypeFilter = []} = this._spec;
+        Object.entries(this._itemMap).forEach((([regionId, marks]) => {
+            marks.forEach((mark => {
+                if (markTypeFilter.includes(mark.type)) return;
+                const grammarMark = mark.getProduct();
+                if (!grammarMark || !grammarMark.elements || !grammarMark.elements.length) return;
+                grammarMark.elements.forEach((el => {
+                    const elementKey = mark.id + "_" + el.key;
+                    el.removeState("inBrush"), el.removeState("outOfBrush"), el.addState(stateName), 
+                    this._outOfBrushElementsMap[elementKey] = el;
+                }));
+            }));
+        })), Object.entries(this._linkedItemMap).forEach((([seriesId, marks]) => {
+            marks.forEach((mark => {
+                if (markTypeFilter.includes(mark.type)) return;
+                const grammarMark = mark.getProduct();
+                if (!grammarMark || !grammarMark.elements || !grammarMark.elements.length) return;
+                grammarMark.elements.forEach((el => {
+                    const elementKey = mark.id + "_" + el.key;
+                    el.removeState("inBrush"), el.removeState("outOfBrush"), el.addState(stateName), 
+                    this._linkedOutOfBrushElementsMap[elementKey] = el;
+                }));
+            }));
+        }));
     }
     _stateClamp(state) {
         return Math.min(Math.max(0, state), 1);
@@ -267,79 +338,9 @@ export class Brush extends BaseComponent {
             }));
         }
     }
-    _bindRegions() {
-        isValid(this._spec.regionId) && isValid(this._spec.regionIndex) && (this._relativeRegions = this._option.getAllRegions()), 
-        this._relativeRegions = this._option.getRegionsInUserIdOrIndex(array(this._spec.regionId), array(this._spec.regionIndex));
-    }
-    _bindLinkedSeries() {
-        isValid(this._spec.brushLinkSeriesId) && isValid(this._spec.brushLinkSeriesIndex) || (this._linkedSeries = this._option.getSeriesInUserIdOrIndex(array(this._spec.brushLinkSeriesId), array(this._spec.brushLinkSeriesIndex)));
-    }
-    _initRegionAxisMap() {
-        isValid(this._spec.axisId) ? array(this._spec.axisId).forEach((axisId => {
-            this._releatedAxes.push(this._option.getComponentByUserId(axisId));
-        })) : isValid(this._spec.axisIndex) ? array(this._spec.axisIndex).forEach((axisIndex => {
-            this._releatedAxes.push(this._option.getComponentByIndex("axes", axisIndex));
-        })) : this._releatedAxes = this._option.getComponentsByKey("axes"), this._releatedAxes.forEach((axis => {
-            null == axis || axis.getRegions().forEach((region => {
-                this._regionAxisMap["region_" + region.id] ? this._regionAxisMap["region_" + region.id].push(axis) : this._regionAxisMap["region_" + region.id] = [ axis ];
-            }));
-        }));
-    }
-    _initAxisDataZoomMap() {
-        this._option.getComponentsByKey("dataZoom").forEach((dz => {
-            dz.relatedAxisComponent && (this._axisDataZoomMap[dz.relatedAxisComponent.id] = dz);
-        }));
-    }
-    _initNeedOperatedItem() {
-        const seriesUserId = this._spec.seriesId, seriesIndex = this._spec.seriesIndex;
-        this._relativeRegions.forEach((r => {
-            const allMarks = [];
-            r.getSeries().forEach((s => {
-                (seriesUserId && array(seriesUserId).includes(s.userId.toString()) || seriesIndex && array(seriesIndex).includes(s.getSpecIndex()) || !seriesIndex && !seriesUserId) && allMarks.push(...s.getMarksWithoutRoot()), 
-                this._itemMap[r.id] = allMarks;
-            }));
-        })), this._linkedSeries.forEach((s => {
-            this._linkedItemMap[s.id] = s.getMarksWithoutRoot();
-        }));
-    }
-    _initMarkBrushState(componentIndex, stateName) {
-        this._brushComponents.forEach(((brush, index) => {
-            index !== componentIndex && brush.children[0].removeAllChild();
-        })), this._inBrushElementsMap = {}, this._outOfBrushElementsMap = {}, this._linkedInBrushElementsMap = {}, 
-        this._linkedOutOfBrushElementsMap = {}, this._option.getAllSeries().forEach((s => {
-            s.getMarksWithoutRoot().forEach((mark => {
-                const grammarMark = mark.getProduct();
-                if (!grammarMark || !grammarMark.elements || !grammarMark.elements.length) return;
-                grammarMark.elements.forEach((el => {
-                    const elementKey = mark.id + "_" + el.key;
-                    el.removeState("inBrush"), el.removeState("outOfBrush"), el.addState(stateName), 
-                    this._outOfBrushElementsMap[elementKey] = el, this._linkedOutOfBrushElementsMap[elementKey] = el;
-                }));
-            }));
-        }));
-    }
-    initEvent() {}
-    onRender(ctx) {}
-    changeRegions(regions) {}
     _getNeedClearVRenderComponents() {
         return this._brushComponents;
     }
-    _compareSpec(spec, prevSpec) {
-        this._brushComponents && this._relativeRegions.forEach(((region, index) => {
-            this._updateBrushComponent(region, index);
-        }));
-        const result = super._compareSpec(spec, prevSpec);
-        return isEqual(prevSpec, spec) || (result.reRender = !0, result.reMake = !0), result;
-    }
-    onLayoutEnd(ctx) {
-        var _a;
-        if (super.onLayoutEnd(ctx), this._option.disableTriggerEvent) return;
-        (null === (_a = this._spec.visible) || void 0 === _a || _a) && (this._brushComponents ? this._relativeRegions.forEach(((region, index) => {
-            this._updateBrushComponent(region, index);
-        })) : (this._brushComponents = [], this._relativeRegions.forEach(((region, index) => {
-            this._createBrushComponent(region, index);
-        }))));
-    }
     clearGraphic() {
         this._brushComponents && this._brushComponents.forEach((brush => {
             brush._container.incrementalClearChild();
@@ -348,8 +349,9 @@ export class Brush extends BaseComponent {
     clear() {
         if (this._brushComponents) {
             const container = this.getContainer();
-            this._brushComponents.forEach((brush => {
-                brush.removeAllChild(), brush.releaseBrushEvents(), container && container.removeChild(brush);
+            this._brushComponents.forEach(((brush, index) => {
+                this._initMarkBrushState(index, ""), this._needDisablePickable = !1, brush.removeAllChild(), 
+                brush.releaseBrushEvents(), container && container.removeChild(brush);
             })), this._brushComponents = null;
         }
     }