@visactor/vrender-components 0.18.0-alpha.0 → 0.18.0-alpha.1

package/cjs/core/type.d.ts

@@ -28,16 +28,18 @@ export type Padding = number | number[] | {
     right?: number;
 };
 type CommonTextContent = {
-    type?: 'text';
-    text?: string | string[] | number | number[];
+    text?: string | string[] | number | number[] | {
+        type?: 'text';
+        text: string | string[] | number | number[];
+    };
 };
 type RichTextContent = {
-    type?: 'rich';
-    text?: IRichTextCharacter[];
+    text?: {
+        type: 'rich';
+        text: IRichTextCharacter[];
+    };
 };
-type HtmlTextContent = {
-    type?: 'html';
-    text?: string | HTMLElement;
+export type TextContent = (CommonTextContent | RichTextContent) & {
+    type?: 'text' | 'rich';
 };
-export type TextContent = CommonTextContent | RichTextContent | HtmlTextContent;
 export {};

package/cjs/core/type.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/type.ts"],"names":[],"mappings":"","file":"type.js","sourcesContent":["import type { IRichTextCharacter } from '@visactor/vrender-core';\n\nexport type Point = {\n  x: number;\n  y: number;\n};\n\nexport interface LocationCfg {\n  [key: string]: any;\n}\n\nexport interface PointLocationCfg extends LocationCfg {\n  /**\n   * 位置 x\n   * @type {number}\n   */\n  x: number;\n  /**\n   * 位置 y\n   * @type {number}\n   */\n  y: number;\n}\n\nexport interface RegionLocationCfg extends LocationCfg {\n  /**\n   * 起始点\n   */\n  start: Point;\n  /**\n   * 结束点\n   */\n  end: Point;\n}\n\nexport type State<T> = {\n  [key: string]: T;\n};\n\nexport type BaseGraphicAttributes<T> = {\n  /**\n   * 基础样式设置\n   */\n  style?: T;\n  /**\n   * 状态样式设置\n   */\n  state?: State<T>;\n};\n\nexport type Padding =\n  | number\n  | number[]\n  | {\n      top?: number;\n      bottom?: number;\n      left?: number;\n      right?: number;\n    };\n\ntype CommonTextContent = {\n  type?: 'text';\n  text?: string | string[] | number | number[];\n};\n\ntype RichTextContent = {\n  type?: 'rich';\n  text?: IRichTextCharacter[];\n};\n\ntype HtmlTextContent = {\n  type?: 'html';\n  text?: string | HTMLElement;\n};\n\nexport type TextContent = CommonTextContent | RichTextContent | HtmlTextContent;\n"]}
+{"version":3,"sources":["../src/core/type.ts"],"names":[],"mappings":"","file":"type.js","sourcesContent":["import type { IRichTextCharacter } from '@visactor/vrender-core';\n\nexport type Point = {\n  x: number;\n  y: number;\n};\n\nexport interface LocationCfg {\n  [key: string]: any;\n}\n\nexport interface PointLocationCfg extends LocationCfg {\n  /**\n   * 位置 x\n   * @type {number}\n   */\n  x: number;\n  /**\n   * 位置 y\n   * @type {number}\n   */\n  y: number;\n}\n\nexport interface RegionLocationCfg extends LocationCfg {\n  /**\n   * 起始点\n   */\n  start: Point;\n  /**\n   * 结束点\n   */\n  end: Point;\n}\n\nexport type State<T> = {\n  [key: string]: T;\n};\n\nexport type BaseGraphicAttributes<T> = {\n  /**\n   * 基础样式设置\n   */\n  style?: T;\n  /**\n   * 状态样式设置\n   */\n  state?: State<T>;\n};\n\nexport type Padding =\n  | number\n  | number[]\n  | {\n      top?: number;\n      bottom?: number;\n      left?: number;\n      right?: number;\n    };\n\ntype CommonTextContent = {\n  text?:\n    | string\n    | string[]\n    | number\n    | number[]\n    | {\n        type?: 'text';\n        text: string | string[] | number | number[];\n      };\n};\n\ntype RichTextContent = {\n  text?: {\n    type: 'rich';\n    text: IRichTextCharacter[];\n  };\n};\n\nexport type TextContent = (CommonTextContent | RichTextContent) & {\n  /** @deprecated */\n  type?: 'text' | 'rich';\n};\n"]}

package/cjs/data-zoom/data-zoom.d.ts

@@ -1,5 +1,5 @@
 import type { FederatedPointerEvent, IGroup } from '@visactor/vrender-core';
-import type { IPointLike } from '@visactor/vutils';
+import type { IBoundsLike, IPointLike } from '@visactor/vutils';
 import { AbstractComponent } from '../core/base';
 import type { TagAttributes } from '../tag';
 import { Tag } from '../tag';
@@ -154,7 +154,9 @@ export declare class DataZoom extends AbstractComponent<Required<DataZoomAttribu
     private _previewPointsY1;
     private _statePointToData;
     private _layoutAttrFromConfig;
+    setPropsFromAttrs(): void;
     constructor(attributes: DataZoomAttributes, options?: ComponentOptions);
+    setAttributes(params: Partial<Required<DataZoomAttributes>>, forceUpdateTag?: boolean): void;
     protected bindEvents(): void;
     protected dragMaskSize(): number;
     protected setStateAttr(start: number, end: number, shouldRender: boolean): void;
@@ -170,6 +172,8 @@ export declare class DataZoom extends AbstractComponent<Required<DataZoomAttribu
     protected backgroundDragZoom(startPos: IPointLike, endPos: IPointLike): void;
     protected moveZoomWithMiddle(middle: number): void;
     protected renderDragMask(): void;
+    protected isTextOverflow(componentBoundsLike: IBoundsLike, textBounds: IBoundsLike | null, layout: 'start' | 'end'): boolean;
+    protected setTextAttr(startTextBounds: IBoundsLike, endTextBounds: IBoundsLike): void;
     protected renderText(): void;
     protected getLayoutAttrFromConfig(): any;
     protected render(): void;

package/cjs/data-zoom/data-zoom.js

@@ -22,6 +22,18 @@ const vrender_core_1 = require("@visactor/vrender-core"), vutils_1 = require("@v
 (0, register_1.loadDataZoomComponent)();
 
 class DataZoom extends base_1.AbstractComponent {
+    setPropsFromAttrs() {
+        const {start: start, end: end, orient: orient, previewData: previewData, previewPointsX: previewPointsX, previewPointsY: previewPointsY, previewPointsX1: previewPointsX1, previewPointsY1: previewPointsY1} = this.attribute;
+        start && (this.state.start = start), end && (this.state.end = end);
+        const {width: width, height: height} = this.getLayoutAttrFromConfig();
+        this._spanCache = this.state.end - this.state.start, this._isHorizontal = "top" === orient || "bottom" === orient, 
+        this._layoutCache.max = this._isHorizontal ? width : height, this._layoutCache.attPos = this._isHorizontal ? "x" : "y", 
+        this._layoutCache.attSize = this._isHorizontal ? "width" : "height", previewData && (this._previewData = previewData), 
+        (0, vutils_1.isFunction)(previewPointsX) && (this._previewPointsX = previewPointsX), 
+        (0, vutils_1.isFunction)(previewPointsY) && (this._previewPointsY = previewPointsY), 
+        (0, vutils_1.isFunction)(previewPointsX1) && (this._previewPointsX1 = previewPointsX1), 
+        (0, vutils_1.isFunction)(previewPointsY1) && (this._previewPointsY1 = previewPointsY1);
+    }
     constructor(attributes, options) {
         super((null == options ? void 0 : options.skipDefault) ? attributes : (0, vutils_1.merge)({}, DataZoom.defaultAttributes, attributes)), 
         this.name = "dataZoom", this._previewData = [], this._activeState = !1, this._activeCache = {
@@ -68,15 +80,12 @@ class DataZoom extends base_1.AbstractComponent {
                 tag: this._activeTag
             }));
         }), this.attribute.delayTime);
