@visactor/vchart 1.4.2-beta.1 → 1.4.2

package/esm/model/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/model/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport type { DataSet } from '@visactor/vdataset';\nimport type { IEvent, IEventDispatcher } from '../event/interface';\nimport type { IMark, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { VChart } from '../vchart-all';\nimport type { IData, IElement, IMark as IVGrammarMark } from '@visactor/vgrammar-core';\nimport type {\n  IOrientType,\n  IPoint,\n  IGroupMarkSpec,\n  ConvertToMarkStyleSpec,\n  CoordinateType,\n  ICommonSpec,\n  IRect,\n  StringOrNumber\n} from '../typings';\nimport type { ITheme } from '../theme';\nimport type { StateValueType } from '../typings/spec';\nimport type { ITooltipHelper } from './tooltip-helper';\nimport type { ModelStateManager } from './model-state-manager';\nimport type { ICompilable, ICompilableInitOption } from '../compile/interface';\nimport type { ICompilableData } from '../compile/data';\nimport type { IGlobalScale } from '../scale/interface';\nimport type { IChart } from '../chart/interface';\n\nexport type ILayoutNumber = number | IPercent | ((layoutRect: ILayoutRect) => number) | IPercentOffset;\n\nexport interface ILayoutPoint {\n  x: number;\n  y: number;\n}\n\nexport interface ILayoutRectLevel {\n  width: number;\n  height: number;\n}\nexport interface ILayoutRect {\n  width: number;\n  height: number;\n}\n\nexport type IPercent = `${number}%`;\n\nexport type IPercentOffset = { percent?: number; offset?: number };\n\nexport type ILayoutPercent = IPercent | number;\n\n/**\n * 相对布局和绝对布局\n * 在相对布局结束后进行二次的绝对布局\n * 绝对布局会只根据 chart 进行相对处理\n */\n\ntype ILayoutType = 'region-relative' | 'region' | 'normal' | 'absolute' | 'normal-inline';\n\nexport type ILayoutOrientPadding = {\n  left?: ILayoutNumber;\n  right?: ILayoutNumber;\n  top?: ILayoutNumber;\n  bottom?: ILayoutNumber;\n};\n\n/** 布局 padding的配置 */\nexport type ILayoutPaddingSpec = ILayoutOrientPadding | ILayoutNumber | ILayoutNumber[];\n\n/**\n * 因为这些元素都会继承到各个模块，所以这里统一有前缀避免语意冲突\n */\nexport interface ILayoutItem {\n  /**\n   * 标记这个布局Item的方向（left->right, right->left, top->bottom, bottom->top）\n   */\n  directionStr?: 'l2r' | 'r2l' | 't2b' | 'b2t';\n  layoutClip: boolean;\n  layoutType: ILayoutType;\n  layoutBindRegionID: number | number[];\n  layoutOrient: IOrientType;\n\n  layoutPaddingLeft: number;\n  layoutPaddingTop: number;\n  layoutPaddingRight: number;\n  layoutPaddingBottom: number;\n\n  layoutOffsetX: number;\n  layoutOffsetY: number;\n\n  // 越大越先处理\n  layoutLevel: number;\n\n  layoutZIndex: number;\n  chartLayoutRect: ILayoutRect;\n\n  /** 是否可见 */\n  getVisible: () => boolean;\n\n  getSpec?: () => any;\n\n  /** 是否自动缩进 */\n  getAutoIndent: () => boolean;\n  getLayoutStartPoint: () => ILayoutPoint;\n  getLayoutRect: () => ILayoutRect;\n  getLastComputeOutBounds: () => IBoundsLike;\n\n  /**\n   * 更新元素布局的 layoutRect 大小，用来更新指定布局空间\n   */\n  setLayoutRect: (rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRectLevel>) => void;\n  /**\n   * 基于元素内部逻辑计算占位空间，rect表示可用空间\n   */\n  computeBoundsInRect: (rect: ILayoutRect) => ILayoutRect;\n  /**\n   * 更新元素布局的起始点位置\n   */\n  setLayoutStartPosition: (pos: Partial<IPoint>) => void;\n  /**\n   * 更新绝对布局元素的位置信息\n   */\n  absoluteLayoutInRect: (rect: IRect) => void;\n  /**\n   * 元素内部布局信息更新\n   */\n  updateLayoutAttribute: () => void;\n}\n\nexport interface ILayoutItemSpec {\n  /** 当前模块的布局类型，配置为 absolute 的话，当前元素会以图表左上角为原点进行绝对布局 */\n  layoutType?: ILayoutType;\n  /**\n   * 布局顺序等级，等级越大的，越优先布局\n   * 比如顶部同时有标题和图例的场景，期望标题先放在顶部，然后放置图例。\n   */\n  layoutLevel?: number;\n\n  // 基础的布局配置\n  /** 模块布局位置 */\n  orient?: IOrientType;\n  /** 模块的布局间距 */\n  padding?: ILayoutPaddingSpec;\n  /** 是否按照 orient 自动修改 padding，隐藏位于外侧的 padding。目前只在组件上生效 */\n  noOuterPadding?: boolean;\n  /** 模块的布局大小：宽度 */\n  width?: ILayoutNumber;\n  /** 模块的布局最大宽度 */\n  maxWidth?: ILayoutNumber;\n  /** 模块的布局最小宽度 */\n  minWidth?: ILayoutNumber;\n  /** 模块的布局大小：高度 */\n  height?: ILayoutNumber;\n  /** 模块的布局最大高度 */\n  maxHeight?: ILayoutNumber;\n  /** 模块的布局最小高度 */\n  minHeight?: ILayoutNumber;\n  /** 模块的布局位置偏移：X */\n  offsetX?: ILayoutNumber;\n  /** 模块的布局位置偏移：Y */\n  offsetY?: ILayoutNumber;\n\n  /** 模块的展示层级，当2个模块重叠时，层级较大的展示在上方 */\n  zIndex?: number;\n  /** 模块是否裁剪超出布局区域外的绘图内容 */\n  clip?: boolean;\n\n  // 绝对布局下的对齐设置\n\n  /** 模块绝对布局下，与图表左侧的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  left?: ILayoutNumber;\n  /** 模块绝对布局下，与图表右侧的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  right?: ILayoutNumber;\n  /** 模块绝对布局下，与图表顶部的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  top?: ILayoutNumber;\n  /** 模块绝对布局下，与图表底部的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  bottom?: ILayoutNumber;\n  /** 模块绝对布局下，元素将放置在图表的正中间。注意仅在 layoutType === 'absolute' 时生效，同时将忽略 padding 属性  */\n  center?: boolean;\n}\n\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelInitOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelLayoutOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelEvaluateOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelRenderOption {}\n\nexport interface IEffect {\n  [key: string]: (e?: any) => any;\n}\n\nexport interface IMarkTreeGroup extends Partial<IMarkStyle<IGroupMarkSpec>> {\n  // 必须要有名字\n  type: 'group';\n  name: string;\n  marks: (IMarkTreeGroup | IMark)[];\n  // TODO: 这里要不要支持复杂场景，有图形组合的场景，用自定义mark？\n  // from?: IData;\n}\n\nexport type IMarkTree = IMarkTreeGroup | IMark | (IMarkTreeGroup | IMark)[];\n\nexport interface IUpdateSpecResult {\n  change: boolean;\n  reMake: boolean;\n  reRender?: boolean;\n  reSize?: boolean;\n  // TODO: compile 的判断应不应该出现在这里?\n  reCompile?: boolean;\n}\n\nexport interface IModelProduct {\n  srData: IData;\n}\n\nexport interface IModel extends ICompilable, ILayoutItem {\n  readonly modelType: string;\n  readonly type: string;\n  readonly specKey: string;\n\n  readonly id: number;\n\n  readonly userId?: StringOrNumber;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  // state如果绑定到mark的更新？\n  // 组件的 mark 要怎么样描述，才能正确的基于组件状态进行样式更新？\n  // 方案1: 组件的 state 关联到 mark 的状态。\n  // 方案2: 组件设置 mark 属性，mark自身属性变化时，自己去更新。\n  // react state\n  readonly state: ModelStateManager;\n  getState: () => ModelStateManager['_stateMap'];\n\n  coordinate?: CoordinateType;\n\n  // 初始化参数\n  getOption: () => IModelOption;\n\n  getMarks: () => IMark[];\n  getMarkNameMap: () => Record<string, IMark>;\n  getMarkInfoList: () => IModelMarkInfo[];\n\n  getData: () => ICompilableData;\n\n  getChart: () => IChart;\n\n  //生命周期\n  // 创建模块自身内容，设置自身属性\n  created: () => void;\n  // 用来处理与其他图表模块的联系\n  init: (option: IModelInitOption) => void;\n  // updateSpec 或者切换主题后，根据新 spec 执行的初始化过程\n  reInit: (theme?: any, lastSpec?: any) => void;\n  // theme\n  setTheme: (theme?: any) => void;\n\n  onLayoutStart: (layoutRect: IRect, viewRect: ILayoutRect, ctx: IModelLayoutOption) => void;\n  onLayoutEnd: (ctx: IModelLayoutOption) => void;\n  onEvaluateEnd: (ctx: IModelEvaluateOption) => void;\n  onRender: (ctx: IModelRenderOption) => void;\n  onDataUpdate: () => void;\n\n  updateSpec: (spec: any, totalSpec?: any) => IUpdateSpecResult;\n  getSpec?: () => any;\n  getSpecIndex: () => number;\n\n  setCurrentTheme: (theme: any, noRender?: boolean) => void;\n\n  setMarkStyle: <T extends ICommonSpec>(\n    mark?: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) => void;\n\n  initMarkStyleWithSpec: (mark?: IMark, spec?: any, key?: string) => void;\n\n  // tooltip\n  tooltipHelper: ITooltipHelper;\n\n  /** 绑定场景结点 */\n  bindSceneNode: (node: IElement) => void;\n  /** 获取场景结点 */\n  getSceneNodes: () => IElement[];\n  /** 获取场景结点对应 mark */\n  getSceneNodeMarks: () => IVGrammarMark[];\n}\n\nexport interface IModelOption extends ICompilableInitOption {\n  eventDispatcher: IEventDispatcher;\n  dataSet: DataSet;\n  map: Map<StringOrNumber, IModel | IMark>;\n  mode: RenderMode;\n  globalInstance: VChart;\n  specIndex?: number;\n  specKey?: string;\n\n  getTheme?: () => ITheme;\n\n  getChartLayoutRect: () => IRect;\n  getChartViewRect: () => ILayoutRect;\n\n  getChart: () => IChart;\n\n  globalScale: IGlobalScale;\n  animation: boolean;\n  /**\n   * 错误消息回调函数\n   */\n  onError: (...args: any[]) => void;\n}\n\nexport interface IModelConstructor {\n  new (ctx: IModelOption): IModel;\n}\n\nexport type ILayoutModelState = ModelStateManager['_stateMap'];\n\n// TODO: 补充model共有配置\nexport type IModelSpec = ILayoutItemSpec & { id?: StringOrNumber };\n\nexport interface IModelMarkInfo {\n  /** mark 类型 */\n  type: MarkTypeEnum | string | (MarkTypeEnum | string)[];\n  /** mark 名称 */\n  name: string;\n}\n"]}
+{"version":3,"sources":["../src/model/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport type { DataSet } from '@visactor/vdataset';\nimport type { IEvent, IEventDispatcher } from '../event/interface';\nimport type { IMark, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { VChart } from '../vchart-all';\nimport type { IData, IElement, IMark as IVGrammarMark } from '@visactor/vgrammar-core';\nimport type {\n  IOrientType,\n  IPoint,\n  IGroupMarkSpec,\n  ConvertToMarkStyleSpec,\n  CoordinateType,\n  ICommonSpec,\n  IRect,\n  StringOrNumber\n} from '../typings';\nimport type { ITheme } from '../theme';\nimport type { StateValueType } from '../typings/spec';\nimport type { ITooltipHelper } from './tooltip-helper';\nimport type { ModelStateManager } from './model-state-manager';\nimport type { ICompilable, ICompilableInitOption } from '../compile/interface';\nimport type { ICompilableData } from '../compile/data';\nimport type { IGlobalScale } from '../scale/interface';\nimport type { IChart } from '../chart/interface';\n\nexport type ILayoutNumber = number | IPercent | ((layoutRect: ILayoutRect) => number) | IPercentOffset;\n\nexport interface ILayoutPoint {\n  x: number;\n  y: number;\n}\n\nexport interface ILayoutRectLevel {\n  width: number;\n  height: number;\n}\nexport interface ILayoutRect {\n  width: number;\n  height: number;\n}\n\nexport type IPercent = `${number}%`;\n\nexport type IPercentOffset = { percent?: number; offset?: number };\n\nexport type ILayoutPercent = IPercent | number;\n\n/**\n * 相对布局和绝对布局\n * 在相对布局结束后进行二次的绝对布局\n * 绝对布局会只根据 chart 进行相对处理\n */\n\ntype ILayoutType = 'region-relative' | 'region' | 'normal' | 'absolute' | 'normal-inline';\n\nexport type ILayoutOrientPadding = {\n  left?: ILayoutNumber;\n  right?: ILayoutNumber;\n  top?: ILayoutNumber;\n  bottom?: ILayoutNumber;\n};\n\n/** 布局 padding的配置 */\nexport type ILayoutPaddingSpec = ILayoutOrientPadding | ILayoutNumber | ILayoutNumber[];\n\n/**\n * 因为这些元素都会继承到各个模块，所以这里统一有前缀避免语意冲突\n */\nexport interface ILayoutItem {\n  /**\n   * 标记这个布局Item的方向（left->right, right->left, top->bottom, bottom->top）\n   */\n  directionStr?: 'l2r' | 'r2l' | 't2b' | 'b2t';\n  layoutClip: boolean;\n  layoutType: ILayoutType;\n  layoutBindRegionID: number | number[];\n  layoutOrient: IOrientType;\n\n  layoutPaddingLeft: number;\n  layoutPaddingTop: number;\n  layoutPaddingRight: number;\n  layoutPaddingBottom: number;\n\n  layoutOffsetX: number;\n  layoutOffsetY: number;\n\n  // 越大越先处理\n  layoutLevel: number;\n\n  layoutZIndex: number;\n  chartLayoutRect: ILayoutRect;\n\n  /** 是否可见 */\n  getVisible: () => boolean;\n\n  getSpec?: () => any;\n\n  /** 是否自动缩进 */\n  getAutoIndent: () => boolean;\n  getLayoutStartPoint: () => ILayoutPoint;\n  getLayoutRect: () => ILayoutRect;\n  getLastComputeOutBounds: () => IBoundsLike;\n\n  /**\n   * 更新元素布局的 layoutRect 大小，用来更新指定布局空间\n   */\n  setLayoutRect: (rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRectLevel>) => void;\n  /**\n   * 基于元素内部逻辑计算占位空间，rect表示可用空间\n   */\n  computeBoundsInRect: (rect: ILayoutRect) => ILayoutRect;\n  /**\n   * 更新元素布局的起始点位置\n   */\n  setLayoutStartPosition: (pos: Partial<IPoint>) => void;\n  /**\n   * 更新绝对布局元素的位置信息\n   */\n  absoluteLayoutInRect: (rect: IRect) => void;\n  /**\n   * 元素内部布局信息更新\n   */\n  updateLayoutAttribute: () => void;\n}\n\nexport interface ILayoutItemSpec {\n  /** 当前模块的布局类型，配置为 absolute 的话，当前元素会以图表左上角为原点进行绝对布局 */\n  layoutType?: ILayoutType;\n  /**\n   * 布局顺序等级，等级越大的，越优先布局\n   * 比如顶部同时有标题和图例的场景，期望标题先放在顶部，然后放置图例。\n   */\n  layoutLevel?: number;\n\n  // 基础的布局配置\n  /** 模块布局位置 */\n  orient?: IOrientType;\n  /** 模块的布局间距 */\n  padding?: ILayoutPaddingSpec;\n  /** 是否按照 orient 自动修改 padding，隐藏位于外侧的 padding。目前只在组件上生效 */\n  noOuterPadding?: boolean;\n  /** 模块的布局大小：宽度 */\n  width?: ILayoutNumber;\n  /** 模块的布局最大宽度 */\n  maxWidth?: ILayoutNumber;\n  /** 模块的布局最小宽度 */\n  minWidth?: ILayoutNumber;\n  /** 模块的布局大小：高度 */\n  height?: ILayoutNumber;\n  /** 模块的布局最大高度 */\n  maxHeight?: ILayoutNumber;\n  /** 模块的布局最小高度 */\n  minHeight?: ILayoutNumber;\n  /** 模块的布局位置偏移：X */\n  offsetX?: ILayoutNumber;\n  /** 模块的布局位置偏移：Y */\n  offsetY?: ILayoutNumber;\n\n  /** 模块的展示层级，当2个模块重叠时，层级较大的展示在上方 */\n  zIndex?: number;\n  /** 模块是否裁剪超出布局区域外的绘图内容 */\n  clip?: boolean;\n\n  // 绝对布局下的对齐设置\n\n  /** 模块绝对布局下，与图表左侧的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  left?: ILayoutNumber;\n  /** 模块绝对布局下，与图表右侧的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  right?: ILayoutNumber;\n  /** 模块绝对布局下，与图表顶部的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  top?: ILayoutNumber;\n  /** 模块绝对布局下，与图表底部的距离。注意仅在 layoutType === 'absolute' 时生效  */\n  bottom?: ILayoutNumber;\n  /** 模块绝对布局下，元素将放置在图表的正中间。注意仅在 layoutType === 'absolute' 时生效，同时将忽略 padding 属性  */\n  center?: boolean;\n}\n\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelInitOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelLayoutOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelEvaluateOption {}\n// TODO:\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelRenderOption {}\n\nexport interface IEffect {\n  [key: string]: (e?: any) => any;\n}\n\nexport interface IMarkTreeGroup extends Partial<IMarkStyle<IGroupMarkSpec>> {\n  // 必须要有名字\n  type: 'group';\n  name: string;\n  marks: (IMarkTreeGroup | IMark)[];\n  // TODO: 这里要不要支持复杂场景，有图形组合的场景，用自定义mark？\n  // from?: IData;\n}\n\nexport type IMarkTree = IMarkTreeGroup | IMark | (IMarkTreeGroup | IMark)[];\n\nexport interface IUpdateSpecResult {\n  change: boolean;\n  reMake: boolean;\n  reRender?: boolean;\n  reSize?: boolean;\n  // TODO: compile 的判断应不应该出现在这里?\n  reCompile?: boolean;\n}\n\nexport interface IModelProduct {\n  srData: IData;\n}\n\nexport interface IModel extends ICompilable, ILayoutItem {\n  readonly modelType: string;\n  readonly type: string;\n  readonly specKey: string;\n\n  readonly id: number;\n\n  readonly userId?: StringOrNumber;\n\n  // 事件\n  readonly event: IEvent;\n\n  // 副作用\n  readonly effect: IEffect;\n\n  // state如果绑定到mark的更新？\n  // 组件的 mark 要怎么样描述，才能正确的基于组件状态进行样式更新？\n  // 方案1: 组件的 state 关联到 mark 的状态。\n  // 方案2: 组件设置 mark 属性，mark自身属性变化时，自己去更新。\n  // react state\n  readonly state: ModelStateManager;\n  getState: () => ModelStateManager['_stateMap'];\n\n  coordinate?: CoordinateType;\n\n  // 初始化参数\n  getOption: () => IModelOption;\n\n  getMarks: () => IMark[];\n  getMarkNameMap: () => Record<string, IMark>;\n  getMarkInfoList: () => IModelMarkInfo[];\n\n  getData: () => ICompilableData;\n\n  getChart: () => IChart;\n\n  //生命周期\n  // 创建模块自身内容，设置自身属性\n  created: () => void;\n  // 用来处理与其他图表模块的联系\n  init: (option: IModelInitOption) => void;\n  // updateSpec 或者切换主题后，根据新 spec 执行的初始化过程\n  reInit: (theme?: any, lastSpec?: any) => void;\n  beforeRelease: () => void;\n\n  onLayoutStart: (layoutRect: IRect, viewRect: ILayoutRect, ctx: IModelLayoutOption) => void;\n  onLayoutEnd: (ctx: IModelLayoutOption) => void;\n  onEvaluateEnd: (ctx: IModelEvaluateOption) => void;\n  onRender: (ctx: IModelRenderOption) => void;\n  onDataUpdate: () => void;\n\n  updateSpec: (spec: any, totalSpec?: any) => IUpdateSpecResult;\n  getSpec?: () => any;\n  getSpecIndex: () => number;\n\n  // theme\n  setTheme: (theme?: any) => void;\n  setCurrentTheme: (theme: any, noRender?: boolean) => void;\n\n  setMarkStyle: <T extends ICommonSpec>(\n    mark?: IMarkRaw<T>,\n    style?: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>,\n    state?: StateValueType,\n    level?: number\n  ) => void;\n\n  initMarkStyleWithSpec: (mark?: IMark, spec?: any, key?: string) => void;\n\n  // tooltip\n  tooltipHelper: ITooltipHelper;\n\n  /** 绑定场景结点 */\n  bindSceneNode: (node: IElement) => void;\n  /** 获取场景结点 */\n  getSceneNodes: () => IElement[];\n  /** 获取场景结点对应 mark */\n  getSceneNodeMarks: () => IVGrammarMark[];\n}\n\nexport interface IModelOption extends ICompilableInitOption {\n  eventDispatcher: IEventDispatcher;\n  dataSet: DataSet;\n  map: Map<StringOrNumber, IModel | IMark>;\n  mode: RenderMode;\n  globalInstance: VChart;\n  specIndex?: number;\n  specKey?: string;\n\n  getTheme?: () => ITheme;\n\n  getChartLayoutRect: () => IRect;\n  getChartViewRect: () => ILayoutRect;\n\n  getChart: () => IChart;\n\n  globalScale: IGlobalScale;\n  animation: boolean;\n  /**\n   * 错误消息回调函数\n   */\n  onError: (...args: any[]) => void;\n}\n\nexport interface IModelConstructor {\n  new (ctx: IModelOption): IModel;\n}\n\nexport type ILayoutModelState = ModelStateManager['_stateMap'];\n\n// TODO: 补充model共有配置\nexport type IModelSpec = ILayoutItemSpec & { id?: StringOrNumber };\n\nexport interface IModelMarkInfo {\n  /** mark 类型 */\n  type: MarkTypeEnum | string | (MarkTypeEnum | string)[];\n  /** mark 名称 */\n  name: string;\n}\n"]}

package/esm/series/polar/polar.js

@@ -66,7 +66,7 @@ export class PolarSeries extends BaseSeries {
     }
     _buildMarkAttributeContext() {
         super._buildMarkAttributeContext(), this._markAttributeContext.valueToPosition = this.valueToPosition.bind(this), 
-        this._markAttributeContext.getCenter = () => this.angleAxisHelper.center();
+        this._markAttributeContext.getCenter = () => this.angleAxisHelper.center(), this._markAttributeContext.getLayoutRadius = () => this._computeLayoutRadius();
     }
     valueToPosition(angleValue, radiusValue) {
         if (isNil(angleValue) || isNil(radiusValue) || !this.angleAxisHelper || !this.radiusAxisHelper) return {

package/esm/series/polar/polar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/polar/polar.ts"],"names":[],"mappings":"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","file":"polar.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\nimport type { IPoint, IPolarPoint } from '../../typings/coordinate';\nimport type { IPolarSeries } from '../interface';\nimport { array, shallowCompare, isValid, isNil } from '../../util';\nimport type { IPolarAxisHelper } from '../../component/axis/polar/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport { POLAR_DEFAULT_RADIUS } from '../../constant/polar';\nimport { BaseSeries } from '../base/base-series';\nimport type { IPolarSeriesSpec } from './interface';\nimport type { Datum, StringOrNumber } from '../../typings';\nimport { sortDataInAxisHelper } from '../util/utils';\n\nexport abstract class PolarSeries<T extends IPolarSeriesSpec = IPolarSeriesSpec>\n  extends BaseSeries<T>\n  implements IPolarSeries\n{\n  readonly coordinate: 'polar' = 'polar';\n\n  protected _outerRadius: number = POLAR_DEFAULT_RADIUS;\n  public get outerRadius() {\n    return this._outerRadius;\n  }\n\n  protected _innerRadius: number = 0;\n  public get innerRadius() {\n    return this._innerRadius;\n  }\n\n  protected _angleField: string[] = [];\n  getAngleField() {\n    return this._angleField;\n  }\n  setAngleField(f: string | string[]): string[] {\n    this._angleField = isValid(f) ? array(f) : [];\n    return this._angleField;\n  }\n\n  protected _radiusField: string[] = [];\n  getRadiusField() {\n    return this._radiusField;\n  }\n  setRadiusField(f: string | string[]): string[] {\n    this._radiusField = isValid(f) ? array(f) : [];\n    return this._radiusField;\n  }\n\n  protected _innerRadiusField!: string[];\n  public get innerRadiusField() {\n    return this._innerRadiusField;\n  }\n  setInnerRadiusField(f: string | string[]): string[] {\n    this._innerRadiusField = array(f);\n    return this._innerRadiusField;\n  }\n\n  protected _radiusScale!: IBaseScale;\n  public get radiusScale() {\n    return this._radiusScale;\n  }\n  setRadiusScale(s: IBaseScale) {\n    this._radiusScale = s;\n    return s;\n  }\n\n  protected _angleScale!: IBaseScale;\n  public get angleScale() {\n    return this._angleScale;\n  }\n  setAngleScale(s: IBaseScale) {\n    this._angleScale = s;\n    return s;\n  }\n\n  private _angleAxisHelper!: IPolarAxisHelper;\n  public get angleAxisHelper() {\n    return this._angleAxisHelper;\n  }\n  public set angleAxisHelper(h: IPolarAxisHelper) {\n    this._angleAxisHelper = h;\n    this.onAngleAxisHelperUpdate();\n  }\n\n  private _radiusAxisHelper!: IPolarAxisHelper;\n  public get radiusAxisHelper() {\n    return this._radiusAxisHelper;\n  }\n  public set radiusAxisHelper(h: IPolarAxisHelper) {\n    this._radiusAxisHelper = h;\n    this.onRadiusAxisHelperUpdate();\n  }\n\n  protected _sortDataByAxis: boolean = false;\n  get sortDataByAxis() {\n    return this._sortDataByAxis;\n  }\n\n  protected _buildMarkAttributeContext() {\n    super._buildMarkAttributeContext();\n    // position\n    this._markAttributeContext.valueToPosition = this.valueToPosition.bind(this);\n    this._markAttributeContext.getCenter = () => {\n      return this.angleAxisHelper.center();\n    };\n  }\n\n  valueToPosition(angleValue: StringOrNumber | StringOrNumber[], radiusValue: StringOrNumber | StringOrNumber[]) {\n    if (isNil(angleValue) || isNil(radiusValue) || !this.angleAxisHelper || !this.radiusAxisHelper) {\n      return { x: Number.NaN, y: Number.NaN };\n    }\n    const angle = this.angleAxisHelper.dataToPosition(array(angleValue));\n    const radius = this.radiusAxisHelper.dataToPosition(array(radiusValue));\n    // FIXME: 由于存在两个轴，这里的 坐标系转换逻辑会有点尬\n    return this.angleAxisHelper.coordToPoint({ angle, radius });\n  }\n\n  dataToPosition(datum: Datum): IPoint {\n    if (!datum || !this.angleAxisHelper || !this.radiusAxisHelper) {\n      return { x: Number.NaN, y: Number.NaN };\n    }\n    // FIXME: 由于存在两个轴，这里的 坐标系转换逻辑会有点尬\n    return this.valueToPosition(\n      this.getDatumPositionValues(datum, this._angleField),\n      this.getDatumPositionValues(datum, this._radiusField)\n    );\n  }\n\n  dataToPositionX(datum: Datum): number {\n    return this.dataToPosition(datum).x;\n  }\n\n  dataToPositionY(datum: Datum): number {\n    return this.dataToPosition(datum).y;\n  }\n\n  dataToPositionZ(datum: Datum): number {\n    return 0;\n  }\n\n  // todo: 待实现\n  positionToData(p: IPolarPoint): any {\n    /* do nothing */\n  }\n  radiusToData(r: number): any {\n    /* do nothing */\n  }\n  angleToData(a: number): any {\n    /* do nothing */\n  }\n\n  getStatisticFields() {\n    const fields: { key: string; operations: Array<'max' | 'min' | 'values'> }[] = [];\n    if (this.radiusAxisHelper?.getScale) {\n      this._radiusField.forEach(f => {\n        const result: { key: string; operations: Array<'max' | 'min' | 'values'> } = { key: f, operations: [] };\n        if (isContinuous(this.radiusAxisHelper.getScale(0).type)) {\n          result.operations = ['max', 'min'];\n        } else {\n          result.operations = ['values'];\n        }\n        fields.push(result);\n      });\n    }\n    if (this.angleAxisHelper?.getScale) {\n      this._angleField.forEach(f => {\n        const result: { key: string; operations: Array<'max' | 'min' | 'values'> } = { key: f, operations: [] };\n        if (isContinuous(this.angleAxisHelper.getScale(0).type)) {\n          result.operations = ['max', 'min'];\n        } else {\n          result.operations = ['values'];\n        }\n        fields.push(result);\n      });\n    }\n    return fields;\n  }\n\n  protected _getDefaultSpecFromChart(chartSpec: any) {\n    const { outerRadius, innerRadius } = chartSpec;\n    return { outerRadius, innerRadius } as Partial<T>;\n  }\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec();\n    if (isValid(this._spec.outerRadius)) {\n      this._outerRadius = this._spec.outerRadius;\n    }\n    if (isValid(this._spec.radius)) {\n      // 优先使用outerRadius, 但要兼容spec.radius\n      this._outerRadius = this._spec.radius;\n    }\n    if (isValid(this._spec.innerRadius)) {\n      this._innerRadius = this._spec.innerRadius;\n    }\n\n    if (isValid(this._spec.sortDataByAxis)) {\n      this._sortDataByAxis = this._spec.sortDataByAxis === true;\n    }\n  }\n\n  onRadiusAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n  onAngleAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n\n  afterInitMark(): void {\n    super.afterInitMark();\n    this._trigger.setStateKeys([...this._angleField, ...this._radiusField]);\n  }\n\n  protected _computeLayoutRadius() {\n    const { width, height } = this._region.getLayoutRect();\n    return Math.min(width / 2, height / 2);\n  }\n\n  setValueFieldToStackOffsetSilhouette(): void {\n    // do nothing\n  }\n  fillData(): void {\n    super.fillData();\n    if (this.sortDataByAxis) {\n      this._sortDataInAxisDomain();\n    }\n  }\n\n  _sortDataInAxisDomain() {\n    if (this.getViewData()?.latestData?.length) {\n      sortDataInAxisHelper(this.angleAxisHelper, this._angleField[0], this.getViewData().latestData);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/polar/polar.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAkB,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAGnE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,MAAM,OAAgB,WACpB,SAAQ,UAAa;IADvB;;QAIW,eAAU,GAAY,OAAO,CAAC;QAE7B,iBAAY,GAAW,oBAAoB,CAAC;QAK5C,iBAAY,GAAW,CAAC,CAAC;QAKzB,gBAAW,GAAa,EAAE,CAAC;QAS3B,iBAAY,GAAa,EAAE,CAAC;QAsD5B,oBAAe,GAAY,KAAK,CAAC;IA2I7C,CAAC;IAnNC,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAGD,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAGD,aAAa;QACX,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IACD,aAAa,CAAC,CAAoB;QAChC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAGD,cAAc;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACD,cAAc,CAAC,CAAoB;QACjC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAGD,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IACD,mBAAmB,CAAC,CAAoB;QACtC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAGD,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACD,cAAc,CAAC,CAAa;QAC1B,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;QACtB,OAAO,CAAC,CAAC;IACX,CAAC;IAGD,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IACD,aAAa,CAAC,CAAa;QACzB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACrB,OAAO,CAAC,CAAC;IACX,CAAC;IAGD,IAAW,eAAe;QACxB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IACD,IAAW,eAAe,CAAC,CAAmB;QAC5C,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,uBAAuB,EAAE,CAAC;IACjC,CAAC;IAGD,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IACD,IAAW,gBAAgB,CAAC,CAAmB;QAC7C,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,wBAAwB,EAAE,CAAC;IAClC,CAAC;IAGD,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAES,0BAA0B;QAClC,KAAK,CAAC,0BAA0B,EAAE,CAAC;QAEnC,IAAI,CAAC,qBAAqB,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7E,IAAI,CAAC,qBAAqB,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;QAC3E,IAAI,CAAC,qBAAqB,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;IACjF,CAAC;IAED,eAAe,CAAC,UAA6C,EAAE,WAA8C;QAC3G,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC9F,OAAO,EAAE,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC;SACzC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QAExE,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,cAAc,CAAC,KAAY;QACzB,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC7D,OAAO,EAAE,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC;SACzC;QAED,OAAO,IAAI,CAAC,eAAe,CACzB,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,EACpD,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,CACtD,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,KAAY;QAC1B,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,eAAe,CAAC,KAAY;QAC1B,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,eAAe,CAAC,KAAY;QAC1B,OAAO,CAAC,CAAC;IACX,CAAC;IAGD,cAAc,CAAC,CAAc;IAE7B,CAAC;IACD,YAAY,CAAC,CAAS;IAEtB,CAAC;IACD,WAAW,CAAC,CAAS;IAErB,CAAC;IAED,kBAAkB;;QAChB,MAAM,MAAM,GAAmE,EAAE,CAAC;QAClF,IAAI,MAAA,IAAI,CAAC,gBAAgB,0CAAE,QAAQ,EAAE;YACnC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC5B,MAAM,MAAM,GAAiE,EAAE,GAAG,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;gBACxG,IAAI,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;oBACxD,MAAM,CAAC,UAAU,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;iBACpC;qBAAM;oBACL,MAAM,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,CAAC;iBAChC;gBACD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,MAAA,IAAI,CAAC,eAAe,0CAAE,QAAQ,EAAE;YAClC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC3B,MAAM,MAAM,GAAiE,EAAE,GAAG,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;gBACxG,IAAI,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;oBACvD,MAAM,CAAC,UAAU,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;iBACpC;qBAAM;oBACL,MAAM,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,CAAC;iBAChC;gBACD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;SACJ;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,wBAAwB,CAAC,SAAc;QAC/C,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;QAC/C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAgB,CAAC;IACpD,CAAC;IAED,eAAe;QACb,KAAK,CAAC,eAAe,EAAE,CAAC;QACxB,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YACnC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;SAC5C;QACD,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YAE9B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;SACvC;QACD,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YACnC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;SAC5C;QAED,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE;YACtC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,KAAK,IAAI,CAAC;SAC3D;IACH,CAAC;IAED,wBAAwB;QACtB,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IACD,uBAAuB;QACrB,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IAED,aAAa;QACX,KAAK,CAAC,aAAa,EAAE,CAAC;QACtB,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;IAC1E,CAAC;IAES,oBAAoB;QAC5B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QACvD,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,oCAAoC;IAEpC,CAAC;IACD,QAAQ;QACN,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,IAAI,CAAC,qBAAqB,EAAE,CAAC;SAC9B;IACH,CAAC;IAED,qBAAqB;;QACnB,IAAI,MAAA,MAAA,IAAI,CAAC,WAAW,EAAE,0CAAE,UAAU,0CAAE,MAAM,EAAE;YAC1C,oBAAoB,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,CAAC;SAChG;IACH,CAAC;CACF","file":"polar.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\nimport type { IPoint, IPolarPoint } from '../../typings/coordinate';\nimport type { IPolarSeries } from '../interface';\nimport { array, shallowCompare, isValid, isNil } from '../../util';\nimport type { IPolarAxisHelper } from '../../component/axis/polar/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport { POLAR_DEFAULT_RADIUS } from '../../constant/polar';\nimport { BaseSeries } from '../base/base-series';\nimport type { IPolarSeriesSpec } from './interface';\nimport type { Datum, StringOrNumber } from '../../typings';\nimport { sortDataInAxisHelper } from '../util/utils';\n\nexport abstract class PolarSeries<T extends IPolarSeriesSpec = IPolarSeriesSpec>\n  extends BaseSeries<T>\n  implements IPolarSeries\n{\n  readonly coordinate: 'polar' = 'polar';\n\n  protected _outerRadius: number = POLAR_DEFAULT_RADIUS;\n  public get outerRadius() {\n    return this._outerRadius;\n  }\n\n  protected _innerRadius: number = 0;\n  public get innerRadius() {\n    return this._innerRadius;\n  }\n\n  protected _angleField: string[] = [];\n  getAngleField() {\n    return this._angleField;\n  }\n  setAngleField(f: string | string[]): string[] {\n    this._angleField = isValid(f) ? array(f) : [];\n    return this._angleField;\n  }\n\n  protected _radiusField: string[] = [];\n  getRadiusField() {\n    return this._radiusField;\n  }\n  setRadiusField(f: string | string[]): string[] {\n    this._radiusField = isValid(f) ? array(f) : [];\n    return this._radiusField;\n  }\n\n  protected _innerRadiusField!: string[];\n  public get innerRadiusField() {\n    return this._innerRadiusField;\n  }\n  setInnerRadiusField(f: string | string[]): string[] {\n    this._innerRadiusField = array(f);\n    return this._innerRadiusField;\n  }\n\n  protected _radiusScale!: IBaseScale;\n  public get radiusScale() {\n    return this._radiusScale;\n  }\n  setRadiusScale(s: IBaseScale) {\n    this._radiusScale = s;\n    return s;\n  }\n\n  protected _angleScale!: IBaseScale;\n  public get angleScale() {\n    return this._angleScale;\n  }\n  setAngleScale(s: IBaseScale) {\n    this._angleScale = s;\n    return s;\n  }\n\n  private _angleAxisHelper!: IPolarAxisHelper;\n  public get angleAxisHelper() {\n    return this._angleAxisHelper;\n  }\n  public set angleAxisHelper(h: IPolarAxisHelper) {\n    this._angleAxisHelper = h;\n    this.onAngleAxisHelperUpdate();\n  }\n\n  private _radiusAxisHelper!: IPolarAxisHelper;\n  public get radiusAxisHelper() {\n    return this._radiusAxisHelper;\n  }\n  public set radiusAxisHelper(h: IPolarAxisHelper) {\n    this._radiusAxisHelper = h;\n    this.onRadiusAxisHelperUpdate();\n  }\n\n  protected _sortDataByAxis: boolean = false;\n  get sortDataByAxis() {\n    return this._sortDataByAxis;\n  }\n\n  protected _buildMarkAttributeContext() {\n    super._buildMarkAttributeContext();\n    // position\n    this._markAttributeContext.valueToPosition = this.valueToPosition.bind(this);\n    this._markAttributeContext.getCenter = () => this.angleAxisHelper.center();\n    this._markAttributeContext.getLayoutRadius = () => this._computeLayoutRadius();\n  }\n\n  valueToPosition(angleValue: StringOrNumber | StringOrNumber[], radiusValue: StringOrNumber | StringOrNumber[]) {\n    if (isNil(angleValue) || isNil(radiusValue) || !this.angleAxisHelper || !this.radiusAxisHelper) {\n      return { x: Number.NaN, y: Number.NaN };\n    }\n    const angle = this.angleAxisHelper.dataToPosition(array(angleValue));\n    const radius = this.radiusAxisHelper.dataToPosition(array(radiusValue));\n    // FIXME: 由于存在两个轴，这里的 坐标系转换逻辑会有点尬\n    return this.angleAxisHelper.coordToPoint({ angle, radius });\n  }\n\n  dataToPosition(datum: Datum): IPoint {\n    if (!datum || !this.angleAxisHelper || !this.radiusAxisHelper) {\n      return { x: Number.NaN, y: Number.NaN };\n    }\n    // FIXME: 由于存在两个轴，这里的 坐标系转换逻辑会有点尬\n    return this.valueToPosition(\n      this.getDatumPositionValues(datum, this._angleField),\n      this.getDatumPositionValues(datum, this._radiusField)\n    );\n  }\n\n  dataToPositionX(datum: Datum): number {\n    return this.dataToPosition(datum).x;\n  }\n\n  dataToPositionY(datum: Datum): number {\n    return this.dataToPosition(datum).y;\n  }\n\n  dataToPositionZ(datum: Datum): number {\n    return 0;\n  }\n\n  // todo: 待实现\n  positionToData(p: IPolarPoint): any {\n    /* do nothing */\n  }\n  radiusToData(r: number): any {\n    /* do nothing */\n  }\n  angleToData(a: number): any {\n    /* do nothing */\n  }\n\n  getStatisticFields() {\n    const fields: { key: string; operations: Array<'max' | 'min' | 'values'> }[] = [];\n    if (this.radiusAxisHelper?.getScale) {\n      this._radiusField.forEach(f => {\n        const result: { key: string; operations: Array<'max' | 'min' | 'values'> } = { key: f, operations: [] };\n        if (isContinuous(this.radiusAxisHelper.getScale(0).type)) {\n          result.operations = ['max', 'min'];\n        } else {\n          result.operations = ['values'];\n        }\n        fields.push(result);\n      });\n    }\n    if (this.angleAxisHelper?.getScale) {\n      this._angleField.forEach(f => {\n        const result: { key: string; operations: Array<'max' | 'min' | 'values'> } = { key: f, operations: [] };\n        if (isContinuous(this.angleAxisHelper.getScale(0).type)) {\n          result.operations = ['max', 'min'];\n        } else {\n          result.operations = ['values'];\n        }\n        fields.push(result);\n      });\n    }\n    return fields;\n  }\n\n  protected _getDefaultSpecFromChart(chartSpec: any) {\n    const { outerRadius, innerRadius } = chartSpec;\n    return { outerRadius, innerRadius } as Partial<T>;\n  }\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec();\n    if (isValid(this._spec.outerRadius)) {\n      this._outerRadius = this._spec.outerRadius;\n    }\n    if (isValid(this._spec.radius)) {\n      // 优先使用outerRadius, 但要兼容spec.radius\n      this._outerRadius = this._spec.radius;\n    }\n    if (isValid(this._spec.innerRadius)) {\n      this._innerRadius = this._spec.innerRadius;\n    }\n\n    if (isValid(this._spec.sortDataByAxis)) {\n      this._sortDataByAxis = this._spec.sortDataByAxis === true;\n    }\n  }\n\n  onRadiusAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n  onAngleAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n\n  afterInitMark(): void {\n    super.afterInitMark();\n    this._trigger.setStateKeys([...this._angleField, ...this._radiusField]);\n  }\n\n  protected _computeLayoutRadius() {\n    const { width, height } = this._region.getLayoutRect();\n    return Math.min(width / 2, height / 2);\n  }\n\n  setValueFieldToStackOffsetSilhouette(): void {\n    // do nothing\n  }\n  fillData(): void {\n    super.fillData();\n    if (this.sortDataByAxis) {\n      this._sortDataInAxisDomain();\n    }\n  }\n\n  _sortDataInAxisDomain() {\n    if (this.getViewData()?.latestData?.length) {\n      sortDataInAxisHelper(this.angleAxisHelper, this._angleField[0], this.getViewData().latestData);\n    }\n  }\n}\n"]}

package/esm/util/text.d.ts

@@ -1,5 +1,5 @@
-import type { ITextMeasureOption } from '@visactor/vutils';
+import type { ITextMeasureOption, ITextSize } from '@visactor/vutils';
 import type { TextMeasure } from '@visactor/vutils';
-import type { AdaptiveSpec } from '../typings';
 import type { ITextGraphicAttribute } from '@visactor/vrender';
-export declare const initTextMeasure: (textSpec?: Partial<ITextGraphicAttribute>, option?: Partial<ITextMeasureOption>, useNaiveCanvas?: boolean) => TextMeasure<AdaptiveSpec<ITextGraphicAttribute, 'lineHeight'>>;
+export declare const initTextMeasure: (textSpec?: Partial<ITextGraphicAttribute>, option?: Partial<ITextMeasureOption>, useNaiveCanvas?: boolean) => TextMeasure<ITextGraphicAttribute>;
+export declare const measureText: (text: string, textSpec?: Partial<ITextGraphicAttribute>, option?: Partial<ITextMeasureOption>, useNaiveCanvas?: boolean) => ITextSize;

package/esm/util/text.js

@@ -6,4 +6,6 @@ export const initTextMeasure = (textSpec, option, useNaiveCanvas) => initTextMea
     fontFamily: THEME_CONSTANTS.defaultFontFamily,
     fontSize: THEME_CONSTANTS.defaultFontSize
 });
+
+export const measureText = (text, textSpec, option, useNaiveCanvas) => initTextMeasure(textSpec, option, useNaiveCanvas).measure(text);
 //# sourceMappingURL=text.js.map

package/esm/util/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGpF,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,QAAyC,EACzC,MAAoC,EACpC,cAAwB,EACwC,EAAE;IAElE,OAAO,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE;QAC3D,UAAU,EAAE,eAAe,CAAC,iBAAiB;QAC7C,QAAQ,EAAE,eAAe,CAAC,eAAe;KAC1C,CAAC,CAAC;AACL,CAAC,CAAC","file":"text.js","sourcesContent":["import type { ITextMeasureOption } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport type { TextMeasure } from '@visactor/vutils';\nimport type { AdaptiveSpec } from '../typings';\nimport { THEME_CONSTANTS } from '../theme/builtin/common/constants';\nimport { initTextMeasure as initTextMeasureFunc } from '@visactor/vutils-extension';\nimport type { ITextGraphicAttribute } from '@visactor/vrender';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextGraphicAttribute>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): TextMeasure<AdaptiveSpec<ITextGraphicAttribute, 'lineHeight'>> => {\n  // FIXME: vrender 支持行高字符串后删除 AdaptiveSpec 范型\n  return initTextMeasureFunc(textSpec, option, useNaiveCanvas, {\n    fontFamily: THEME_CONSTANTS.defaultFontFamily,\n    fontSize: THEME_CONSTANTS.defaultFontSize\n  });\n};\n"]}
+{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGpF,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,QAAyC,EACzC,MAAoC,EACpC,cAAwB,EACY,EAAE;IACtC,OAAO,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE;QAC3D,UAAU,EAAE,eAAe,CAAC,iBAAiB;QAC7C,QAAQ,EAAE,eAAe,CAAC,eAAe;KAC1C,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,IAAY,EACZ,QAAyC,EACzC,MAAoC,EACpC,cAAwB,EACb,EAAE;IACb,OAAO,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACzE,CAAC,CAAC","file":"text.js","sourcesContent":["import type { ITextMeasureOption, ITextSize } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport type { TextMeasure } from '@visactor/vutils';\nimport { THEME_CONSTANTS } from '../theme/builtin/common/constants';\nimport { initTextMeasure as initTextMeasureFunc } from '@visactor/vutils-extension';\nimport type { ITextGraphicAttribute } from '@visactor/vrender';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextGraphicAttribute>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): TextMeasure<ITextGraphicAttribute> => {\n  return initTextMeasureFunc(textSpec, option, useNaiveCanvas, {\n    fontFamily: THEME_CONSTANTS.defaultFontFamily,\n    fontSize: THEME_CONSTANTS.defaultFontSize\n  });\n};\n\nexport const measureText = (\n  text: string,\n  textSpec?: Partial<ITextGraphicAttribute>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): ITextSize => {\n  return initTextMeasure(textSpec, option, useNaiveCanvas).measure(text);\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vchart",
-  "version": "1.4.2-beta.1",
+  "version": "1.4.2",
   "description": "charts lib based @visactor/VGrammar",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -89,9 +89,9 @@
     "@visactor/vgrammar-hierarchy": "~0.7.6",
     "@visactor/vgrammar-sankey": "~0.7.6",
     "@visactor/vgrammar-util": "~0.7.6",
-    "@visactor/vrender": "~0.15.5",
-    "@visactor/vrender-components": "~0.15.5",
-    "@visactor/vutils-extension": "1.4.2-beta.1"
+    "@visactor/vrender": "~0.15.6",
+    "@visactor/vrender-components": "~0.15.6",
+    "@visactor/vutils-extension": "1.4.2"
   },
   "publishConfig": {
     "access": "public",

package/cjs/component/tooltip/handler/utils/style.d.ts

@@ -1,4 +0,0 @@
-import type { ITheme } from '../../../../theme';
-import type { ITooltipTextTheme } from '../../interface';
-import type { ITooltipTextStyle } from '../interface';
-export declare function getTextAttributes(style?: ITooltipTextTheme, globalTheme?: ITheme, defaultAttributes?: Partial<ITooltipTextStyle>): ITooltipTextStyle;

package/cjs/component/tooltip/handler/utils/style.js

@@ -1,32 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.getTextAttributes = void 0;
-
-const constants_1 = require("../../../../theme/builtin/common/constants"), defaultTextAttributes = {
-    fontFamily: constants_1.THEME_CONSTANTS.defaultFontFamily,
-    spacing: 10,
-    multiLine: !1,
-    wordBreak: "break-word"
-};
-
-function getTextAttributes(style = {}, globalTheme, defaultAttributes) {
-    var _a, _b;
-    return Object.assign(Object.assign({}, null != defaultAttributes ? defaultAttributes : defaultTextAttributes), {
-        fill: null !== (_a = style.fill) && void 0 !== _a ? _a : style.fontColor,
-        textAlign: style.textAlign,
-        textBaseline: style.textBaseline,
-        fontFamily: null !== (_b = style.fontFamily) && void 0 !== _b ? _b : null == globalTheme ? void 0 : globalTheme.fontFamily,
-        fontSize: style.fontSize,
-        fontWeight: style.fontWeight,
-        lineHeight: style.lineHeight,
-        spacing: style.spacing,
-        multiLine: style.multiLine,
-        maxWidth: style.maxWidth,
-        wordBreak: style.wordBreak
-    });
-}
-
-exports.getTextAttributes = getTextAttributes;
-//# sourceMappingURL=style.js.map

package/cjs/component/tooltip/handler/utils/style.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/component/tooltip/handler/utils/style.ts"],"names":[],"mappings":";;;AACA,0EAA6E;AAI7E,MAAM,qBAAqB,GAA+B;IACxD,UAAU,EAAE,2BAAe,CAAC,iBAAiB;IAC7C,OAAO,EAAE,EAAE;IACX,SAAS,EAAE,KAAK;IAChB,SAAS,EAAE,YAAY;CACxB,CAAC;AAEF,SAAgB,iBAAiB,CAC/B,QAA2B,EAAE,EAC7B,WAAoB,EACpB,iBAA8C;;IAE9C,MAAM,KAAK,mCACN,CAAC,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,qBAAqB,CAAC,KAC/C,IAAI,EAAE,CAAC,MAAA,KAAK,CAAC,IAAI,mCAAI,KAAK,CAAC,SAAS,CAAW,EAC/C,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,YAAY,EAAE,KAAK,CAAC,YAAY,EAChC,UAAU,EAAE,MAAA,KAAK,CAAC,UAAU,mCAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,EACvD,QAAQ,EAAE,KAAK,CAAC,QAAQ,EACxB,UAAU,EAAE,KAAK,CAAC,UAAU,EAC5B,UAAU,EAAE,KAAK,CAAC,UAAiB,EACnC,OAAO,EAAE,KAAK,CAAC,OAAO,EACtB,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ,EACxB,SAAS,EAAE,KAAK,CAAC,SAAS,GAC3B,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AApBD,8CAoBC","file":"style.js","sourcesContent":["import type { ITheme } from '../../../../theme';\nimport { THEME_CONSTANTS } from '../../../../theme/builtin/common/constants';\nimport type { ITooltipTextTheme } from '../../interface';\nimport type { ITooltipTextStyle } from '../interface';\n\nconst defaultTextAttributes: Partial<ITooltipTextStyle> = {\n  fontFamily: THEME_CONSTANTS.defaultFontFamily,\n  spacing: 10,\n  multiLine: false,\n  wordBreak: 'break-word'\n};\n\nexport function getTextAttributes(\n  style: ITooltipTextTheme = {},\n  globalTheme?: ITheme,\n  defaultAttributes?: Partial<ITooltipTextStyle>\n): ITooltipTextStyle {\n  const attrs: ITooltipTextStyle = {\n    ...(defaultAttributes ?? defaultTextAttributes),\n    fill: (style.fill ?? style.fontColor) as string,\n    textAlign: style.textAlign,\n    textBaseline: style.textBaseline,\n    fontFamily: style.fontFamily ?? globalTheme?.fontFamily,\n    fontSize: style.fontSize,\n    fontWeight: style.fontWeight,\n    lineHeight: style.lineHeight as any, // FIXME: vrender 支持行高字符串后删除 any\n    spacing: style.spacing,\n    multiLine: style.multiLine,\n    maxWidth: style.maxWidth,\n    wordBreak: style.wordBreak\n  };\n  return attrs;\n}\n"]}

package/esm/component/tooltip/handler/utils/style.d.ts

@@ -1,4 +0,0 @@
-import type { ITheme } from '../../../../theme';
-import type { ITooltipTextTheme } from '../../interface';
-import type { ITooltipTextStyle } from '../interface';
-export declare function getTextAttributes(style?: ITooltipTextTheme, globalTheme?: ITheme, defaultAttributes?: Partial<ITooltipTextStyle>): ITooltipTextStyle;

package/esm/component/tooltip/handler/utils/style.js

@@ -1,26 +0,0 @@
-import { THEME_CONSTANTS } from "../../../../theme/builtin/common/constants";
-
-const defaultTextAttributes = {
-    fontFamily: THEME_CONSTANTS.defaultFontFamily,
-    spacing: 10,
-    multiLine: !1,
-    wordBreak: "break-word"
-};
-
-export function getTextAttributes(style = {}, globalTheme, defaultAttributes) {
-    var _a, _b;
-    return Object.assign(Object.assign({}, null != defaultAttributes ? defaultAttributes : defaultTextAttributes), {
-        fill: null !== (_a = style.fill) && void 0 !== _a ? _a : style.fontColor,
-        textAlign: style.textAlign,
-        textBaseline: style.textBaseline,
-        fontFamily: null !== (_b = style.fontFamily) && void 0 !== _b ? _b : null == globalTheme ? void 0 : globalTheme.fontFamily,
-        fontSize: style.fontSize,
-        fontWeight: style.fontWeight,
-        lineHeight: style.lineHeight,
-        spacing: style.spacing,
-        multiLine: style.multiLine,
-        maxWidth: style.maxWidth,
-        wordBreak: style.wordBreak
-    });
-}
-//# sourceMappingURL=style.js.map

package/esm/component/tooltip/handler/utils/style.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/component/tooltip/handler/utils/style.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAI7E,MAAM,qBAAqB,GAA+B;IACxD,UAAU,EAAE,eAAe,CAAC,iBAAiB;IAC7C,OAAO,EAAE,EAAE;IACX,SAAS,EAAE,KAAK;IAChB,SAAS,EAAE,YAAY;CACxB,CAAC;AAEF,MAAM,UAAU,iBAAiB,CAC/B,QAA2B,EAAE,EAC7B,WAAoB,EACpB,iBAA8C;;IAE9C,MAAM,KAAK,mCACN,CAAC,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,qBAAqB,CAAC,KAC/C,IAAI,EAAE,CAAC,MAAA,KAAK,CAAC,IAAI,mCAAI,KAAK,CAAC,SAAS,CAAW,EAC/C,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,YAAY,EAAE,KAAK,CAAC,YAAY,EAChC,UAAU,EAAE,MAAA,KAAK,CAAC,UAAU,mCAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,EACvD,QAAQ,EAAE,KAAK,CAAC,QAAQ,EACxB,UAAU,EAAE,KAAK,CAAC,UAAU,EAC5B,UAAU,EAAE,KAAK,CAAC,UAAiB,EACnC,OAAO,EAAE,KAAK,CAAC,OAAO,EACtB,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ,EACxB,SAAS,EAAE,KAAK,CAAC,SAAS,GAC3B,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC","file":"style.js","sourcesContent":["import type { ITheme } from '../../../../theme';\nimport { THEME_CONSTANTS } from '../../../../theme/builtin/common/constants';\nimport type { ITooltipTextTheme } from '../../interface';\nimport type { ITooltipTextStyle } from '../interface';\n\nconst defaultTextAttributes: Partial<ITooltipTextStyle> = {\n  fontFamily: THEME_CONSTANTS.defaultFontFamily,\n  spacing: 10,\n  multiLine: false,\n  wordBreak: 'break-word'\n};\n\nexport function getTextAttributes(\n  style: ITooltipTextTheme = {},\n  globalTheme?: ITheme,\n  defaultAttributes?: Partial<ITooltipTextStyle>\n): ITooltipTextStyle {\n  const attrs: ITooltipTextStyle = {\n    ...(defaultAttributes ?? defaultTextAttributes),\n    fill: (style.fill ?? style.fontColor) as string,\n    textAlign: style.textAlign,\n    textBaseline: style.textBaseline,\n    fontFamily: style.fontFamily ?? globalTheme?.fontFamily,\n    fontSize: style.fontSize,\n    fontWeight: style.fontWeight,\n    lineHeight: style.lineHeight as any, // FIXME: vrender 支持行高字符串后删除 any\n    spacing: style.spacing,\n    multiLine: style.multiLine,\n    maxWidth: style.maxWidth,\n    wordBreak: style.wordBreak\n  };\n  return attrs;\n}\n"]}