@visactor/vchart 1.15.5-alpha.8 → 2.0.0-alpha.0

package/cjs/component/crosshair/utils/polar.js

@@ -1,130 +1,85 @@
 "use strict";
 
-var __rest = this && this.__rest || function(s, e) {
-    var t = {};
-    for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0 && (t[p] = s[p]);
-    if (null != s && "function" == typeof Object.getOwnPropertySymbols) {
-        var i = 0;
-        for (p = Object.getOwnPropertySymbols(s); i < p.length; i++) e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]) && (t[p[i]] = s[p[i]]);
-    }
-    return t;
-};
-
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.layoutRadiusCrosshair = exports.layoutAngleCrosshair = exports.layoutByValue = void 0;
+}), exports.layoutCrosshair = exports.layoutByValue = void 0;
 
-const util_1 = require("../../axis/util"), vutils_1 = require("@visactor/vutils"), vutils_extension_1 = require("@visactor/vutils-extension"), util_2 = require("../../util"), layoutByValue = (series, currValueAngle, currValueRadius, angleHair, radiusHair, enableRemain = !1, cacheAngleCrossHairInfo, cacheRadiusCrossHairInfo) => {
-    let angleCrossHairInfo = {
-        x: 0,
-        y: 0,
-        center: {
-            x: 0,
-            y: 0
-        },
-        radius: 0,
-        distance: 0,
-        startAngle: 0,
-        endAngle: 0,
-        innerRadius: 0,
-        visible: !1,
-        label: {
-            visible: !1,
-            text: "",
-            offset: 0
+const util_1 = require("../../axis/util"), vutils_1 = require("@visactor/vutils"), util_2 = require("../../util"), layoutByValue = (stateByField, series, enableRemain = !1) => {
+    Object.keys(stateByField).forEach((field => {
+        const {attributes: attributes, currentValue: currentValue, cacheInfo: cacheInfo, coordKey: coordKey} = stateByField[field];
+        if (attributes) {
+            const isVisible = !!currentValue.size, useCache = enableRemain && !isVisible && (0, 
+            vutils_1.isValid)(cacheInfo), newInfo = useCache ? cacheInfo : {
+                coord: 0,
+                axis: null,
+                visible: isVisible,
+                coordRange: [ 0, 0 ],
+                sizeRange: [ 0, 0 ],
+                labels: {
+                    all: {
+                        visible: !1,
+                        text: "",
+                        offset: 0
+                    }
+                }
+            };
+            if (cacheInfo && (cacheInfo._isCache = useCache), "valueField" === field && (newInfo.sides = series.angleAxisHelper.getScale(0).domain().length), 
+            currentValue.forEach((({axis: axis, datum: value = ""}) => {
+                var _a;
+                const niceLabelFormatter = axis.niceLabelFormatter;
+                if ((null === (_a = attributes.label) || void 0 === _a ? void 0 : _a.visible) && (newInfo.labels.all.visible = !0, 
+                newInfo.labels.all.defaultFormatter = niceLabelFormatter, newInfo.labels.all.text = value, 
+                newInfo.labels.all.offset = (0, util_1.getAxisLabelOffset)(axis.getSpec())), "categoryField" === field) {
+                    const angle = series.angleAxisHelper.dataToPosition([ value ]), bandSize = series.angleAxisHelper.getBandwidth(0), radius = axis.getOuterRadius();
+                    newInfo.coord = angle, newInfo.coordRange = [ angle - bandSize / 2, angle + bandSize / 2 ], 
+                    newInfo.sizeRange = [ radius, radius ];
+                } else {
+                    const angle = axis.startAngle, radius = series.radiusAxisHelper.dataToPosition([ value ]);
+                    newInfo.coord = radius, newInfo.coordRange = [ radius, radius ], newInfo.sizeRange = [ angle, angle ];
+                }
+                newInfo.axis = axis;
+            })), newInfo && !useCache && newInfo.labels.all.visible && attributes && attributes.label) {
+                const label = newInfo.labels.all, {formatMethod: formatMethod, formatter: formatter} = attributes.label, {formatFunc: formatFunc, args: args} = (0, 
+                util_2.getFormatFunction)(formatMethod, formatter, label.text, {
+                    label: label.text,
+                    orient: coordKey
+                });
+                formatFunc ? label.text = formatFunc(...args) : label.defaultFormatter && (label.text = label.defaultFormatter(label.text));
+            }
+            stateByField[field].cacheInfo = newInfo;
         }
-    }, radiusCrossHairInfo = {
-        x: 0,
-        y: 0,
-        center: {
-            x: 0,
-            y: 0
-        },
-        radius: 0,
-        distance: 0,
-        startAngle: 0,
-        endAngle: 0,
-        innerRadius: 0,
-        visible: !1,
-        sides: series.angleAxisHelper.getScale(0).domain().length,
-        label: {
-            visible: !1,
-            text: "",
-            offset: 0
-        }
-    };
-    if (angleHair) {
-        angleCrossHairInfo.visible = !!currValueAngle.size;
-        const bandWidth = series.angleAxisHelper.getBandwidth(0);
-        currValueAngle.forEach((_a => {
-            var _b, {axis: axis, value: value, coord: coord} = _a, rest = __rest(_a, [ "axis", "value", "coord" ]);
-            value = null != value ? value : "", (0, vutils_extension_1.mergeSpec)(angleCrossHairInfo, rest);
-            const angle = series.angleAxisHelper.dataToPosition([ value ]);
-            angleCrossHairInfo.angle = angle;
-            const niceLabelFormatter = axis.niceLabelFormatter;
-            (null === (_b = angleHair.label) || void 0 === _b ? void 0 : _b.visible) && (angleCrossHairInfo.label.visible = !0, 
-            angleCrossHairInfo.label.defaultFormatter = niceLabelFormatter, angleCrossHairInfo.label.text = value, 
-            angleCrossHairInfo.label.offset = (0, util_1.getAxisLabelOffset)(axis.getSpec())), 
-            angleCrossHairInfo.startAngle = angle - bandWidth / 2, angleCrossHairInfo.endAngle = angle + bandWidth / 2;
-        }));
-    }
-    if (radiusHair && (radiusCrossHairInfo.visible = !!currValueRadius.size, currValueRadius.forEach((_a => {
-        var _b, {axis: axis, value: value, coord: coord} = _a, rest = __rest(_a, [ "axis", "value", "coord" ]);
-        value = null != value ? value : "";
-        const niceLabelFormatter = axis.niceLabelFormatter;
-        (null === (_b = radiusHair.label) || void 0 === _b ? void 0 : _b.visible) && (radiusCrossHairInfo.label.visible = !0, 
-        radiusCrossHairInfo.label.defaultFormatter = niceLabelFormatter, radiusCrossHairInfo.label.text = value, 
-        radiusCrossHairInfo.label.offset = (0, util_1.getAxisLabelOffset)(axis.getSpec())), 
-        radiusCrossHairInfo.angle = coord.angle, radiusCrossHairInfo.axis = axis, (0, vutils_extension_1.mergeSpec)(radiusCrossHairInfo, rest);
-    }))), enableRemain && !angleCrossHairInfo.visible && (0, vutils_1.isValid)(cacheAngleCrossHairInfo)) angleCrossHairInfo = cacheAngleCrossHairInfo; else if (angleCrossHairInfo.label.visible && angleHair && angleHair.label) {
-        const {label: label} = angleCrossHairInfo, {formatMethod: formatMethod, formatter: formatter} = angleHair.label, {formatFunc: formatFunc, args: args} = (0, 
-        util_2.getFormatFunction)(formatMethod, formatter, label.text, {
-            label: label.text,
-            orient: "angle"
-        });
-        formatFunc ? label.text = formatFunc(...args) : label.defaultFormatter && (label.text = label.defaultFormatter(label.text));
-    }
-    if (enableRemain && !radiusCrossHairInfo.visible && (0, vutils_1.isValid)(cacheRadiusCrossHairInfo)) radiusCrossHairInfo = cacheRadiusCrossHairInfo; else if (radiusCrossHairInfo.label.visible && radiusHair && radiusHair.label) {
-        const {label: label} = radiusCrossHairInfo, {formatMethod: formatMethod, formatter: formatter} = radiusHair.label, {formatFunc: formatFunc, args: args} = (0, 
-        util_2.getFormatFunction)(formatMethod, formatter, label.text, {
-            label: label.text,
-            orient: "radius"
-        });
-        formatFunc ? label.text = formatFunc(...args) : label.defaultFormatter && (label.text = label.defaultFormatter(label.text));
-    }
-    return {
-        angle: angleCrossHairInfo,
-        radius: radiusCrossHairInfo
-    };
+    }));
 };
 
 exports.layoutByValue = layoutByValue;
 
-const layoutAngleCrosshair = (angleHair, crosshairInfo) => {
-    const {angle: angle, innerRadius: innerRadius, radius: radius, startAngle: startAngle, endAngle: endAngle, center: center} = crosshairInfo;
-    let positionAttrs;
-    return positionAttrs = "sector" === ("rect" === angleHair.type ? "sector" : "line") ? {
-        center: center,
-        innerRadius: innerRadius,
-        radius: radius,
-        startAngle: startAngle,
-        endAngle: endAngle
-    } : {
-        start: (0, vutils_1.polarToCartesian)(center, innerRadius, angle),
-        end: (0, vutils_1.polarToCartesian)(center, radius, angle)
-    }, positionAttrs;
-};
-
-exports.layoutAngleCrosshair = layoutAngleCrosshair;
-
-const layoutRadiusCrosshair = (radiusHair, crosshairInfo) => {
-    const {center: center, startAngle: startAngle, endAngle: endAngle, distance: distance, sides: sides, axis: axis, point: point, radius: radius, innerRadius: innerRadius} = crosshairInfo;
-    let polygonRadius = distance;
-    if ("polygon" === (radiusHair.smooth ? "circle" : "polygon")) {
-        const axisCenter = axis.getCenter(), curAngle = (0, vutils_1.getAngleByPoint)(axisCenter, point), stepAngle = (endAngle - startAngle) / sides, index = Math.floor((curAngle - startAngle) / stepAngle), preAngle = index * stepAngle + startAngle, nextAngle = Math.min((index + 1) * stepAngle + startAngle, endAngle), prePoint = (0, 
-        vutils_1.polarToCartesian)(axisCenter, distance, preAngle), nextPoint = (0, vutils_1.polarToCartesian)(axisCenter, distance, nextAngle), insertPoint = (0, 
+const layoutCrosshair = (stateItem, layoutStartPoint, smooth) => {
+    const {cacheInfo: cacheInfo, coordKey: coordKey, attributes: attributes} = stateItem, {axis: axis, coord: coord, sizeRange: sizeRange, coordRange: coordRange} = cacheInfo, axisCenter = axis.getCenter(), center = {
+        x: axisCenter.x + layoutStartPoint.x,
+        y: axisCenter.y + layoutStartPoint.y
+    };
+    if ("angle" === coordKey) {
+        return "sector" === ("rect" === attributes.type ? "sector" : "line") ? {
+            center: center,
+            innerRadius: axis.getInnerRadius(),
+            radius: axis.getOuterRadius(),
+            startAngle: coordRange[0],
+            endAngle: coordRange[1]
+        } : {
+            start: (0, vutils_1.polarToCartesian)(center, axis.getInnerRadius(), coord),
+            end: (0, vutils_1.polarToCartesian)(center, axis.getOuterRadius(), coord)
+        };
+    }
+    const startAngle = axis.startAngle, endAngle = axis.endAngle, sides = cacheInfo.sides;
+    let polygonRadius = coord;
+    if (!smooth) {
+        const axisCenter = axis.getCenter(), point = axis.coordToPoint({
+            angle: sizeRange[0],
+            radius: coord
+        }), curAngle = (0, vutils_1.getAngleByPoint)(axisCenter, point), stepAngle = (endAngle - startAngle) / sides, index = Math.floor((curAngle - startAngle) / stepAngle), preAngle = index * stepAngle + startAngle, nextAngle = Math.min((index + 1) * stepAngle + startAngle, endAngle), prePoint = (0, 
+        vutils_1.polarToCartesian)(axisCenter, coord, preAngle), nextPoint = (0, vutils_1.polarToCartesian)(axisCenter, coord, nextAngle), insertPoint = (0, 
         vutils_1.getIntersectPoint)([ nextPoint.x, nextPoint.y ], [ prePoint.x, prePoint.y ], [ axisCenter.x, axisCenter.y ], [ point.x, point.y ]);
-        insertPoint && (polygonRadius = (0, vutils_1.clamp)(vutils_1.PointService.distancePN(point, insertPoint[0], insertPoint[1]) + distance, innerRadius, radius));
+        insertPoint && (polygonRadius = (0, vutils_1.clamp)(vutils_1.PointService.distancePN(point, insertPoint[0], insertPoint[1]) + coord, axis.getInnerRadius(), axis.getOuterRadius()));
     }
     return {
         center: center,
@@ -135,5 +90,5 @@ const layoutRadiusCrosshair = (radiusHair, crosshairInfo) => {
     };
 };
 
-exports.layoutRadiusCrosshair = layoutRadiusCrosshair;
+exports.layoutCrosshair = layoutCrosshair;
 //# sourceMappingURL=polar.js.map

package/cjs/component/crosshair/utils/polar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/crosshair/utils/polar.ts"],"names":[],"mappings":"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","file":"polar.js","sourcesContent":["import type { BandScale } from '@visactor/vscale';\nimport type { IPolarSeries } from '../../../series';\nimport type { IHair, IHairRadius } from '../base';\nimport type { AxisCurrentValueMap, IPolarCrosshairInfo } from '../interface';\nimport { getAxisLabelOffset } from '../../axis/util';\nimport { PointService, clamp, getAngleByPoint, getIntersectPoint, isValid, polarToCartesian } from '@visactor/vutils';\nimport type { ILinearAxis, IPolarAxis } from '../../axis';\nimport { mergeSpec } from '@visactor/vutils-extension';\nimport { getFormatFunction } from '../../util';\n\nexport const layoutByValue = (\n  series: IPolarSeries,\n  currValueAngle: AxisCurrentValueMap,\n  currValueRadius: AxisCurrentValueMap,\n  angleHair: IHair,\n  radiusHair: IHair,\n  enableRemain: boolean = false,\n  cacheAngleCrossHairInfo?: IPolarCrosshairInfo,\n  cacheRadiusCrossHairInfo?: IPolarCrosshairInfo\n) => {\n  let angleCrossHairInfo = {\n    x: 0,\n    y: 0,\n    center: { x: 0, y: 0 },\n    radius: 0,\n    distance: 0,\n    startAngle: 0,\n    endAngle: 0,\n    innerRadius: 0,\n    visible: false,\n    label: { visible: false, text: '', offset: 0 }\n  } as IPolarCrosshairInfo;\n  let radiusCrossHairInfo = {\n    x: 0,\n    y: 0,\n    center: { x: 0, y: 0 },\n    radius: 0,\n    distance: 0,\n    startAngle: 0,\n    endAngle: 0,\n    innerRadius: 0,\n    visible: false,\n    sides: (series.angleAxisHelper.getScale(0) as BandScale).domain().length,\n    label: { visible: false, text: '', offset: 0 }\n  } as IPolarCrosshairInfo;\n\n  // 计算x轴和y轴的数据，只允许最多一对x和一对y\n  if (angleHair) {\n    angleCrossHairInfo.visible = !!currValueAngle.size;\n    const bandWidth = series.angleAxisHelper.getBandwidth(0);\n    currValueAngle.forEach(({ axis, value, coord, ...rest }) => {\n      value = value ?? '';\n      mergeSpec(angleCrossHairInfo, rest);\n      const angle = series.angleAxisHelper.dataToPosition([value]);\n      angleCrossHairInfo.angle = angle;\n      const niceLabelFormatter = (axis as ILinearAxis).niceLabelFormatter;\n      if (angleHair.label?.visible) {\n        angleCrossHairInfo.label.visible = true;\n        angleCrossHairInfo.label.defaultFormatter = niceLabelFormatter;\n        angleCrossHairInfo.label.text = value;\n        angleCrossHairInfo.label.offset = getAxisLabelOffset(axis.getSpec());\n      }\n\n      angleCrossHairInfo.startAngle = angle - bandWidth / 2;\n      angleCrossHairInfo.endAngle = angle + bandWidth / 2;\n    });\n  }\n\n  if (radiusHair) {\n    radiusCrossHairInfo.visible = !!currValueRadius.size;\n    currValueRadius.forEach(({ axis, value, coord, ...rest }) => {\n      value = value ?? '';\n      const niceLabelFormatter = (axis as ILinearAxis).niceLabelFormatter;\n      if (radiusHair.label?.visible) {\n        radiusCrossHairInfo.label.visible = true;\n        radiusCrossHairInfo.label.defaultFormatter = niceLabelFormatter;\n        radiusCrossHairInfo.label.text = value;\n        radiusCrossHairInfo.label.offset = getAxisLabelOffset(axis.getSpec());\n      }\n      radiusCrossHairInfo.angle = coord.angle;\n      radiusCrossHairInfo.axis = axis as IPolarAxis;\n      mergeSpec(radiusCrossHairInfo, rest);\n    });\n  }\n\n  if (enableRemain && !angleCrossHairInfo.visible && isValid(cacheAngleCrossHairInfo)) {\n    angleCrossHairInfo = cacheAngleCrossHairInfo;\n  } else {\n    if (angleCrossHairInfo.label.visible) {\n      if (angleHair && angleHair.label) {\n        const { label } = angleCrossHairInfo;\n        const { formatMethod, formatter } = angleHair.label;\n        const { formatFunc, args } = getFormatFunction(formatMethod, formatter, label.text, {\n          label: label.text,\n          orient: 'angle'\n        });\n        if (formatFunc) {\n          label.text = formatFunc(...args);\n        } else if (label.defaultFormatter) {\n          label.text = label.defaultFormatter(label.text);\n        }\n      }\n    }\n  }\n\n  if (enableRemain && !radiusCrossHairInfo.visible && isValid(cacheRadiusCrossHairInfo)) {\n    radiusCrossHairInfo = cacheRadiusCrossHairInfo;\n  } else {\n    if (radiusCrossHairInfo.label.visible) {\n      if (radiusHair && radiusHair.label) {\n        const { label } = radiusCrossHairInfo;\n        const { formatMethod, formatter } = radiusHair.label;\n        const { formatFunc, args } = getFormatFunction(formatMethod, formatter, label.text, {\n          label: label.text,\n          orient: 'radius'\n        });\n        if (formatFunc) {\n          label.text = formatFunc(...args);\n        } else if (label.defaultFormatter) {\n          label.text = label.defaultFormatter(label.text);\n        }\n      }\n    }\n  }\n\n  return {\n    angle: angleCrossHairInfo,\n    radius: radiusCrossHairInfo\n  };\n};\n\nexport const layoutAngleCrosshair = (angleHair: IHair, crosshairInfo: IPolarCrosshairInfo) => {\n  const { angle, innerRadius, radius, startAngle, endAngle, center } = crosshairInfo;\n\n  const crosshairType = angleHair.type === 'rect' ? 'sector' : 'line';\n  let positionAttrs;\n  if (crosshairType === 'sector') {\n    positionAttrs = {\n      center,\n      innerRadius,\n      radius,\n      startAngle: startAngle,\n      endAngle: endAngle\n    };\n  } else {\n    positionAttrs = {\n      start: polarToCartesian(center, innerRadius, angle),\n      end: polarToCartesian(center, radius, angle)\n    };\n  }\n\n  return positionAttrs;\n};\n\nexport const layoutRadiusCrosshair = (radiusHair: IHairRadius, crosshairInfo: IPolarCrosshairInfo) => {\n  const { center, startAngle, endAngle, distance, sides, axis, point, radius, innerRadius } = crosshairInfo;\n\n  const crosshairType = radiusHair.smooth ? 'circle' : 'polygon';\n\n  let polygonRadius = distance;\n  if (crosshairType === 'polygon') {\n    const axisCenter = axis.getCenter();\n    // 需要计算半径\n    // 获取当前点的角度\n    const curAngle = getAngleByPoint(axisCenter, point);\n    const stepAngle = (endAngle - startAngle) / sides;\n    const index = Math.floor((curAngle - startAngle) / stepAngle);\n    const preAngle = index * stepAngle + startAngle;\n    const nextAngle = Math.min((index + 1) * stepAngle + startAngle, endAngle);\n\n    const prePoint = polarToCartesian(axisCenter, distance, preAngle);\n    const nextPoint = polarToCartesian(axisCenter, distance, nextAngle);\n    // 求交点\n    const insertPoint = getIntersectPoint(\n      [nextPoint.x, nextPoint.y],\n      [prePoint.x, prePoint.y],\n      [axisCenter.x, axisCenter.y],\n      [point.x, point.y]\n    );\n    if (insertPoint) {\n      polygonRadius = clamp(\n        PointService.distancePN(point, insertPoint[0], insertPoint[1]) + distance,\n        innerRadius,\n        radius\n      );\n    }\n  }\n  const positionAttrs = {\n    center,\n    startAngle: startAngle,\n    endAngle: endAngle,\n    radius: polygonRadius,\n    sides\n  };\n\n  return positionAttrs;\n};\n"]}
+{"version":3,"sources":["../src/component/crosshair/utils/polar.ts"],"names":[],"mappings":"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","file":"polar.js","sourcesContent":["import type { BandScale } from '@visactor/vscale';\nimport type { IPolarSeries } from '../../../series';\nimport type { CrossHairStateByField, CrossHairStateItem, ICrosshairInfo } from '../interface';\nimport { getAxisLabelOffset } from '../../axis/util';\nimport { PointService, clamp, getAngleByPoint, getIntersectPoint, isValid, polarToCartesian } from '@visactor/vutils';\nimport type { ILinearAxis, IPolarAxis } from '../../axis';\nimport { getFormatFunction } from '../../util';\nimport type { ILayoutPoint } from '../../../typings/layout';\n\nexport const layoutByValue = (\n  stateByField: CrossHairStateByField,\n  series: IPolarSeries,\n  enableRemain: boolean = false\n) => {\n  Object.keys(stateByField).forEach(field => {\n    const { attributes, currentValue, cacheInfo, coordKey } = stateByField[field];\n\n    if (attributes) {\n      const isVisible = !!currentValue.size;\n      const useCache = enableRemain && !isVisible && isValid(cacheInfo);\n      const newInfo = useCache\n        ? cacheInfo\n        : ({\n            coord: 0,\n            axis: null,\n            visible: isVisible,\n            coordRange: [0, 0],\n            sizeRange: [0, 0],\n            labels: {\n              all: { visible: false, text: '', offset: 0 }\n            }\n          } as ICrosshairInfo);\n      if (cacheInfo) {\n        cacheInfo._isCache = useCache;\n      }\n\n      if (field === 'valueField') {\n        (newInfo as any).sides = (series.angleAxisHelper.getScale(0) as BandScale).domain().length;\n      }\n\n      currentValue.forEach(({ axis, datum: value = '' }) => {\n        const niceLabelFormatter = (axis as ILinearAxis).niceLabelFormatter;\n\n        if (attributes.label?.visible) {\n          newInfo.labels.all.visible = true;\n          newInfo.labels.all.defaultFormatter = niceLabelFormatter;\n          newInfo.labels.all.text = value;\n          newInfo.labels.all.offset = getAxisLabelOffset(axis.getSpec());\n        }\n\n        if (field === 'categoryField') {\n          const angle = series.angleAxisHelper.dataToPosition([value]);\n          const bandSize = series.angleAxisHelper.getBandwidth(0);\n          const radius = (axis as IPolarAxis).getOuterRadius();\n\n          newInfo.coord = angle;\n          newInfo.coordRange = [angle - bandSize / 2, angle + bandSize / 2];\n          newInfo.sizeRange = [radius, radius];\n        } else {\n          const angle = (axis as IPolarAxis).startAngle;\n          const radius = series.radiusAxisHelper.dataToPosition([value]);\n\n          newInfo.coord = radius;\n          newInfo.coordRange = [radius, radius];\n          newInfo.sizeRange = [angle, angle];\n        }\n\n        newInfo.axis = axis as IPolarAxis;\n      });\n\n      if (newInfo && !useCache) {\n        if (newInfo.labels.all.visible) {\n          if (attributes && attributes.label) {\n            const label = newInfo.labels.all;\n            const { formatMethod, formatter } = attributes.label;\n            const { formatFunc, args } = getFormatFunction(formatMethod, formatter, label.text, {\n              label: label.text,\n              orient: coordKey\n            });\n            if (formatFunc) {\n              label.text = formatFunc(...args);\n            } else if (label.defaultFormatter) {\n              label.text = label.defaultFormatter(label.text);\n            }\n          }\n        }\n      }\n\n      stateByField[field].cacheInfo = newInfo;\n    }\n  });\n};\n\nexport const layoutCrosshair = (stateItem: CrossHairStateItem, layoutStartPoint: ILayoutPoint, smooth?: boolean) => {\n  const { cacheInfo, coordKey, attributes } = stateItem;\n  const { axis, coord, sizeRange, coordRange } = cacheInfo;\n  const axisCenter = (axis as IPolarAxis).getCenter();\n  const center = {\n    x: axisCenter.x + layoutStartPoint.x,\n    y: axisCenter.y + layoutStartPoint.y\n  };\n\n  if (coordKey === 'angle') {\n    const crosshairType = attributes.type === 'rect' ? 'sector' : 'line';\n\n    if (crosshairType === 'sector') {\n      // angle 轴对应的crosshair\n      return {\n        center,\n        innerRadius: (axis as IPolarAxis).getInnerRadius(),\n        radius: (axis as IPolarAxis).getOuterRadius(),\n        startAngle: coordRange[0],\n        endAngle: coordRange[1]\n      };\n    }\n    // angle 轴对应的crosshair\n    return {\n      start: polarToCartesian(center, (axis as IPolarAxis).getInnerRadius(), coord),\n      end: polarToCartesian(center, (axis as IPolarAxis).getOuterRadius(), coord)\n    };\n  }\n\n  const startAngle = (axis as IPolarAxis).startAngle;\n  const endAngle = (axis as IPolarAxis).endAngle;\n  const sides = cacheInfo.sides;\n\n  let polygonRadius = coord;\n  if (!smooth) {\n    const axisCenter = (axis as IPolarAxis).getCenter();\n    // 需要计算半径\n    // 获取当前点的角度\n    const point = (axis as IPolarAxis).coordToPoint({\n      angle: sizeRange[0],\n      radius: coord\n    });\n    const curAngle = getAngleByPoint(axisCenter, point);\n    const stepAngle = (endAngle - startAngle) / sides;\n    const index = Math.floor((curAngle - startAngle) / stepAngle);\n    const preAngle = index * stepAngle + startAngle;\n    const nextAngle = Math.min((index + 1) * stepAngle + startAngle, endAngle);\n\n    const prePoint = polarToCartesian(axisCenter, coord, preAngle);\n    const nextPoint = polarToCartesian(axisCenter, coord, nextAngle);\n    // 求交点\n    const insertPoint = getIntersectPoint(\n      [nextPoint.x, nextPoint.y],\n      [prePoint.x, prePoint.y],\n      [axisCenter.x, axisCenter.y],\n      [point.x, point.y]\n    );\n    if (insertPoint) {\n      polygonRadius = clamp(\n        PointService.distancePN(point, (insertPoint as [number, number])[0], (insertPoint as [number, number])[1]) +\n          coord,\n        (axis as IPolarAxis).getInnerRadius(),\n        (axis as IPolarAxis).getOuterRadius()\n      );\n    }\n  }\n  return {\n    center,\n    startAngle: startAngle,\n    endAngle: endAngle,\n    radius: polygonRadius,\n    sides\n  };\n};\n"]}

package/cjs/component/custom-mark/custom-mark.js

@@ -29,20 +29,13 @@ class CustomMark extends base_component_1.BaseComponent {
     }
     initMarks() {
         if (!this._spec) return;
-        const series = this._option && this._option.getAllSeries(), hasAnimation = !1 !== this._option.animation, depend = [];
-        series && series.length && series.forEach((s => {
-            const marks = s && s.getMarksWithoutRoot();
-            marks && marks.length && marks.forEach((mark => {
-                depend.push(mark);
-            }));
-        }));
+        const hasAnimation = !1 !== this._option.animation;
         let parentMark = null;
         if (this._spec.parent) {
             const mark = this.getChart().getAllMarks().find((m => m.getUserId() === this._spec.parent));
             "group" === mark.type && (parentMark = mark);
         }
         this._createExtensionMark(this._spec, parentMark, `${base_1.PREFIX}_series_${this.id}_extensionMark`, 0, {
-            depend: depend,
             hasAnimation: hasAnimation
         });
     }
@@ -62,8 +55,7 @@ class CustomMark extends base_component_1.BaseComponent {
                 const config = (0, utils_1.animationConfig)({}, (0, utils_1.userAnimationConfig)(spec.type, spec, this._markAttributeContext));
                 mark.setAnimationConfig(config);
             }
-            if (options.depend && options.depend.length && mark.setDepend(...options.depend), 
-            (0, vutils_1.isNil)(parentMark) ? this._marks.addMark(mark) : parentMark && parentMark.addMark(mark), 
+            if ((0, vutils_1.isNil)(parentMark) ? this._marks.addMark(mark) : parentMark && parentMark.addMark(mark), 
             this.initMarkStyleWithSpec(mark, spec), "group" === spec.type && (namePrefix = `${namePrefix}_${index}`, 
             null === (_a = spec.children) || void 0 === _a || _a.forEach(((s, i) => {
                 this._createExtensionMark(s, mark, namePrefix, i, options);
@@ -104,7 +96,7 @@ class CustomMark extends base_component_1.BaseComponent {
         const bounds = new vutils_1.Bounds;
         return this.getMarks().forEach((mark => {
             const product = mark.getProduct();
-            product && bounds.union(product.getBounds());
+            product && bounds.union(product.AABBBounds);
         })), bounds.empty() ? {
             width: 0,
             height: 0

package/cjs/component/custom-mark/custom-mark.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/custom-mark/custom-mark.ts"],"names":[],"mappings":"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","file":"custom-mark.js","sourcesContent":["import { BaseComponent } from '../base/base-component';\nimport { ComponentTypeEnum } from '../interface/type';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IRegion } from '../../region/interface';\nimport type { IModelRenderOption } from '../../model/interface';\nimport { LayoutLevel, LayoutZIndex } from '../../constant/layout';\nimport { PREFIX } from '../../constant/base';\nimport type { EnableMarkType, ICustomMarkGroupSpec, ICustomMarkSpec, ILayoutRect } from '../../typings';\nimport type { IGroupMark, IMark } from '../../mark/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { Bounds, isEqual, isNil, isValid, isValidNumber } from '@visactor/vutils';\nimport { Factory } from '../../core/factory';\nimport type { IGraphic } from '@visactor/vrender-core';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport type { IModelMarkAttributeContext } from '../../compile/mark/interface';\n\n// TODO: 规范范型\nexport class CustomMark extends BaseComponent<ICustomMarkSpec<EnableMarkType>> {\n  static type = ComponentTypeEnum.customMark;\n  type = ComponentTypeEnum.customMark;\n\n  static specKey = 'customMark';\n  specKey = 'customMark';\n\n  layoutType: 'none' = 'none';\n  layoutZIndex: number = LayoutZIndex.CustomMark;\n  layoutLevel: number = LayoutLevel.CustomMark;\n\n  protected declare _spec: ICustomMarkSpec<Exclude<EnableMarkType, 'group'>> | ICustomMarkGroupSpec;\n\n  created() {\n    super.created();\n    this.initMarks();\n    this.initEvent();\n  }\n\n  protected _markAttributeContext: IModelMarkAttributeContext;\n  getMarkAttributeContext() {\n    return this._markAttributeContext;\n  }\n\n  protected _buildMarkAttributeContext() {\n    this._markAttributeContext = {\n      vchart: this._option.globalInstance,\n      globalScale: (key: string, value: string | number) => {\n        return this._option.globalScale.getScale(key)?.scale(value);\n      }\n    };\n  }\n\n  protected initMarks() {\n    if (!this._spec) {\n      return;\n    }\n    const series = this._option && this._option.getAllSeries();\n    const hasAnimation = this._option.animation !== false;\n    const depend: IMark[] = [];\n\n    if (series && series.length) {\n      series.forEach(s => {\n        const marks = s && s.getMarksWithoutRoot();\n\n        if (marks && marks.length) {\n          marks.forEach(mark => {\n            depend.push(mark);\n          });\n        }\n      });\n    }\n    let parentMark: IGroupMark | null = null;\n    if (this._spec.parent) {\n      const mark = this.getChart()\n        .getAllMarks()\n        .find(m => m.getUserId() === this._spec.parent) as IGroupMark;\n      if (mark.type === 'group') {\n        parentMark = mark;\n      }\n    }\n    this._createExtensionMark(this._spec, parentMark, `${PREFIX}_series_${this.id}_extensionMark`, 0, {\n      depend,\n      hasAnimation\n    });\n  }\n\n  private _createExtensionMark(\n    spec: ICustomMarkSpec<Exclude<EnableMarkType, 'group'>> | ICustomMarkGroupSpec,\n    parentMark: null | IGroupMark,\n    namePrefix: string,\n    index: number = 0,\n    options: { hasAnimation?: boolean; depend?: IMark[] }\n  ) {\n    const mark = this._createMark(\n      {\n        type: spec.type,\n        name: isValid(spec.name) ? `${spec.name}` : `${namePrefix}_${index}`\n      },\n      {\n        // 避免二次dataflow\n        skipBeforeLayouted: true,\n        attributeContext: this._getMarkAttributeContext(),\n        componentType: spec.componentType,\n        key: spec.dataKey\n      }\n    ) as IGroupMark;\n    if (!mark) {\n      return;\n    }\n\n    if (isValid(spec.id)) {\n      mark.setUserId(spec.id);\n    }\n\n    if (options.hasAnimation && spec.animation) {\n      // 自定义图元默认不添加动画\n      const config = animationConfig({}, userAnimationConfig(spec.type, spec as any, this._markAttributeContext));\n      mark.setAnimationConfig(config);\n    }\n\n    if (options.depend && options.depend.length) {\n      mark.setDepend(...options.depend);\n    }\n    if (isNil(parentMark)) {\n      this._marks.addMark(mark);\n    } else if (parentMark) {\n      parentMark.addMark(mark);\n    }\n    // set style\n    this.initMarkStyleWithSpec(mark, spec);\n    if (spec.type === 'group') {\n      namePrefix = `${namePrefix}_${index}`;\n      spec.children?.forEach((s, i) => {\n        this._createExtensionMark(s as any, mark, namePrefix, i, options);\n      });\n    }\n\n    if (isValid(spec.dataId) || isValidNumber(spec.dataIndex)) {\n      const dataview = this.getChart().getSeriesData(spec.dataId, spec.dataIndex);\n      if (dataview) {\n        dataview.target.addListener('change', () => {\n          mark.getData().updateData();\n        });\n        mark.setDataView(dataview);\n      }\n    }\n  }\n\n  initEvent() {\n    // do nothing\n  }\n\n  /**\n   * updateSpec\n   */\n  _compareSpec(spec: ICustomMarkSpec<EnableMarkType>, prevSpec: ICustomMarkSpec<EnableMarkType>) {\n    const result = super._compareSpec(spec, prevSpec);\n    if (!isEqual(prevSpec, spec)) {\n      result.reMake = true;\n    }\n\n    result.change = true;\n    result.reRender = true;\n    return result;\n  }\n\n  changeRegions(regions: IRegion[]): void {\n    // do nothing;\n  }\n\n  protected _getNeedClearVRenderComponents(): IGraphic[] {\n    return [];\n  }\n\n  onRender(ctx: IModelRenderOption): void {\n    // do nothing;\n  }\n\n  private _getMarkAttributeContext() {\n    return {\n      vchart: this._option.globalInstance,\n      chart: this.getChart(),\n      globalScale: (key: string, value: string | number) => {\n        return this._option.globalScale.getScale(key)?.scale(value);\n      },\n      getLayoutBounds: () => {\n        const { x, y } = this.getLayoutStartPoint();\n        const { width, height } = this.getLayoutRect();\n        return new Bounds().set(x, y, x + width, y + height);\n      }\n    };\n  }\n\n  private _getLayoutRect() {\n    const bounds = new Bounds();\n\n    this.getMarks().forEach(mark => {\n      const product = mark.getProduct();\n\n      if (product) {\n        bounds.union(product.getBounds());\n      }\n    });\n\n    if (bounds.empty()) {\n      return {\n        width: 0,\n        height: 0\n      };\n    }\n\n    return {\n      width: bounds.width(),\n      height: bounds.height()\n    };\n  }\n\n  getBoundsInRect(rect: ILayoutRect) {\n    this.setLayoutRect(rect);\n\n    const result = this._getLayoutRect();\n    const { x, y } = this.getLayoutStartPoint();\n    return {\n      x1: x,\n      y1: y,\n      x2: x + result.width,\n      y2: y + result.height\n    };\n  }\n}\n\nexport const registerCustomMark = () => {\n  Factory.registerComponent(CustomMark.type, CustomMark);\n};\n"]}
+{"version":3,"sources":["../src/component/custom-mark/custom-mark.ts"],"names":[],"mappings":"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","file":"custom-mark.js","sourcesContent":["import { BaseComponent } from '../base/base-component';\nimport { ComponentTypeEnum } from '../interface/type';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IRegion } from '../../region/interface';\nimport type { IModelRenderOption } from '../../model/interface';\nimport { LayoutLevel, LayoutZIndex } from '../../constant/layout';\nimport { PREFIX } from '../../constant/base';\nimport type { EnableMarkType, ICustomMarkGroupSpec, ICustomMarkSpec, ILayoutRect } from '../../typings';\nimport type { IGroupMark, IMark } from '../../mark/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { Bounds, isEqual, isNil, isValid, isValidNumber } from '@visactor/vutils';\nimport { Factory } from '../../core/factory';\nimport type { IGraphic } from '@visactor/vrender-core';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport type { IModelMarkAttributeContext } from '../../compile/mark/interface';\n\n// TODO: 规范范型\nexport class CustomMark extends BaseComponent<ICustomMarkSpec<EnableMarkType>> {\n  static type = ComponentTypeEnum.customMark;\n  type = ComponentTypeEnum.customMark;\n\n  static specKey = 'customMark';\n  specKey = 'customMark';\n\n  layoutType: 'none' = 'none';\n  layoutZIndex: number = LayoutZIndex.CustomMark;\n  layoutLevel: number = LayoutLevel.CustomMark;\n\n  protected declare _spec: ICustomMarkSpec<Exclude<EnableMarkType, 'group'>> | ICustomMarkGroupSpec;\n\n  created() {\n    super.created();\n    this.initMarks();\n    this.initEvent();\n  }\n\n  protected _markAttributeContext: IModelMarkAttributeContext;\n  getMarkAttributeContext() {\n    return this._markAttributeContext;\n  }\n\n  protected _buildMarkAttributeContext() {\n    this._markAttributeContext = {\n      vchart: this._option.globalInstance,\n      globalScale: (key: string, value: string | number) => {\n        return this._option.globalScale.getScale(key)?.scale(value);\n      }\n    };\n  }\n\n  protected initMarks() {\n    if (!this._spec) {\n      return;\n    }\n    const hasAnimation = this._option.animation !== false;\n\n    let parentMark: IGroupMark | null = null;\n    if (this._spec.parent) {\n      const mark = this.getChart()\n        .getAllMarks()\n        .find(m => m.getUserId() === this._spec.parent) as IGroupMark;\n      if (mark.type === 'group') {\n        parentMark = mark;\n      }\n    }\n    this._createExtensionMark(this._spec, parentMark, `${PREFIX}_series_${this.id}_extensionMark`, 0, {\n      hasAnimation\n    });\n  }\n\n  private _createExtensionMark(\n    spec: ICustomMarkSpec<Exclude<EnableMarkType, 'group'>> | ICustomMarkGroupSpec,\n    parentMark: null | IGroupMark,\n    namePrefix: string,\n    index: number = 0,\n    options: { hasAnimation?: boolean }\n  ) {\n    const mark = this._createMark(\n      {\n        type: spec.type,\n        name: isValid(spec.name) ? `${spec.name}` : `${namePrefix}_${index}`\n      },\n      {\n        // 避免二次dataflow\n        skipBeforeLayouted: true,\n        attributeContext: this._getMarkAttributeContext(),\n        componentType: spec.componentType,\n        key: spec.dataKey\n      }\n    ) as IGroupMark;\n    if (!mark) {\n      return;\n    }\n\n    if (isValid(spec.id)) {\n      mark.setUserId(spec.id);\n    }\n\n    if (options.hasAnimation && spec.animation) {\n      // 自定义图元默认不添加动画\n      const config = animationConfig({}, userAnimationConfig(spec.type, spec as any, this._markAttributeContext));\n      mark.setAnimationConfig(config);\n    }\n\n    if (isNil(parentMark)) {\n      this._marks.addMark(mark);\n    } else if (parentMark) {\n      parentMark.addMark(mark);\n    }\n    // set style\n    this.initMarkStyleWithSpec(mark, spec);\n    if (spec.type === 'group') {\n      namePrefix = `${namePrefix}_${index}`;\n      spec.children?.forEach((s, i) => {\n        this._createExtensionMark(s as any, mark, namePrefix, i, options);\n      });\n    }\n\n    if (isValid(spec.dataId) || isValidNumber(spec.dataIndex)) {\n      const dataview = this.getChart().getSeriesData(spec.dataId, spec.dataIndex);\n      if (dataview) {\n        dataview.target.addListener('change', () => {\n          mark.getData().updateData();\n        });\n        mark.setDataView(dataview);\n      }\n    }\n  }\n\n  initEvent() {\n    // do nothing\n  }\n\n  /**\n   * updateSpec\n   */\n  _compareSpec(spec: ICustomMarkSpec<EnableMarkType>, prevSpec: ICustomMarkSpec<EnableMarkType>) {\n    const result = super._compareSpec(spec, prevSpec);\n    if (!isEqual(prevSpec, spec)) {\n      result.reMake = true;\n    }\n\n    result.change = true;\n    result.reRender = true;\n    return result;\n  }\n\n  changeRegions(regions: IRegion[]): void {\n    // do nothing;\n  }\n\n  protected _getNeedClearVRenderComponents(): IGraphic[] {\n    return [];\n  }\n\n  onRender(ctx: IModelRenderOption): void {\n    // do nothing;\n  }\n\n  private _getMarkAttributeContext() {\n    return {\n      vchart: this._option.globalInstance,\n      chart: this.getChart(),\n      globalScale: (key: string, value: string | number) => {\n        return this._option.globalScale.getScale(key)?.scale(value);\n      },\n      getLayoutBounds: () => {\n        const { x, y } = this.getLayoutStartPoint();\n        const { width, height } = this.getLayoutRect();\n        return new Bounds().set(x, y, x + width, y + height);\n      }\n    };\n  }\n\n  private _getLayoutRect() {\n    const bounds = new Bounds();\n\n    this.getMarks().forEach(mark => {\n      const product = mark.getProduct();\n\n      if (product) {\n        bounds.union(product.AABBBounds);\n      }\n    });\n\n    if (bounds.empty()) {\n      return {\n        width: 0,\n        height: 0\n      };\n    }\n\n    return {\n      width: bounds.width(),\n      height: bounds.height()\n    };\n  }\n\n  getBoundsInRect(rect: ILayoutRect) {\n    this.setLayoutRect(rect);\n\n    const result = this._getLayoutRect();\n    const { x, y } = this.getLayoutStartPoint();\n    return {\n      x1: x,\n      y1: y,\n      x2: x + result.width,\n      y2: y + result.height\n    };\n  }\n}\n\nexport const registerCustomMark = () => {\n  Factory.registerComponent(CustomMark.type, CustomMark);\n};\n"]}

package/cjs/component/data-zoom/data-filter-base-component.d.ts

@@ -79,7 +79,7 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
     protected _initEvent(): void;
     protected _initData(): void;
     setAttrFromSpec(): void;
-    protected _statePointToData(state: number): any;
+    statePointToData(state: number): any;
     dataToStatePoint(data: number | string): number;
     protected _modeCheck(statePoint: 'start' | 'end', mode: string): any;
     protected _setStateFromSpec(): void;
@@ -105,7 +105,7 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
         zoomDelta: number;
         zoomX?: number;
         zoomY?: number;
-    }) => void;
+    }, e?: BaseEventParams['event']) => void;
     protected _handleChartScroll: (params: {
         scrollX: number;
         scrollY: number;
@@ -115,8 +115,8 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
     protected _initCommonEvent(): void;
     updateLayoutAttribute(): void;
     protected _autoVisible(isShown: boolean): void;
-    onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, ctx: any): void;
-    onLayoutEnd(ctx: any): void;
+    onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect): void;
+    onLayoutEnd(): void;
     getBoundsInRect(rect: ILayoutRect): IBoundsLike;
     hide(): void;
     show(): void;

package/cjs/component/data-zoom/data-filter-base-component.js

@@ -122,9 +122,9 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
             return this._startValue = startValue, this._endValue = endValue, this._newDomain = this._parseDomainFromState(this._startValue, this._endValue), 
             null === (_b = (_a = this.effect).onZoomChange) || void 0 === _b || _b.call(_a, tag), 
             !0;
-        }, this._handleChartZoom = params => {
+        }, this._handleChartZoom = (params, e) => {
             var _a, _b;
-            if (!this._activeRoam) return;
+            if (!this._activeRoam || this._zoomAttr.filter && !this._zoomAttr.filter(params, e)) return;
             const {zoomDelta: zoomDelta, zoomX: zoomX, zoomY: zoomY} = params, {x: x, y: y} = this._regions[0].getLayoutStartPoint(), {width: width, height: height} = this._regions[0].getLayoutRect(), delta = Math.abs(this._start - this._end), zoomRate = null !== (_b = null === (_a = this._spec.roamZoom) || void 0 === _a ? void 0 : _a.rate) && void 0 !== _b ? _b : 1;
             if (delta >= 1 && zoomDelta < 1) return;
             if (delta <= .01 && zoomDelta > 1) return;
@@ -139,7 +139,7 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
             this._handleChange(Math.min(start, end), Math.max(start, end), !0);
         }, this._handleChartScroll = (params, e) => {
             var _a;
-            if (!this._activeRoam) return !1;
+            if (!this._activeRoam || this._scrollAttr.filter && !this._scrollAttr.filter(params, e)) return !1;
             const {scrollX: scrollX, scrollY: scrollY} = params;
             let value = this._isHorizontal ? scrollX : scrollY;
             const active = this._isHorizontal ? (0, vutils_1.abs)(scrollX / scrollY) >= .5 : (0, 
@@ -149,7 +149,7 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
             return active && hasChange;
         }, this._handleChartDrag = (delta, e) => {
             var _a;
-            if (!this._activeRoam) return;
+            if (!this._activeRoam || this._dragAttr.filter && !this._dragAttr.filter(delta, e)) return;
             const [dx, dy] = delta;
             let value = this._isHorizontal ? dx : dy;
             this._dragAttr.reverse && (value = -value), this._handleChartMove(value, null !== (_a = this._dragAttr.rate) && void 0 !== _a ? _a : 1);
@@ -288,7 +288,7 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
         this._field = this._spec.field, this._width = this._computeWidth(), this._height = this._computeHeight(), 
         this._visible = null === (_a = this._spec.visible) || void 0 === _a || _a;
     }
-    _statePointToData(state) {
+    statePointToData(state) {
         const scale = this._stateScale, domain = scale.domain();
         if ((0, vscale_1.isContinuous)(scale.type)) return this._isReverse() ? domain[0] + ((0, 
         vutils_1.last)(domain) - domain[0]) * (1 - state) : domain[0] + ((0, vutils_1.last)(domain) - domain[0]) * state;
@@ -317,7 +317,7 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
             end = "percent" === endMode ? this._spec.end : this.dataToStatePoint(this._spec.endValue));
         } else start = this._spec.start ? this._spec.start : this._spec.startValue ? this.dataToStatePoint(this._spec.startValue) : 0, 
         end = this._spec.end ? this._spec.end : this._spec.endValue ? this.dataToStatePoint(this._spec.endValue) : 1;
-        this._startValue = this._statePointToData(start), this._endValue = this._statePointToData(end), 
+        this._startValue = this.statePointToData(start), this._endValue = this.statePointToData(end), 
         this._start = start, this._end = end, this._minSpan = null !== (_a = this._spec.minSpan) && void 0 !== _a ? _a : 0, 
         this._maxSpan = null !== (_b = this._spec.maxSpan) && void 0 !== _b ? _b : 1, (0, 
         vscale_1.isContinuous)(this._stateScale.type) && this._stateScale.domain()[0] !== (0, 
@@ -403,7 +403,8 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
         const option = {
             delayType: null !== (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.delayType) && void 0 !== _b ? _b : "throttle",
             delayTime: (0, vutils_1.isValid)(null === (_c = this._spec) || void 0 === _c ? void 0 : _c.delayType) ? null !== (_e = null === (_d = this._spec) || void 0 === _d ? void 0 : _d.delayTime) && void 0 !== _e ? _e : 30 : 0,
-            realTime: null === (_g = null === (_f = this._spec) || void 0 === _f ? void 0 : _f.realTime) || void 0 === _g || _g
+            realTime: null === (_g = null === (_f = this._spec) || void 0 === _f ? void 0 : _f.realTime) || void 0 === _g || _g,
+            allowComponentZoom: !0
         };
         this._zoomAttr.enable && this.initZoomEventOfRegions(this._regions, null, this._handleChartZoom, option), 
         this._scrollAttr.enable && this.initScrollEventOfRegions(this._regions, null, this._handleChartScroll, option), 
@@ -422,14 +423,14 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
             [sizeKey]: attribute_1.AttributeLevel.Built_In
         });
     }
-    onLayoutStart(layoutRect, viewRect, ctx) {
-        super.onLayoutStart(layoutRect, viewRect, ctx);
+    onLayoutStart(layoutRect, viewRect) {
+        super.onLayoutStart(layoutRect, viewRect);
         const isShown = this._autoUpdate(layoutRect);
         this._autoVisible(isShown), this._dataUpdating = !1;
     }
-    onLayoutEnd(ctx) {
+    onLayoutEnd() {
         const isShown = !(0 === this._start && 1 === this._end);
-        this._autoVisible(isShown), super.onLayoutEnd(ctx);
+        this._autoVisible(isShown), super.onLayoutEnd();
     }
     getBoundsInRect(rect) {
         const result = {