-        const {start: start, end: end, size: size, orient: orient, showDetail: showDetail, position: position, previewData: previewData, previewPointsX: previewPointsX, previewPointsY: previewPointsY, previewPointsX1: previewPointsX1, previewPointsY1: previewPointsY1, updateStateCallback: updateStateCallback} = this.attribute, {width: width, height: height} = size;
-        start && (this.state.start = start), end && (this.state.end = end), this._spanCache = this.state.end - this.state.start, 
-        this._isHorizontal = "top" === orient || "bottom" === orient, this._layoutCache.max = this._isHorizontal ? width : height, 
-        this._layoutCache.attPos = this._isHorizontal ? "x" : "y", this._layoutCache.attSize = this._isHorizontal ? "width" : "height", 
+        const {position: position, showDetail: showDetail} = attributes;
         this._activeCache.startPos = position, this._activeCache.lastPos = position, this._showText = "auto" !== showDetail && showDetail, 
-        previewData && (this._previewData = previewData), (0, vutils_1.isFunction)(previewPointsX) && (this._previewPointsX = previewPointsX), 
-        (0, vutils_1.isFunction)(previewPointsY) && (this._previewPointsY = previewPointsY), 
-        (0, vutils_1.isFunction)(previewPointsX1) && (this._previewPointsX1 = previewPointsX1), 
-        (0, vutils_1.isFunction)(previewPointsY1) && (this._previewPointsY1 = previewPointsY1);
+        this.setPropsFromAttrs();
+    }
+    setAttributes(params, forceUpdateTag) {
+        super.setAttributes(params, forceUpdateTag), this.setPropsFromAttrs();
     }
     bindEvents() {
         if (this.attribute.disableTriggerEvent) return;
@@ -108,7 +117,7 @@ class DataZoom extends base_1.AbstractComponent {
     }
     eventPosToStagePos(e) {
         var _a, _b;
-        const {x: x, y: y} = vrender_core_1.vglobal.mapToCanvasPoint(e);
+        const {x: x, y: y} = vrender_core_1.vglobal.mapToCanvasPoint(e, this.stage.window.getContext().canvas.nativeCanvas);
         return {
             x: x - ((null === (_a = this.stage) || void 0 === _a ? void 0 : _a.x) || 0),
             y: y - ((null === (_b = this.stage) || void 0 === _b ? void 0 : _b.y) || 0)
@@ -162,59 +171,80 @@ class DataZoom extends base_1.AbstractComponent {
             height: this._activeState && this._activeTag === type_1.DataZoomActiveTag.background && Math.abs(this.dragMaskSize()) || 0
         }, dragMaskStyle), "rect");
     }
