@visactor/vchart 1.11.0-alpha.1 → 1.11.0-alpha.3

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 { IPolarAxis } from '../../axis';\nimport { mergeSpec } from '../../../util';\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      if (angleHair.label?.visible) {\n        angleCrossHairInfo.label.visible = true;\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      if (radiusHair.label?.visible) {\n        radiusCrossHairInfo.label.visible = true;\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        }\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        }\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 { 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"]}

package/cjs/component/custom-mark/custom-mark.d.ts

@@ -2,11 +2,11 @@ import { BaseComponent } from '../base/base-component';
 import { ComponentTypeEnum } from '../interface/type';
 import type { IRegion } from '../../region/interface';
 import type { IModelRenderOption, IModelSpecInfo } from '../../model/interface';
-import type { EnableMarkType, ICustomMarkGroupSpec, ICustomMarkSpec } from '../../typings';
+import type { EnableMarkType, ICustomMarkGroupSpec, ICustomMarkSpec, ILayoutRect } from '../../typings';
 import type { Maybe } from '@visactor/vutils';
 import type { IGraphic } from '@visactor/vrender-core';
 import type { IModelMarkAttributeContext } from '../../compile/mark/interface';
-export declare class CustomMark<T = any> extends BaseComponent<any> {
+export declare class CustomMark extends BaseComponent<ICustomMarkSpec<EnableMarkType>> {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     static specKey: string;
@@ -14,7 +14,7 @@ export declare class CustomMark<T = any> extends BaseComponent<any> {
     layoutType: 'none';
     layoutZIndex: number;
     layoutLevel: number;
-    protected _spec: (ICustomMarkSpec<Exclude<EnableMarkType, 'group'>> | ICustomMarkGroupSpec)[];
+    protected _spec: ICustomMarkSpec<Exclude<EnableMarkType, 'group'>> | ICustomMarkGroupSpec;
     static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]>;
     created(): void;
     protected _markAttributeContext: IModelMarkAttributeContext;
@@ -23,7 +23,7 @@ export declare class CustomMark<T = any> extends BaseComponent<any> {
     protected initMarks(): void;
     private _createExtensionMark;
     initEvent(): void;
-    _compareSpec(spec: T, prevSpec: T): {
+    _compareSpec(spec: ICustomMarkSpec<EnableMarkType>, prevSpec: ICustomMarkSpec<EnableMarkType>): {
         change: boolean;
         reMake: boolean;
         reRender: boolean;
@@ -35,5 +35,12 @@ export declare class CustomMark<T = any> extends BaseComponent<any> {
     onRender(ctx: IModelRenderOption): void;
     afterCompile(): void;
     private _getMarkAttributeContext;
+    private _getLayoutRect;
+    getBoundsInRect(rect: ILayoutRect): {
+        x1: number;
+        y1: number;
+        x2: number;
+        y2: number;
+    };
 }
 export declare const registerCustomMark: () => void;

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerCustomMark = exports.CustomMark = void 0;
 
-const base_component_1 = require("../base/base-component"), type_1 = require("../interface/type"), constant_1 = require("../../constant"), vutils_1 = require("@visactor/vutils"), factory_1 = require("../../core/factory"), image_1 = require("../../mark/image"), vgrammar_core_1 = require("@visactor/vgrammar-core"), utils_1 = require("../../animation/utils");
+const base_component_1 = require("../base/base-component"), type_1 = require("../interface/type"), constant_1 = require("../../constant"), vutils_1 = require("@visactor/vutils"), factory_1 = require("../../core/factory"), vgrammar_core_1 = require("@visactor/vgrammar-core"), utils_1 = require("../../animation/utils");
 
 class CustomMark extends base_component_1.BaseComponent {
     constructor() {
@@ -14,7 +14,12 @@ class CustomMark extends base_component_1.BaseComponent {
     }
     static getSpecInfo(chartSpec) {
         const spec = chartSpec[this.specKey];
-        return spec ? [ {
+        return spec ? (0, vutils_1.isArray)(spec) ? spec.map(((specItem, i) => ({
+            spec: specItem,
+            specPath: [ this.specKey, i ],
+            specInfoPath: [ "component", this.specKey, i ],
+            type: type_1.ComponentTypeEnum.customMark
+        }))) : [ {
             spec: spec,
             specPath: [ this.specKey ],
             specInfoPath: [ "component", this.specKey, 0 ],
@@ -44,18 +49,16 @@ class CustomMark extends base_component_1.BaseComponent {
             marks && marks.length && marks.forEach((mark => {
                 depend.push(mark);
             }));
-        })), this._spec.forEach(((m, i) => {
-            this._createExtensionMark(m, null, `${constant_1.PREFIX}_series_${this.id}_extensionMark`, i, {
-                depend: depend,
-                hasAnimation: hasAnimation
-            });
-        }));
+        })), this._createExtensionMark(this._spec, null, `${constant_1.PREFIX}_series_${this.id}_extensionMark`, 0, {
+            depend: depend,
+            hasAnimation: hasAnimation
+        });
     }
-    _createExtensionMark(spec, parentMark, namePrefix, index, options) {
+    _createExtensionMark(spec, parentMark, namePrefix, index = 0, options) {
         var _a;
         const mark = this._createMark({
             type: spec.type,
-            name: `${constant_1.PREFIX}_${index}`
+            name: `${namePrefix}_${index}`
         }, {
             skipBeforeLayouted: !0,
             attributeContext: this._getMarkAttributeContext(),
@@ -63,7 +66,7 @@ class CustomMark extends base_component_1.BaseComponent {
             key: spec.dataKey
         });
         if (mark) {
-            if (options.hasAnimation) {
+            if (options.hasAnimation && spec.animation) {
                 const config = (0, utils_1.animationConfig)({}, (0, utils_1.userAnimationConfig)(spec.type, spec, this._markAttributeContext));
                 mark.setAnimationConfig(config);
             }
@@ -105,19 +108,47 @@ class CustomMark extends base_component_1.BaseComponent {
     _getMarkAttributeContext() {
         return {
             vchart: this._option.globalInstance,
+            chart: this.getChart(),
             globalScale: (key, value) => {
                 var _a;
                 return null === (_a = this._option.globalScale.getScale(key)) || void 0 === _a ? void 0 : _a.scale(value);
+            },
+            getLayoutBounds: () => {
+                const {x: x, y: y} = this.getLayoutStartPoint(), {width: width, height: height} = this.getLayoutRect();
+                return (new vutils_1.Bounds).set(x, y, x + width, y + height);
             }
         };
     }
+    _getLayoutRect() {
+        const bounds = new vutils_1.Bounds;
+        return this.getMarks().forEach((mark => {
+            const product = mark.getProduct();
+            product && bounds.union(product.getBounds());
+        })), bounds.empty() ? {
+            width: 0,
+            height: 0
+        } : {
+            width: bounds.width(),
+            height: bounds.height()
+        };
+    }
+    getBoundsInRect(rect) {
+        this.setLayoutRect(rect);
+        const result = this._getLayoutRect(), {x: x, y: y} = this.getLayoutStartPoint();
+        return {
+            x1: x,
+            y1: y,
+            x2: x + result.width,
+            y2: y + result.height
+        };
+    }
 }
 
 exports.CustomMark = CustomMark, CustomMark.type = type_1.ComponentTypeEnum.customMark, 
 CustomMark.specKey = "customMark";
 
 const registerCustomMark = () => {
-    (0, image_1.registerImageMark)(), factory_1.Factory.registerComponent(CustomMark.type, CustomMark);
+    factory_1.Factory.registerComponent(CustomMark.type, CustomMark);
 };
 
 exports.registerCustomMark = registerCustomMark;

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, IModelSpecInfo } from '../../model/interface';\nimport { LayoutLevel, LayoutZIndex, PREFIX } from '../../constant';\nimport type { EnableMarkType, ICustomMarkGroupSpec, ICustomMarkSpec } from '../../typings';\nimport type { IGroupMark } from '../../mark/group';\nimport type { IMark } from '../../mark/interface';\nimport type { LooseFunction, Maybe } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isEqual, isNil, isValid, isValidNumber } from '@visactor/vutils';\nimport { Factory } from '../../core/factory';\nimport { registerImageMark } from '../../mark/image';\nimport type { IGraphic } from '@visactor/vrender-core';\nimport { HOOK_EVENT } from '@visactor/vgrammar-core';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport type { IModelMarkAttributeContext } from '../../compile/mark/interface';\n\n// TODO: 规范范型\nexport class CustomMark<T = any> extends BaseComponent<any> {\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  static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]> {\n    const spec = chartSpec[this.specKey];\n    if (!spec) {\n      return null;\n    }\n    return [\n      {\n        spec,\n        specPath: [this.specKey],\n        specInfoPath: ['component', this.specKey, 0],\n        type: ComponentTypeEnum.customMark\n      }\n    ];\n  }\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\n    this._spec.forEach((m, i) => {\n      this._createExtensionMark(m, null, `${PREFIX}_series_${this.id}_extensionMark`, i, { depend, hasAnimation });\n    });\n  }\n\n  private _createExtensionMark(\n    spec: ICustomMarkSpec<Exclude<EnableMarkType, 'group'>> | ICustomMarkGroupSpec,\n    parentMark: null | IGroupMark,\n    namePrefix: string,\n    index: number,\n    options: { hasAnimation?: boolean; depend?: IMark[] }\n  ) {\n    const mark = this._createMark(\n      {\n        type: spec.type,\n        name: `${PREFIX}_${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 (options.hasAnimation) {\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: T, prevSpec: T) {\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  afterCompile() {\n    this.getMarks().forEach(mark => {\n      const product = mark.getProduct();\n      if (product) {\n        product.addEventListener(HOOK_EVENT.AFTER_ELEMENT_ENCODE, () => {\n          if (this._isLayout === false) {\n            const component = product.getGroupGraphicItem();\n            // TODO: 待 vgrammar 提供接口后进行优化 @zwx\n            if (component.listenerCount('*') === 0) {\n              component.addEventListener('*', ((event: any, type: string) =>\n                this._delegateEvent(component as unknown as IGraphic, event, type)) as LooseFunction);\n            }\n          }\n        });\n      }\n    });\n  }\n  private _getMarkAttributeContext() {\n    return {\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\nexport const registerCustomMark = () => {\n  registerImageMark();\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, IModelSpecInfo } from '../../model/interface';\nimport { LayoutLevel, LayoutZIndex, PREFIX } from '../../constant';\nimport type { EnableMarkType, ICustomMarkGroupSpec, ICustomMarkSpec, ILayoutRect } from '../../typings';\nimport type { IGroupMark } from '../../mark/group';\nimport type { IMark } from '../../mark/interface';\nimport type { LooseFunction, Maybe } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { Bounds, isArray, isEqual, isNil, isValid, isValidNumber } from '@visactor/vutils';\nimport { Factory } from '../../core/factory';\nimport type { IGraphic } from '@visactor/vrender-core';\nimport { HOOK_EVENT } from '@visactor/vgrammar-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  static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]> {\n    const spec = chartSpec[this.specKey];\n    if (!spec) {\n      return null;\n    }\n\n    if (!isArray(spec)) {\n      return [\n        {\n          spec,\n          specPath: [this.specKey],\n          specInfoPath: ['component', this.specKey, 0],\n          type: ComponentTypeEnum.customMark\n        }\n      ];\n    }\n\n    return (spec as ICustomMarkSpec<EnableMarkType>[]).map((specItem, i) => {\n      return {\n        spec: specItem,\n        specPath: [this.specKey, i],\n        specInfoPath: ['component', this.specKey, i],\n        type: ComponentTypeEnum.customMark\n      };\n    });\n  }\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\n    this._createExtensionMark(this._spec, null, `${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: `${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 (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  afterCompile() {\n    this.getMarks().forEach(mark => {\n      const product = mark.getProduct();\n      if (product) {\n        product.addEventListener(HOOK_EVENT.AFTER_ELEMENT_ENCODE, () => {\n          if (this._isLayout === false) {\n            const component = product.getGroupGraphicItem();\n            // TODO: 待 vgrammar 提供接口后进行优化 @zwx\n            if (component.listenerCount('*') === 0) {\n              component.addEventListener('*', ((event: any, type: string) =>\n                this._delegateEvent(component as unknown as IGraphic, event, type)) as LooseFunction);\n            }\n          }\n        });\n      }\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"]}

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

@@ -5,7 +5,7 @@ import type { AdaptiveSpec, ILayoutRect, ILayoutType, IOrientType, IRect, String
 import type { IBaseScale } from '@visactor/vscale';
 import type { ICartesianBandAxisSpec } from '../axis/cartesian';
 import type { IBoundsLike } from '@visactor/vutils';
-import { IFilterMode } from './interface';
+import type { IFilterMode } from './interface';
 import type { IDataFilterComponent, IDataFilterComponentSpec, IRoamDragSpec, IRoamScrollSpec, IRoamZoomSpec } from './interface';
 import type { BaseEventParams } from '../../event/interface';
 import type { AbstractComponent } from '@visactor/vrender-components';
@@ -19,6 +19,7 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
     protected _fixedBandSize?: number;
     protected _cacheRect?: ILayoutRect;
     protected _cacheVisibility?: boolean;
+    protected _dataUpdating: boolean;
     protected _stateScale: IBaseScale;
     protected _relatedAxisComponent: IComponent;
     protected _originalStateFields: Record<number, string | number>;
@@ -110,7 +111,7 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
         scrollY: number;
     }, e: BaseEventParams['event']) => boolean;
     protected _handleChartDrag: (delta: [number, number], e: BaseEventParams['event']) => void;
-    protected _handleChartMove: (value: number, rate: number) => void;
+    protected _handleChartMove: (value: number, rate: number) => boolean;
     protected _initCommonEvent(): void;
     updateLayoutAttribute(): void;
     onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, ctx: any): void;

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

@@ -36,8 +36,8 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
     }
     _handleChange(start, end, updateComponent) {
         var _a, _b;
-        null !== (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.zoomLock) && void 0 !== _b && _b || end - start !== this._spanCache && (end - start < this._minSpan || end - start > this._maxSpan) ? this._shouldChange = !1 : this._shouldChange = !0, 
-        this._spanCache = end - start;
+        null !== (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.zoomLock) && void 0 !== _b && _b || end - start !== this._spanCache && (end - start < this._minSpan || end - start > this._maxSpan) ? this._shouldChange = !1 : (this._shouldChange = !0, 
+        this._spanCache = end - start);
     }
     _isReverse() {
         const axis = this._relatedAxisComponent;
@@ -79,7 +79,8 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
     }
     constructor(spec, options) {
         super(spec, options), this.layoutType = "none", this._orient = "left", this._cacheVisibility = void 0, 
-        this._shouldChange = !0, this._stateField = "x", this._activeRoam = !0, this._zoomAttr = {
+        this._dataUpdating = !1, this._shouldChange = !0, this._stateField = "x", this._activeRoam = !0, 
+        this._zoomAttr = {
             enable: !0,
             rate: 1,
             focus: !0
@@ -141,8 +142,9 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
             let value = this._isHorizontal ? scrollX : scrollY;
             const active = this._isHorizontal ? (0, vutils_1.abs)(scrollX / scrollY) >= .5 : (0, 
             vutils_1.abs)(scrollY / scrollX) >= .5;
-            return this._scrollAttr.reverse || (value = -value), active && this._handleChartMove(value, null !== (_a = this._scrollAttr.rate) && void 0 !== _a ? _a : 1), 
-            active;
+            this._scrollAttr.reverse || (value = -value), active && this._handleChartMove(value, null !== (_a = this._scrollAttr.rate) && void 0 !== _a ? _a : 1);
+            const hasChange = 0 !== this._start && 1 !== this._end;
+            return active && hasChange;
         }, this._handleChartDrag = (delta, e) => {
             var _a;
             if (!this._activeRoam) return;
@@ -158,6 +160,7 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
                 const moveDelta = Math.max(-this._start, value / totalValue) * rate;
                 this._handleChange(this._start + moveDelta, this._end + moveDelta, !0);
             }
+            return !1;
         }, this._orient = (0, common_1.getOrient)(spec), this._isHorizontal = "horizontal" === (0, 
         common_1.getDirectionByOrient)(this._orient);
     }
@@ -203,8 +206,10 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
         } else ;
     }
     onDataUpdate() {
+        var _a;
         const domain = this._computeDomainOfStateScale((0, vscale_1.isContinuous)(this._stateScale.type));
-        this._stateScale.domain(domain, !0), this._handleChange(this._start, this._end, !0);
+        this._stateScale.domain(domain, !0), this._handleChange(this._start, this._end, !0), 
+        this._spec.auto && (this._dataUpdating = !0, null === (_a = this.getChart()) || void 0 === _a || _a.setLayoutTag(!0, null, !1));
     }
     _computeDomainOfStateScale(isContinuous) {
         if (this._spec.customDomain) return this._spec.customDomain;
@@ -220,7 +225,6 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
     }
     _initData() {
         const dataCollection = [], stateFields = [], valueFields = [];
-        let hasValidateValueField = !1;
         if (this._relatedAxisComponent) {
             const originalStateFields = {};
             (0, model_1.eachSeries)(this._regions, (s => {
@@ -229,7 +233,7 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
                 if (!xAxisHelper || !yAxisHelper) return;
                 const stateAxisHelper = xAxisHelper.getAxisId() === this._relatedAxisComponent.id ? xAxisHelper : yAxisHelper.getAxisId() === this._relatedAxisComponent.id ? yAxisHelper : this._isHorizontal ? xAxisHelper : yAxisHelper, valueAxisHelper = stateAxisHelper === xAxisHelper ? yAxisHelper : xAxisHelper, isValidateValueAxis = (0, 
                 vscale_1.isContinuous)(valueAxisHelper.getScale(0).type);
-                isValidateValueAxis && (hasValidateValueField = !0), dataCollection.push(s.getRawData());
+                dataCollection.push(s.getRawData());
                 const seriesSpec = s.getSpec(), xFields = (0, vutils_1.array)(seriesSpec.xField), yFields = (0, 
                 vutils_1.array)(seriesSpec.yField), xField = "cartesian" === s.coordinate ? xFields[0] : null !== (_a = seriesSpec.angleField) && void 0 !== _a ? _a : seriesSpec.categoryField, yField = "cartesian" === s.coordinate ? yFields[0] : null !== (_b = seriesSpec.radiusField) && void 0 !== _b ? _b : seriesSpec.valueField;
                 if (originalStateFields[s.id] = "link" === s.type ? "from_xField" : stateAxisHelper === xAxisHelper ? xField : yField, 
@@ -241,7 +245,7 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
                 userId: this._seriesUserId,
                 specIndex: this._seriesIndex
             }), this._originalStateFields = originalStateFields;
-        } else hasValidateValueField = (0, vutils_1.isNil)(this._spec.valueField), (0, model_1.eachSeries)(this._regions, (s => {
+        } else (0, model_1.eachSeries)(this._regions, (s => {
             dataCollection.push(s.getRawData()), stateFields.push(this._field), this._valueField && valueFields.push(this._spec.valueField);
         }), {
             userId: this._seriesUserId,
@@ -392,7 +396,7 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
             [sizeKey]: isShown ? this[`_${sizeKey}`] : 0
         }, {
             [sizeKey]: constant_1.AttributeLevel.Built_In
-        });
+        }), this._dataUpdating = !1;
     }
     getBoundsInRect(rect) {
         const result = {
@@ -424,7 +428,7 @@ class DataFilterBaseComponent extends base_component_1.BaseComponent {
         var _a, _b, _c, _d, _e, _f;
         if (!this._auto) return this._cacheVisibility = void 0, !0;
         const axis = this._relatedAxisComponent, axisSpec = null == axis ? void 0 : axis.getSpec(), axisScale = null == axis ? void 0 : axis.getScale(), bandSizeResult = this._getAxisBandSize(axisSpec);
-        if ((0, vscale_1.isDiscrete)(axisScale.type) && (null == rect ? void 0 : rect.height) === (null === (_a = this._cacheRect) || void 0 === _a ? void 0 : _a.height) && (null == rect ? void 0 : rect.width) === (null === (_b = this._cacheRect) || void 0 === _b ? void 0 : _b.width) && this._fixedBandSize === (null == bandSizeResult ? void 0 : bandSizeResult.bandSize)) return this._cacheVisibility;
+        if (!this._dataUpdating && (0, vscale_1.isDiscrete)(axisScale.type) && (null == rect ? void 0 : rect.height) === (null === (_a = this._cacheRect) || void 0 === _a ? void 0 : _a.height) && (null == rect ? void 0 : rect.width) === (null === (_b = this._cacheRect) || void 0 === _b ? void 0 : _b.width) && this._fixedBandSize === (null == bandSizeResult ? void 0 : bandSizeResult.bandSize)) return this._cacheVisibility;
         let isShown = !0;
         if (this._isHorizontal && (null == rect ? void 0 : rect.width) !== (null === (_c = this._cacheRect) || void 0 === _c ? void 0 : _c.width) ? axisScale.range(axis.getInverse() ? [ rect.width, 0 ] : [ 0, rect.width ]) : (null == rect ? void 0 : rect.height) !== (null === (_d = this._cacheRect) || void 0 === _d ? void 0 : _d.height) && axisScale.range(axis.getInverse() ? [ 0, rect.height ] : [ rect.height, 0 ]), 
         this._cacheRect = {