@visactor/vchart 1.3.1 → 1.4.0-alpha.2

package/cjs/compile/mark/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/compile/mark/interface.ts"],"names":[],"mappings":";;;AAwMA,IAAY,gBAWX;AAXD,WAAY,gBAAgB;IAC1B,2CAAuB,CAAA;IAEvB,yCAAqB,CAAA;IACrB,yDAAqC,CAAA;IAErC,6DAAyC,CAAA;IACzC,6EAAyD,CAAA;IAEzD,+CAA2B,CAAA;IAC3B,+DAA2C,CAAA;AAC7C,CAAC,EAXW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAW3B;AAGD,IAAY,wBAIX;AAJD,WAAY,wBAAwB;IAClC,iEAAqC,CAAA;IACrC,qFAAyD,CAAA;IACzD,uEAA2C,CAAA;AAC7C,CAAC,EAJW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAInC;AAcD,IAAY,WAQX;AARD,WAAY,WAAW;IACrB,iDAAU,CAAA;IACV,yEAAsB,CAAA;IACtB,2EAAuB,CAAA;IACvB,qDAAY,CAAA;IACZ,mEAAmB,CAAA;IACnB,qEAAoB,CAAA;IACpB,+CAAS,CAAA;AACX,CAAC,EARW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAQtB","file":"interface.js","sourcesContent":["import type { IMarkProgressiveConfig, IMarkStateStyle, MarkType } from '../../mark/interface';\nimport type { IModel } from '../../model/interface';\nimport type { GrammarItemCompileOption, GrammarItemInitOption } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IGrammarItem } from '../interface';\nimport type { MarkStateManager } from './mark-state-manager';\nimport type { DataView } from '@visactor/vdataset';\nimport type {\n  IAnimate,\n  IAnimateArranger,\n  IElement,\n  IGroupMark,\n  IMark,\n  MarkAnimationSpec,\n  Nil,\n  TransformSpec\n} from '@visactor/vgrammar';\nimport type { Maybe, Datum, StringOrNumber } from '../../typings';\nimport type { MarkData } from './mark-data';\nimport type { ILabelSpec } from '../../component/label';\nimport type { IRegion } from '../../region/interface';\n\nexport interface ICompilableMarkOption extends GrammarItemInitOption {\n  key?: string | ((datum: Datum) => string);\n  /** 分组字段，更多用于 morphing 动画的 element 匹配 */\n  groupKey?: string;\n  /** 是否在dataflow的过程中，布局前跳过该mark */\n  skipBeforeLayouted?: boolean;\n\n  /** 这个mark是否支持3d视角 */\n  support3d?: boolean;\n  /* VGrammar的组件是否支持3d */\n  mode?: '2d' | '3d';\n}\n\nexport interface ICompilableMark extends IGrammarItem {\n  // 类型\n  readonly type: MarkType;\n  // id\n  readonly id: number;\n  // name\n  readonly name: string;\n  // key field\n  readonly key?: string | ((datum: Datum) => string);\n  // parent model\n  readonly model: IModel;\n\n  // 数据 可以没有\n  getData: () => MarkData | undefined;\n  setData: (d: MarkData) => void;\n  getDataView: () => DataView | undefined;\n  setDataView: (d?: DataView, productId?: string) => void;\n\n  // 分片\n  getFacet: () => string | undefined;\n  setFacet: (facet: string) => void;\n\n  // 标签\n  getLabelSpec: () => ILabelSpec;\n  setLabelSpec: (label: ILabelSpec) => void;\n\n  // 状态\n  state: MarkStateManager;\n  readonly stateStyle: IMarkStateStyle<any>;\n  hasState: (state: string) => boolean;\n  getState: (state: string) => any;\n  updateState: (newState: Record<string, unknown>) => Promise<void>;\n  /** 更新encode中的样式 */\n  updateLayoutState: (noRender?: boolean, recursion?: boolean) => Promise<void>;\n  /** 更新某一个状态 */\n  updateMarkState: (key: string) => void;\n\n  // transform\n  setTransform: (transform: TransformSpec[] | Nil) => void;\n\n  // 交互\n  getInteractive: () => boolean;\n  setInteractive: (interactive: boolean) => void;\n\n  // 动画配置\n  setAnimationConfig: (config: Partial<MarkAnimationSpec>) => void;\n  getAnimationConfig: () => Partial<MarkAnimationSpec>;\n\n  // 层级\n  getZIndex: () => number;\n  setZIndex: (zIndex: number) => void;\n\n  // 是否显示\n  getVisible: () => boolean;\n  setVisible: (visible: boolean) => void;\n\n  // 是否开启 morph\n  getMorph: () => boolean;\n  setMorph: (morph: boolean) => void;\n\n  // 是否开启 morph\n  getProgressiveConfig: () => IMarkProgressiveConfig;\n  setProgressiveConfig: (config: IMarkProgressiveConfig) => void;\n\n  // morphKey 配置\n  getMorphKey: () => string | undefined;\n  setMorphKey: (morphKey: string) => void;\n\n  getMorphElementKey: () => string | undefined;\n  setMorphElementKey: (morphKey: string) => void;\n\n  // groupKey 配置\n  getGroupKey: () => string | undefined;\n  setGroupKey: (groupKey: string) => void;\n\n  // 用户 id\n  getUserId: () => StringOrNumber | undefined;\n  setUserId: (id: StringOrNumber) => void;\n\n  compile: (option?: IMarkCompileOption) => void;\n\n  getProduct: () => Maybe<IMark>;\n\n  /** 获取子mark */\n  getMarks: () => ICompilableMark[];\n\n  /** 是否跳过布局阶段 */\n  setSkipBeforeLayouted: (skip: boolean) => void;\n  getSkipBeforeLayouted: () => boolean;\n\n  /** 开始状态动画 */\n  runAnimationByState: (animationState?: string) => IAnimateArranger;\n  /** 停止状态动画*/\n  stopAnimationByState: (animationState?: string) => IAnimate;\n  /** 暂停状态动画*/\n  pauseAnimationByState: (animationState: string) => IAnimate;\n  /** 恢复状态动画*/\n  resumeAnimationByState: (animationState: string) => IAnimate;\n}\n\nexport interface IMarkDataInitOption extends ICompilableMarkOption {\n  mark: ICompilableMark;\n}\n\nexport interface IMarkCompileOption extends GrammarItemCompileOption {\n  group?: string | IGroupMark;\n  ignoreChildren?: boolean;\n}\n\nexport interface IStateInfo {\n  /** 状态值 */\n  stateValue: StateValue;\n  // 对应的数据维度 可以是多维度\n  // TODO: fields 是否保留\n  fields?: any | null | undefined;\n  /** 筛选数据 */\n  datums?: any[] | null | undefined;\n  /** 筛选数据 */\n  datumKeys?: string[] | null | undefined;\n  /** 筛选 item */\n  items?: any[] | null | undefined;\n  /** 筛选函数 */\n  filter?: ((datum: any, options: Record<string, any>) => boolean) | null | undefined;\n  cache?: {\n    [key: string]: {\n      [key: string]: boolean;\n    };\n  };\n  /** 状态优先级 */\n  level?: number | undefined;\n}\n// TODO:目前看这个类型没有必要，确认后彻底删除\nexport interface IStateSpec {\n  /** 状态值 */\n  stateValue: StateValue;\n  /** 筛选数据 */\n  datums?: any[] | null | undefined;\n  /** 筛选数据对应字段 */\n  datumKeys?: string[] | null | undefined;\n  /** TODO: 暂时不提供 filter 函数形式 */\n  // filter?:\n  //   | ((datum: any, options: Record<string, any>) => boolean)\n  //   | null\n  //   | undefined;\n  /** 状态优先级 */\n  level?: number | undefined;\n}\n\nexport interface IMarkState {\n  readonly id: number;\n  // 状态\n  getStates: () => IStateInfo[];\n\n  // state 相关\n  getState: (stateValue: StateValue) => IStateInfo | undefined;\n  addState: (stateInfo: IStateInfo) => void;\n  changeState: (stateInfo: Partial<IStateInfo>, update?: boolean) => void;\n  checkState: (item: any, datum: any) => string[];\n\n  clearState: (stateValues: StateValue[], update?: boolean) => void;\n\n  // 更新\n  update: () => void;\n}\n\nexport enum STATE_VALUE_ENUM {\n  STATE_NORMAL = 'normal',\n\n  STATE_HOVER = 'hover',\n  STATE_HOVER_REVERSE = 'hover_reverse',\n\n  STATE_DIMENSION_HOVER = 'dimension_hover',\n  STATE_DIMENSION_HOVER_REVERSE = 'dimension_hover_reverse',\n\n  STATE_SELECTED = 'selected',\n  STATE_SELECTED_REVERSE = 'selected_reverse'\n}\n\n// TODO: 也许有更好的ts写法\nexport enum STATE_VALUE_ENUM_REVERSE {\n  STATE_HOVER_REVERSE = 'hover_reverse',\n  STATE_DIMENSION_HOVER_REVERSE = 'dimension_hover_reverse',\n  STATE_SELECTED_REVERSE = 'selected_reverse'\n}\n\nexport type STATE_NORMAL = typeof STATE_VALUE_ENUM.STATE_NORMAL;\nexport type STATE_HOVER = typeof STATE_VALUE_ENUM.STATE_HOVER;\nexport type STATE_HOVER_REVERSE = typeof STATE_VALUE_ENUM.STATE_HOVER_REVERSE;\nexport type STATE_CUSTOM = string;\n\n// TODO: 待补充\n\nexport type StateValueNot = STATE_HOVER_REVERSE | STATE_CUSTOM;\nexport type StateValue = STATE_NORMAL | STATE_HOVER | STATE_CUSTOM;\nexport type StateValueType = StateValue | StateValueNot;\n\n// TODO: 迁移内容\nexport enum STATE_LEVEL {\n  NORMAL = 0,\n  DIMENSION_SELECTED = 1,\n  RELATIONAL_SELECTED = 2,\n  SELECTED = 3,\n  DIMENSION_HOVER = 4,\n  RELATIONAL_HOVER = 5,\n  HOVER = 6\n}\n\nexport interface IAttributeOpt {\n  element: IElement;\n  mark: IElement['mark'];\n  parent: IElement['mark']['group'];\n}\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelMarkAttributeContext {\n  [key: string]: unknown;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface ISeriesMarkAttributeContext extends IModelMarkAttributeContext {\n  // 通用的默认属性值获取，比如color，如果有散点图有sizeScale，则可以获取 size\n  globalScale: (scaleKey: string, value: string | number) => unknown;\n  // 传入seriesField值，获取对应的颜色。\n  // 如果传入 null ，返回的是当前系列对应的第一个颜色值。\n  seriesColor: (seriesValue?: string | number) => string;\n  /**\n   * 获取当前的 region\n   * @returns\n   */\n  getRegion: () => IRegion;\n}\n"]}
+{"version":3,"sources":["../src/compile/mark/interface.ts"],"names":[],"mappings":";;;AA6MA,IAAY,gBAWX;AAXD,WAAY,gBAAgB;IAC1B,2CAAuB,CAAA;IAEvB,yCAAqB,CAAA;IACrB,yDAAqC,CAAA;IAErC,6DAAyC,CAAA;IACzC,6EAAyD,CAAA;IAEzD,+CAA2B,CAAA;IAC3B,+DAA2C,CAAA;AAC7C,CAAC,EAXW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAW3B;AAGD,IAAY,wBAIX;AAJD,WAAY,wBAAwB;IAClC,iEAAqC,CAAA;IACrC,qFAAyD,CAAA;IACzD,uEAA2C,CAAA;AAC7C,CAAC,EAJW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAInC;AAcD,IAAY,WAQX;AARD,WAAY,WAAW;IACrB,iDAAU,CAAA;IACV,yEAAsB,CAAA;IACtB,2EAAuB,CAAA;IACvB,qDAAY,CAAA;IACZ,mEAAmB,CAAA;IACnB,qEAAoB,CAAA;IACpB,+CAAS,CAAA;AACX,CAAC,EARW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAQtB","file":"interface.js","sourcesContent":["import type { IMarkProgressiveConfig, IMarkStateStyle, MarkType } from '../../mark/interface';\nimport type { IModel } from '../../model/interface';\nimport type { GrammarItemCompileOption, GrammarItemInitOption } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IGrammarItem } from '../interface';\nimport type { MarkStateManager } from './mark-state-manager';\nimport type { DataView } from '@visactor/vdataset';\nimport type {\n  IAnimate,\n  IAnimateArranger,\n  IElement,\n  IGroupMark,\n  IMark,\n  MarkAnimationSpec,\n  Nil,\n  TransformSpec\n} from '@visactor/vgrammar';\nimport type { Maybe, Datum, StringOrNumber } from '../../typings';\nimport type { MarkData } from './mark-data';\nimport type { ILabelSpec } from '../../component/label';\nimport type { IRegion } from '../../region/interface';\n\nexport interface ICompilableMarkOption extends GrammarItemInitOption {\n  key?: string | ((datum: Datum) => string);\n  /** 分组字段，更多用于 morphing 动画的 element 匹配 */\n  groupKey?: string;\n  /** 是否在dataflow的过程中，布局前跳过该mark */\n  skipBeforeLayouted?: boolean;\n\n  /** 这个mark是否支持3d视角 */\n  support3d?: boolean;\n  /* VGrammar的组件是否支持3d */\n  mode?: '2d' | '3d';\n}\n\nexport interface ICompilableMark extends IGrammarItem {\n  // 类型\n  readonly type: MarkType;\n  // id\n  readonly id: number;\n  // name\n  readonly name: string;\n  // key field\n  readonly key?: string | ((datum: Datum) => string);\n  // parent model\n  readonly model: IModel;\n\n  // 数据 可以没有\n  getData: () => MarkData | undefined;\n  setData: (d: MarkData) => void;\n  getDataView: () => DataView | undefined;\n  setDataView: (d?: DataView, productId?: string) => void;\n\n  // 分片\n  getFacet: () => string | undefined;\n  setFacet: (facet: string) => void;\n\n  // 标签\n  getLabelSpec: () => ILabelSpec[];\n  addLabelSpec: (label: ILabelSpec) => void;\n\n  // 状态\n  state: MarkStateManager;\n  readonly stateStyle: IMarkStateStyle<any>;\n  hasState: (state: string) => boolean;\n  getState: (state: string) => any;\n  updateState: (newState: Record<string, unknown>) => Promise<void>;\n  /** 更新group | enter中的静态样式 */\n  updateStaticEncode: () => void;\n  /** 更新encode中的样式 */\n  updateLayoutState: (noRender?: boolean, recursion?: boolean) => Promise<void>;\n  /** 更新某一个状态 */\n  updateMarkState: (key: string) => void;\n\n  // transform\n  setTransform: (transform: TransformSpec[] | Nil) => void;\n\n  // 交互\n  getInteractive: () => boolean;\n  setInteractive: (interactive: boolean) => void;\n\n  // 动画配置\n  setAnimationConfig: (config: Partial<MarkAnimationSpec>) => void;\n  getAnimationConfig: () => Partial<MarkAnimationSpec>;\n\n  // 层级\n  getZIndex: () => number;\n  setZIndex: (zIndex: number) => void;\n\n  // 是否显示\n  getVisible: () => boolean;\n  setVisible: (visible: boolean) => void;\n\n  // 是否开启 morph\n  getMorph: () => boolean;\n  setMorph: (morph: boolean) => void;\n\n  // 是否开启 morph\n  getProgressiveConfig: () => IMarkProgressiveConfig;\n  setProgressiveConfig: (config: IMarkProgressiveConfig) => void;\n\n  // morphKey 配置\n  getMorphKey: () => string | undefined;\n  setMorphKey: (morphKey: string) => void;\n\n  getMorphElementKey: () => string | undefined;\n  setMorphElementKey: (morphKey: string) => void;\n\n  // groupKey 配置\n  getGroupKey: () => string | undefined;\n  setGroupKey: (groupKey: string) => void;\n\n  // 用户 id\n  getUserId: () => StringOrNumber | undefined;\n  setUserId: (id: StringOrNumber) => void;\n\n  // 是否支持 3d\n  getSupport3d: () => boolean | undefined;\n\n  compile: (option?: IMarkCompileOption) => void;\n\n  getProduct: () => Maybe<IMark>;\n\n  /** 获取子mark */\n  getMarks: () => ICompilableMark[];\n\n  /** 是否跳过布局阶段 */\n  setSkipBeforeLayouted: (skip: boolean) => void;\n  getSkipBeforeLayouted: () => boolean;\n\n  /** 开始状态动画 */\n  runAnimationByState: (animationState?: string) => IAnimateArranger;\n  /** 停止状态动画*/\n  stopAnimationByState: (animationState?: string) => IAnimate;\n  /** 暂停状态动画*/\n  pauseAnimationByState: (animationState: string) => IAnimate;\n  /** 恢复状态动画*/\n  resumeAnimationByState: (animationState: string) => IAnimate;\n}\n\nexport interface IMarkDataInitOption extends ICompilableMarkOption {\n  mark: ICompilableMark;\n}\n\nexport interface IMarkCompileOption extends GrammarItemCompileOption {\n  group?: string | IGroupMark;\n  ignoreChildren?: boolean;\n}\n\nexport interface IStateInfo {\n  /** 状态值 */\n  stateValue: StateValue;\n  // 对应的数据维度 可以是多维度\n  // TODO: fields 是否保留\n  fields?: any | null | undefined;\n  /** 筛选数据 */\n  datums?: any[] | null | undefined;\n  /** 筛选数据 */\n  datumKeys?: string[] | null | undefined;\n  /** 筛选 item */\n  items?: any[] | null | undefined;\n  /** 筛选函数 */\n  filter?: ((datum: any, options: Record<string, any>) => boolean) | null | undefined;\n  cache?: {\n    [key: string]: {\n      [key: string]: boolean;\n    };\n  };\n  /** 状态优先级 */\n  level?: number | undefined;\n}\n// TODO:目前看这个类型没有必要，确认后彻底删除\nexport interface IStateSpec {\n  /** 状态值 */\n  stateValue: StateValue;\n  /** 筛选数据 */\n  datums?: any[] | null | undefined;\n  /** 筛选数据对应字段 */\n  datumKeys?: string[] | null | undefined;\n  /** TODO: 暂时不提供 filter 函数形式 */\n  // filter?:\n  //   | ((datum: any, options: Record<string, any>) => boolean)\n  //   | null\n  //   | undefined;\n  /** 状态优先级 */\n  level?: number | undefined;\n}\n\nexport interface IMarkState {\n  readonly id: number;\n  // 状态\n  getStates: () => IStateInfo[];\n\n  // state 相关\n  getState: (stateValue: StateValue) => IStateInfo | undefined;\n  addState: (stateInfo: IStateInfo) => void;\n  changeState: (stateInfo: Partial<IStateInfo>, update?: boolean) => void;\n  checkState: (item: any, datum: any) => string[];\n\n  clearState: (stateValues: StateValue[], update?: boolean) => void;\n\n  // 更新\n  update: () => void;\n}\n\nexport enum STATE_VALUE_ENUM {\n  STATE_NORMAL = 'normal',\n\n  STATE_HOVER = 'hover',\n  STATE_HOVER_REVERSE = 'hover_reverse',\n\n  STATE_DIMENSION_HOVER = 'dimension_hover',\n  STATE_DIMENSION_HOVER_REVERSE = 'dimension_hover_reverse',\n\n  STATE_SELECTED = 'selected',\n  STATE_SELECTED_REVERSE = 'selected_reverse'\n}\n\n// TODO: 也许有更好的ts写法\nexport enum STATE_VALUE_ENUM_REVERSE {\n  STATE_HOVER_REVERSE = 'hover_reverse',\n  STATE_DIMENSION_HOVER_REVERSE = 'dimension_hover_reverse',\n  STATE_SELECTED_REVERSE = 'selected_reverse'\n}\n\nexport type STATE_NORMAL = typeof STATE_VALUE_ENUM.STATE_NORMAL;\nexport type STATE_HOVER = typeof STATE_VALUE_ENUM.STATE_HOVER;\nexport type STATE_HOVER_REVERSE = typeof STATE_VALUE_ENUM.STATE_HOVER_REVERSE;\nexport type STATE_CUSTOM = string;\n\n// TODO: 待补充\n\nexport type StateValueNot = STATE_HOVER_REVERSE | STATE_CUSTOM;\nexport type StateValue = STATE_NORMAL | STATE_HOVER | STATE_CUSTOM;\nexport type StateValueType = StateValue | StateValueNot;\n\n// TODO: 迁移内容\nexport enum STATE_LEVEL {\n  NORMAL = 0,\n  DIMENSION_SELECTED = 1,\n  RELATIONAL_SELECTED = 2,\n  SELECTED = 3,\n  DIMENSION_HOVER = 4,\n  RELATIONAL_HOVER = 5,\n  HOVER = 6\n}\n\nexport interface IAttributeOpt {\n  element: IElement;\n  mark: IElement['mark'];\n  parent: IElement['mark']['group'];\n}\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface IModelMarkAttributeContext {\n  [key: string]: unknown;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface ISeriesMarkAttributeContext extends IModelMarkAttributeContext {\n  // 通用的默认属性值获取，比如color，如果有散点图有sizeScale，则可以获取 size\n  globalScale: (scaleKey: string, value: string | number) => unknown;\n  // 传入seriesField值，获取对应的颜色。\n  // 如果传入 null ，返回的是当前系列对应的第一个颜色值。\n  seriesColor: (seriesValue?: string | number) => string;\n  /**\n   * 获取当前的 region\n   * @returns\n   */\n  getRegion: () => IRegion;\n}\n"]}

package/cjs/compile/signal/state-manager.d.ts

@@ -8,5 +8,5 @@ export declare class StateManager extends SignalManager {
     constructor(option: IStateManagerOption);
     initStateMap(state?: StateValueMap): void;
     compile(stateMap?: StateValueMap): void;
-    updateState(newState: Partial<StateValueMap>, noRender?: boolean): Promise<void>;
+    updateState(newState: Partial<StateValueMap>, noRender?: boolean): Promise<any>;
 }

package/cjs/compile/signal/state-manager.js

@@ -29,7 +29,7 @@ class StateManager extends signal_manager_1.SignalManager {
     }
     updateState(newState, noRender) {
         return newState ? ((0, vutils_1.merge)(this._stateMap, newState), this.compile(newState), 
-        noRender ? Promise.resolve() : this.getCompiler().reRenderAsync()) : Promise.resolve();
+        noRender ? Promise.resolve() : this.getCompiler().renderAsync()) : Promise.resolve();
     }
 }
 

