@visactor/vchart 1.10.0-alpha.1 → 1.10.0-alpha.4

package/cjs/component/marker/mark-line/mark-line.js

@@ -178,7 +178,7 @@ class MarkLine extends base_marker_1.BaseMarker {
         }), needRegr && data.transform({
             type: "markerRegression",
             options: options
-        }), (needAggr || needRegr) && data.transform({
+        }), data.transform({
             type: "markerFilter",
             options: this._getAllRelativeSeries()
         }), data.target.on("change", (() => {

package/cjs/component/marker/mark-line/mark-line.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/marker/mark-line/mark-line.ts"],"names":[],"mappings":"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","file":"mark-line.js","sourcesContent":["import { DataView } from '@visactor/vdataset';\nimport type {\n  IMarkLine,\n  IMarkLineSpec,\n  IMarkLineXYSpec,\n  IMarkLineXYY1Spec,\n  IMarkLineYXX1Spec,\n  IStepMarkLineSpec\n} from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { ComponentTypeEnum } from '../../interface/type';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IOptionAggr } from '../../../data/transforms/aggregation';\n// eslint-disable-next-line no-duplicate-imports\nimport { markerAggregation } from '../../../data/transforms/aggregation';\nimport { computeClipRange, coordinateLayout, positionLayout, transformLabelAttributes, xyLayout } from '../utils';\nimport { registerDataSetInstanceTransform } from '../../../data/register';\nimport type { MarkLineAttrs } from '@visactor/vrender-components';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkLine as MarkLineComponent } from '@visactor/vrender-components';\n// eslint-disable-next-line no-duplicate-imports\nimport type { Maybe } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isEmpty, isValid, isArray } from '@visactor/vutils';\nimport { transformToGraphic } from '../../../util/style';\nimport { BaseMarker } from '../base-marker';\nimport type { IGroup } from '@visactor/vrender-core';\nimport type { IDataPos, IMarkerSymbol } from '../interface';\nimport type { IOptionRegr } from '../../../data/transforms/regression';\n// eslint-disable-next-line no-duplicate-imports\nimport { markerRegression } from '../../../data/transforms/regression';\nimport { LayoutZIndex } from '../../../constant';\nimport { getInsertPoints, getTextOffset } from './util';\nimport { Factory } from '../../../core/factory';\nimport { isPercent } from '../../../util';\nimport type { IPoint } from '../../../typings';\nimport type { IModelSpecInfo } from '../../../model/interface';\nimport { markerFilter } from '../../../data/transforms/marker-filter';\n\nexport class MarkLine extends BaseMarker<IMarkLineSpec> implements IMarkLine {\n  static type = ComponentTypeEnum.markLine;\n  type = ComponentTypeEnum.markLine;\n  name: string = ComponentTypeEnum.markLine;\n\n  static specKey = 'markLine';\n  specKey = 'markLine';\n\n  layoutZIndex: number = LayoutZIndex.MarkLine;\n\n  protected declare _markerComponent: MarkLineComponent;\n\n  private _isXYLayout: boolean;\n\n  static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]> {\n    const markLineSpec = chartSpec[this.specKey];\n    if (isEmpty(markLineSpec)) {\n      return undefined;\n    }\n    if (!isArray(markLineSpec) && markLineSpec.visible !== false) {\n      return [\n        {\n          spec: markLineSpec,\n          specPath: [this.specKey],\n          specInfoPath: ['component', this.specKey, 0],\n          type: ComponentTypeEnum.markLine\n        }\n      ];\n    }\n    const specInfos: IModelSpecInfo[] = [];\n    markLineSpec.forEach((m: any, i: number) => {\n      if (m.visible !== false) {\n        specInfos.push({\n          spec: m,\n          specPath: [this.specKey, i],\n          specInfoPath: ['component', this.specKey, i],\n          type: ComponentTypeEnum.markLine\n        });\n      }\n    });\n    return specInfos;\n  }\n\n  protected _createMarkerComponent() {\n    const {\n      label = {},\n      startSymbol = {} as IMarkerSymbol,\n      endSymbol = {} as IMarkerSymbol\n    } = this._spec as IMarkLineSpec;\n\n    const markLineAttrs: MarkLineAttrs = {\n      zIndex: this.layoutZIndex,\n      interactive: this._spec.interactive ?? false,\n      points: [\n        { x: 0, y: 0 },\n        { x: 0, y: 0 }\n      ],\n      lineStyle: this._spec.line?.style as unknown as any,\n      clipInRange: this._spec.clip ?? false,\n      label: transformLabelAttributes(label)\n    };\n\n    if (startSymbol.visible) {\n      markLineAttrs.startSymbol = {\n        ...startSymbol,\n        visible: true,\n        style: transformToGraphic(startSymbol.style)\n      };\n    } else {\n      markLineAttrs.startSymbol = {\n        visible: false\n      };\n    }\n\n    if (endSymbol.visible) {\n      markLineAttrs.endSymbol = {\n        ...endSymbol,\n        visible: true,\n        style: transformToGraphic(endSymbol.style)\n      };\n    } else {\n      markLineAttrs.endSymbol = {\n        visible: false\n      };\n    }\n\n    const markLine = new MarkLineComponent(markLineAttrs);\n    return markLine as unknown as IGroup;\n  }\n\n  protected _markerLayout() {\n    const spec = this._spec as any;\n    const data = this._markerData;\n    const startRelativeSeries = this._startRelativeSeries;\n    const endRelativeSeries = this._endRelativeSeries;\n    const relativeSeries = this._relativeSeries;\n\n    const isValidCoordinates = isValid(spec.coordinates);\n    const isValidProcess = isValid(spec.process);\n    const isValidProcessX = isValidProcess && isValid(spec.process.x);\n    const isValidProcessY = isValidProcess && isValid(spec.process.y);\n    const isCoordinateLayout = isValidCoordinates && (!isValidProcess || ('process' in spec && 'xy' in spec.process));\n    const isPositionLayout = isValid(spec.positions);\n    const autoRange = spec.autoRange ?? false;\n\n    let points: IPoint[] = [];\n    if (this._isXYLayout || (isValidCoordinates && isValidProcessX) || (isValidCoordinates && isValidProcessY)) {\n      const xyPoints = xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange);\n      // 这里不同的场景返回的值不同，如果同时声明了 x x1 y y1，会返回两个数值的数组（如 [[{}], [{}]]），所以需要分别处理下\n      points = (xyPoints.length === 1 ? xyPoints[0] : xyPoints.map(point => point[0])) as IPoint[];\n    } else if (isCoordinateLayout) {\n      points = coordinateLayout(data, relativeSeries, autoRange, spec.coordinatesOffset);\n    } else if (isPositionLayout) {\n      points = positionLayout(spec.positions, relativeSeries, spec.regionRelative);\n    }\n\n    const seriesData = this._relativeSeries.getViewData().latestData;\n    const dataPoints =\n      data.latestData[0] && data.latestData[0].latestData ? data.latestData[0].latestData : data.latestData;\n\n    let limitRect;\n    if (spec.clip || spec.label?.confine) {\n      const { minX, maxX, minY, maxY } = computeClipRange([\n        startRelativeSeries.getRegion(),\n        endRelativeSeries.getRegion(),\n        relativeSeries.getRegion()\n      ]);\n      limitRect = {\n        x: minX,\n        y: minY,\n        width: maxX - minX,\n        height: maxY - minY\n      };\n    }\n    const markerComponentAttr = this._markerComponent?.attribute ?? {};\n    const labelAttrs = {\n      ...markerComponentAttr.label,\n      text: this._spec.label.formatMethod\n        ? this._spec.label.formatMethod(dataPoints, seriesData)\n        : markerComponentAttr.label?.text\n    };\n\n    if ((this._spec as IStepMarkLineSpec).type === 'type-step') {\n      const { multiSegment, mainSegmentIndex } = (this._spec as IStepMarkLineSpec).line || {};\n      const { connectDirection, expandDistance = 0 } = this._spec as IStepMarkLineSpec;\n\n      let expandDistanceValue: number;\n      if (isPercent(expandDistance)) {\n        const regionStart = startRelativeSeries.getRegion();\n        const regionStartLayoutStartPoint = regionStart.getLayoutStartPoint();\n        const regionEnd = endRelativeSeries.getRegion();\n        const regionEndLayoutStartPoint = regionEnd.getLayoutStartPoint();\n\n        if (connectDirection === 'bottom' || connectDirection === 'top') {\n          const regionHeight = Math.abs(\n            Math.min(regionStartLayoutStartPoint.y, regionEndLayoutStartPoint.y) -\n              Math.max(\n                regionStartLayoutStartPoint.y + regionStart.getLayoutRect().height,\n                regionEndLayoutStartPoint.y + regionEnd.getLayoutRect().height\n              )\n          );\n          expandDistanceValue = (Number(expandDistance.substring(0, expandDistance.length - 1)) * regionHeight) / 100;\n        } else {\n          const regionWidth = Math.abs(\n            Math.min(regionStartLayoutStartPoint.x, regionEndLayoutStartPoint.x) -\n              Math.max(\n                regionStartLayoutStartPoint.x + regionStart.getLayoutRect().width,\n                regionEndLayoutStartPoint.x + regionEnd.getLayoutRect().width\n              )\n          );\n          expandDistanceValue = (Number(expandDistance.substring(0, expandDistance.length - 1)) * regionWidth) / 100;\n        }\n      } else {\n        expandDistanceValue = expandDistance as number;\n      }\n\n      const joinPoints = getInsertPoints(points[0], points[1], connectDirection, expandDistanceValue);\n\n      let labelPositionAttrs: any;\n      if (multiSegment && isValid(mainSegmentIndex)) {\n        // 如果用户配置了主线段，则不进行 label 的偏移处理，直接显示在主线段中间\n        labelPositionAttrs = {\n          position: 'middle',\n          autoRotate: false,\n          refX: 0,\n          refY: 0\n        };\n      } else {\n        labelPositionAttrs = {\n          position: 'start',\n          autoRotate: false,\n          ...getTextOffset(points[0], points[1], connectDirection, expandDistanceValue),\n          refX: 0,\n          refY: 0\n        };\n      }\n\n      this._markerComponent?.setAttributes({\n        points: multiSegment\n          ? [\n              [joinPoints[0], joinPoints[1]],\n              [joinPoints[1], joinPoints[2]],\n              [joinPoints[2], joinPoints[3]]\n            ]\n          : joinPoints,\n        label: {\n          ...labelAttrs,\n          ...labelPositionAttrs,\n          textStyle: {\n            ...markerComponentAttr.label.textStyle,\n            textAlign: 'center',\n            textBaseline: 'middle'\n          }\n        },\n        limitRect,\n        multiSegment,\n        mainSegmentIndex,\n        dx: this._layoutOffsetX,\n        dy: this._layoutOffsetY\n      });\n    } else {\n      this._markerComponent?.setAttributes({\n        points: points,\n        label: labelAttrs as any, // FIXME: 富文本类型问题\n        limitRect,\n        dx: this._layoutOffsetX,\n        dy: this._layoutOffsetY\n      });\n    }\n  }\n\n  protected _initDataView(): void {\n    const spec = this._spec;\n    const relativeSeries = this._relativeSeries;\n    const isXProcess = 'x' in spec;\n    const isYProcess = 'y' in spec;\n    const isX1Process = 'x1' in spec;\n    const isY1Process = 'y1' in spec;\n    const isCoordinateProcess = 'coordinates' in spec;\n\n    const doXProcess = isXProcess && !isYProcess && !isY1Process;\n    const doXYY1Process = isXProcess && isYProcess && isY1Process;\n    const doYProcess = isYProcess && !isXProcess && !isX1Process;\n    const doYXX1Process = isYProcess && isXProcess && isX1Process;\n    const doXYProcess = isXProcess && isYProcess && isX1Process && isY1Process;\n\n    this._markerData = relativeSeries.getViewData();\n\n    if (!doXProcess && !doYProcess && !doXYY1Process && !doYXX1Process && !doXYProcess && !isCoordinateProcess) {\n      return;\n    }\n\n    registerDataSetInstanceTransform(this._option.dataSet, 'markerAggregation', markerAggregation);\n    registerDataSetInstanceTransform(this._option.dataSet, 'markerRegression', markerRegression);\n    registerDataSetInstanceTransform(this._option.dataSet, 'markerFilter', markerFilter);\n\n    this._isXYLayout = doXProcess || doXYY1Process || doYProcess || doYXX1Process || doXYProcess;\n\n    let options: IOptionAggr[] | IOptionRegr;\n    let processData: DataView = relativeSeries.getViewData();\n    let needAggr: boolean = true;\n    let needRegr: boolean = false;\n\n    if (doXYProcess) {\n      const { x, x1, y, y1 } = spec as IMarkLineXYSpec;\n      options = [this._processSpecXY(x, y), this._processSpecXY(x1, y1)];\n    } else if (doXProcess) {\n      options = [this._processSpecX(spec.x)];\n    } else if (doYProcess) {\n      options = [this._processSpecY(spec.y)];\n    } else if (doXYY1Process) {\n      const { x, y, y1 } = spec as IMarkLineXYY1Spec;\n      options = [this._processSpecXY(x, y), this._processSpecXY(x, y1)];\n    } else if (doYXX1Process) {\n      const { x, x1, y } = spec as IMarkLineYXX1Spec;\n      options = [this._processSpecXY(x, y), this._processSpecXY(x1, y)];\n    } else if (isCoordinateProcess) {\n      options = this._processSpecCoo(spec);\n      needAggr = false;\n      processData = new DataView(this._option.dataSet, { name: `${this.type}_${this.id}_data` })\n        .parse([relativeSeries.getViewData()], {\n          type: 'dataview'\n        })\n        .transform({\n          type: 'markerAggregation',\n          options\n        });\n      if (spec.process && 'x' in spec.process) {\n        options = [this._processSpecX(spec.process.x as unknown as IDataPos)] as unknown as any;\n        needAggr = true;\n      }\n      if (spec.process && 'y' in spec.process) {\n        options = [this._processSpecY(spec.process.y as unknown as IDataPos)] as unknown as any;\n        needAggr = true;\n      }\n      if (spec.process && 'xy' in spec.process) {\n        const { xField, yField } = relativeSeries.getSpec();\n        options = {\n          fieldX: xField,\n          fieldY: yField\n        };\n        needRegr = true;\n      }\n    } else {\n      needAggr = false;\n    }\n\n    const data = new DataView(this._option.dataSet);\n    data.parse([processData], {\n      type: 'dataview'\n    });\n    if (needAggr) {\n      data.transform({\n        type: 'markerAggregation',\n        options\n      });\n    }\n    if (needRegr) {\n      data.transform({\n        type: 'markerRegression',\n        options\n      });\n    }\n\n    if (needAggr || needRegr) {\n      data.transform({\n        type: 'markerFilter',\n        options: this._getAllRelativeSeries()\n      });\n    }\n\n    data.target.on('change', () => {\n      this._markerLayout();\n    });\n    this._markerData = data;\n  }\n}\n\nexport const registerMarkLine = () => {\n  Factory.registerComponent(MarkLine.type, MarkLine);\n};\n"]}
+{"version":3,"sources":["../src/component/marker/mark-line/mark-line.ts"],"names":[],"mappings":"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","file":"mark-line.js","sourcesContent":["import { DataView } from '@visactor/vdataset';\nimport type {\n  IMarkLine,\n  IMarkLineSpec,\n  IMarkLineXYSpec,\n  IMarkLineXYY1Spec,\n  IMarkLineYXX1Spec,\n  IStepMarkLineSpec\n} from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { ComponentTypeEnum } from '../../interface/type';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IOptionAggr } from '../../../data/transforms/aggregation';\n// eslint-disable-next-line no-duplicate-imports\nimport { markerAggregation } from '../../../data/transforms/aggregation';\nimport { computeClipRange, coordinateLayout, positionLayout, transformLabelAttributes, xyLayout } from '../utils';\nimport { registerDataSetInstanceTransform } from '../../../data/register';\nimport type { MarkLineAttrs } from '@visactor/vrender-components';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkLine as MarkLineComponent } from '@visactor/vrender-components';\n// eslint-disable-next-line no-duplicate-imports\nimport type { Maybe } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isEmpty, isValid, isArray } from '@visactor/vutils';\nimport { transformToGraphic } from '../../../util/style';\nimport { BaseMarker } from '../base-marker';\nimport type { IGroup } from '@visactor/vrender-core';\nimport type { IDataPos, IMarkerSymbol } from '../interface';\nimport type { IOptionRegr } from '../../../data/transforms/regression';\n// eslint-disable-next-line no-duplicate-imports\nimport { markerRegression } from '../../../data/transforms/regression';\nimport { LayoutZIndex } from '../../../constant';\nimport { getInsertPoints, getTextOffset } from './util';\nimport { Factory } from '../../../core/factory';\nimport { isPercent } from '../../../util';\nimport type { IPoint } from '../../../typings';\nimport type { IModelSpecInfo } from '../../../model/interface';\nimport { markerFilter } from '../../../data/transforms/marker-filter';\n\nexport class MarkLine extends BaseMarker<IMarkLineSpec> implements IMarkLine {\n  static type = ComponentTypeEnum.markLine;\n  type = ComponentTypeEnum.markLine;\n  name: string = ComponentTypeEnum.markLine;\n\n  static specKey = 'markLine';\n  specKey = 'markLine';\n\n  layoutZIndex: number = LayoutZIndex.MarkLine;\n\n  protected declare _markerComponent: MarkLineComponent;\n\n  private _isXYLayout: boolean;\n\n  static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]> {\n    const markLineSpec = chartSpec[this.specKey];\n    if (isEmpty(markLineSpec)) {\n      return undefined;\n    }\n    if (!isArray(markLineSpec) && markLineSpec.visible !== false) {\n      return [\n        {\n          spec: markLineSpec,\n          specPath: [this.specKey],\n          specInfoPath: ['component', this.specKey, 0],\n          type: ComponentTypeEnum.markLine\n        }\n      ];\n    }\n    const specInfos: IModelSpecInfo[] = [];\n    markLineSpec.forEach((m: any, i: number) => {\n      if (m.visible !== false) {\n        specInfos.push({\n          spec: m,\n          specPath: [this.specKey, i],\n          specInfoPath: ['component', this.specKey, i],\n          type: ComponentTypeEnum.markLine\n        });\n      }\n    });\n    return specInfos;\n  }\n\n  protected _createMarkerComponent() {\n    const {\n      label = {},\n      startSymbol = {} as IMarkerSymbol,\n      endSymbol = {} as IMarkerSymbol\n    } = this._spec as IMarkLineSpec;\n\n    const markLineAttrs: MarkLineAttrs = {\n      zIndex: this.layoutZIndex,\n      interactive: this._spec.interactive ?? false,\n      points: [\n        { x: 0, y: 0 },\n        { x: 0, y: 0 }\n      ],\n      lineStyle: this._spec.line?.style as unknown as any,\n      clipInRange: this._spec.clip ?? false,\n      label: transformLabelAttributes(label)\n    };\n\n    if (startSymbol.visible) {\n      markLineAttrs.startSymbol = {\n        ...startSymbol,\n        visible: true,\n        style: transformToGraphic(startSymbol.style)\n      };\n    } else {\n      markLineAttrs.startSymbol = {\n        visible: false\n      };\n    }\n\n    if (endSymbol.visible) {\n      markLineAttrs.endSymbol = {\n        ...endSymbol,\n        visible: true,\n        style: transformToGraphic(endSymbol.style)\n      };\n    } else {\n      markLineAttrs.endSymbol = {\n        visible: false\n      };\n    }\n\n    const markLine = new MarkLineComponent(markLineAttrs);\n    return markLine as unknown as IGroup;\n  }\n\n  protected _markerLayout() {\n    const spec = this._spec as any;\n    const data = this._markerData;\n    const startRelativeSeries = this._startRelativeSeries;\n    const endRelativeSeries = this._endRelativeSeries;\n    const relativeSeries = this._relativeSeries;\n\n    const isValidCoordinates = isValid(spec.coordinates);\n    const isValidProcess = isValid(spec.process);\n    const isValidProcessX = isValidProcess && isValid(spec.process.x);\n    const isValidProcessY = isValidProcess && isValid(spec.process.y);\n    const isCoordinateLayout = isValidCoordinates && (!isValidProcess || ('process' in spec && 'xy' in spec.process));\n    const isPositionLayout = isValid(spec.positions);\n    const autoRange = spec.autoRange ?? false;\n\n    let points: IPoint[] = [];\n    if (this._isXYLayout || (isValidCoordinates && isValidProcessX) || (isValidCoordinates && isValidProcessY)) {\n      const xyPoints = xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange);\n      // 这里不同的场景返回的值不同，如果同时声明了 x x1 y y1，会返回两个数值的数组（如 [[{}], [{}]]），所以需要分别处理下\n      points = (xyPoints.length === 1 ? xyPoints[0] : xyPoints.map(point => point[0])) as IPoint[];\n    } else if (isCoordinateLayout) {\n      points = coordinateLayout(data, relativeSeries, autoRange, spec.coordinatesOffset);\n    } else if (isPositionLayout) {\n      points = positionLayout(spec.positions, relativeSeries, spec.regionRelative);\n    }\n\n    const seriesData = this._relativeSeries.getViewData().latestData;\n    const dataPoints =\n      data.latestData[0] && data.latestData[0].latestData ? data.latestData[0].latestData : data.latestData;\n\n    let limitRect;\n    if (spec.clip || spec.label?.confine) {\n      const { minX, maxX, minY, maxY } = computeClipRange([\n        startRelativeSeries.getRegion(),\n        endRelativeSeries.getRegion(),\n        relativeSeries.getRegion()\n      ]);\n      limitRect = {\n        x: minX,\n        y: minY,\n        width: maxX - minX,\n        height: maxY - minY\n      };\n    }\n    const markerComponentAttr = this._markerComponent?.attribute ?? {};\n    const labelAttrs = {\n      ...markerComponentAttr.label,\n      text: this._spec.label.formatMethod\n        ? this._spec.label.formatMethod(dataPoints, seriesData)\n        : markerComponentAttr.label?.text\n    };\n\n    if ((this._spec as IStepMarkLineSpec).type === 'type-step') {\n      const { multiSegment, mainSegmentIndex } = (this._spec as IStepMarkLineSpec).line || {};\n      const { connectDirection, expandDistance = 0 } = this._spec as IStepMarkLineSpec;\n\n      let expandDistanceValue: number;\n      if (isPercent(expandDistance)) {\n        const regionStart = startRelativeSeries.getRegion();\n        const regionStartLayoutStartPoint = regionStart.getLayoutStartPoint();\n        const regionEnd = endRelativeSeries.getRegion();\n        const regionEndLayoutStartPoint = regionEnd.getLayoutStartPoint();\n\n        if (connectDirection === 'bottom' || connectDirection === 'top') {\n          const regionHeight = Math.abs(\n            Math.min(regionStartLayoutStartPoint.y, regionEndLayoutStartPoint.y) -\n              Math.max(\n                regionStartLayoutStartPoint.y + regionStart.getLayoutRect().height,\n                regionEndLayoutStartPoint.y + regionEnd.getLayoutRect().height\n              )\n          );\n          expandDistanceValue = (Number(expandDistance.substring(0, expandDistance.length - 1)) * regionHeight) / 100;\n        } else {\n          const regionWidth = Math.abs(\n            Math.min(regionStartLayoutStartPoint.x, regionEndLayoutStartPoint.x) -\n              Math.max(\n                regionStartLayoutStartPoint.x + regionStart.getLayoutRect().width,\n                regionEndLayoutStartPoint.x + regionEnd.getLayoutRect().width\n              )\n          );\n          expandDistanceValue = (Number(expandDistance.substring(0, expandDistance.length - 1)) * regionWidth) / 100;\n        }\n      } else {\n        expandDistanceValue = expandDistance as number;\n      }\n\n      const joinPoints = getInsertPoints(points[0], points[1], connectDirection, expandDistanceValue);\n\n      let labelPositionAttrs: any;\n      if (multiSegment && isValid(mainSegmentIndex)) {\n        // 如果用户配置了主线段，则不进行 label 的偏移处理，直接显示在主线段中间\n        labelPositionAttrs = {\n          position: 'middle',\n          autoRotate: false,\n          refX: 0,\n          refY: 0\n        };\n      } else {\n        labelPositionAttrs = {\n          position: 'start',\n          autoRotate: false,\n          ...getTextOffset(points[0], points[1], connectDirection, expandDistanceValue),\n          refX: 0,\n          refY: 0\n        };\n      }\n\n      this._markerComponent?.setAttributes({\n        points: multiSegment\n          ? [\n              [joinPoints[0], joinPoints[1]],\n              [joinPoints[1], joinPoints[2]],\n              [joinPoints[2], joinPoints[3]]\n            ]\n          : joinPoints,\n        label: {\n          ...labelAttrs,\n          ...labelPositionAttrs,\n          textStyle: {\n            ...markerComponentAttr.label.textStyle,\n            textAlign: 'center',\n            textBaseline: 'middle'\n          }\n        },\n        limitRect,\n        multiSegment,\n        mainSegmentIndex,\n        dx: this._layoutOffsetX,\n        dy: this._layoutOffsetY\n      });\n    } else {\n      this._markerComponent?.setAttributes({\n        points: points,\n        label: labelAttrs as MarkLineComponent['attribute']['label'],\n        limitRect,\n        dx: this._layoutOffsetX,\n        dy: this._layoutOffsetY\n      });\n    }\n  }\n\n  protected _initDataView(): void {\n    const spec = this._spec;\n    const relativeSeries = this._relativeSeries;\n    const isXProcess = 'x' in spec;\n    const isYProcess = 'y' in spec;\n    const isX1Process = 'x1' in spec;\n    const isY1Process = 'y1' in spec;\n    const isCoordinateProcess = 'coordinates' in spec;\n\n    const doXProcess = isXProcess && !isYProcess && !isY1Process;\n    const doXYY1Process = isXProcess && isYProcess && isY1Process;\n    const doYProcess = isYProcess && !isXProcess && !isX1Process;\n    const doYXX1Process = isYProcess && isXProcess && isX1Process;\n    const doXYProcess = isXProcess && isYProcess && isX1Process && isY1Process;\n\n    this._markerData = relativeSeries.getViewData();\n\n    if (!doXProcess && !doYProcess && !doXYY1Process && !doYXX1Process && !doXYProcess && !isCoordinateProcess) {\n      return;\n    }\n\n    registerDataSetInstanceTransform(this._option.dataSet, 'markerAggregation', markerAggregation);\n    registerDataSetInstanceTransform(this._option.dataSet, 'markerRegression', markerRegression);\n    registerDataSetInstanceTransform(this._option.dataSet, 'markerFilter', markerFilter);\n\n    this._isXYLayout = doXProcess || doXYY1Process || doYProcess || doYXX1Process || doXYProcess;\n\n    let options: IOptionAggr[] | IOptionRegr;\n    let processData: DataView = relativeSeries.getViewData();\n    let needAggr: boolean = true;\n    let needRegr: boolean = false;\n\n    if (doXYProcess) {\n      const { x, x1, y, y1 } = spec as IMarkLineXYSpec;\n      options = [this._processSpecXY(x, y), this._processSpecXY(x1, y1)];\n    } else if (doXProcess) {\n      options = [this._processSpecX(spec.x)];\n    } else if (doYProcess) {\n      options = [this._processSpecY(spec.y)];\n    } else if (doXYY1Process) {\n      const { x, y, y1 } = spec as IMarkLineXYY1Spec;\n      options = [this._processSpecXY(x, y), this._processSpecXY(x, y1)];\n    } else if (doYXX1Process) {\n      const { x, x1, y } = spec as IMarkLineYXX1Spec;\n      options = [this._processSpecXY(x, y), this._processSpecXY(x1, y)];\n    } else if (isCoordinateProcess) {\n      options = this._processSpecCoo(spec);\n      needAggr = false;\n      processData = new DataView(this._option.dataSet, { name: `${this.type}_${this.id}_data` })\n        .parse([relativeSeries.getViewData()], {\n          type: 'dataview'\n        })\n        .transform({\n          type: 'markerAggregation',\n          options\n        });\n      if (spec.process && 'x' in spec.process) {\n        options = [this._processSpecX(spec.process.x as unknown as IDataPos)] as unknown as any;\n        needAggr = true;\n      }\n      if (spec.process && 'y' in spec.process) {\n        options = [this._processSpecY(spec.process.y as unknown as IDataPos)] as unknown as any;\n        needAggr = true;\n      }\n      if (spec.process && 'xy' in spec.process) {\n        const { xField, yField } = relativeSeries.getSpec();\n        options = {\n          fieldX: xField,\n          fieldY: yField\n        };\n        needRegr = true;\n      }\n    } else {\n      needAggr = false;\n    }\n\n    const data = new DataView(this._option.dataSet);\n    data.parse([processData], {\n      type: 'dataview'\n    });\n    if (needAggr) {\n      data.transform({\n        type: 'markerAggregation',\n        options\n      });\n    }\n    if (needRegr) {\n      data.transform({\n        type: 'markerRegression',\n        options\n      });\n    }\n\n    data.transform({\n      type: 'markerFilter',\n      options: this._getAllRelativeSeries()\n    });\n\n    data.target.on('change', () => {\n      this._markerLayout();\n    });\n    this._markerData = data;\n  }\n}\n\nexport const registerMarkLine = () => {\n  Factory.registerComponent(MarkLine.type, MarkLine);\n};\n"]}

package/cjs/component/marker/mark-point/interface/theme.d.ts

@@ -4,7 +4,7 @@ import type { ILineMarkSpec, ISymbolMarkSpec } from '../../../../typings';
 import type { IMarkerLabelSpec, IMarkerRef, IMarkerSymbol } from '../../interface';
 export interface IItemContent extends IMarkerRef {
     type?: 'symbol' | 'text' | 'image' | 'richText';
-    position?: IMarkPointItemPosition;
+    position?: keyof typeof IMarkPointItemPosition;
     offsetX?: number;
     offsetY?: number;
     confine?: boolean;

package/cjs/component/marker/mark-point/interface/theme.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/marker/mark-point/interface/theme.ts"],"names":[],"mappings":"","file":"theme.js","sourcesContent":["import type { IImageGraphicAttribute, IRichTextGraphicAttribute } from '@visactor/vrender-core';\nimport type { IMarkPointItemPosition } from '@visactor/vrender-components';\nimport type { ILineMarkSpec, ISymbolMarkSpec } from '../../../../typings';\nimport type { IMarkerLabelSpec, IMarkerRef, IMarkerSymbol } from '../../interface';\n\nexport interface IItemContent extends IMarkerRef {\n  /**\n   * 标注类型\n   */\n  type?: 'symbol' | 'text' | 'image' | 'richText';\n  /**\n   * 标注内容相对于定位点的位置\n   */\n  position?: IMarkPointItemPosition;\n  /**\n   * x 方向偏移量\n   */\n  offsetX?: number;\n  /**\n   * y 方向偏移量\n   */\n  offsetY?: number;\n  /**\n   * 是否自动调整 item content 使其展示在 marker 可见区域内。\n   * @default false\n   * @since 1.8.7\n   */\n  confine?: boolean;\n  /**\n   * type为symbol时, symbol的样式\n   */\n  symbol?: {\n    style?: ISymbolMarkSpec;\n  };\n  /**\n   * type为image时, image的样式\n   */\n  image?: {\n    style?: IImageGraphicAttribute;\n  };\n  /**\n   * type为text时, text的样式\n   * 'text'类型的ItemContent新增三种子类型：'text','rich','html'。配置在textStyle.type上。\n   */\n  text?: IMarkerLabelSpec;\n  /**\n   * type为rich text时, rich text的样式\n   */\n  richText?: {\n    style?: IRichTextGraphicAttribute;\n  };\n}\n\nexport type IItemLine<T extends Partial<IMarkerSymbol> = IMarkerSymbol> = {\n  /** TODO：'type-opo' */\n  /**\n   * 引导线类型\n   * 'type-s'表示起点和终点直接连线; 'type-do'表示包含一个折点，且折点x坐标为起点到终点的 1/2 x坐标，折点y坐标为起点y坐标；'type-op' 表示包含一个折点，且折点x坐标为起点x坐标，折点y坐标为终点y坐标；'type-po' 表示包含一个折点，且折点x坐标为终点x坐标，折点y坐标为起点y坐标\n   * 引导线类型的具体形式参考：https://journals.sagepub.com/doi/10.1177/1473871618799500\n   */\n  type?: 'type-s' | 'type-do' | 'type-po' | 'type-op';\n  /**\n   * 引导线可见性\n   */\n  visible?: boolean;\n  /**\n   * 垂直于引导线的装饰线，参考案例: https://observablehq.com/@mikelotis/edmonton-population-history-line-chart\n   */\n  decorativeLine?: {\n    /**\n     * 装饰线可见性\n     */\n    visible?: boolean;\n    /**\n     * 装饰线的长度\n     */\n    length?: number;\n  };\n  /**\n   * 引导线起点symbol样式\n   */\n  startSymbol?: T;\n  /**\n   * 引导线终点symbol样式\n   */\n  endSymbol?: T;\n  /**\n   * 引导线样式\n   */\n  line?: {\n    style?: Omit<ILineMarkSpec, 'visible'>;\n  };\n};\n\nexport interface IMarkPointTheme<T extends Partial<IMarkerSymbol> = Partial<IMarkerSymbol>> {\n  /**\n   * 标注引导线\n   */\n  itemLine?: IItemLine<T>;\n\n  /**\n   * 标注内容\n   */\n  itemContent?: IItemContent;\n}\n"]}
+{"version":3,"sources":["../src/component/marker/mark-point/interface/theme.ts"],"names":[],"mappings":"","file":"theme.js","sourcesContent":["import type { IImageGraphicAttribute, IRichTextGraphicAttribute } from '@visactor/vrender-core';\nimport type { IMarkPointItemPosition } from '@visactor/vrender-components';\nimport type { ILineMarkSpec, ISymbolMarkSpec } from '../../../../typings';\nimport type { IMarkerLabelSpec, IMarkerRef, IMarkerSymbol } from '../../interface';\n\nexport interface IItemContent extends IMarkerRef {\n  /**\n   * 标注类型\n   */\n  type?: 'symbol' | 'text' | 'image' | 'richText';\n  /**\n   * 标注内容相对于定位点的位置\n   */\n  position?: keyof typeof IMarkPointItemPosition;\n  /**\n   * x 方向偏移量\n   */\n  offsetX?: number;\n  /**\n   * y 方向偏移量\n   */\n  offsetY?: number;\n  /**\n   * 是否自动调整 item content 使其展示在 marker 可见区域内。\n   * @default false\n   * @since 1.8.7\n   */\n  confine?: boolean;\n  /**\n   * type为symbol时, symbol的样式\n   */\n  symbol?: {\n    style?: ISymbolMarkSpec;\n  };\n  /**\n   * type为image时, image的样式\n   */\n  image?: {\n    style?: IImageGraphicAttribute;\n  };\n  /**\n   * type为text时, text的样式\n   * 'text'类型的ItemContent新增三种子类型：'text','rich'。配置在textStyle.type上。\n   */\n  text?: IMarkerLabelSpec;\n  /**\n   * type为rich text时, rich text的样式\n   */\n  richText?: {\n    style?: IRichTextGraphicAttribute;\n  };\n}\n\nexport type IItemLine<T extends Partial<IMarkerSymbol> = IMarkerSymbol> = {\n  /** TODO：'type-opo' */\n  /**\n   * 引导线类型\n   * 'type-s'表示起点和终点直接连线; 'type-do'表示包含一个折点，且折点x坐标为起点到终点的 1/2 x坐标，折点y坐标为起点y坐标；'type-op' 表示包含一个折点，且折点x坐标为起点x坐标，折点y坐标为终点y坐标；'type-po' 表示包含一个折点，且折点x坐标为终点x坐标，折点y坐标为起点y坐标\n   * 引导线类型的具体形式参考：https://journals.sagepub.com/doi/10.1177/1473871618799500\n   */\n  type?: 'type-s' | 'type-do' | 'type-po' | 'type-op';\n  /**\n   * 引导线可见性\n   */\n  visible?: boolean;\n  /**\n   * 垂直于引导线的装饰线，参考案例: https://observablehq.com/@mikelotis/edmonton-population-history-line-chart\n   */\n  decorativeLine?: {\n    /**\n     * 装饰线可见性\n     */\n    visible?: boolean;\n    /**\n     * 装饰线的长度\n     */\n    length?: number;\n  };\n  /**\n   * 引导线起点symbol样式\n   */\n  startSymbol?: T;\n  /**\n   * 引导线终点symbol样式\n   */\n  endSymbol?: T;\n  /**\n   * 引导线样式\n   */\n  line?: {\n    style?: Omit<ILineMarkSpec, 'visible'>;\n  };\n};\n\nexport interface IMarkPointTheme<T extends Partial<IMarkerSymbol> = Partial<IMarkerSymbol>> {\n  /**\n   * 标注引导线\n   */\n  itemLine?: IItemLine<T>;\n\n  /**\n   * 标注内容\n   */\n  itemContent?: IItemContent;\n}\n"]}

package/cjs/component/marker/mark-point/mark-point.js

@@ -86,7 +86,10 @@ class MarkPoint extends base_marker_1.BaseMarker {
         if (this._markerComponent) {
             const attribute = null !== (_c = this._markerComponent.attribute) && void 0 !== _c ? _c : {}, textStyle = null !== (_e = null === (_d = attribute.itemContent) || void 0 === _d ? void 0 : _d.textStyle) && void 0 !== _e ? _e : {};
             this._markerComponent.setAttributes({
-                position: point,
+                position: void 0 === point ? {
+                    x: null,
+                    y: null
+                } : point,
                 itemContent: Object.assign(Object.assign({}, attribute.itemContent), {
                     textStyle: Object.assign(Object.assign({}, textStyle), {
                         text: (null === (_f = this._spec.itemContent.text) || void 0 === _f ? void 0 : _f.formatMethod) ? this._spec.itemContent.text.formatMethod(dataPoints, seriesData) : textStyle.text
@@ -115,7 +118,7 @@ class MarkPoint extends base_marker_1.BaseMarker {
         }), data.transform({
             type: "markerAggregation",
             options: options
-        }), options && data.transform({
+        }), data.transform({
             type: "markerFilter",
             options: this._getAllRelativeSeries()
         }), data.target.on("change", (() => {

package/cjs/component/marker/mark-point/mark-point.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/marker/mark-point/mark-point.ts"],"names":[],"mappings":"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","file":"mark-point.js","sourcesContent":["import { DataView } from '@visactor/vdataset';\nimport type { IMarkPoint, IMarkPointCoordinateSpec, IMarkPointSpec } from './interface';\nimport { ComponentTypeEnum } from '../../interface/type';\nimport { markerAggregation } from '../../../data/transforms/aggregation';\nimport { computeClipRange, coordinateLayout, positionLayout, transformLabelAttributes, xyLayout } from '../utils';\nimport { registerDataSetInstanceTransform } from '../../../data/register';\nimport type { MarkPointAttrs } from '@visactor/vrender-components';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkPoint as MarkPointComponent } from '@visactor/vrender-components';\nimport type { Maybe } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isEmpty, isValid, isArray } from '@visactor/vutils';\nimport { transformToGraphic } from '../../../util/style';\nimport { BaseMarker } from '../base-marker';\nimport { LayoutZIndex } from '../../../constant';\nimport { Factory } from '../../../core/factory';\nimport type { IGroup } from '@visactor/vrender-core';\nimport type { IPoint } from '../../../typings';\nimport type { IModelSpecInfo } from '../../../model/interface';\nimport { markerFilter } from '../../../data/transforms/marker-filter';\n\nexport class MarkPoint extends BaseMarker<IMarkPointSpec> implements IMarkPoint {\n  static type = ComponentTypeEnum.markPoint;\n  type = ComponentTypeEnum.markPoint;\n  name: string = ComponentTypeEnum.markPoint;\n\n  static specKey = 'markPoint';\n  specKey = 'markPoint';\n\n  layoutZIndex: number = LayoutZIndex.MarkPoint;\n\n  // markPoint组件\n  protected declare _markerComponent: MarkPointComponent;\n\n  static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]> {\n    const markPointSpec = chartSpec[this.specKey];\n    if (isEmpty(markPointSpec)) {\n      return undefined;\n    }\n    if (!isArray(markPointSpec) && markPointSpec.visible !== false) {\n      return [\n        {\n          spec: markPointSpec,\n          specPath: [this.specKey],\n          specInfoPath: ['component', this.specKey, 0],\n          type: ComponentTypeEnum.markPoint\n        }\n      ];\n    }\n    const specInfos: IModelSpecInfo[] = [];\n    markPointSpec.forEach((m: any, i: number) => {\n      if (m.visible !== false) {\n        specInfos.push({\n          spec: m,\n          specPath: [this.specKey, i],\n          specInfoPath: ['component', this.specKey, i],\n          type: ComponentTypeEnum.markPoint\n        });\n      }\n    });\n    return specInfos;\n  }\n\n  protected _createMarkerComponent() {\n    const { itemContent = {}, itemLine = {} } = this._spec;\n    const { text: label = {}, symbol, image, richText, ...restItemContent } = itemContent;\n\n    const markPointAttrs: MarkPointAttrs = {\n      zIndex: this.layoutZIndex,\n      interactive: this._spec.interactive ?? false,\n      position: { x: 0, y: 0 },\n      clipInRange: this._spec.clip ?? false,\n      itemContent: {\n        symbolStyle: transformToGraphic(symbol?.style),\n        imageStyle: image?.style,\n        textStyle: transformLabelAttributes(label),\n        richTextStyle: richText?.style,\n        ...restItemContent // Tips: 因为网站 demo 上已经透出了 imageStyle richTextStyle 的写法，为了兼容所以这个需要在后面覆盖\n      }\n    };\n\n    const { visible, line = {}, ...restItemLine } = itemLine;\n    if (visible !== false) {\n      markPointAttrs.itemLine = {\n        ...restItemLine,\n        visible: true,\n        lineStyle: transformToGraphic(line.style)\n      };\n    } else {\n      markPointAttrs.itemLine = {\n        visible: false\n      };\n    }\n\n    const markPoint = new MarkPointComponent(markPointAttrs);\n    return markPoint as unknown as IGroup;\n  }\n\n  protected _markerLayout() {\n    const spec = this._spec;\n    const data = this._markerData;\n    const relativeSeries = this._relativeSeries;\n    const isXYLayout = 'x' in spec && 'y' in spec;\n    const isCoordinateLayout = 'coordinate' in spec;\n    const isPositionLayout = 'position' in spec;\n    const autoRange = spec?.autoRange ?? false;\n\n    let point: IPoint;\n    if (isXYLayout) {\n      point = xyLayout(data, relativeSeries, relativeSeries, relativeSeries, autoRange)[0][0];\n    } else if (isCoordinateLayout) {\n      point = coordinateLayout(\n        data,\n        relativeSeries,\n        autoRange,\n        (spec as IMarkPointCoordinateSpec).coordinatesOffset\n      )[0];\n    } else if (isPositionLayout) {\n      point = positionLayout([spec.position], relativeSeries, spec.regionRelative)[0];\n    }\n\n    const seriesData = this._relativeSeries.getViewData().latestData;\n    const dataPoints = data\n      ? data.latestData[0] && data.latestData[0].latestData\n        ? data.latestData[0].latestData\n        : data.latestData\n      : seriesData;\n\n    let limitRect;\n    if (spec.clip || spec.itemContent?.confine) {\n      const { minX, maxX, minY, maxY } = computeClipRange([relativeSeries.getRegion()]);\n      limitRect = {\n        x: minX,\n        y: minY,\n        width: maxX - minX,\n        height: maxY - minY\n      };\n    }\n    if (this._markerComponent) {\n      const attribute = this._markerComponent.attribute ?? {};\n      const textStyle = attribute.itemContent?.textStyle ?? {};\n      this._markerComponent.setAttributes({\n        position: point,\n        itemContent: {\n          ...attribute.itemContent,\n          textStyle: {\n            ...textStyle,\n            text: this._spec.itemContent.text?.formatMethod\n              ? this._spec.itemContent.text.formatMethod(dataPoints, seriesData)\n              : (textStyle.text as any) // FIXME: 富文本类型问题\n          }\n        },\n        limitRect,\n        dx: this._layoutOffsetX,\n        dy: this._layoutOffsetY\n      });\n    }\n  }\n\n  protected _initDataView(): void {\n    const spec = this._spec as any;\n    const relativeSeries = this._relativeSeries;\n    const isXYProcess = isValid(spec.x) && isValid(spec.y);\n    const isCoordinateProcess = isValid(spec.coordinate);\n    if (!isCoordinateProcess && !isXYProcess) {\n      return;\n    }\n\n    registerDataSetInstanceTransform(this._option.dataSet, 'markerAggregation', markerAggregation);\n    registerDataSetInstanceTransform(this._option.dataSet, 'markerFilter', markerFilter);\n\n    let options;\n    if (isXYProcess) {\n      options = [this._processSpecXY(spec.x, spec.y)];\n    } else if (isCoordinateProcess) {\n      options = this._processSpecCoo(spec);\n    }\n\n    const data = new DataView(this._option.dataSet, { name: `${this.type}_${this.id}_data` });\n    data.parse([relativeSeries.getViewData()], {\n      type: 'dataview'\n    });\n    data.transform({\n      type: 'markerAggregation',\n      options\n    });\n\n    if (options) {\n      data.transform({\n        type: 'markerFilter',\n        options: this._getAllRelativeSeries()\n      });\n    }\n    data.target.on('change', () => {\n      this._markerLayout();\n    });\n    this._markerData = data;\n  }\n}\n\nexport const registerMarkPoint = () => {\n  Factory.registerComponent(MarkPoint.type, MarkPoint);\n};\n"]}
+{"version":3,"sources":["../src/component/marker/mark-point/mark-point.ts"],"names":[],"mappings":"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","file":"mark-point.js","sourcesContent":["import { DataView } from '@visactor/vdataset';\nimport type { IMarkPoint, IMarkPointCoordinateSpec, IMarkPointSpec } from './interface';\nimport { ComponentTypeEnum } from '../../interface/type';\nimport { markerAggregation } from '../../../data/transforms/aggregation';\nimport { computeClipRange, coordinateLayout, positionLayout, transformLabelAttributes, xyLayout } from '../utils';\nimport { registerDataSetInstanceTransform } from '../../../data/register';\nimport type { MarkPointAttrs } from '@visactor/vrender-components';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkPoint as MarkPointComponent } from '@visactor/vrender-components';\nimport type { Maybe } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isEmpty, isValid, isArray } from '@visactor/vutils';\nimport { transformToGraphic } from '../../../util/style';\nimport { BaseMarker } from '../base-marker';\nimport { LayoutZIndex } from '../../../constant';\nimport { Factory } from '../../../core/factory';\nimport type { IGroup } from '@visactor/vrender-core';\nimport type { IPoint } from '../../../typings';\nimport type { IModelSpecInfo } from '../../../model/interface';\nimport { markerFilter } from '../../../data/transforms/marker-filter';\n\nexport class MarkPoint extends BaseMarker<IMarkPointSpec> implements IMarkPoint {\n  static type = ComponentTypeEnum.markPoint;\n  type = ComponentTypeEnum.markPoint;\n  name: string = ComponentTypeEnum.markPoint;\n\n  static specKey = 'markPoint';\n  specKey = 'markPoint';\n\n  layoutZIndex: number = LayoutZIndex.MarkPoint;\n\n  // markPoint组件\n  protected declare _markerComponent: MarkPointComponent;\n\n  static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]> {\n    const markPointSpec = chartSpec[this.specKey];\n    if (isEmpty(markPointSpec)) {\n      return undefined;\n    }\n    if (!isArray(markPointSpec) && markPointSpec.visible !== false) {\n      return [\n        {\n          spec: markPointSpec,\n          specPath: [this.specKey],\n          specInfoPath: ['component', this.specKey, 0],\n          type: ComponentTypeEnum.markPoint\n        }\n      ];\n    }\n    const specInfos: IModelSpecInfo[] = [];\n    markPointSpec.forEach((m: any, i: number) => {\n      if (m.visible !== false) {\n        specInfos.push({\n          spec: m,\n          specPath: [this.specKey, i],\n          specInfoPath: ['component', this.specKey, i],\n          type: ComponentTypeEnum.markPoint\n        });\n      }\n    });\n    return specInfos;\n  }\n\n  protected _createMarkerComponent() {\n    const { itemContent = {}, itemLine = {} } = this._spec;\n    const { text: label = {}, symbol, image, richText, ...restItemContent } = itemContent;\n\n    const markPointAttrs: MarkPointAttrs = {\n      zIndex: this.layoutZIndex,\n      interactive: this._spec.interactive ?? false,\n      position: { x: 0, y: 0 },\n      clipInRange: this._spec.clip ?? false,\n      itemContent: {\n        symbolStyle: transformToGraphic(symbol?.style),\n        imageStyle: image?.style,\n        textStyle: transformLabelAttributes(label),\n        richTextStyle: richText?.style,\n        ...restItemContent // Tips: 因为网站 demo 上已经透出了 imageStyle richTextStyle 的写法，为了兼容所以这个需要在后面覆盖\n      }\n    };\n\n    const { visible, line = {}, ...restItemLine } = itemLine;\n    if (visible !== false) {\n      markPointAttrs.itemLine = {\n        ...restItemLine,\n        visible: true,\n        lineStyle: transformToGraphic(line.style)\n      };\n    } else {\n      markPointAttrs.itemLine = {\n        visible: false\n      };\n    }\n\n    const markPoint = new MarkPointComponent(markPointAttrs);\n    return markPoint as unknown as IGroup;\n  }\n\n  protected _markerLayout() {\n    const spec = this._spec;\n    const data = this._markerData;\n    const relativeSeries = this._relativeSeries;\n    const isXYLayout = 'x' in spec && 'y' in spec;\n    const isCoordinateLayout = 'coordinate' in spec;\n    const isPositionLayout = 'position' in spec;\n    const autoRange = spec?.autoRange ?? false;\n\n    let point: IPoint;\n    if (isXYLayout) {\n      point = xyLayout(data, relativeSeries, relativeSeries, relativeSeries, autoRange)[0][0];\n    } else if (isCoordinateLayout) {\n      point = coordinateLayout(\n        data,\n        relativeSeries,\n        autoRange,\n        (spec as IMarkPointCoordinateSpec).coordinatesOffset\n      )[0];\n    } else if (isPositionLayout) {\n      point = positionLayout([spec.position], relativeSeries, spec.regionRelative)[0];\n    }\n\n    const seriesData = this._relativeSeries.getViewData().latestData;\n    const dataPoints = data\n      ? data.latestData[0] && data.latestData[0].latestData\n        ? data.latestData[0].latestData\n        : data.latestData\n      : seriesData;\n\n    let limitRect;\n    if (spec.clip || spec.itemContent?.confine) {\n      const { minX, maxX, minY, maxY } = computeClipRange([relativeSeries.getRegion()]);\n      limitRect = {\n        x: minX,\n        y: minY,\n        width: maxX - minX,\n        height: maxY - minY\n      };\n    }\n    if (this._markerComponent) {\n      const attribute = this._markerComponent.attribute ?? {};\n      const textStyle = attribute.itemContent?.textStyle ?? {};\n      this._markerComponent.setAttributes({\n        position: point === undefined ? { x: null, y: null } : point, // setAttrs时merge时undefined会被忽略, 所以这里做转换\n        itemContent: {\n          ...attribute.itemContent,\n          textStyle: {\n            ...textStyle,\n            text: this._spec.itemContent.text?.formatMethod\n              ? // type error here will be fixed in components\n                (this._spec.itemContent.text.formatMethod(dataPoints, seriesData) as any)\n              : textStyle.text\n          }\n        },\n        limitRect,\n        dx: this._layoutOffsetX,\n        dy: this._layoutOffsetY\n      });\n    }\n  }\n\n  protected _initDataView(): void {\n    const spec = this._spec as any;\n    const relativeSeries = this._relativeSeries;\n    const isXYProcess = isValid(spec.x) && isValid(spec.y);\n    const isCoordinateProcess = isValid(spec.coordinate);\n    if (!isCoordinateProcess && !isXYProcess) {\n      return;\n    }\n\n    registerDataSetInstanceTransform(this._option.dataSet, 'markerAggregation', markerAggregation);\n    registerDataSetInstanceTransform(this._option.dataSet, 'markerFilter', markerFilter);\n\n    let options;\n    if (isXYProcess) {\n      options = [this._processSpecXY(spec.x, spec.y)];\n    } else if (isCoordinateProcess) {\n      options = this._processSpecCoo(spec);\n    }\n\n    const data = new DataView(this._option.dataSet, { name: `${this.type}_${this.id}_data` });\n    data.parse([relativeSeries.getViewData()], {\n      type: 'dataview'\n    });\n    data.transform({\n      type: 'markerAggregation',\n      options\n    });\n\n    data.transform({\n      type: 'markerFilter',\n      options: this._getAllRelativeSeries()\n    });\n    data.target.on('change', () => {\n      this._markerLayout();\n    });\n    this._markerData = data;\n  }\n}\n\nexport const registerMarkPoint = () => {\n  Factory.registerComponent(MarkPoint.type, MarkPoint);\n};\n"]}

package/cjs/component/poptip/interface.d.ts

@@ -1,11 +1,14 @@
 import type { PopTipAttributes } from '@visactor/vrender-components';
 import type { IColorKey } from '../../theme/color-scheme/interface';
+import type { ITokenKey } from '../../theme/token';
 export interface IPoptipTheme extends Omit<PopTipAttributes, 'titleStyle' | 'contentStyle' | 'panel'> {
-    titleStyle?: Partial<Omit<PopTipAttributes['titleStyle'], 'fill'>> & {
+    titleStyle?: Partial<Omit<PopTipAttributes['titleStyle'], 'fill' | 'fontSize'>> & {
         fill?: PopTipAttributes['titleStyle']['fill'] | IColorKey;
+        fontSize?: PopTipAttributes['titleStyle']['fontSize'] | ITokenKey;
     };
-    contentStyle?: Partial<Omit<PopTipAttributes['contentStyle'], 'fill'>> & {
+    contentStyle?: Partial<Omit<PopTipAttributes['contentStyle'], 'fill' | 'fontSize'>> & {
         fill?: PopTipAttributes['contentStyle']['fill'] | IColorKey;
+        fontSize?: PopTipAttributes['contentStyle']['fontSize'] | ITokenKey;
     };
     panel?: Partial<Omit<PopTipAttributes['panel'], 'fill' | 'stroke' | 'shadowColor'>> & {
         fill?: PopTipAttributes['panel']['fill'] | IColorKey;

package/cjs/component/poptip/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/poptip/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { PopTipAttributes } from '@visactor/vrender-components';\nimport type { IColorKey } from '../../theme/color-scheme/interface';\n\nexport interface IPoptipTheme extends Omit<PopTipAttributes, 'titleStyle' | 'contentStyle' | 'panel'> {\n  titleStyle?: Partial<Omit<PopTipAttributes['titleStyle'], 'fill'>> & {\n    fill?: PopTipAttributes['titleStyle']['fill'] | IColorKey;\n  };\n  contentStyle?: Partial<Omit<PopTipAttributes['contentStyle'], 'fill'>> & {\n    fill?: PopTipAttributes['contentStyle']['fill'] | IColorKey;\n  };\n  panel?: Partial<Omit<PopTipAttributes['panel'], 'fill' | 'stroke' | 'shadowColor'>> & {\n    fill?: PopTipAttributes['panel']['fill'] | IColorKey;\n    stroke?: PopTipAttributes['panel']['stroke'] | IColorKey;\n    shadowColor?: PopTipAttributes['panel']['shadowColor'] | IColorKey;\n  };\n}\n"]}
+{"version":3,"sources":["../src/component/poptip/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { PopTipAttributes } from '@visactor/vrender-components';\nimport type { IColorKey } from '../../theme/color-scheme/interface';\nimport type { ITokenKey } from '../../theme/token';\n\nexport interface IPoptipTheme extends Omit<PopTipAttributes, 'titleStyle' | 'contentStyle' | 'panel'> {\n  titleStyle?: Partial<Omit<PopTipAttributes['titleStyle'], 'fill' | 'fontSize'>> & {\n    fill?: PopTipAttributes['titleStyle']['fill'] | IColorKey;\n    fontSize?: PopTipAttributes['titleStyle']['fontSize'] | ITokenKey;\n  };\n  contentStyle?: Partial<Omit<PopTipAttributes['contentStyle'], 'fill' | 'fontSize'>> & {\n    fill?: PopTipAttributes['contentStyle']['fill'] | IColorKey;\n    fontSize?: PopTipAttributes['contentStyle']['fontSize'] | ITokenKey;\n  };\n  panel?: Partial<Omit<PopTipAttributes['panel'], 'fill' | 'stroke' | 'shadowColor'>> & {\n    fill?: PopTipAttributes['panel']['fill'] | IColorKey;\n    stroke?: PopTipAttributes['panel']['stroke'] | IColorKey;\n    shadowColor?: PopTipAttributes['panel']['shadowColor'] | IColorKey;\n  };\n}\n"]}

package/cjs/component/title/interface/spec.d.ts

@@ -1,14 +1,10 @@
 import type { IComponent } from '../../interface';
 import type { ITextGraphicAttribute, IRichTextCharacter, RichTextWordBreak } from '@visactor/vrender-core';
-import type { IOrientType, IPadding, StringOrNumber } from '../../../typings';
+import type { IOrientType, IPadding } from '../../../typings';
 import type { IComponentSpec } from '../../base/interface';
-export interface ITitleSpec extends Omit<IComponentSpec, 'orient'> {
+interface ITitleSpecWithoutText extends Omit<IComponentSpec, 'orient'> {
     visible?: boolean;
     orient?: IOrientType;
-    text?: string | number | string[] | number[] | IRichTextCharacter[];
-    textType?: string;
-    subtext?: string | number | string[] | number[] | IRichTextCharacter[];
-    subtextType?: string;
     x?: number;
     y?: number;
     width?: number;
@@ -43,5 +39,20 @@ export interface ITitleSpec extends Omit<IComponentSpec, 'orient'> {
         character?: IRichTextCharacter[];
     } & Partial<ITextGraphicAttribute>;
 }
-export type Text = StringOrNumber;
+export type ITitleTextSpec = {
+    textType?: 'text';
+    text: string | number | string[] | number[];
+} | {
+    textType: 'rich';
+    text: IRichTextCharacter[];
+};
+export type ISubTitleTextSpec = {
+    subtextType?: 'text';
+    subtext?: string | number | string[] | number[];
+} | {
+    subtextType?: 'rich';
+    subtext?: IRichTextCharacter[];
+};
+export type ITitleSpec = ITitleSpecWithoutText & ITitleTextSpec & ISubTitleTextSpec;
 export type ITitle = IComponent;
+export {};

package/cjs/component/title/interface/spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/title/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { IComponent } from '../../interface';\nimport type { ITextGraphicAttribute, IRichTextCharacter, RichTextWordBreak } from '@visactor/vrender-core';\nimport type { IOrientType, IPadding, StringOrNumber } from '../../../typings';\nimport type { IComponentSpec } from '../../base/interface';\n\nexport interface ITitleSpec extends Omit<IComponentSpec, 'orient'> {\n  /**\n   * 是否显示标题\n   */\n  visible?: boolean;\n  /**\n   * Title位置\n   * @default 'top'\n   */\n  orient?: IOrientType;\n  /**\n   * 主标题文本内容\n   * - 支持富文本配置\n   */\n  text?: string | number | string[] | number[] | IRichTextCharacter[];\n  /**\n   * 主标题文本类型（默认类型为text）\n   * text, rich, html\n   */\n  textType?: string;\n  /**\n   * 副标题文本内容\n   * - 支持富文本配置\n   */\n  subtext?: string | number | string[] | number[] | IRichTextCharacter[];\n  /**\n   * 副标题文本类型（默认类型为text）\n   * text, rich, html\n   */\n  subtextType?: string;\n  /**\n   * 标题左上角x坐标像素值\n   */\n  x?: number;\n  /**\n   * 标题左上角y坐标像素值\n   */\n  y?: number;\n  /**\n   * 标题宽度\n   */\n  width?: number;\n  /**\n   * 标题高度\n   */\n  height?: number;\n  /**\n   * 最小宽度，像素值\n   */\n  minWidth?: number;\n  /**\n   * 最大宽度，像素值。当文字超过最大宽度时，会自动省略。\n   */\n  maxWidth?: number;\n  /**\n   * 最小高度，像素值\n   */\n  minHeight?: number;\n  /**\n   * 最大高度，像素值\n   */\n  maxHeight?: number;\n  /**\n   * 标题的边距留白\n   */\n  innerPadding?: IPadding | number | number[];\n  /**\n   * 文字水平对齐方式\n   * 'left' | 'center' | 'right'\n   */\n  align?: string;\n  /**\n   * 文字垂直对齐方式\n   * 'top' | 'middle' | 'bottom'\n   */\n  verticalAlign?: string;\n  /**\n   * 主标题样式\n   */\n  textStyle?: {\n    width?: number;\n    height?: number;\n    /**\n     * 文字水平对齐方式\n     * 'left' | 'center' | 'right'\n     */\n    align?: string;\n    /**\n     * 文字垂直对齐方式\n     * 'top' | 'middle' | 'bottom'\n     */\n    verticalAlign?: string;\n    /**\n     * 折行方式\n     * 'break-word' | 'break-all'\n     */\n    wordBreak?: RichTextWordBreak;\n    /**\n     * 按照宽度限制自动折行或显示省略号(maxLineWidth)\n     * 默认设置为title宽度\n     */\n    maxLineWidth?: number;\n    /**\n     * 高度限制控制显示内容及省略号(heightLimit)\n     */\n    heightLimit?: number;\n    /**\n     * 按照行数限制显示内容及省略号(lineClamp)\n     */\n    lineClamp?: number;\n    /**\n     * 富文本配置（暂时保留旧设置）\n     * @deprecated use text & textType instead\n     */\n    character?: IRichTextCharacter[];\n  } & Partial<ITextGraphicAttribute>;\n  /**\n   * 副标题样式\n   */\n  subtextStyle?: {\n    /** 指定宽度 */\n    width?: number;\n    /** 指定高度 */\n    height?: number;\n    /**\n     * 文字水平对齐方式\n     * 'left' | 'center' | 'right'\n     */\n    align?: string;\n    /**\n     * 文字垂直对齐方式\n     * 'top' | 'middle' | 'bottom'\n     */\n    verticalAlign?: string;\n    /**\n     * 折行方式\n     * 'break-word' | 'break-all'\n     */\n    wordBreak?: RichTextWordBreak;\n    /**\n     * 按照宽度限制自动折行或显示省略号(maxLineWidth)\n     * 默认设置为title宽度\n     */\n    maxLineWidth?: number;\n    /**\n     * 高度限制控制显示内容及省略号(heightLimit)\n     */\n    heightLimit?: number;\n    /**\n     * 按照行数限制显示内容及省略号(lineClamp)\n     */\n    lineClamp?: number;\n    /**\n     * 富文本配置（暂时保留旧设置）\n     * @deprecated use subtext & subtextType instead\n     */\n    character?: IRichTextCharacter[];\n  } & Partial<ITextGraphicAttribute>;\n}\n\nexport type Text = StringOrNumber;\n\nexport type ITitle = IComponent;\n"]}
+{"version":3,"sources":["../src/component/title/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { IComponent } from '../../interface';\nimport type { ITextGraphicAttribute, IRichTextCharacter, RichTextWordBreak } from '@visactor/vrender-core';\nimport type { IOrientType, IPadding } from '../../../typings';\nimport type { IComponentSpec } from '../../base/interface';\n\ninterface ITitleSpecWithoutText extends Omit<IComponentSpec, 'orient'> {\n  /**\n   * 是否显示标题\n   */\n  visible?: boolean;\n  /**\n   * Title位置\n   * @default 'top'\n   */\n  orient?: IOrientType;\n  /**\n   * 标题左上角x坐标像素值\n   */\n  x?: number;\n  /**\n   * 标题左上角y坐标像素值\n   */\n  y?: number;\n  /**\n   * 标题宽度\n   */\n  width?: number;\n  /**\n   * 标题高度\n   */\n  height?: number;\n  /**\n   * 最小宽度，像素值\n   */\n  minWidth?: number;\n  /**\n   * 最大宽度，像素值。当文字超过最大宽度时，会自动省略。\n   */\n  maxWidth?: number;\n  /**\n   * 最小高度，像素值\n   */\n  minHeight?: number;\n  /**\n   * 最大高度，像素值\n   */\n  maxHeight?: number;\n  /**\n   * 标题的边距留白\n   */\n  innerPadding?: IPadding | number | number[];\n  /**\n   * 文字水平对齐方式\n   * 'left' | 'center' | 'right'\n   */\n  align?: string;\n  /**\n   * 文字垂直对齐方式\n   * 'top' | 'middle' | 'bottom'\n   */\n  verticalAlign?: string;\n  /**\n   * 主标题样式\n   */\n  textStyle?: {\n    width?: number;\n    height?: number;\n    /**\n     * 文字水平对齐方式\n     * 'left' | 'center' | 'right'\n     */\n    align?: string;\n    /**\n     * 文字垂直对齐方式\n     * 'top' | 'middle' | 'bottom'\n     */\n    verticalAlign?: string;\n    /**\n     * 折行方式\n     * 'break-word' | 'break-all'\n     */\n    wordBreak?: RichTextWordBreak;\n    /**\n     * 按照宽度限制自动折行或显示省略号(maxLineWidth)\n     * 默认设置为title宽度\n     */\n    maxLineWidth?: number;\n    /**\n     * 高度限制控制显示内容及省略号(heightLimit)\n     */\n    heightLimit?: number;\n    /**\n     * 按照行数限制显示内容及省略号(lineClamp)\n     */\n    lineClamp?: number;\n    /**\n     * 富文本配置（暂时保留旧设置）\n     * @deprecated use text & textType instead\n     */\n    character?: IRichTextCharacter[];\n  } & Partial<ITextGraphicAttribute>;\n  /**\n   * 副标题样式\n   */\n  subtextStyle?: {\n    /** 指定宽度 */\n    width?: number;\n    /** 指定高度 */\n    height?: number;\n    /**\n     * 文字水平对齐方式\n     * 'left' | 'center' | 'right'\n     */\n    align?: string;\n    /**\n     * 文字垂直对齐方式\n     * 'top' | 'middle' | 'bottom'\n     */\n    verticalAlign?: string;\n    /**\n     * 折行方式\n     * 'break-word' | 'break-all'\n     */\n    wordBreak?: RichTextWordBreak;\n    /**\n     * 按照宽度限制自动折行或显示省略号(maxLineWidth)\n     * 默认设置为title宽度\n     */\n    maxLineWidth?: number;\n    /**\n     * 高度限制控制显示内容及省略号(heightLimit)\n     */\n    heightLimit?: number;\n    /**\n     * 按照行数限制显示内容及省略号(lineClamp)\n     */\n    lineClamp?: number;\n    /**\n     * 富文本配置（暂时保留旧设置）\n     * @deprecated use subtext & subtextType instead\n     */\n    character?: IRichTextCharacter[];\n  } & Partial<ITextGraphicAttribute>;\n}\n\nexport type ITitleTextSpec =\n  | {\n      /**\n       * 主标题文本类型\n       */\n      textType?: 'text';\n      /**\n       * 主标题文本配置\n       */\n      text: string | number | string[] | number[];\n    }\n  | {\n      /**\n       * 主标题文本类型（默认类型为text）\n       */\n      textType: 'rich';\n      /**\n       * 主标题富文本内容\n       */\n      text: IRichTextCharacter[];\n    };\n\nexport type ISubTitleTextSpec =\n  | {\n      /**\n       * 副标题文本类型\n       */\n      subtextType?: 'text';\n      /**\n       * 副标题文本内容\n       */\n      subtext?: string | number | string[] | number[];\n    }\n  | {\n      /**\n       * 副标题文本类型\n       */\n      subtextType?: 'rich';\n\n      /**\n       * 副标题富文本内容\n       */\n      subtext?: IRichTextCharacter[];\n    };\n\nexport type ITitleSpec = ITitleSpecWithoutText & ITitleTextSpec & ISubTitleTextSpec;\n\nexport type ITitle = IComponent;\n"]}

package/cjs/component/title/interface/theme.d.ts

@@ -1,12 +1,13 @@
 import type { ILayoutItemSpec } from '../../../layout/interface';
 import type { IColorKey } from '../../../theme/color-scheme/interface';
+import type { ITokenKey } from '../../../theme/token';
 import type { StringOrNumber } from '../../../typings';
 import type { TextAlign, TextBaseLine } from '../../../typings/visual';
 export interface ITitleTextTheme {
     width?: number;
     height?: number;
     fontFamily?: string;
-    fontSize?: number;
+    fontSize?: number | ITokenKey;
     fill?: string | IColorKey;
     fontWeight?: StringOrNumber;
     textAlign?: TextAlign;

package/cjs/component/title/interface/theme.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/title/interface/theme.ts"],"names":[],"mappings":"","file":"theme.js","sourcesContent":["import type { ILayoutItemSpec } from '../../../layout/interface';\nimport type { IColorKey } from '../../../theme/color-scheme/interface';\nimport type { StringOrNumber } from '../../../typings';\nimport type { TextAlign, TextBaseLine } from '../../../typings/visual';\nexport interface ITitleTextTheme {\n  /** 主（副）标题宽度 */\n  width?: number;\n  /** 主（副）标题高度 */\n  height?: number;\n  /** 字体 */\n  fontFamily?: string;\n  /** 字体大小 */\n  fontSize?: number;\n  /** 字体颜色 */\n  fill?: string | IColorKey;\n  /** 字重 */\n  fontWeight?: StringOrNumber;\n  /** 对齐方式 */\n  textAlign?: TextAlign;\n  /** 字体基线 */\n  textBaseline?: TextBaseLine;\n  /** 行高 */\n  lineHeight?: number;\n}\n\nexport interface ITitleTheme extends ILayoutItemSpec {\n  /** 主标题样式 */\n  textStyle?: ITitleTextTheme;\n  /** 副标题样式 */\n  subtextStyle?: ITitleTextTheme;\n}\n"]}
+{"version":3,"sources":["../src/component/title/interface/theme.ts"],"names":[],"mappings":"","file":"theme.js","sourcesContent":["import type { ILayoutItemSpec } from '../../../layout/interface';\nimport type { IColorKey } from '../../../theme/color-scheme/interface';\nimport type { ITokenKey } from '../../../theme/token';\nimport type { StringOrNumber } from '../../../typings';\nimport type { TextAlign, TextBaseLine } from '../../../typings/visual';\nexport interface ITitleTextTheme {\n  /** 主（副）标题宽度 */\n  width?: number;\n  /** 主（副）标题高度 */\n  height?: number;\n  /** 字体 */\n  fontFamily?: string;\n  /** 字体大小 */\n  fontSize?: number | ITokenKey;\n  /** 字体颜色 */\n  fill?: string | IColorKey;\n  /** 字重 */\n  fontWeight?: StringOrNumber;\n  /** 对齐方式 */\n  textAlign?: TextAlign;\n  /** 字体基线 */\n  textBaseline?: TextBaseLine;\n  /** 行高 */\n  lineHeight?: number;\n}\n\nexport interface ITitleTheme extends ILayoutItemSpec {\n  /** 主标题样式 */\n  textStyle?: ITitleTextTheme;\n  /** 副标题样式 */\n  subtextStyle?: ITitleTextTheme;\n}\n"]}

package/cjs/component/tooltip/interface/common.d.ts

@@ -14,7 +14,7 @@ export type TotalMouseEventData = {
     tooltipInfo: Partial<ITooltipActiveTypeAsKeys<MarkTooltipInfo, DimensionTooltipInfo>>;
     ignore: Partial<ITooltipActiveTypeAsKeys<boolean, boolean>>;
 };
-export declare enum TooltipResult {
+export declare const enum TooltipResult {
     success = 0,
     failed = 1
 }

package/cjs/component/tooltip/interface/common.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/interface/common.ts"],"names":[],"mappings":";;;AAoBA,IAAY,aAKX;AALD,WAAY,aAAa;IAEvB,uDAAW,CAAA;IAEX,qDAAU,CAAA;AACZ,CAAC,EALW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAKxB","file":"common.js","sourcesContent":["import type { DimensionEventParams } from '../../../event/events/dimension/interface';\nimport type { BaseEventParams } from '../../../event/interface';\nimport type { DimensionTooltipInfo, MarkTooltipInfo } from '../processor/interface';\nimport type { Datum, IShowTooltipOption } from '../../../typings';\nimport type { IComponent } from '../../interface';\n\nexport type TooltipHandlerParams = (BaseEventParams | DimensionEventParams) & {\n  changePositionOnly?: boolean;\n};\n\nexport interface ITooltipActiveTypeAsKeys<T, K> {\n  mark: T;\n  dimension: K;\n}\n\nexport type TotalMouseEventData = {\n  tooltipInfo: Partial<ITooltipActiveTypeAsKeys<MarkTooltipInfo, DimensionTooltipInfo>>;\n  ignore: Partial<ITooltipActiveTypeAsKeys<boolean, boolean>>;\n};\n\nexport enum TooltipResult {\n  /** tooltip 显示成功 */\n  success = 0,\n  /** tooltip 未成功显示 */\n  failed = 1\n}\n\nexport interface ITooltip extends IComponent {\n  getVisible: () => boolean;\n  showTooltip: (datum: Datum, options: IShowTooltipOption) => void;\n}\n"]}
+{"version":3,"sources":["../src/component/tooltip/interface/common.ts"],"names":[],"mappings":";;;AAoBA,IAAkB,aAKjB;AALD,WAAkB,aAAa;IAE7B,uDAAW,CAAA;IAEX,qDAAU,CAAA;AACZ,CAAC,EALiB,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAK9B","file":"common.js","sourcesContent":["import type { DimensionEventParams } from '../../../event/events/dimension/interface';\nimport type { BaseEventParams } from '../../../event/interface';\nimport type { DimensionTooltipInfo, MarkTooltipInfo } from '../processor/interface';\nimport type { Datum, IShowTooltipOption } from '../../../typings';\nimport type { IComponent } from '../../interface';\n\nexport type TooltipHandlerParams = (BaseEventParams | DimensionEventParams) & {\n  changePositionOnly?: boolean;\n};\n\nexport interface ITooltipActiveTypeAsKeys<T, K> {\n  mark: T;\n  dimension: K;\n}\n\nexport type TotalMouseEventData = {\n  tooltipInfo: Partial<ITooltipActiveTypeAsKeys<MarkTooltipInfo, DimensionTooltipInfo>>;\n  ignore: Partial<ITooltipActiveTypeAsKeys<boolean, boolean>>;\n};\n\nexport const enum TooltipResult {\n  /** tooltip 显示成功 */\n  success = 0,\n  /** tooltip 未成功显示 */\n  failed = 1\n}\n\nexport interface ITooltip extends IComponent {\n  getVisible: () => boolean;\n  showTooltip: (datum: Datum, options: IShowTooltipOption) => void;\n}\n"]}

package/cjs/component/tooltip/interface/theme.d.ts

@@ -1,15 +1,16 @@
 import type { RichTextWordBreak } from '@visactor/vrender-core';
 import type { StringOrNumber, TextAlign, TextBaseLine } from '../../../typings';
 import type { Padding } from '@visactor/vrender-components/es/core/type';
+import type { ITokenKey } from '../../../theme/token';
 export interface ITooltipTextTheme<ColorType = string> {
     fontFamily?: string;
-    fontSize?: number;
+    fontSize?: number | ITokenKey;
     fill?: ColorType;
     fontColor?: ColorType;
     fontWeight?: StringOrNumber;
     textAlign?: TextAlign;
     textBaseline?: TextBaseLine;
-    lineHeight?: number | string;
+    lineHeight?: number | string | ITokenKey;
     spacing?: number;
     multiLine?: boolean;
     maxWidth?: number;

package/cjs/component/tooltip/interface/theme.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/interface/theme.ts"],"names":[],"mappings":"","file":"theme.js","sourcesContent":["import type { RichTextWordBreak } from '@visactor/vrender-core';\nimport type { StringOrNumber, TextAlign, TextBaseLine } from '../../../typings';\nimport type { Padding } from '@visactor/vrender-components/es/core/type';\n\nexport interface ITooltipTextTheme<ColorType = string> {\n  /** 字体 */\n  fontFamily?: string;\n  /** 字体大小 */\n  fontSize?: number;\n  /** 字体颜色 */\n  fill?: ColorType;\n  /** @deprecated 字体颜色（兼容旧版本） */\n  fontColor?: ColorType;\n  /** 字重 */\n  fontWeight?: StringOrNumber;\n  /** 对齐方式 */\n  textAlign?: TextAlign;\n  /** 字体基线 */\n  textBaseline?: TextBaseLine;\n  /** 行高 */\n  lineHeight?: number | string;\n  /** 与相邻元素的水平间距 */\n  spacing?: number;\n  /** 是否支持换行 */\n  multiLine?: boolean;\n  /** 最大宽度 */\n  maxWidth?: number;\n  /** 换行模式，默认为'break-word' */\n  wordBreak?: RichTextWordBreak;\n  /**\n   * 是否开启自动宽度。效果分为以下几种情况：\n   * - tooltip 标题：`autoWidth` 默认为 `false`。如果配置为 `true`，则 tooltip 标题会保持和 tooltip 内容一致的宽度\n   * - tooltip key 标签：`autoWidth` 不适用\n   * - tooltip value 标签：`autoWidth` 默认为 `true`。如果配置为 `true`，则 tooltip value 标签会自动占满 tooltip 整体宽度的剩余部分\n   * @since 1.4.2\n   */\n  autoWidth?: boolean;\n}\n\nexport interface ITooltipTheme<ColorType = string> {\n  /** 容器样式配置 */\n  panel?: {\n    /** tooltip 容器内边距 */\n    padding?: Padding;\n    /** 背景色 */\n    backgroundColor?: ColorType;\n    /** tooltip边框 */\n    border?: {\n      color?: ColorType;\n      width?: number;\n      /** 圆角 */\n      radius?: number;\n    };\n    /** tooltip阴影 */\n    shadow?: {\n      x: number;\n      y: number;\n      blur: number;\n      spread: number;\n      color: ColorType;\n    };\n  };\n  shape?: {\n    /** 标记大小 */\n    size?: number;\n    /** shape 与相邻元素的水平间距 */\n    spacing?: number;\n  };\n  /** tooltip标题 */\n  titleLabel?: ITooltipTextTheme<ColorType>;\n  /** tooltip内容，key字段 */\n  keyLabel?: Omit<ITooltipTextTheme<ColorType>, 'autoWidth'>;\n  /** tooltip内容，value字段 */\n  valueLabel?: ITooltipTextTheme<ColorType>;\n  /** 内容项行间距 */\n  spaceRow?: number;\n  /**\n   * 最大内容区高度，内容区若超过该高度将显示局部滚动条（适用于 dom tooltip）\n   * @since 1.9.0\n   */\n  maxContentHeight?: number;\n  /** 偏移量 */\n  offset?: {\n    x?: number;\n    y?: number;\n  };\n}\n"]}
+{"version":3,"sources":["../src/component/tooltip/interface/theme.ts"],"names":[],"mappings":"","file":"theme.js","sourcesContent":["import type { RichTextWordBreak } from '@visactor/vrender-core';\nimport type { StringOrNumber, TextAlign, TextBaseLine } from '../../../typings';\nimport type { Padding } from '@visactor/vrender-components/es/core/type';\nimport type { ITokenKey } from '../../../theme/token';\n\nexport interface ITooltipTextTheme<ColorType = string> {\n  /** 字体 */\n  fontFamily?: string;\n  /** 字体大小 */\n  fontSize?: number | ITokenKey;\n  /** 字体颜色 */\n  fill?: ColorType;\n  /** @deprecated 字体颜色（兼容旧版本） */\n  fontColor?: ColorType;\n  /** 字重 */\n  fontWeight?: StringOrNumber;\n  /** 对齐方式 */\n  textAlign?: TextAlign;\n  /** 字体基线 */\n  textBaseline?: TextBaseLine;\n  /** 行高 */\n  lineHeight?: number | string | ITokenKey;\n  /** 与相邻元素的水平间距 */\n  spacing?: number;\n  /** 是否支持换行 */\n  multiLine?: boolean;\n  /** 最大宽度 */\n  maxWidth?: number;\n  /** 换行模式，默认为'break-word' */\n  wordBreak?: RichTextWordBreak;\n  /**\n   * 是否开启自动宽度。效果分为以下几种情况：\n   * - tooltip 标题：`autoWidth` 默认为 `false`。如果配置为 `true`，则 tooltip 标题会保持和 tooltip 内容一致的宽度\n   * - tooltip key 标签：`autoWidth` 不适用\n   * - tooltip value 标签：`autoWidth` 默认为 `true`。如果配置为 `true`，则 tooltip value 标签会自动占满 tooltip 整体宽度的剩余部分\n   * @since 1.4.2\n   */\n  autoWidth?: boolean;\n}\n\nexport interface ITooltipTheme<ColorType = string> {\n  /** 容器样式配置 */\n  panel?: {\n    /** tooltip 容器内边距 */\n    padding?: Padding;\n    /** 背景色 */\n    backgroundColor?: ColorType;\n    /** tooltip边框 */\n    border?: {\n      color?: ColorType;\n      width?: number;\n      /** 圆角 */\n      radius?: number;\n    };\n    /** tooltip阴影 */\n    shadow?: {\n      x: number;\n      y: number;\n      blur: number;\n      spread: number;\n      color: ColorType;\n    };\n  };\n  shape?: {\n    /** 标记大小 */\n    size?: number;\n    /** shape 与相邻元素的水平间距 */\n    spacing?: number;\n  };\n  /** tooltip标题 */\n  titleLabel?: ITooltipTextTheme<ColorType>;\n  /** tooltip内容，key字段 */\n  keyLabel?: Omit<ITooltipTextTheme<ColorType>, 'autoWidth'>;\n  /** tooltip内容，value字段 */\n  valueLabel?: ITooltipTextTheme<ColorType>;\n  /** 内容项行间距 */\n  spaceRow?: number;\n  /**\n   * 最大内容区高度，内容区若超过该高度将显示局部滚动条（适用于 dom tooltip）\n   * @since 1.9.0\n   */\n  maxContentHeight?: number;\n  /** 偏移量 */\n  offset?: {\n    x?: number;\n    y?: number;\n  };\n}\n"]}

package/cjs/component/tooltip/processor/base.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseTooltipProcessor = void 0;
 
-const vutils_1 = require("@visactor/vutils"), common_1 = require("../interface/common"), constant_1 = require("../../../constant"), polar_1 = require("../../../event/events/dimension/util/polar"), cartesian_1 = require("../../../event/events/dimension/util/cartesian"), vscale_1 = require("@visactor/vscale");
+const vutils_1 = require("@visactor/vutils"), constant_1 = require("../../../constant"), polar_1 = require("../../../event/events/dimension/util/polar"), cartesian_1 = require("../../../event/events/dimension/util/cartesian"), vscale_1 = require("@visactor/vscale");
 
 class BaseTooltipProcessor {
     constructor(component) {
@@ -15,7 +15,7 @@ class BaseTooltipProcessor {
                 activeType: this.activeType,
                 tooltip: this.component
             })), (null === (_a = this.component.tooltipHandler) || void 0 === _a ? void 0 : _a.showTooltip) && (0, 
-            vutils_1.isValid)(data) ? null !== (_b = this.component.tooltipHandler.showTooltip(this.activeType, data, params)) && void 0 !== _b ? _b : common_1.TooltipResult.success : common_1.TooltipResult.failed;
+            vutils_1.isValid)(data) ? null !== (_b = this.component.tooltipHandler.showTooltip(this.activeType, data, params)) && void 0 !== _b ? _b : 0 : 1;
         }, this.component = component;
     }
     _preprocessDimensionInfo(dimensionInfo) {

package/cjs/component/tooltip/processor/base.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/processor/base.ts"],"names":[],"mappings":"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","file":"base.js","sourcesContent":["import { isValid } from '@visactor/vutils';\nimport type { BaseEventParams } from '../../../event/interface';\nimport type { TooltipActiveType, TooltipData } from '../../../typings';\nimport type { TooltipHandlerParams } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { TooltipResult } from '../interface/common';\nimport type { Tooltip } from '../tooltip';\nimport type { MouseEventData, TooltipInfo } from './interface';\nimport { ChartEvent } from '../../../constant';\nimport type { TooltipEventParams } from '../interface/event';\nimport type { IDimensionData, IDimensionInfo } from '../../../event/events/dimension';\nimport { getPolarDimensionInfo } from '../../../event/events/dimension/util/polar';\nimport { getCartesianDimensionInfo } from '../../../event/events/dimension/util/cartesian';\nimport { isDiscrete } from '@visactor/vscale';\nimport type { ICartesianSeries } from '../../../series/interface';\n\nexport abstract class BaseTooltipProcessor {\n  readonly component: Tooltip;\n  activeType: TooltipActiveType;\n\n  constructor(component: Tooltip) {\n    this.component = component;\n  }\n\n  /** 触发对应类型的 tooltip */\n  abstract showTooltip(info: TooltipInfo, params: BaseEventParams, changePositionOnly: boolean): TooltipResult;\n\n  /** 判断是否应该触发 tooltip */\n  abstract shouldHandleTooltip(params: BaseEventParams, mouseEventData: Partial<MouseEventData>): boolean;\n\n  /** 获取触发 tooltip 需要的信息 */\n  abstract getMouseEventData(params: BaseEventParams): MouseEventData;\n\n  protected _showTooltipByHandler = (data: TooltipData | undefined, params: TooltipHandlerParams): TooltipResult => {\n    this.component.event.emit(ChartEvent.tooltipShow, {\n      ...params,\n      tooltipData: data,\n      activeType: this.activeType,\n      tooltip: this.component\n    } as TooltipEventParams);\n    if (this.component.tooltipHandler?.showTooltip && isValid(data)) {\n      return this.component.tooltipHandler.showTooltip(this.activeType, data, params) ?? TooltipResult.success;\n    }\n    return TooltipResult.failed;\n  };\n\n  protected _preprocessDimensionInfo(dimensionInfo?: IDimensionInfo[]): IDimensionInfo[] | undefined {\n    const newDimensionInfo: IDimensionInfo[] = [];\n    dimensionInfo?.forEach(info => {\n      const di: IDimensionInfo = {\n        ...info,\n        data: info.data.filter(\n          ({ series }: any) => series.getSpec()?.tooltip?.visible !== false // 过滤掉不需要显示的维度数据\n        )\n      };\n      if (di.data.length > 0) {\n        newDimensionInfo.push(di);\n      }\n    });\n    if (newDimensionInfo.length > 0) {\n      return newDimensionInfo;\n    }\n    return undefined;\n  }\n\n  protected _getDimensionInfo(params: BaseEventParams): IDimensionInfo[] {\n    let targetDimensionInfo: IDimensionInfo[] | undefined;\n    // 处理dimension info\n    const chart = this.component.getChart();\n\n    // compute layer offset\n    const layer = chart.getCompiler().getStage().getLayer(undefined);\n    const point = { x: params.event.viewX, y: params.event.viewY };\n    layer.globalTransMatrix.transformPoint({ x: params.event.viewX, y: params.event.viewY }, point);\n\n    targetDimensionInfo = [\n      ...(getCartesianDimensionInfo(chart, point, true) ?? []),\n      ...(getPolarDimensionInfo(chart, point) ?? [])\n    ];\n    if (targetDimensionInfo.length === 0) {\n      targetDimensionInfo = undefined;\n    } else if (targetDimensionInfo.length > 1) {\n      // 只保留一个轴的dimension info\n      const dimensionAxisInfo = targetDimensionInfo.filter(info => {\n        const axis = info.axis;\n        if (axis.getSpec().hasDimensionTooltip) {\n          return true;\n        }\n\n        // 优先显示离散轴 tooltip\n        if (!isDiscrete(axis.getScale().type)) {\n          return false;\n        }\n        // 下面的逻辑用来判断当前的离散轴是不是维度轴\n        let firstSeries: ICartesianSeries | undefined;\n        for (const region of axis?.getRegions() ?? []) {\n          for (const series of region.getSeries()) {\n            if (series.coordinate === 'cartesian') {\n              firstSeries = series as ICartesianSeries;\n              break;\n            }\n          }\n          if (isValid(firstSeries)) {\n            break;\n          }\n        }\n        if (isValid(firstSeries) && firstSeries.getDimensionField()[0] === firstSeries.fieldY[0]) {\n          // 维度轴为Y轴时，选择只显示Y轴tooltip\n          return axis.getOrient() === 'left' || axis.getOrient() === 'right';\n        }\n        // 维度轴为X轴时，选择只显示X轴tooltip\n        return axis.getOrient() === 'bottom' || axis.getOrient() === 'top';\n      });\n      targetDimensionInfo = dimensionAxisInfo.length ? dimensionAxisInfo : targetDimensionInfo.slice(0, 1);\n\n      // datum 去重，保证每个系列的每个数据项只对应于一行 tooltip 内容项\n      if (targetDimensionInfo.length > 1) {\n        const dimensionDataKeySet = new Set<string>();\n        targetDimensionInfo.forEach(info => {\n          info.data = info.data.filter(({ key }: IDimensionData) => {\n            if (dimensionDataKeySet.has(key)) {\n              return false;\n            }\n            dimensionDataKeySet.add(key);\n            return true;\n          });\n        });\n      }\n    }\n\n    return targetDimensionInfo;\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/tooltip/processor/base.ts"],"names":[],"mappings":"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","file":"base.js","sourcesContent":["import { isValid } from '@visactor/vutils';\nimport type { BaseEventParams } from '../../../event/interface';\nimport type { TooltipActiveType, TooltipData } from '../../../typings';\nimport type { TooltipHandlerParams } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { TooltipResult } from '../interface/common';\nimport type { Tooltip } from '../tooltip';\nimport type { MouseEventData, TooltipInfo } from './interface';\nimport { ChartEvent } from '../../../constant';\nimport type { TooltipEventParams } from '../interface/event';\nimport type { IDimensionData, IDimensionInfo } from '../../../event/events/dimension';\nimport { getPolarDimensionInfo } from '../../../event/events/dimension/util/polar';\nimport { getCartesianDimensionInfo } from '../../../event/events/dimension/util/cartesian';\nimport { isDiscrete } from '@visactor/vscale';\nimport type { ICartesianSeries } from '../../../series/interface';\n\nexport abstract class BaseTooltipProcessor {\n  readonly component: Tooltip;\n  activeType: TooltipActiveType;\n\n  constructor(component: Tooltip) {\n    this.component = component;\n  }\n\n  /** 触发对应类型的 tooltip */\n  abstract showTooltip(info: TooltipInfo, params: BaseEventParams, changePositionOnly: boolean): TooltipResult;\n\n  /** 判断是否应该触发 tooltip */\n  abstract shouldHandleTooltip(params: BaseEventParams, mouseEventData: Partial<MouseEventData>): boolean;\n\n  /** 获取触发 tooltip 需要的信息 */\n  abstract getMouseEventData(params: BaseEventParams): MouseEventData;\n\n  protected _showTooltipByHandler = (data: TooltipData | undefined, params: TooltipHandlerParams): TooltipResult => {\n    this.component.event.emit(ChartEvent.tooltipShow, {\n      ...params,\n      tooltipData: data,\n      activeType: this.activeType,\n      tooltip: this.component\n    } as TooltipEventParams);\n    if (this.component.tooltipHandler?.showTooltip && isValid(data)) {\n      return this.component.tooltipHandler.showTooltip(this.activeType, data, params) ?? TooltipResult.success;\n    }\n    return TooltipResult.failed;\n  };\n\n  protected _preprocessDimensionInfo(dimensionInfo?: IDimensionInfo[]): IDimensionInfo[] | undefined {\n    const newDimensionInfo: IDimensionInfo[] = [];\n    dimensionInfo?.forEach(info => {\n      const di: IDimensionInfo = {\n        ...info,\n        data: info.data.filter(\n          ({ series }: any) => series.getSpec()?.tooltip?.visible !== false // 过滤掉不需要显示的维度数据\n        )\n      };\n      if (di.data.length > 0) {\n        newDimensionInfo.push(di);\n      }\n    });\n    if (newDimensionInfo.length > 0) {\n      return newDimensionInfo;\n    }\n    return undefined;\n  }\n\n  protected _getDimensionInfo(params: BaseEventParams): IDimensionInfo[] {\n    let targetDimensionInfo: IDimensionInfo[] | undefined;\n    // 处理dimension info\n    const chart = this.component.getChart();\n\n    // compute layer offset\n    const layer = chart.getCompiler().getStage().getLayer(undefined);\n    const point = { x: params.event.viewX, y: params.event.viewY };\n    layer.globalTransMatrix.transformPoint({ x: params.event.viewX, y: params.event.viewY }, point);\n\n    targetDimensionInfo = [\n      ...(getCartesianDimensionInfo(chart, point, true) ?? []),\n      ...(getPolarDimensionInfo(chart, point) ?? [])\n    ];\n    if (targetDimensionInfo.length === 0) {\n      targetDimensionInfo = undefined;\n    } else if (targetDimensionInfo.length > 1) {\n      // 只保留一个轴的dimension info\n      const dimensionAxisInfo = targetDimensionInfo.filter(info => {\n        const axis = info.axis;\n        if (axis.getSpec().hasDimensionTooltip) {\n          return true;\n        }\n\n        // 优先显示离散轴 tooltip\n        if (!isDiscrete(axis.getScale().type)) {\n          return false;\n        }\n        // 下面的逻辑用来判断当前的离散轴是不是维度轴\n        let firstSeries: ICartesianSeries | undefined;\n        for (const region of axis?.getRegions() ?? []) {\n          for (const series of region.getSeries()) {\n            if (series.coordinate === 'cartesian') {\n              firstSeries = series as ICartesianSeries;\n              break;\n            }\n          }\n          if (isValid(firstSeries)) {\n            break;\n          }\n        }\n        if (isValid(firstSeries) && firstSeries.getDimensionField()[0] === firstSeries.fieldY[0]) {\n          // 维度轴为Y轴时，选择只显示Y轴tooltip\n          return axis.getOrient() === 'left' || axis.getOrient() === 'right';\n        }\n        // 维度轴为X轴时，选择只显示X轴tooltip\n        return axis.getOrient() === 'bottom' || axis.getOrient() === 'top';\n      });\n      targetDimensionInfo = dimensionAxisInfo.length ? dimensionAxisInfo : targetDimensionInfo.slice(0, 1);\n\n      // datum 去重，保证每个系列的每个数据项只对应于一行 tooltip 内容项\n      if (targetDimensionInfo.length > 1) {\n        const dimensionDataKeySet = new Set<string>();\n        targetDimensionInfo.forEach(info => {\n          info.data = info.data.filter(({ key }: IDimensionData) => {\n            if (dimensionDataKeySet.has(key)) {\n              return false;\n            }\n            dimensionDataKeySet.add(key);\n            return true;\n          });\n        });\n      }\n    }\n\n    return targetDimensionInfo;\n  }\n}\n"]}

package/cjs/component/tooltip/tooltip.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerTooltip = exports.Tooltip = void 0;
 
-const type_1 = require("../interface/type"), base_component_1 = require("../base/base-component"), env_1 = require("../../util/env"), common_1 = require("./interface/common"), show_tooltip_1 = require("./utils/show-tooltip"), common_2 = require("./utils/common"), common_3 = require("../../event/events/dimension/util/common"), constant_1 = require("../../constant"), dimension_tooltip_1 = require("./processor/dimension-tooltip"), util_1 = require("./processor/util"), mark_tooltip_1 = require("./processor/mark-tooltip"), vutils_1 = require("@visactor/vutils"), vchart_1 = require("../../core/vchart"), factory_1 = require("../../core/factory"), tooltip_transformer_1 = require("./tooltip-transformer"), constants_1 = require("../../plugin/components/tooltip-handler/constants"), util_2 = require("../../util");
+const type_1 = require("../interface/type"), base_component_1 = require("../base/base-component"), env_1 = require("../../util/env"), show_tooltip_1 = require("./utils/show-tooltip"), common_1 = require("./utils/common"), common_2 = require("../../event/events/dimension/util/common"), constant_1 = require("../../constant"), dimension_tooltip_1 = require("./processor/dimension-tooltip"), util_1 = require("./processor/util"), mark_tooltip_1 = require("./processor/mark-tooltip"), vutils_1 = require("@visactor/vutils"), vchart_1 = require("../../core/vchart"), factory_1 = require("../../core/factory"), tooltip_transformer_1 = require("./tooltip-transformer"), constants_1 = require("../../plugin/components/tooltip-handler/constants"), util_2 = require("../../util");
 
 class Tooltip extends base_component_1.BaseComponent {
     constructor() {
@@ -36,7 +36,7 @@ class Tooltip extends base_component_1.BaseComponent {
             let markTooltipSuccess = !1, dimensionTooltipSuccess = !1;
             markTooltipSuccess = this._showTooltipByMouseEvent("mark", mouseEventData, params), 
             markTooltipSuccess || (dimensionTooltipSuccess = this._showTooltipByMouseEvent("dimension", mouseEventData, params)), 
-            markTooltipSuccess || dimensionTooltipSuccess || (0, common_2.isEmptyPos)(params) || (ignoreMark && (0, 
+            markTooltipSuccess || dimensionTooltipSuccess || (0, common_1.isEmptyPos)(params) || (ignoreMark && (0, 
             util_1.isMarkInfo)(this._cacheInfo) ? markTooltipSuccess = this._showTooltipByMouseEvent("mark", mouseEventData, params, !0) : ignoreDimension && (0, 
             util_1.isDimensionInfo)(this._cacheInfo) ? dimensionTooltipSuccess = this._showTooltipByMouseEvent("dimension", mouseEventData, params, !0) : (0, 
             vutils_1.isValid)(dimensionInfo) && (dimensionTooltipSuccess = this._showTooltipByMouseEvent("dimension", mouseEventData, params))), 
@@ -68,7 +68,7 @@ class Tooltip extends base_component_1.BaseComponent {
             })), result;
         }, this._hideTooltipByHandler = params => {
             var _a, _b, _c;
-            if (!this._isTooltipShown && !(null === (_b = null === (_a = this.tooltipHandler) || void 0 === _a ? void 0 : _a.isTooltipShown) || void 0 === _b ? void 0 : _b.call(_a))) return common_1.TooltipResult.success;
+            if (!this._isTooltipShown && !(null === (_b = null === (_a = this.tooltipHandler) || void 0 === _a ? void 0 : _a.isTooltipShown) || void 0 === _b ? void 0 : _b.call(_a))) return 0;
             if (this.event.emit(constant_1.ChartEvent.tooltipHide, Object.assign(Object.assign({}, params), {
                 source: constant_1.Event_Source_Type.chart,
                 tooltip: this
@@ -76,7 +76,7 @@ class Tooltip extends base_component_1.BaseComponent {
                 const result = this.tooltipHandler.hideTooltip(params);
                 return result || (this._isTooltipShown = !1), result;
             }
-            return common_1.TooltipResult.failed;
+            return 1;
         };
     }
     static getSpecInfo(chartSpec) {
@@ -172,7 +172,7 @@ class Tooltip extends base_component_1.BaseComponent {
         const userSpec = this._spec;
         this._spec = Object.assign(Object.assign({}, userSpec), {
             visible: !(0, vutils_1.isValid)(userSpec.visible) || userSpec.visible,
-            activeType: (0, common_2.getTooltipActualActiveType)(userSpec),
+            activeType: (0, common_1.getTooltipActualActiveType)(userSpec),
             renderMode: "html",
             trigger: (0, vutils_1.isValid)(userSpec.trigger) ? userSpec.trigger : "hover",
             className: (0, vutils_1.isValid)(userSpec.className) ? userSpec.className : constants_1.TOOLTIP_EL_CLASS_NAME,
@@ -214,7 +214,7 @@ class Tooltip extends base_component_1.BaseComponent {
         if ((0, util_1.isDimensionInfo)(nextInfo)) {
             if ((0, util_1.isMarkInfo)(this._cacheInfo)) return !1;
             const prevInfo = this._cacheInfo;
-            if (!(prevInfo.length === nextInfo.length && nextInfo.every(((info, i) => (0, common_3.isSameDimensionInfo)(info, prevInfo[i]))))) return !1;
+            if (!(prevInfo.length === nextInfo.length && nextInfo.every(((info, i) => (0, common_2.isSameDimensionInfo)(info, prevInfo[i]))))) return !1;
         } else {
             if ((0, util_1.isDimensionInfo)(this._cacheInfo)) return !1;
             const prevInfo = this._cacheInfo;