-    renderText() {
-        const {startTextStyle: startTextStyle, endTextStyle: endTextStyle} = this.attribute, {formatMethod: startTextFormat} = startTextStyle, restStartStyle = __rest(startTextStyle, [ "formatMethod" ]), {formatMethod: endTextFormat} = endTextStyle, restEndTextStyle = __rest(endTextStyle, [ "formatMethod" ]), {start: start, end: end} = this.state;
+    isTextOverflow(componentBoundsLike, textBounds, layout) {
+        if (!textBounds) return !1;
+        if (this._isHorizontal) {
+            if ("start" === layout) {
+                if (textBounds.x1 < componentBoundsLike.x1) return !0;
+            } else if (textBounds.x2 > componentBoundsLike.x2) return !0;
+        } else if ("start" === layout) {
+            if (textBounds.y1 < componentBoundsLike.y1) return !0;
+        } else if (textBounds.y2 > componentBoundsLike.y2) return !0;
+        return !1;
+    }
+    setTextAttr(startTextBounds, endTextBounds) {
+        const {startTextStyle: startTextStyle, endTextStyle: endTextStyle} = this.attribute, {formatMethod: startTextFormat} = startTextStyle, restStartTextStyle = __rest(startTextStyle, [ "formatMethod" ]), {formatMethod: endTextFormat} = endTextStyle, restEndTextStyle = __rest(endTextStyle, [ "formatMethod" ]), {start: start, end: end} = this.state;
         this._startValue = this._statePointToData(start), this._endValue = this._statePointToData(end);
-        const {position: position, width: width, height: height} = this.getLayoutAttrFromConfig();
-        this._isHorizontal ? (this._startText = this.maybeAddLabel(this._container, (0, 
-        vutils_1.merge)({}, restStartStyle, {
-            text: startTextFormat ? startTextFormat(this._startValue) : this._startValue,
+        const {position: position, width: width, height: height} = this.getLayoutAttrFromConfig(), startTextValue = startTextFormat ? startTextFormat(this._startValue) : this._startValue, endTextValue = endTextFormat ? endTextFormat(this._endValue) : this._endValue, componentBoundsLike = {
+            x1: position.x,
+            y1: position.y,
+            x2: position.x + width,
+            y2: position.y + height
+        };
+        let startTextPosition, endTextPosition, startTextAlignStyle, endTextAlignStyle;
+        this._isHorizontal ? (startTextPosition = {
             x: position.x + start * width,
-            y: position.y + height / 2,
-            visible: this._showText,
-            pickable: !1,
-            childrenPickable: !1,
-            textStyle: {
-                textAlign: "right",
-                textBaseline: "middle"
-            }
-        }), `data-zoom-start-text-${position}`), this._endText = this.maybeAddLabel(this._container, (0, 
-        vutils_1.merge)({}, restEndTextStyle, {
-            text: endTextFormat ? endTextFormat(this._endValue) : this._endValue,
+            y: position.y + height / 2
+        }, endTextPosition = {
             x: position.x + end * width,
-            y: position.y + height / 2,
-            visible: this._showText,
-            pickable: !1,
-            childrenPickable: !1,
-            textStyle: {
-                textAlign: "left",
-                textBaseline: "middle"
-            }
-        }), `data-zoom-end-text-${position}`)) : (this._startText = this.maybeAddLabel(this._container, (0, 
-        vutils_1.merge)({}, restStartStyle, {
-            text: startTextFormat ? startTextFormat(this._startValue) : this._startValue,
+            y: position.y + height / 2
+        }, startTextAlignStyle = {
+            textAlign: this.isTextOverflow(componentBoundsLike, startTextBounds, "start") ? "left" : "right",
+            textBaseline: "middle"
+        }, endTextAlignStyle = {
+            textAlign: this.isTextOverflow(componentBoundsLike, endTextBounds, "end") ? "right" : "left",
+            textBaseline: "middle"
+        }) : (startTextPosition = {
             x: position.x + width / 2,
-            y: position.y + start * height,
+            y: position.y + start * height
+        }, endTextPosition = {
+            x: position.x + width / 2,
+            y: position.y + end * height
+        }, startTextAlignStyle = {
+            textAlign: "center",
+            textBaseline: this.isTextOverflow(componentBoundsLike, startTextBounds, "start") ? "top" : "bottom"
+        }, endTextAlignStyle = {
+            textAlign: "center",
+            textBaseline: this.isTextOverflow(componentBoundsLike, endTextBounds, "end") ? "bottom" : "top"
+        }), this._startText = this.maybeAddLabel(this._container, (0, vutils_1.merge)({}, restStartTextStyle, {
+            text: startTextValue,
+            x: startTextPosition.x,
+            y: startTextPosition.y,
             visible: this._showText,
             pickable: !1,
             childrenPickable: !1,
-            textStyle: {
-                textAlign: "center",
-                textBaseline: "bottom"
-            }
+            textStyle: startTextAlignStyle
         }), `data-zoom-start-text-${position}`), this._endText = this.maybeAddLabel(this._container, (0, 
         vutils_1.merge)({}, restEndTextStyle, {
-            text: endTextFormat ? endTextFormat(this._endValue) : this._endValue,
-            x: position.x + width / 2,
-            y: position.y + end * height,
+            text: endTextValue,
+            x: endTextPosition.x,
+            y: endTextPosition.y,
             visible: this._showText,
             pickable: !1,
             childrenPickable: !1,
-            textStyle: {
-                textAlign: "center",
-                textBaseline: "top"
-            }
-        }), `data-zoom-end-text-${position}`));
+            textStyle: endTextAlignStyle
+        }), `data-zoom-end-text-${position}`);
+    }
+    renderText() {
+        let startTextBounds = null, endTextBounds = null;
+        this.setTextAttr(startTextBounds, endTextBounds), startTextBounds = this._startText.AABBBounds, 
+        endTextBounds = this._endText.AABBBounds, this.setTextAttr(startTextBounds, endTextBounds), 
+        startTextBounds = this._startText.AABBBounds, endTextBounds = this._endText.AABBBounds;
+        const {x1: x1, x2: x2, y1: y1, y2: y2} = startTextBounds, {dx: startTextDx = 0, dy: startTextDy = 0} = this.attribute.startTextStyle;
+        if ((new vutils_1.Bounds).set(x1, y1, x2, y2).intersects(endTextBounds)) {
+            const direction = "bottom" === this.attribute.orient || "right" === this.attribute.orient ? -1 : 1;
+            this._isHorizontal ? this._startText.setAttribute("dy", startTextDy + direction * Math.abs(endTextBounds.y1 - endTextBounds.y2)) : this._startText.setAttribute("dx", startTextDx + direction * Math.abs(endTextBounds.x1 - endTextBounds.x2));
+        } else this._isHorizontal ? this._startText.setAttribute("dy", startTextDy) : this._startText.setAttribute("dx", startTextDx);
     }
     getLayoutAttrFromConfig() {
         var _a, _b, _c, _d;
@@ -246,60 +276,72 @@ class DataZoom extends base_1.AbstractComponent {
     render() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
         this._layoutAttrFromConfig = null;
-        const {orient: orient, backgroundStyle: backgroundStyle, backgroundChartStyle: backgroundChartStyle = {}, selectedBackgroundStyle: selectedBackgroundStyle = {}, selectedBackgroundChartStyle: selectedBackgroundChartStyle = {}, middleHandlerStyle: middleHandlerStyle = {}, startHandlerStyle: startHandlerStyle = {}, endHandlerStyle: endHandlerStyle = {}, brushSelect: brushSelect} = this.attribute, {start: start, end: end} = this.state, {position: position, width: width, height: height} = this.getLayoutAttrFromConfig(), startHandlerMinSize = null !== (_a = startHandlerStyle.triggerMinSize) && void 0 !== _a ? _a : 40, endHandlerMinSize = null !== (_b = endHandlerStyle.triggerMinSize) && void 0 !== _b ? _b : 40, group = this.createOrUpdateChild("dataZoom-container", {}, "group");
-        if (this._container = group, this._background = group.createOrUpdateChild("background", Object.assign({
+        const {orient: orient, backgroundStyle: backgroundStyle, backgroundChartStyle: backgroundChartStyle = {}, selectedBackgroundStyle: selectedBackgroundStyle = {}, selectedBackgroundChartStyle: selectedBackgroundChartStyle = {}, middleHandlerStyle: middleHandlerStyle = {}, startHandlerStyle: startHandlerStyle = {}, endHandlerStyle: endHandlerStyle = {}, brushSelect: brushSelect, zoomLock: zoomLock} = this.attribute, {start: start, end: end} = this.state, {position: position, width: width, height: height} = this.getLayoutAttrFromConfig(), startHandlerMinSize = null !== (_a = startHandlerStyle.triggerMinSize) && void 0 !== _a ? _a : 40, endHandlerMinSize = null !== (_b = endHandlerStyle.triggerMinSize) && void 0 !== _b ? _b : 40, group = this.createOrUpdateChild("dataZoom-container", {}, "group");
+        if (this._container = group, this._background = group.createOrUpdateChild("background", Object.assign(Object.assign({
             x: position.x,
             y: position.y,
             width: width,
             height: height,
             cursor: brushSelect ? "crosshair" : "auto"
-        }, backgroundStyle), "rect"), (null === (_c = backgroundChartStyle.line) || void 0 === _c ? void 0 : _c.visible) && this.setPreviewAttributes("line", group), 
+        }, backgroundStyle), {
+            pickable: !zoomLock
+        }), "rect"), (null === (_c = backgroundChartStyle.line) || void 0 === _c ? void 0 : _c.visible) && this.setPreviewAttributes("line", group), 
         (null === (_d = backgroundChartStyle.area) || void 0 === _d ? void 0 : _d.visible) && this.setPreviewAttributes("area", group), 
-        brushSelect && this.renderDragMask(), this._isHorizontal ? this._selectedBackground = group.createOrUpdateChild("selectedBackground", Object.assign({
+        brushSelect && this.renderDragMask(), this._isHorizontal ? this._selectedBackground = group.createOrUpdateChild("selectedBackground", Object.assign(Object.assign({
             x: position.x + start * width,
             y: position.y,
             width: (end - start) * width,
             height: height,
             cursor: brushSelect ? "crosshair" : "move"
-        }, selectedBackgroundStyle), "rect") : this._selectedBackground = group.createOrUpdateChild("selectedBackground", Object.assign({
+        }, selectedBackgroundStyle), {
+            pickable: !zoomLock
+        }), "rect") : this._selectedBackground = group.createOrUpdateChild("selectedBackground", Object.assign(Object.assign({
             x: position.x,
             y: position.y + start * height,
             width: width,
             height: (end - start) * height,
             cursor: brushSelect ? "crosshair" : "move"
-        }, selectedBackgroundStyle), "rect"), (null === (_e = selectedBackgroundChartStyle.line) || void 0 === _e ? void 0 : _e.visible) && this.setSelectedPreviewAttributes("line", group), 
+        }, selectedBackgroundStyle), {
+            pickable: !zoomLock
+        }), "rect"), (null === (_e = selectedBackgroundChartStyle.line) || void 0 === _e ? void 0 : _e.visible) && this.setSelectedPreviewAttributes("line", group), 
         (null === (_f = selectedBackgroundChartStyle.area) || void 0 === _f ? void 0 : _f.visible) && this.setSelectedPreviewAttributes("area", group), 
-        this._showText && this.renderText(), this._isHorizontal) {
+        this._isHorizontal) {
             if (middleHandlerStyle.visible) {
                 const middleHandlerBackgroundSize = (null === (_g = middleHandlerStyle.background) || void 0 === _g ? void 0 : _g.size) || 10;
-                this._middleHandlerRect = group.createOrUpdateChild("middleHandlerRect", Object.assign({
+                this._middleHandlerRect = group.createOrUpdateChild("middleHandlerRect", Object.assign(Object.assign({
                     x: position.x + start * width,
                     y: position.y - middleHandlerBackgroundSize,
                     width: (end - start) * width,
                     height: middleHandlerBackgroundSize
-                }, null === (_h = middleHandlerStyle.background) || void 0 === _h ? void 0 : _h.style), "rect"), 
-                this._middleHandlerSymbol = group.createOrUpdateChild("middleHandlerSymbol", Object.assign({
+                }, null === (_h = middleHandlerStyle.background) || void 0 === _h ? void 0 : _h.style), {
+                    pickable: !zoomLock
+                }), "rect"), this._middleHandlerSymbol = group.createOrUpdateChild("middleHandlerSymbol", Object.assign(Object.assign({
                     x: position.x + (start + end) / 2 * width,
                     y: position.y - middleHandlerBackgroundSize / 2,
                     strokeBoundsBuffer: 0,
                     angle: 0,
                     symbolType: null !== (_k = null === (_j = middleHandlerStyle.icon) || void 0 === _j ? void 0 : _j.symbolType) && void 0 !== _k ? _k : "square"
-                }, middleHandlerStyle.icon), "symbol");
+                }, middleHandlerStyle.icon), {
+                    pickable: !zoomLock
+                }), "symbol");
             }
-            this._startHandler = group.createOrUpdateChild("startHandler", Object.assign(Object.assign({
+            this._startHandler = group.createOrUpdateChild("startHandler", Object.assign(Object.assign(Object.assign({
                 x: position.x + start * width,
                 y: position.y + height / 2,
                 size: height,
                 symbolType: null !== (_l = startHandlerStyle.symbolType) && void 0 !== _l ? _l : "square"
-            }, config_1.DEFAULT_HANDLER_ATTR_MAP.horizontal), startHandlerStyle), "symbol"), 
-            this._endHandler = group.createOrUpdateChild("endHandler", Object.assign(Object.assign({
+            }, config_1.DEFAULT_HANDLER_ATTR_MAP.horizontal), startHandlerStyle), {
+                pickable: !zoomLock
+            }), "symbol"), this._endHandler = group.createOrUpdateChild("endHandler", Object.assign(Object.assign(Object.assign({
                 x: position.x + end * width,
                 y: position.y + height / 2,
                 size: height,
                 symbolType: null !== (_m = endHandlerStyle.symbolType) && void 0 !== _m ? _m : "square"
-            }, config_1.DEFAULT_HANDLER_ATTR_MAP.horizontal), endHandlerStyle), "symbol");
+            }, config_1.DEFAULT_HANDLER_ATTR_MAP.horizontal), endHandlerStyle), {
+                pickable: !zoomLock
+            }), "symbol");
             const startHandlerWidth = Math.max(this._startHandler.AABBBounds.width(), startHandlerMinSize), startHandlerHeight = Math.max(this._startHandler.AABBBounds.height(), startHandlerMinSize), endHandlerWidth = Math.max(this._endHandler.AABBBounds.width(), endHandlerMinSize), endHandlerHeight = Math.max(this._endHandler.AABBBounds.height(), endHandlerMinSize);
-            this._startHandlerMask = group.createOrUpdateChild("startHandlerMask", Object.assign({
+            this._startHandlerMask = group.createOrUpdateChild("startHandlerMask", Object.assign(Object.assign({
                 x: position.x + start * width - startHandlerWidth / 2,
                 y: position.y + height / 2 - startHandlerHeight / 2,
                 width: startHandlerWidth,
@@ -307,7 +349,9 @@ class DataZoom extends base_1.AbstractComponent {
                 fill: "white",
                 fillOpacity: 0,
                 zIndex: 999
-            }, config_1.DEFAULT_HANDLER_ATTR_MAP.horizontal), "rect"), this._endHandlerMask = group.createOrUpdateChild("endHandlerMask", Object.assign({
+            }, config_1.DEFAULT_HANDLER_ATTR_MAP.horizontal), {
+                pickable: !zoomLock
+            }), "rect"), this._endHandlerMask = group.createOrUpdateChild("endHandlerMask", Object.assign(Object.assign({
                 x: position.x + end * width - endHandlerWidth / 2,
                 y: position.y + height / 2 - endHandlerHeight / 2,
                 width: endHandlerWidth,
@@ -315,37 +359,46 @@ class DataZoom extends base_1.AbstractComponent {
                 fill: "white",
                 fillOpacity: 0,
                 zIndex: 999
-            }, config_1.DEFAULT_HANDLER_ATTR_MAP.horizontal), "rect");
+            }, config_1.DEFAULT_HANDLER_ATTR_MAP.horizontal), {
+                pickable: !zoomLock
+            }), "rect");
         } else {
             if (middleHandlerStyle.visible) {
                 const middleHandlerBackgroundSize = (null === (_o = middleHandlerStyle.background) || void 0 === _o ? void 0 : _o.size) || 10;
-                this._middleHandlerRect = group.createOrUpdateChild("middleHandlerRect", Object.assign({
+                this._middleHandlerRect = group.createOrUpdateChild("middleHandlerRect", Object.assign(Object.assign({
                     x: "left" === orient ? position.x - middleHandlerBackgroundSize : position.x + width,
                     y: position.y + start * height,
                     width: middleHandlerBackgroundSize,
                     height: (end - start) * height
-                }, null === (_p = middleHandlerStyle.background) || void 0 === _p ? void 0 : _p.style), "rect"), 
-                this._middleHandlerSymbol = group.createOrUpdateChild("middleHandlerSymbol", Object.assign({
+                }, null === (_p = middleHandlerStyle.background) || void 0 === _p ? void 0 : _p.style), {
+                    pickable: !zoomLock
+                }), "rect"), this._middleHandlerSymbol = group.createOrUpdateChild("middleHandlerSymbol", Object.assign(Object.assign({
                     x: "left" === orient ? position.x - middleHandlerBackgroundSize / 2 : position.x + width + middleHandlerBackgroundSize / 2,
                     y: position.y + (start + end) / 2 * height,
                     angle: Math.PI / 180 * 90,
                     symbolType: null !== (_r = null === (_q = middleHandlerStyle.icon) || void 0 === _q ? void 0 : _q.symbolType) && void 0 !== _r ? _r : "square",
                     strokeBoundsBuffer: 0
-                }, middleHandlerStyle.icon), "symbol");
+                }, middleHandlerStyle.icon), {
+                    pickable: !zoomLock
+                }), "symbol");
             }
-            this._startHandler = group.createOrUpdateChild("startHandler", Object.assign(Object.assign({
+            this._startHandler = group.createOrUpdateChild("startHandler", Object.assign(Object.assign(Object.assign({
                 x: position.x + width / 2,
                 y: position.y + start * height,
                 size: width,
                 symbolType: null !== (_s = startHandlerStyle.symbolType) && void 0 !== _s ? _s : "square"
-            }, config_1.DEFAULT_HANDLER_ATTR_MAP.vertical), startHandlerStyle), "symbol"), this._endHandler = group.createOrUpdateChild("endHandler", Object.assign(Object.assign({
+            }, config_1.DEFAULT_HANDLER_ATTR_MAP.vertical), startHandlerStyle), {
+                pickable: !zoomLock
+            }), "symbol"), this._endHandler = group.createOrUpdateChild("endHandler", Object.assign(Object.assign(Object.assign({
                 x: position.x + width / 2,
                 y: position.y + end * height,
                 size: width,
                 symbolType: null !== (_t = endHandlerStyle.symbolType) && void 0 !== _t ? _t : "square"
-            }, config_1.DEFAULT_HANDLER_ATTR_MAP.vertical), endHandlerStyle), "symbol");
+            }, config_1.DEFAULT_HANDLER_ATTR_MAP.vertical), endHandlerStyle), {
+                pickable: !zoomLock
+            }), "symbol");
             const startHandlerWidth = Math.max(this._startHandler.AABBBounds.width(), startHandlerMinSize), startHandlerHeight = Math.max(this._startHandler.AABBBounds.height(), startHandlerMinSize), endHandlerWidth = Math.max(this._endHandler.AABBBounds.width(), endHandlerMinSize), endHandlerHeight = Math.max(this._endHandler.AABBBounds.height(), endHandlerMinSize);
-            this._startHandlerMask = group.createOrUpdateChild("startHandlerMask", Object.assign({
+            this._startHandlerMask = group.createOrUpdateChild("startHandlerMask", Object.assign(Object.assign({
                 x: position.x + width / 2 + startHandlerWidth / 2,
                 y: position.y + start * height - startHandlerHeight / 2,
                 width: endHandlerHeight,
@@ -353,7 +406,9 @@ class DataZoom extends base_1.AbstractComponent {
                 fill: "white",
                 fillOpacity: 0,
                 zIndex: 999
-            }, config_1.DEFAULT_HANDLER_ATTR_MAP.vertical), "rect"), this._endHandlerMask = group.createOrUpdateChild("endHandlerMask", Object.assign({
+            }, config_1.DEFAULT_HANDLER_ATTR_MAP.vertical), {
+                pickable: !zoomLock
+            }), "rect"), this._endHandlerMask = group.createOrUpdateChild("endHandlerMask", Object.assign(Object.assign({
                 x: position.x + width / 2 + endHandlerWidth / 2,
                 y: position.y + end * height - endHandlerHeight / 2,
                 width: endHandlerHeight,
@@ -361,8 +416,11 @@ class DataZoom extends base_1.AbstractComponent {
                 fill: "white",
                 fillOpacity: 0,
                 zIndex: 999
-            }, config_1.DEFAULT_HANDLER_ATTR_MAP.vertical), "rect");
+            }, config_1.DEFAULT_HANDLER_ATTR_MAP.vertical), {
+                pickable: !zoomLock
+            }), "rect");
         }
+        this._showText && this.renderText();
     }
     computeBasePoints() {
         const {orient: orient} = this.attribute, {position: position, width: width, height: height} = this.getLayoutAttrFromConfig();