package/cjs/compile/signal/state-manager.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/compile/signal/state-manager.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAEzC,qDAAiD;AAGjD,MAAa,YAAa,SAAQ,8BAAa;IAE7C,WAAW;QACT,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAGS,mBAAmB;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC;IAKD,YAAY,MAA2B;QACrC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,MAAM,CAAC,oBAAoB,EAAE;YAC/B,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC;SACzD;aAAM;YACL,IAAI,CAAC,oBAAoB,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC;SAClD;QACD,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAGD,YAAY,CAAC,KAAqB;QAChC,IAAI,CAAC,SAAS,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;IACvD,CAAC;IAED,OAAO,CAAC,QAAwB;QAC9B,MAAM,KAAK,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,IAAI,CAAC,SAAS,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YACzB,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;IAGD,WAAW,CAAC,QAAgC,EAAE,QAAkB;QAC9D,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1B;QACD,IAAA,cAAK,EAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAEhC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAEvB,IAAI,QAAQ,EAAE;YACZ,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1B;QACD,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,CAAC;IAC5C,CAAC;CACF;AApDD,oCAoDC","file":"state-manager.js","sourcesContent":["import { merge } from '@visactor/vutils';\nimport type { IStateManagerOption, StateValueMap } from './interface';\nimport { SignalManager } from './signal-manager';\n\n/** 状态管理器，由 SignalManager 继承而来，管理所有和状态相关的 signal */\nexport class StateManager extends SignalManager {\n  protected _stateMap: StateValueMap;\n  getStateMap() {\n    return this._stateMap;\n  }\n\n  /** 默认 state map */\n  protected _getDefaultStateMap(): StateValueMap {\n    return {};\n  }\n\n  /** state key 转为 signal name */\n  protected stateKeyToSignalName: (key: string) => string;\n\n  constructor(option: IStateManagerOption) {\n    super(option);\n    if (option.stateKeyToSignalName) {\n      this.stateKeyToSignalName = option.stateKeyToSignalName;\n    } else {\n      this.stateKeyToSignalName = () => 'state_signal';\n    }\n    this.initStateMap();\n  }\n\n  /** 初始化 state map */\n  initStateMap(state?: StateValueMap) {\n    this._stateMap = state ?? this._getDefaultStateMap();\n  }\n\n  compile(stateMap?: StateValueMap) {\n    const state = stateMap ?? this._stateMap;\n    Object.keys(state).forEach(key => {\n      const name = this.stateKeyToSignalName(key);\n      const value = state[key];\n      this.updateSignal(name, value);\n    });\n  }\n\n  /** 更新 state 并默认触发重渲染 */\n  updateState(newState: Partial<StateValueMap>, noRender?: boolean) {\n    if (!newState) {\n      return Promise.resolve();\n    }\n    merge(this._stateMap, newState);\n\n    this.compile(newState);\n\n    if (noRender) {\n      return Promise.resolve();\n    }\n    return this.getCompiler().reRenderAsync();\n  }\n}\n"]}
+{"version":3,"sources":["../src/compile/signal/state-manager.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAEzC,qDAAiD;AAGjD,MAAa,YAAa,SAAQ,8BAAa;IAE7C,WAAW;QACT,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAGS,mBAAmB;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC;IAKD,YAAY,MAA2B;QACrC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,MAAM,CAAC,oBAAoB,EAAE;YAC/B,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC;SACzD;aAAM;YACL,IAAI,CAAC,oBAAoB,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC;SAClD;QACD,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAGD,YAAY,CAAC,KAAqB;QAChC,IAAI,CAAC,SAAS,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;IACvD,CAAC;IAED,OAAO,CAAC,QAAwB;QAC9B,MAAM,KAAK,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,IAAI,CAAC,SAAS,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YACzB,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;IAGD,WAAW,CAAC,QAAgC,EAAE,QAAkB;QAC9D,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1B;QACD,IAAA,cAAK,EAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAEhC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAEvB,IAAI,QAAQ,EAAE;YACZ,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1B;QACD,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,CAAC;IAC1C,CAAC;CACF;AApDD,oCAoDC","file":"state-manager.js","sourcesContent":["import { merge } from '@visactor/vutils';\nimport type { IStateManagerOption, StateValueMap } from './interface';\nimport { SignalManager } from './signal-manager';\n\n/** 状态管理器，由 SignalManager 继承而来，管理所有和状态相关的 signal */\nexport class StateManager extends SignalManager {\n  protected _stateMap: StateValueMap;\n  getStateMap() {\n    return this._stateMap;\n  }\n\n  /** 默认 state map */\n  protected _getDefaultStateMap(): StateValueMap {\n    return {};\n  }\n\n  /** state key 转为 signal name */\n  protected stateKeyToSignalName: (key: string) => string;\n\n  constructor(option: IStateManagerOption) {\n    super(option);\n    if (option.stateKeyToSignalName) {\n      this.stateKeyToSignalName = option.stateKeyToSignalName;\n    } else {\n      this.stateKeyToSignalName = () => 'state_signal';\n    }\n    this.initStateMap();\n  }\n\n  /** 初始化 state map */\n  initStateMap(state?: StateValueMap) {\n    this._stateMap = state ?? this._getDefaultStateMap();\n  }\n\n  compile(stateMap?: StateValueMap) {\n    const state = stateMap ?? this._stateMap;\n    Object.keys(state).forEach(key => {\n      const name = this.stateKeyToSignalName(key);\n      const value = state[key];\n      this.updateSignal(name, value);\n    });\n  }\n\n  /** 更新 state 并默认触发重渲染 */\n  updateState(newState: Partial<StateValueMap>, noRender?: boolean) {\n    if (!newState) {\n      return Promise.resolve();\n    }\n    merge(this._stateMap, newState);\n\n    this.compile(newState);\n\n    if (noRender) {\n      return Promise.resolve();\n    }\n    return this.getCompiler().renderAsync();\n  }\n}\n"]}

package/cjs/component/axis/base-axis.d.ts

@@ -10,6 +10,7 @@ import type { IAxis, ICommonAxisSpec, ITick, StatisticsDomain } from './interfac
 import type { IComponentOption } from '../interface';
 import type { ISeries } from '../../series/interface';
 import type { ITransformOptions } from '@visactor/vdataset';
+import type { IComponentMark } from '../../mark/component';
 export declare abstract class AxisComponent<T extends ICommonAxisSpec & Record<string, any> = any> extends BaseComponent<T> implements IAxis {
     static specKey: string;
     protected _orient: IPolarOrientType | IOrientType;
@@ -48,6 +49,8 @@ export declare abstract class AxisComponent<T extends ICommonAxisSpec & Record<s
     protected abstract _initData(): void;
     abstract transformScaleDomain(): void;
     protected _dataFieldText: string;
+    protected _axisMark: IComponentMark;
+    protected _gridMark: IComponentMark;
     constructor(spec: T, options: IComponentOption);
     created(): void;
     protected isSeriesDataEnable(): boolean;
@@ -99,19 +102,6 @@ export declare abstract class AxisComponent<T extends ICommonAxisSpec & Record<s
             style: any;
             state: {};
         };
-        grid: {
-            type: string;
-            visible: any;
-            alternateColor: any;
-            alignWithLabel: any;
-            style: any;
-        };
-        subGrid: {
-            type: string;
-            visible: any;
-            alternateColor: any;
-            style: any;
-        };
         title: {
             visible: any;
             position: any;
@@ -141,5 +131,16 @@ export declare abstract class AxisComponent<T extends ICommonAxisSpec & Record<s
             state: {};
         };
     };
+    protected _getGridAttributes(): {
+        alternateColor: any;
+        alignWithLabel: any;
+        style: any;
+        subGrid: {
+            type: string;
+            visible: any;
+            alternateColor: any;
+            style: any;
+        };
+    };
     addTransformToTickData(options: ITransformOptions, execute?: boolean): void;
 }

package/cjs/component/axis/base-axis.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.AxisComponent = void 0;
 
-const vscale_1 = require("@visactor/vscale"), vrender_components_1 = require("@visactor/vrender-components"), base_1 = require("../base"), util_1 = require("../../util"), constant_1 = require("../../constant"), utils_1 = require("../../animation/utils"), config_1 = require("../../animation/config"), vutils_1 = require("@visactor/vutils"), util_2 = require("./util"), style_1 = require("../../util/style");
+const vscale_1 = require("@visactor/vscale"), base_1 = require("../base"), util_1 = require("../../util"), constant_1 = require("../../constant"), utils_1 = require("../../animation/utils"), config_1 = require("../../animation/config"), vutils_1 = require("@visactor/vutils"), util_2 = require("./util"), style_1 = require("../../util/style"), vgrammar_1 = require("@visactor/vgrammar");
 
 class AxisComponent extends base_1.BaseComponent {
     getOrient() {
@@ -49,7 +49,7 @@ class AxisComponent extends base_1.BaseComponent {
         }, this._visible = null === (_a = spec.visible) || void 0 === _a || _a;
     }
     created() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         if (super.created(), this.setSeriesAndRegionsFromSpec(), this.initEvent(), this.initScales(), 
         this.updateSeriesScale(), this._initData(), this._visible) {
             const axisMark = this._createMark({
@@ -59,29 +59,40 @@ class AxisComponent extends base_1.BaseComponent {
                 componentType: "angle" === this.getOrient() ? "circleAxis" : "axis",
                 mode: this._spec.mode
             });
-            if (this._marks.addMark(axisMark), axisMark.setZIndex(this.layoutZIndex), (0, util_1.isValid)(this._spec.id) && axisMark.setUserId(this._spec.id), 
-            (0, util_1.isBoolean)(this._spec.interactive) && axisMark.setInteractive(this._spec.interactive), 
+            if (this._axisMark = axisMark, axisMark.setZIndex(this.layoutZIndex), (0, util_1.isValid)(this._spec.id) && axisMark.setUserId(this._spec.id), 
+            this._marks.addMark(axisMark), null === (_a = this._spec.grid) || void 0 === _a ? void 0 : _a.visible) {
+                const gridMark = this._createMark({
+                    type: "component",
+                    name: `axis-${this.getOrient()}-grid`
+                }, {
+                    componentType: "angle" === this.getOrient() ? vgrammar_1.GridEnum.circleAxisGrid : vgrammar_1.GridEnum.lineAxisGrid,
+                    mode: this._spec.mode
+                });
+                gridMark.setZIndex(null !== (_f = null !== (_d = null === (_c = null === (_b = this._spec.grid) || void 0 === _b ? void 0 : _b.style) || void 0 === _c ? void 0 : _c.zIndex) && void 0 !== _d ? _d : null === (_e = this._spec.grid) || void 0 === _e ? void 0 : _e.zIndex) && void 0 !== _f ? _f : constant_1.LayoutZIndex.Axis_Grid), 
+                this._marks.addMark(gridMark), this._gridMark = gridMark;
+            }
+            if ((0, util_1.isBoolean)(this._spec.interactive) && this._marks.forEach((m => m.setInteractive(this._spec.interactive))), 
             !1 !== this._option.animation && !1 !== (0, util_1.get)(this._option.getChart().getSpec(), "animation") && !0 === this._spec.animation) {
                 const axisAnimateConfig = (0, utils_1.animationConfig)(config_1.DEFAULT_MARK_ANIMATION.axis(), {
-                    appear: null !== (_b = null !== (_a = this._spec.animationAppear) && void 0 !== _a ? _a : (0, 
-                    util_1.get)(this._option.getChart().getSpec(), "animationAppear.axis")) && void 0 !== _b ? _b : (0, 
+                    appear: null !== (_h = null !== (_g = this._spec.animationAppear) && void 0 !== _g ? _g : (0, 
+                    util_1.get)(this._option.getChart().getSpec(), "animationAppear.axis")) && void 0 !== _h ? _h : (0, 
                     util_1.get)(this._option.getChart().getSpec(), "animationAppear"),
-                    disappear: null !== (_d = null !== (_c = this._spec.animationDisappear) && void 0 !== _c ? _c : (0, 
-                    util_1.get)(this._option.getChart().getSpec(), "animationDisappear.axis")) && void 0 !== _d ? _d : (0, 
+                    disappear: null !== (_k = null !== (_j = this._spec.animationDisappear) && void 0 !== _j ? _j : (0, 
+                    util_1.get)(this._option.getChart().getSpec(), "animationDisappear.axis")) && void 0 !== _k ? _k : (0, 
                     util_1.get)(this._option.getChart().getSpec(), "animationDisappear"),
-                    enter: null !== (_f = null !== (_e = this._spec.animationEnter) && void 0 !== _e ? _e : (0, 
-                    util_1.get)(this._option.getChart().getSpec(), "animationEnter.axis")) && void 0 !== _f ? _f : (0, 
+                    enter: null !== (_m = null !== (_l = this._spec.animationEnter) && void 0 !== _l ? _l : (0, 
+                    util_1.get)(this._option.getChart().getSpec(), "animationEnter.axis")) && void 0 !== _m ? _m : (0, 
                     util_1.get)(this._option.getChart().getSpec(), "animationEnter"),
-                    exit: null !== (_h = null !== (_g = this._spec.animationExit) && void 0 !== _g ? _g : (0, 
-                    util_1.get)(this._option.getChart().getSpec(), "animationExit.axis")) && void 0 !== _h ? _h : (0, 
+                    exit: null !== (_p = null !== (_o = this._spec.animationExit) && void 0 !== _o ? _o : (0, 
+                    util_1.get)(this._option.getChart().getSpec(), "animationExit.axis")) && void 0 !== _p ? _p : (0, 
                     util_1.get)(this._option.getChart().getSpec(), "animationExit"),
-                    update: null !== (_k = null !== (_j = this._spec.animationUpdate) && void 0 !== _j ? _j : (0, 
-                    util_1.get)(this._option.getChart().getSpec(), "animationUpdate.axis")) && void 0 !== _k ? _k : (0, 
+                    update: null !== (_r = null !== (_q = this._spec.animationUpdate) && void 0 !== _q ? _q : (0, 
+                    util_1.get)(this._option.getChart().getSpec(), "animationUpdate.axis")) && void 0 !== _r ? _r : (0, 
                     util_1.get)(this._option.getChart().getSpec(), "animationUpdate")
                 });
                 axisAnimateConfig.update[0].customParameters = {
                     enter: axisAnimateConfig.enter[0]
-                }, axisMark.setAnimationConfig(axisAnimateConfig);
+                }, this._marks.forEach((m => m.setAnimationConfig(axisAnimateConfig)));
             }
         }
     }
@@ -146,9 +157,7 @@ class AxisComponent extends base_1.BaseComponent {
     updateSpec(spec) {
         const originalSpec = this._originalSpec, result = super.updateSpec(spec);
         return result.reRender = !0, originalSpec.type !== spec.type ? (result.reMake = !0, 
-        result) : (result.reMake = [ "seriesId", "seriesIndex", "regionId", "regionIndex" ].some((k => {
-            JSON.stringify(originalSpec[k]), JSON.stringify(spec[k]);
-        })) || result.reMake, result);
+        result) : result;
     }
     getLabelFormatMethod() {
         return this._spec.label.formatMethod ? (value, datum, index) => this._spec.label.formatMethod(datum.rawValue, datum) : null;
@@ -162,8 +171,7 @@ class AxisComponent extends base_1.BaseComponent {
         }))).filter((entry => entry.value >= 0 && entry.value <= 1)) ] : [];
     }
     _delegateAxisContainerEvent(component) {
-        const axisMainContainer = null == component ? void 0 : component.find((node => node.name === vrender_components_1.AXIS_ELEMENT_NAME.axisContainer), !0);
-        axisMainContainer && axisMainContainer.addEventListener("*", ((event, type) => this._delegateEvent(component, event, type)));
+        component.addEventListener("*", ((event, type) => this._delegateEvent(component, event, type)));
     }
     _getAxisAttributes() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
@@ -212,23 +220,6 @@ class AxisComponent extends base_1.BaseComponent {
                 } : (0, style_1.transformToGraphic)(spec.subTick.style),
                 state: (0, style_1.transformStateStyle)(spec.subTick.state)
             },
-            grid: {
-                type: "line",
-                visible: spec.grid.visible,
-                alternateColor: spec.grid.alternateColor,
-                alignWithLabel: spec.grid.alignWithLabel,
-                style: (0, util_1.isFunction)(spec.grid.style) ? (datum, index) => {
-                    var _a, _b;
-                    const style = spec.grid.style(null === (_a = datum.datum) || void 0 === _a ? void 0 : _a.rawValue, index, datum.datum);
-                    return (0, style_1.transformToGraphic)(this._prepareSpecAfterMergingTheme((0, util_1.mergeSpec)({}, null === (_b = this._theme.grid) || void 0 === _b ? void 0 : _b.style, style)));
-                } : (0, style_1.transformToGraphic)(spec.grid.style)
-            },
-            subGrid: {
-                type: "line",
-                visible: spec.subGrid.visible,
-                alternateColor: spec.subGrid.alternateColor,
-                style: (0, style_1.transformToGraphic)(spec.subGrid.style)
-            },
             title: {
                 visible: spec.title.visible,
                 position: spec.title.position,
@@ -259,6 +250,24 @@ class AxisComponent extends base_1.BaseComponent {
             }
         };
     }
+    _getGridAttributes() {
+        const spec = this._spec;
+        return {
+            alternateColor: spec.grid.alternateColor,
+            alignWithLabel: spec.grid.alignWithLabel,
+            style: (0, util_1.isFunction)(spec.grid.style) ? () => (datum, index) => {
+                var _a, _b;
+                const style = spec.grid.style(null === (_a = datum.datum) || void 0 === _a ? void 0 : _a.rawValue, index, datum.datum);
+                return (0, style_1.transformToGraphic)(this._prepareSpecAfterMergingTheme((0, util_1.mergeSpec)({}, null === (_b = this._theme.grid) || void 0 === _b ? void 0 : _b.style, style)));
+            } : (0, style_1.transformToGraphic)(spec.grid.style),
+            subGrid: {
+                type: "line",
+                visible: spec.subGrid.visible,
+                alternateColor: spec.subGrid.alternateColor,
+                style: (0, style_1.transformToGraphic)(spec.subGrid.style)
+            }
+        };
+    }
     addTransformToTickData(options, execute) {
         var _a, _b;
         null === (_b = null === (_a = this._tickData) || void 0 === _a ? void 0 : _a.getDataView()) || void 0 === _b || _b.transform(options, execute);

package/cjs/component/axis/base-axis.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/axis/base-axis.ts"],"names":[],"mappings":"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","file":"base-axis.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport type { INode, IGroup, IGraphic } from '@visactor/vrender';\nimport { AXIS_ELEMENT_NAME } from '@visactor/vrender-components';\n// eslint-disable-next-line no-duplicate-imports\nimport type { AxisItem } from '@visactor/vrender-components';\nimport type { IOrientType, IPolarOrientType, Datum, StringOrNumber } from '../../typings';\nimport { BaseComponent } from '../base';\nimport type { IPolarAxisCommonTheme } from './polar/interface';\nimport type { ICartesianAxisCommonTheme } from './cartesian/interface';\nimport type { CompilableData } from '../../compile/data';\nimport type { IAxis, ICommonAxisSpec, ITick, StatisticsDomain } from './interface';\nimport type { IComponentOption } from '../interface';\nimport {\n  array,\n  eachSeries,\n  get,\n  getSeries,\n  isArray,\n  isBoolean,\n  isFunction,\n  isNil,\n  isValid,\n  mergeSpec\n} from '../../util';\nimport type { ISeries } from '../../series/interface';\nimport { ChartEvent } from '../../constant';\nimport type { Group } from '../../series/base/group';\nimport { animationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport { degreeToRadian, pickWithout, type LooseFunction } from '@visactor/vutils';\nimport { DEFAULT_TITLE_STYLE, transformAxisLineStyle } from './util';\nimport { transformAxisLabelStateStyle, transformStateStyle, transformToGraphic } from '../../util/style';\nimport type { ITransformOptions } from '@visactor/vdataset';\n\nexport abstract class AxisComponent<T extends ICommonAxisSpec & Record<string, any> = any> // FIXME: 补充公共类型，去掉 Record<string, any>\n  extends BaseComponent<T>\n  implements IAxis\n{\n  static specKey = 'axes';\n\n  protected _orient: IPolarOrientType | IOrientType;\n  getOrient() {\n    return this._orient;\n  }\n\n  protected _scale!: IBaseScale;\n  getScale() {\n    return this._scale;\n  }\n\n  protected _scales: IBaseScale[] = [];\n  getScales() {\n    return this._scales;\n  }\n\n  protected declare _theme: ICartesianAxisCommonTheme | IPolarAxisCommonTheme;\n\n  protected _tickData!: CompilableData;\n  getTickData() {\n    return this._tickData;\n  }\n\n  protected _statisticsDomain: StatisticsDomain = { domain: [], index: {} };\n  getStatisticsDomain() {\n    return this._statisticsDomain;\n  }\n\n  // 与系列的关联关系\n  // 优先级：id > index\n  // 最终结果：series & region取交集\n  protected _seriesUserId?: StringOrNumber[];\n  protected _seriesIndex?: number[];\n  protected _regionUserId?: StringOrNumber[];\n  protected _regionIndex?: number[];\n\n  /**\n   * if axis will be shown\n   */\n  protected _visible: boolean = true;\n  get visible() {\n    return this._visible;\n  }\n\n  protected _tick: ITick | undefined = undefined;\n  protected abstract computeDomain(data: { min: number; max: number; values: any[] }[]): StringOrNumber[];\n  abstract dataToPosition(values: any[], cfg?: any): number;\n  abstract valueToPosition(value: any): number;\n  protected abstract axisHelper(): any;\n  protected abstract getSeriesStatisticsField(s: ISeries): string[];\n  protected abstract updateSeriesScale(): void;\n  protected abstract collectData(depth: number): { min: number; max: number; values: any[] }[];\n  protected abstract _initData(): void;\n  abstract transformScaleDomain(): void;\n\n  protected _dataFieldText: string;\n\n  constructor(spec: T, options: IComponentOption) {\n    super(spec, {\n      ...options\n    });\n    this._visible = spec.visible ?? true;\n  }\n\n  created() {\n    super.created();\n    //series and regions\n    this.setSeriesAndRegionsFromSpec();\n    // event\n    this.initEvent();\n    // scales\n    this.initScales();\n    this.updateSeriesScale();\n    // data\n    this._initData();\n\n    if (this._visible) {\n      // 创建语法元素\n\n      const axisMark = this._createMark(\n        { type: 'component', name: `axis-${this.getOrient()}` },\n        {\n          componentType: this.getOrient() === 'angle' ? 'circleAxis' : 'axis',\n          mode: this._spec.mode\n        }\n      );\n      this._marks.addMark(axisMark);\n\n      axisMark.setZIndex(this.layoutZIndex);\n      if (isValid(this._spec.id)) {\n        axisMark.setUserId(this._spec.id);\n      }\n      // interactive\n      if (isBoolean(this._spec.interactive)) {\n        axisMark.setInteractive(this._spec.interactive);\n      }\n\n      // Tip: 支持 spec.animationAppear.axis，并且坐标轴默认关闭动画\n      if (\n        this._option.animation !== false &&\n        get(this._option.getChart().getSpec(), 'animation') !== false &&\n        this._spec.animation === true\n      ) {\n        const axisAnimateConfig = animationConfig(DEFAULT_MARK_ANIMATION.axis(), {\n          appear:\n            this._spec.animationAppear ??\n            get(this._option.getChart().getSpec(), 'animationAppear.axis') ??\n            get(this._option.getChart().getSpec(), 'animationAppear'),\n          disappear:\n            this._spec.animationDisappear ??\n            get(this._option.getChart().getSpec(), 'animationDisappear.axis') ??\n            get(this._option.getChart().getSpec(), 'animationDisappear'),\n          enter:\n            this._spec.animationEnter ??\n            get(this._option.getChart().getSpec(), 'animationEnter.axis') ??\n            get(this._option.getChart().getSpec(), 'animationEnter'),\n          exit:\n            this._spec.animationExit ??\n            get(this._option.getChart().getSpec(), 'animationExit.axis') ??\n            get(this._option.getChart().getSpec(), 'animationExit'),\n          update:\n            this._spec.animationUpdate ??\n            get(this._option.getChart().getSpec(), 'animationUpdate.axis') ??\n            get(this._option.getChart().getSpec(), 'animationUpdate')\n        });\n        // 因为坐标轴的更新动画中处理了 enter，所以需要将 enter 的参数传入\n        axisAnimateConfig.update[0].customParameters = {\n          enter: axisAnimateConfig.enter[0]\n        };\n        axisMark.setAnimationConfig(axisAnimateConfig);\n      }\n    }\n  }\n\n  protected isSeriesDataEnable() {\n    let enable = true;\n    eachSeries(\n      this._regions,\n      s => {\n        if (isArray(s.getViewDataStatistics()?.latestData)) {\n          enable = false;\n        }\n      },\n      {\n        userId: this._seriesUserId,\n        specIndex: this._seriesIndex\n      }\n    );\n    return enable;\n  }\n\n  protected setSeriesAndRegionsFromSpec() {\n    const { seriesId, seriesIndex, regionId, regionIndex } = this._spec;\n    isValid(seriesId) && (this._seriesUserId = array(seriesId));\n    isValid(regionId) && (this._regionUserId = array(regionId));\n    isValid(seriesIndex) && (this._seriesIndex = array(seriesIndex));\n    isValid(regionIndex) && (this._regionIndex = array(regionIndex));\n    this._regions = this._option.getRegionsInUserIdOrIndex(this._regionUserId as string[], this._regionIndex);\n    // _regions 被更新了，layoutBindRegionID 也要更新\n    this.layoutBindRegionID = this._regions.map(x => x.id);\n  }\n\n  getBindSeriesFilter() {\n    return {\n      userId: this._seriesUserId,\n      specIndex: this._seriesIndex\n    };\n  }\n\n  protected computeStatisticsDomain = () => {\n    const data: { min: number; max: number; values: any[] }[] = [];\n    eachSeries(\n      this._regions,\n      s => {\n        const vd = s.getViewDataStatistics?.();\n        vd &&\n          this.getSeriesStatisticsField(s as ISeries).forEach(f => {\n            vd.latestData?.[f] && data.push(vd.latestData[f]);\n          });\n      },\n      {\n        userId: this._seriesUserId,\n        specIndex: this._seriesIndex\n      }\n    );\n\n    this._statisticsDomain.domain = this.computeDomain(data);\n    if (!isContinuous(this._scale.type)) {\n      this._statisticsDomain.index = {};\n      for (let i = 0; i < this._statisticsDomain.domain.length; i++) {\n        this._statisticsDomain.index[this._statisticsDomain.domain[i]] = i;\n      }\n    }\n  };\n\n  protected initEvent() {\n    this.event.on(\n      ChartEvent.scaleUpdate,\n      { filter: ({ model }) => model?.id === this.id },\n      this.effect.scaleUpdate.bind(this)\n    );\n    const viewStatistics = getSeries(this._regions, {\n      userId: this._seriesUserId,\n      specIndex: this._seriesIndex\n    })\n      .map(s => s.getViewDataStatistics())\n      .filter(v => !!v);\n    this._option.dataSet.multipleDataViewAddListener(viewStatistics, 'change', () => {\n      this.updateScaleDomain();\n    });\n  }\n\n  protected updateScaleDomain() {\n    // 留给各个类型的 axis 来 override\n  }\n\n  protected computeData(): void {\n    this._tickData.getDataView().reRunAllTransform();\n    this._tickData.updateData();\n  }\n\n  protected initScales() {\n    this._scales = [this._scale];\n    const groups: Group[] = [];\n    eachSeries(\n      this._regions,\n      s => {\n        const g = s.getGroups();\n        g && groups.push(g);\n      },\n      {\n        userId: this._seriesUserId,\n        specIndex: this._seriesIndex\n      }\n    );\n    if (groups.length !== 0) {\n      const depth = Math.max(...groups.map(g => g.fields.length));\n      for (let i = 1; i < depth; i++) {\n        const scale = this._scale.clone();\n        this._scales.push(scale);\n      }\n    }\n    // this.updateScaleDomain();\n  }\n\n  /** Update API **/\n  updateSpec(spec: any) {\n    const originalSpec = this._originalSpec;\n    const result = super.updateSpec(spec);\n    result.reRender = true;\n    if (originalSpec.type !== spec.type) {\n      result.reMake = true;\n      return result;\n    }\n    result.reMake =\n      ['seriesId', 'seriesIndex', 'regionId', 'regionIndex'].some(k => {\n        JSON.stringify(originalSpec[k]) !== JSON.stringify(spec[k]);\n      }) || result.reMake;\n    return result;\n  }\n\n  protected getLabelFormatMethod() {\n    return this._spec.label.formatMethod\n      ? (value: any, datum: any, index: number) => this._spec.label.formatMethod(datum.rawValue, datum)\n      : null;\n  }\n\n  protected getLabelItems(length: number) {\n    return isArray(this._tickData.getLatestData())\n      ? [\n          this._tickData\n            .getLatestData()\n            .map((obj: Datum) => {\n              return {\n                id: obj.value,\n                label: obj.value,\n                value: length === 0 ? 0 : this.dataToPosition([obj.value]) / length,\n                rawValue: obj.value\n              };\n            })\n            .filter((entry: AxisItem) => entry.value >= 0 && entry.value <= 1)\n        ]\n      : [];\n  }\n\n  protected _delegateAxisContainerEvent(component: IGroup) {\n    const axisMainContainer = component?.find((node: INode) => node.name === AXIS_ELEMENT_NAME.axisContainer, true);\n    if (axisMainContainer) {\n      // 代理组件上的事件，目前坐标轴组件比较特殊，包含了网格线，但是事件这块只提供不包含网格线部分的响应\n      axisMainContainer.addEventListener('*', ((event: any, type: string) =>\n        this._delegateEvent(component as unknown as IGraphic, event, type)) as LooseFunction);\n    }\n  }\n\n  protected _getAxisAttributes() {\n    const spec = this._spec;\n    let titleAngle = spec.title.angle;\n    let titleTextStyle;\n    if (spec.orient === 'left' || spec.orient === 'right') {\n      // 处理纵轴的标题样式\n      if (spec.title?.autoRotate && isNil(spec.title.angle)) {\n        titleAngle = spec.orient === 'left' ? -90 : 90;\n        titleTextStyle = DEFAULT_TITLE_STYLE[spec.orient];\n      }\n    }\n\n    const labelSpec = pickWithout(spec.label, ['style', 'formatMethod', 'state']);\n\n    return {\n      orient: this.getOrient(),\n      select: spec.select,\n      hover: spec.hover,\n      line: transformAxisLineStyle(spec.domainLine),\n      label: {\n        style: isFunction(spec.label.style)\n          ? (datum: Datum, index: number, data: Datum[], layer?: number) => {\n              const style = this._prepareSpecAfterMergingTheme(\n                spec.label.style(datum.rawValue, index, datum, data, layer)\n              );\n              return transformToGraphic(\n                this._prepareSpecAfterMergingTheme(mergeSpec({}, this._theme.label?.style, style))\n              );\n            }\n          : transformToGraphic(spec.label.style),\n        formatMethod: spec.label.formatMethod\n          ? (value: any, datum: any, index: number) => {\n              return spec.label.formatMethod(datum.rawValue, datum);\n            }\n          : null,\n        state: transformAxisLabelStateStyle(spec.label.state),\n        ...labelSpec\n      },\n      tick: {\n        visible: spec.tick.visible,\n        length: spec.tick.tickSize,\n        inside: spec.tick.inside,\n        alignWithLabel: spec.tick.alignWithLabel,\n        style: isFunction(spec.tick.style)\n          ? (value: number, index: number, datum: Datum, data: Datum[]) => {\n              const style = this._prepareSpecAfterMergingTheme((spec.tick.style as any)(value, index, datum, data));\n              return transformToGraphic(\n                this._prepareSpecAfterMergingTheme(mergeSpec({}, this._theme.tick?.style, style))\n              );\n            }\n          : transformToGraphic(spec.tick.style),\n        state: transformStateStyle(spec.tick.state),\n        dataFilter: spec.tick.dataFilter\n      },\n      subTick: {\n        visible: spec.subTick.visible,\n        length: spec.subTick.tickSize,\n        inside: spec.subTick.inside,\n        count: spec.subTick.tickCount,\n        style: isFunction(spec.subTick.style)\n          ? (value: number, index: number, datum: Datum, data: Datum[]) => {\n              const style = (spec.subTick.style as any)(value, index, datum, data);\n              return transformToGraphic(mergeSpec({}, this._theme.subTick?.style, style));\n            }\n          : transformToGraphic(spec.subTick.style),\n        state: transformStateStyle(spec.subTick.state)\n      },\n      grid: {\n        type: 'line',\n        visible: spec.grid.visible,\n        alternateColor: spec.grid.alternateColor,\n        alignWithLabel: spec.grid.alignWithLabel,\n        style: isFunction(spec.grid.style)\n          ? (datum: Datum, index: number) => {\n              const style = spec.grid.style(datum.datum?.rawValue, index, datum.datum);\n              return transformToGraphic(\n                this._prepareSpecAfterMergingTheme(mergeSpec({}, this._theme.grid?.style, style))\n              );\n            }\n          : transformToGraphic(spec.grid.style)\n      },\n      subGrid: {\n        type: 'line',\n        visible: spec.subGrid.visible,\n        alternateColor: spec.subGrid.alternateColor,\n        style: transformToGraphic(spec.subGrid.style)\n      },\n      title: {\n        visible: spec.title.visible,\n        position: spec.title.position,\n        space: spec.title.space,\n        autoRotate: false, // 默认不对外提供该配置\n        angle: titleAngle ? degreeToRadian(titleAngle) : null,\n        textStyle: mergeSpec({}, titleTextStyle, transformToGraphic(spec.title.style)),\n        padding: spec.title.padding,\n        shape: {\n          visible: spec.title.shape?.visible,\n          space: spec.title.shape?.space,\n          style: transformToGraphic(spec.title.shape?.style)\n        },\n        background: {\n          visible: spec.title.background?.visible,\n          style: transformToGraphic(spec.title.background?.style)\n        },\n        state: {\n          text: transformStateStyle(spec.title.state),\n          shape: transformStateStyle(spec.title.shape?.state),\n          background: transformStateStyle(spec.title.background?.state)\n        }\n      },\n      panel: {\n        visible: spec.background?.visible,\n        style: transformToGraphic(spec.background?.style),\n        state: transformStateStyle(spec.background?.state)\n      }\n    };\n  }\n\n  addTransformToTickData(options: ITransformOptions, execute?: boolean) {\n    this._tickData?.getDataView()?.transform(options, execute);\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/axis/base-axis.ts"],"names":[],"mappings":"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","file":"base-axis.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport type { IGroup, IGraphic } from '@visactor/vrender';\n// eslint-disable-next-line no-duplicate-imports\nimport type { AxisItem } from '@visactor/vrender-components';\nimport type { IOrientType, IPolarOrientType, Datum, StringOrNumber, IGroup as ISeriesGroup } from '../../typings';\nimport { BaseComponent } from '../base';\nimport type { IPolarAxisCommonTheme } from './polar/interface';\nimport type { ICartesianAxisCommonTheme } from './cartesian/interface';\nimport type { CompilableData } from '../../compile/data';\nimport type { IAxis, ICommonAxisSpec, ITick, StatisticsDomain } from './interface';\nimport type { IComponentOption } from '../interface';\nimport {\n  array,\n  eachSeries,\n  get,\n  getSeries,\n  isArray,\n  isBoolean,\n  isFunction,\n  isNil,\n  isValid,\n  mergeSpec\n} from '../../util';\nimport type { ISeries } from '../../series/interface';\nimport { ChartEvent, LayoutZIndex } from '../../constant';\nimport { animationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport { degreeToRadian, pickWithout, type LooseFunction } from '@visactor/vutils';\nimport { DEFAULT_TITLE_STYLE, transformAxisLineStyle } from './util';\nimport { transformAxisLabelStateStyle, transformStateStyle, transformToGraphic } from '../../util/style';\nimport type { ITransformOptions } from '@visactor/vdataset';\nimport { GridEnum } from '@visactor/vgrammar';\nimport type { IComponentMark } from '../../mark/component';\n\nexport abstract class AxisComponent<T extends ICommonAxisSpec & Record<string, any> = any> // FIXME: 补充公共类型，去掉 Record<string, any>\n  extends BaseComponent<T>\n  implements IAxis\n{\n  static specKey = 'axes';\n\n  protected _orient: IPolarOrientType | IOrientType;\n  getOrient() {\n    return this._orient;\n  }\n\n  protected _scale!: IBaseScale;\n  getScale() {\n    return this._scale;\n  }\n\n  protected _scales: IBaseScale[] = [];\n  getScales() {\n    return this._scales;\n  }\n\n  protected declare _theme: ICartesianAxisCommonTheme | IPolarAxisCommonTheme;\n\n  protected _tickData!: CompilableData;\n  getTickData() {\n    return this._tickData;\n  }\n\n  protected _statisticsDomain: StatisticsDomain = { domain: [], index: {} };\n  getStatisticsDomain() {\n    return this._statisticsDomain;\n  }\n\n  // 与系列的关联关系\n  // 优先级：id > index\n  // 最终结果：series & region取交集\n  protected _seriesUserId?: StringOrNumber[];\n  protected _seriesIndex?: number[];\n  protected _regionUserId?: StringOrNumber[];\n  protected _regionIndex?: number[];\n\n  /**\n   * if axis will be shown\n   */\n  protected _visible: boolean = true;\n  get visible() {\n    return this._visible;\n  }\n\n  protected _tick: ITick | undefined = undefined;\n  protected abstract computeDomain(data: { min: number; max: number; values: any[] }[]): StringOrNumber[];\n  abstract dataToPosition(values: any[], cfg?: any): number;\n  abstract valueToPosition(value: any): number;\n  protected abstract axisHelper(): any;\n  protected abstract getSeriesStatisticsField(s: ISeries): string[];\n  protected abstract updateSeriesScale(): void;\n  protected abstract collectData(depth: number): { min: number; max: number; values: any[] }[];\n  protected abstract _initData(): void;\n  abstract transformScaleDomain(): void;\n\n  protected _dataFieldText: string;\n  protected _axisMark: IComponentMark;\n  protected _gridMark: IComponentMark;\n\n  constructor(spec: T, options: IComponentOption) {\n    super(spec, {\n      ...options\n    });\n    this._visible = spec.visible ?? true;\n  }\n\n  created() {\n    super.created();\n    //series and regions\n    this.setSeriesAndRegionsFromSpec();\n    // event\n    this.initEvent();\n    // scales\n    this.initScales();\n    this.updateSeriesScale();\n    // data\n    this._initData();\n\n    if (this._visible) {\n      // 创建语法元素\n      const axisMark = this._createMark(\n        { type: 'component', name: `axis-${this.getOrient()}` },\n        {\n          componentType: this.getOrient() === 'angle' ? 'circleAxis' : 'axis',\n          mode: this._spec.mode\n        }\n      );\n      this._axisMark = axisMark;\n      axisMark.setZIndex(this.layoutZIndex);\n      if (isValid(this._spec.id)) {\n        axisMark.setUserId(this._spec.id);\n      }\n      this._marks.addMark(axisMark);\n\n      if (this._spec.grid?.visible) {\n        const gridMark = this._createMark(\n          { type: 'component', name: `axis-${this.getOrient()}-grid` },\n          {\n            componentType: this.getOrient() === 'angle' ? GridEnum.circleAxisGrid : GridEnum.lineAxisGrid,\n            mode: this._spec.mode\n          }\n        );\n        gridMark.setZIndex(this._spec.grid?.style?.zIndex ?? this._spec.grid?.zIndex ?? LayoutZIndex.Axis_Grid);\n        this._marks.addMark(gridMark);\n        this._gridMark = gridMark;\n      }\n\n      // interactive\n      if (isBoolean(this._spec.interactive)) {\n        this._marks.forEach(m => m.setInteractive(this._spec.interactive));\n      }\n\n      // Tip: 支持 spec.animationAppear.axis，并且坐标轴默认关闭动画\n      if (\n        this._option.animation !== false &&\n        get(this._option.getChart().getSpec(), 'animation') !== false &&\n        this._spec.animation === true\n      ) {\n        const axisAnimateConfig = animationConfig(DEFAULT_MARK_ANIMATION.axis(), {\n          appear:\n            this._spec.animationAppear ??\n            get(this._option.getChart().getSpec(), 'animationAppear.axis') ??\n            get(this._option.getChart().getSpec(), 'animationAppear'),\n          disappear:\n            this._spec.animationDisappear ??\n            get(this._option.getChart().getSpec(), 'animationDisappear.axis') ??\n            get(this._option.getChart().getSpec(), 'animationDisappear'),\n          enter:\n            this._spec.animationEnter ??\n            get(this._option.getChart().getSpec(), 'animationEnter.axis') ??\n            get(this._option.getChart().getSpec(), 'animationEnter'),\n          exit:\n            this._spec.animationExit ??\n            get(this._option.getChart().getSpec(), 'animationExit.axis') ??\n            get(this._option.getChart().getSpec(), 'animationExit'),\n          update:\n            this._spec.animationUpdate ??\n            get(this._option.getChart().getSpec(), 'animationUpdate.axis') ??\n            get(this._option.getChart().getSpec(), 'animationUpdate')\n        });\n        // 因为坐标轴的更新动画中处理了 enter，所以需要将 enter 的参数传入\n        axisAnimateConfig.update[0].customParameters = {\n          enter: axisAnimateConfig.enter[0]\n        };\n        this._marks.forEach(m => m.setAnimationConfig(axisAnimateConfig));\n      }\n    }\n  }\n\n  protected isSeriesDataEnable() {\n    let enable = true;\n    eachSeries(\n      this._regions,\n      s => {\n        if (isArray(s.getViewDataStatistics()?.latestData)) {\n          enable = false;\n        }\n      },\n      {\n        userId: this._seriesUserId,\n        specIndex: this._seriesIndex\n      }\n    );\n    return enable;\n  }\n\n  protected setSeriesAndRegionsFromSpec() {\n    const { seriesId, seriesIndex, regionId, regionIndex } = this._spec;\n    isValid(seriesId) && (this._seriesUserId = array(seriesId));\n    isValid(regionId) && (this._regionUserId = array(regionId));\n    isValid(seriesIndex) && (this._seriesIndex = array(seriesIndex));\n    isValid(regionIndex) && (this._regionIndex = array(regionIndex));\n    this._regions = this._option.getRegionsInUserIdOrIndex(this._regionUserId as string[], this._regionIndex);\n    // _regions 被更新了，layoutBindRegionID 也要更新\n    this.layoutBindRegionID = this._regions.map(x => x.id);\n  }\n\n  getBindSeriesFilter() {\n    return {\n      userId: this._seriesUserId,\n      specIndex: this._seriesIndex\n    };\n  }\n\n  protected computeStatisticsDomain = () => {\n    const data: { min: number; max: number; values: any[] }[] = [];\n    eachSeries(\n      this._regions,\n      s => {\n        const vd = s.getViewDataStatistics?.();\n        vd &&\n          this.getSeriesStatisticsField(s as ISeries).forEach(f => {\n            vd.latestData?.[f] && data.push(vd.latestData[f]);\n          });\n      },\n      {\n        userId: this._seriesUserId,\n        specIndex: this._seriesIndex\n      }\n    );\n\n    this._statisticsDomain.domain = this.computeDomain(data);\n    if (!isContinuous(this._scale.type)) {\n      this._statisticsDomain.index = {};\n      for (let i = 0; i < this._statisticsDomain.domain.length; i++) {\n        this._statisticsDomain.index[this._statisticsDomain.domain[i]] = i;\n      }\n    }\n  };\n\n  protected initEvent() {\n    this.event.on(\n      ChartEvent.scaleUpdate,\n      { filter: ({ model }) => model?.id === this.id },\n      this.effect.scaleUpdate.bind(this)\n    );\n    const viewStatistics = getSeries(this._regions, {\n      userId: this._seriesUserId,\n      specIndex: this._seriesIndex\n    })\n      .map(s => s.getViewDataStatistics())\n      .filter(v => !!v);\n    this._option.dataSet.multipleDataViewAddListener(viewStatistics, 'change', () => {\n      this.updateScaleDomain();\n    });\n  }\n\n  protected updateScaleDomain() {\n    // 留给各个类型的 axis 来 override\n  }\n\n  protected computeData(): void {\n    this._tickData.getDataView().reRunAllTransform();\n    this._tickData.updateData();\n  }\n\n  protected initScales() {\n    this._scales = [this._scale];\n    const groups: ISeriesGroup[] = [];\n    eachSeries(\n      this._regions,\n      s => {\n        const g = s.getGroups();\n        g && groups.push(g);\n      },\n      {\n        userId: this._seriesUserId,\n        specIndex: this._seriesIndex\n      }\n    );\n    if (groups.length !== 0) {\n      const depth = Math.max(...groups.map(g => g.fields.length));\n      for (let i = 1; i < depth; i++) {\n        const scale = this._scale.clone();\n        this._scales.push(scale);\n      }\n    }\n    // this.updateScaleDomain();\n  }\n\n  /** Update API **/\n  updateSpec(spec: any) {\n    const originalSpec = this._originalSpec;\n    const result = super.updateSpec(spec);\n    result.reRender = true;\n    if (originalSpec.type !== spec.type) {\n      result.reMake = true;\n      return result;\n    }\n    return result;\n  }\n\n  protected getLabelFormatMethod() {\n    return this._spec.label.formatMethod\n      ? (value: any, datum: any, index: number) => this._spec.label.formatMethod(datum.rawValue, datum)\n      : null;\n  }\n\n  protected getLabelItems(length: number) {\n    return isArray(this._tickData.getLatestData())\n      ? [\n          this._tickData\n            .getLatestData()\n            .map((obj: Datum) => {\n              return {\n                id: obj.value,\n                label: obj.value,\n                value: length === 0 ? 0 : this.dataToPosition([obj.value]) / length,\n                rawValue: obj.value\n              };\n            })\n            .filter((entry: AxisItem) => entry.value >= 0 && entry.value <= 1)\n        ]\n      : [];\n  }\n\n  protected _delegateAxisContainerEvent(component: IGroup) {\n    component.addEventListener('*', ((event: any, type: string) =>\n      this._delegateEvent(component as unknown as IGraphic, event, type)) as LooseFunction);\n  }\n\n  protected _getAxisAttributes() {\n    const spec = this._spec;\n    let titleAngle = spec.title.angle;\n    let titleTextStyle;\n    if (spec.orient === 'left' || spec.orient === 'right') {\n      // 处理纵轴的标题样式\n      if (spec.title?.autoRotate && isNil(spec.title.angle)) {\n        titleAngle = spec.orient === 'left' ? -90 : 90;\n        titleTextStyle = DEFAULT_TITLE_STYLE[spec.orient];\n      }\n    }\n\n    const labelSpec = pickWithout(spec.label, ['style', 'formatMethod', 'state']);\n\n    return {\n      orient: this.getOrient(),\n      select: spec.select,\n      hover: spec.hover,\n      line: transformAxisLineStyle(spec.domainLine),\n      label: {\n        style: isFunction(spec.label.style)\n          ? (datum: Datum, index: number, data: Datum[], layer?: number) => {\n              const style = this._prepareSpecAfterMergingTheme(\n                spec.label.style(datum.rawValue, index, datum, data, layer)\n              );\n              return transformToGraphic(\n                this._prepareSpecAfterMergingTheme(mergeSpec({}, this._theme.label?.style, style))\n              );\n            }\n          : transformToGraphic(spec.label.style),\n        formatMethod: spec.label.formatMethod\n          ? (value: any, datum: any, index: number) => {\n              return spec.label.formatMethod(datum.rawValue, datum);\n            }\n          : null,\n        state: transformAxisLabelStateStyle(spec.label.state),\n        ...labelSpec\n      },\n      tick: {\n        visible: spec.tick.visible,\n        length: spec.tick.tickSize,\n        inside: spec.tick.inside,\n        alignWithLabel: spec.tick.alignWithLabel,\n        style: isFunction(spec.tick.style)\n          ? (value: number, index: number, datum: Datum, data: Datum[]) => {\n              const style = this._prepareSpecAfterMergingTheme((spec.tick.style as any)(value, index, datum, data));\n              return transformToGraphic(\n                this._prepareSpecAfterMergingTheme(mergeSpec({}, this._theme.tick?.style, style))\n              );\n            }\n          : transformToGraphic(spec.tick.style),\n        state: transformStateStyle(spec.tick.state),\n        dataFilter: spec.tick.dataFilter\n      },\n      subTick: {\n        visible: spec.subTick.visible,\n        length: spec.subTick.tickSize,\n        inside: spec.subTick.inside,\n        count: spec.subTick.tickCount,\n        style: isFunction(spec.subTick.style)\n          ? (value: number, index: number, datum: Datum, data: Datum[]) => {\n              const style = (spec.subTick.style as any)(value, index, datum, data);\n              return transformToGraphic(mergeSpec({}, this._theme.subTick?.style, style));\n            }\n          : transformToGraphic(spec.subTick.style),\n        state: transformStateStyle(spec.subTick.state)\n      },\n      title: {\n        visible: spec.title.visible,\n        position: spec.title.position,\n        space: spec.title.space,\n        autoRotate: false, // 默认不对外提供该配置\n        angle: titleAngle ? degreeToRadian(titleAngle) : null,\n        textStyle: mergeSpec({}, titleTextStyle, transformToGraphic(spec.title.style)),\n        padding: spec.title.padding,\n        shape: {\n          visible: spec.title.shape?.visible,\n          space: spec.title.shape?.space,\n          style: transformToGraphic(spec.title.shape?.style)\n        },\n        background: {\n          visible: spec.title.background?.visible,\n          style: transformToGraphic(spec.title.background?.style)\n        },\n        state: {\n          text: transformStateStyle(spec.title.state),\n          shape: transformStateStyle(spec.title.shape?.state),\n          background: transformStateStyle(spec.title.background?.state)\n        }\n      },\n      panel: {\n        visible: spec.background?.visible,\n        style: transformToGraphic(spec.background?.style),\n        state: transformStateStyle(spec.background?.state)\n      }\n    };\n  }\n\n  protected _getGridAttributes() {\n    const spec = this._spec;\n    return {\n      alternateColor: spec.grid.alternateColor,\n      alignWithLabel: spec.grid.alignWithLabel,\n      style: isFunction(spec.grid.style)\n        ? () => {\n            return (datum: Datum, index: number) => {\n              const style = spec.grid.style(datum.datum?.rawValue, index, datum.datum);\n              return transformToGraphic(\n                this._prepareSpecAfterMergingTheme(mergeSpec({}, this._theme.grid?.style, style))\n              );\n            };\n          }\n        : transformToGraphic(spec.grid.style),\n      subGrid: {\n        type: 'line',\n        visible: spec.subGrid.visible,\n        alternateColor: spec.subGrid.alternateColor,\n        style: transformToGraphic(spec.subGrid.style)\n      }\n    };\n  }\n\n  addTransformToTickData(options: ITransformOptions, execute?: boolean) {\n    this._tickData?.getDataView()?.transform(options, execute);\n  }\n}\n"]}

package/cjs/component/axis/cartesian/axis.js

@@ -1,6 +1,14 @@
 "use strict";
 
-var __importDefault = this && this.__importDefault || function(mod) {
+var __rest = this && this.__rest || function(s, e) {
+    var t = {};
+    for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0 && (t[p] = s[p]);
+    if (null != s && "function" == typeof Object.getOwnPropertySymbols) {
+        var i = 0;
+        for (p = Object.getOwnPropertySymbols(s); i < p.length; i++) e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]) && (t[p[i]] = s[p[i]]);
+    }
+    return t;
+}, __importDefault = this && this.__importDefault || function(mod) {
     return mod && mod.__esModule ? mod : {
         default: mod
     };
@@ -10,7 +18,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.CartesianAxis = void 0;
 
-const util_1 = require("../../../util"), space_1 = require("../../../typings/space"), vscale_1 = require("@visactor/vscale"), factory_1 = require("../../../core/factory"), util_2 = require("./util"), constant_1 = require("../../../constant"), index_1 = require("../../../constant/index"), components_1 = __importDefault(require("../../../plugin/components")), interface_1 = require("../../interface"), vgrammar_1 = require("@visactor/vgrammar"), util_3 = require("../util"), register_1 = require("../../../data/register"), scale_1 = require("../../../data/parser/scale"), tick_data_1 = require("../../../data/transforms/tick-data"), vdataset_1 = require("@visactor/vdataset"), data_1 = require("../../../compile/data"), base_axis_1 = require("../base-axis"), CartesianAxisPlugin = [ components_1.default.AxisSyncPlugin ];
+const util_1 = require("../../../util"), space_1 = require("../../../typings/space"), vscale_1 = require("@visactor/vscale"), factory_1 = require("../../../core/factory"), util_2 = require("./util"), constant_1 = require("../../../constant"), index_1 = require("../../../constant/index"), components_1 = __importDefault(require("../../../plugin/components")), interface_1 = require("../../interface"), vgrammar_1 = require("@visactor/vgrammar"), util_3 = require("../util"), register_1 = require("../../../data/register"), scale_1 = require("../../../data/parser/scale"), vutils_extension_1 = require("@visactor/vutils-extension"), vdataset_1 = require("@visactor/vdataset"), data_1 = require("../../../compile/data"), base_axis_1 = require("../base-axis"), CartesianAxisPlugin = [ components_1.default.AxisSyncPlugin ];
 
 class CartesianAxis extends base_axis_1.AxisComponent {
     getOrient() {
@@ -71,7 +79,7 @@ class CartesianAxis extends base_axis_1.AxisComponent {
                         isValidAxis(indexAxis) && (bindAxis = indexAxis);
                     } else bindAxis = relativeAxes[0];
                     if (bindAxis) {
-                        const axisMark = this.getMarks()[0].getProduct(), position = bindAxis.valueToPosition(0);
+                        const axisMark = this._axisMark.getProduct(), position = bindAxis.valueToPosition(0);
                         isX ? axisMark.encode({
                             line: Object.assign(Object.assign({}, this._axisStyle.line), {
                                 dy: "bottom" === this._orient ? -(bindAxis.getScale().range()[0] - position) : position
@@ -145,12 +153,14 @@ class CartesianAxis extends base_axis_1.AxisComponent {
         }));
     }
     setAttrFromSpec() {
-        super.setAttrFromSpec();
-        (0, util_2.isXAxis)(this.getOrient()) ? (0, util_1.isUndefined)(this._spec.maxHeight) && (this._spec.maxHeight = "30%") : (0, 
-        util_1.isUndefined)(this._spec.maxWidth) && (this._spec.maxWidth = "30%");
-        const axisStyle = this._getAxisAttributes();
-        axisStyle.label.formatMethod = this.getLabelFormatMethod(), axisStyle.verticalFactor = "top" === this.getOrient() || "right" === this.getOrient() ? -1 : 1, 
-        this._axisStyle = axisStyle, this._tick = this._spec.tick;
+        if (super.setAttrFromSpec(), this.visible) {
+            (0, util_2.isXAxis)(this.getOrient()) ? (0, util_1.isUndefined)(this._spec.maxHeight) && (this._spec.maxHeight = "30%") : (0, 
+            util_1.isUndefined)(this._spec.maxWidth) && (this._spec.maxWidth = "30%");
+            const axisStyle = this._getAxisAttributes();
+            axisStyle.label.formatMethod = this.getLabelFormatMethod(), axisStyle.verticalFactor = "top" === this.getOrient() || "right" === this.getOrient() ? -1 : 1, 
+            this._axisStyle = axisStyle;
+        }
+        this._tick = this._spec.tick;
     }
     getSeriesStatisticsField(s) {
         let f;
@@ -159,7 +169,7 @@ class CartesianAxis extends base_axis_1.AxisComponent {
     }
     _initData() {
         (0, register_1.registerDataSetInstanceParser)(this._option.dataSet, "scale", scale_1.scaleParser), 
-        (0, register_1.registerDataSetInstanceTransform)(this._option.dataSet, "ticks", tick_data_1.ticks);
+        (0, register_1.registerDataSetInstanceTransform)(this._option.dataSet, "ticks", vutils_extension_1.ticks);
         const label = this._spec.label || {}, tick = this._tick || {}, tickData = new vdataset_1.DataView(this._option.dataSet).parse(this._scale, {
             type: "scale"
         }).transform({
@@ -195,7 +205,7 @@ class CartesianAxis extends base_axis_1.AxisComponent {
     }
     afterCompile() {
         var _a;
-        const product = null === (_a = this.getMarks()[0]) || void 0 === _a ? void 0 : _a.getProduct();
+        const product = null === (_a = this._axisMark) || void 0 === _a ? void 0 : _a.getProduct();
         product && product.addEventListener(vgrammar_1.HOOK_EVENT.AFTER_ELEMENT_ENCODE, (() => {
             !1 === this._isLayout && ((0, util_2.isXAxis)(this.getOrient()) ? this.callPlugin((plugin => {
                 this.pluginService && plugin.onDidLayoutHorizontal && plugin.onDidLayoutHorizontal(this.pluginService, this);
@@ -303,7 +313,7 @@ class CartesianAxis extends base_axis_1.AxisComponent {
         })) : this.pluginService && this.callPlugin((plugin => {
             plugin.onWillLayoutVertical && plugin.onWillLayoutVertical(this.pluginService, context, this);
         }));
-        const product = this.getMarks()[0].getProduct();
+        const product = this._axisMark.getProduct();
         if (this._latestBounds = product.getBounds(), !context.skipLayout) {
             const attrs = this._getUpdateAttribute(!0), updateBounds = product.getGroupGraphicItem().getBoundsWithoutRender((0, 
             util_1.mergeSpec)(Object.assign({}, this.getLayoutStartPoint()), this._axisStyle, attrs));
@@ -313,9 +323,12 @@ class CartesianAxis extends base_axis_1.AxisComponent {
     }
     updateLayoutAttribute() {
         if (!this.visible) return;
-        const attrs = this._getUpdateAttribute(!1), product = this.getMarks()[0].getProduct(), axisAttrs = (0, 
-        util_1.mergeSpec)(Object.assign({}, this.getLayoutStartPoint()), this._axisStyle, attrs);
-        product.encode(axisAttrs), super.updateLayoutAttribute();
+        const _a = this._getUpdateAttribute(!1), {grid: updateGridAttrs} = _a, updateAxisAttrs = __rest(_a, [ "grid" ]), axisProduct = this._axisMark.getProduct(), axisAttrs = (0, 
+        util_1.mergeSpec)(Object.assign({}, this.getLayoutStartPoint()), this._axisStyle, updateAxisAttrs);
+        if (axisProduct.encode(axisAttrs), this._gridMark) {
+            this._gridMark.getProduct().encode((0, util_1.mergeSpec)(Object.assign({}, this.getLayoutStartPoint()), this._getGridAttributes(), updateGridAttrs));
+        }
+        super.updateLayoutAttribute();
     }
     _getTitleLimit(isX) {
         var _a, _b, _c, _d, _e;
@@ -359,8 +372,9 @@ class CartesianAxis extends base_axis_1.AxisComponent {
         }, gridLength = regionWidth, axisLength = height), isZ) {
             const directionStr = null !== (_a = this.directionStr) && void 0 !== _a ? _a : "r2l", depthZ = this.layout3dBox ? this.layout3dBox.width : 0;
             let anchor3d = [ 0, 0 ], alpha = -Math.PI / 2, z = 0;
-            return "l2r" === directionStr && (z = this.layout3dBox.length, anchor3d = [ 0, 0, 0 ], 
-            alpha = Math.PI / 2), {
+            "l2r" === directionStr && (z = this.layout3dBox.length, anchor3d = [ 0, 0, 0 ], 
+            alpha = Math.PI / 2);
+            const items = this.getLabelItems(width), axisAttrs = {
                 start: {
                     x: 0,
                     y: 0
@@ -372,41 +386,59 @@ class CartesianAxis extends base_axis_1.AxisComponent {
                 z: z,
                 alpha: alpha,
                 anchor3d: anchor3d,
-                grid: {
-                    type: "line",
-                    depth: depthZ,
-                    length: regionHeight,
-                    visible: this._spec.grid.visible && !ignoreGrid
-                },
                 title: {
                     text: this._spec.title.text || this._dataFieldText,
                     maxWidth: this._getTitleLimit(isX)
                 },
-                items: this.getLabelItems(width)
+                items: items
             };
+            return ignoreGrid || (axisAttrs.grid = {
+                type: "line",
+                start: {
+                    x: 0,
+                    y: 0
+                },
+                end: {
+                    x: depth,
+                    y: 0
+                },
+                items: items[0],
+                verticalFactor: this._axisStyle.verticalFactor,
+                depth: depthZ,
+                length: regionHeight,
+                z: z,
+                alpha: alpha,
+                anchor3d: anchor3d
+            }), axisAttrs;
         }
         let verticalMinSize = isX ? this._minHeight : this._minWidth;
         (isX && this._layoutRectLevelMap.height === constant_1.USER_LAYOUT_RECT_LEVEL || isY && this._layoutRectLevelMap.width === constant_1.USER_LAYOUT_RECT_LEVEL) && (verticalMinSize = this._verticalLimitSize);
-        return {
+        const items = this.getLabelItems(axisLength), attrs = {
             start: {
                 x: 0,
                 y: 0
             },
             end: end,
-            grid: {
-                type: "line",
-                depth: depth,
-                length: gridLength,
-                visible: this._spec.grid.visible && !ignoreGrid
-            },
             title: {
                 text: this._spec.title.text || this._dataFieldText,
                 maxWidth: this._getTitleLimit(isX)
             },
-            items: this.getLabelItems(axisLength),
+            items: items,
             verticalLimitSize: this._verticalLimitSize,
             verticalMinSize: verticalMinSize
         };
+        return ignoreGrid || (attrs.grid = {
+            type: "line",
+            start: {
+                x: 0,
+                y: 0
+            },
+            end: end,
+            items: items[0],
+            verticalFactor: this._axisStyle.verticalFactor,
+            depth: depth,
+            length: gridLength
+        }), attrs;
     }
     initEvent() {
         super.initEvent(), this.visible && (this.event.on(constant_1.ChartEvent.layoutEnd, this._fixAxisOnZero),