@visactor/vchart 1.3.0-beta.8 → 1.3.0

package/cjs/compile/interface/compilable-item.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/compile/interface/compilable-item.ts"],"names":[],"mappings":";;;AAiCA,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,4BAAa,CAAA;IACb,gCAAiB,CAAA;IACjB,4BAAa,CAAA;AACf,CAAC,EAJW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAItB","file":"compilable-item.js","sourcesContent":["import type { IGroupMark, IGrammarBase, IView } from '@visactor/vgrammar';\nimport type { Compiler } from '../compiler';\nimport type { Maybe, IPerformanceHook } from '../../typings';\n\nexport interface ICompilable {\n  /** 获取 compile 对象 */\n  getCompiler: () => Compiler;\n  /** 获取 vgrammar view */\n  getVGrammarView: () => IView;\n\n  /** 编译总入口 */\n  compile: () => void;\n  /** 编译所有 mark */\n  compileMarks?: (group?: string | IGroupMark) => void;\n  /** 编译所有 data */\n  compileData?: () => void;\n  /** 编译所有 signal */\n  compileSignal?: () => void;\n\n  /** 全部编译完成 lift circle */\n  afterCompile?: () => void;\n\n  /** 释放总入口 */\n  release: () => void;\n}\n\nexport interface ICompilableInitOption {\n  /** 编译对象 应当由外部提供 */\n  getCompiler: () => Compiler;\n  /** 性能测试钩子 */\n  performanceHook?: IPerformanceHook;\n}\n\nexport enum GrammarType {\n  data = 'data',\n  signal = 'signal',\n  mark = 'mark'\n}\n\nexport interface IGrammarItem extends ICompilable {\n  id: number;\n  /** 语法元素类型 */\n  grammarType: GrammarType;\n  /** 获取语法元素 */\n  getProduct: () => Maybe<IGrammarBase>;\n  /** 生成语法元素名称 */\n  generateProductId: () => string;\n  /** 获取语法元素名称 */\n  getProductId: () => string;\n  /** 删除已编译的语法元素 */\n  removeProduct: (reserveVGrammarModel?: boolean) => void;\n  /** 获取该语法元素依赖的语法元素 */\n  getDepend: () => IGrammarItem[];\n  /** 设置该语法元素依赖的语法元素 */\n  setDepend: (...depend: IGrammarItem[]) => void;\n  /** 更新语法元素的依赖，返回是否全部成功更新 */\n  updateDepend: () => boolean;\n}\n\nexport type GrammarItemInitOption = ICompilableInitOption;\n\nexport type GrammarItemCompileOption = Record<string, any>;\n"]}
+{"version":3,"sources":["../src/compile/interface/compilable-item.ts"],"names":[],"mappings":";;;AAoCA,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,4BAAa,CAAA;IACb,gCAAiB,CAAA;IACjB,4BAAa,CAAA;AACf,CAAC,EAJW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAItB","file":"compilable-item.js","sourcesContent":["import type { IGroupMark, IGrammarBase, IView } from '@visactor/vgrammar';\nimport type { Compiler } from '../compiler';\nimport type { Maybe, IPerformanceHook } from '../../typings';\n\nexport interface ICompilable {\n  /** 获取 compile 对象 */\n  getCompiler: () => Compiler;\n  /** 获取 vgrammar view */\n  getVGrammarView: () => IView;\n\n  /** 编译总入口 */\n  compile: () => void;\n  /** 编译所有 mark */\n  compileMarks?: (group?: string | IGroupMark) => void;\n  /** 编译所有 data */\n  compileData?: () => void;\n  /** 编译所有 signal */\n  compileSignal?: () => void;\n\n  /** 清除compile 内容入口 */\n  clear?: () => void;\n\n  /** 全部编译完成 lift circle */\n  afterCompile?: () => void;\n\n  /** 释放总入口 */\n  release: () => void;\n}\n\nexport interface ICompilableInitOption {\n  /** 编译对象 应当由外部提供 */\n  getCompiler: () => Compiler;\n  /** 性能测试钩子 */\n  performanceHook?: IPerformanceHook;\n}\n\nexport enum GrammarType {\n  data = 'data',\n  signal = 'signal',\n  mark = 'mark'\n}\n\nexport interface IGrammarItem extends ICompilable {\n  id: number;\n  /** 语法元素类型 */\n  grammarType: GrammarType;\n  /** 获取语法元素 */\n  getProduct: () => Maybe<IGrammarBase>;\n  /** 生成语法元素名称 */\n  generateProductId: () => string;\n  /** 获取语法元素名称 */\n  getProductId: () => string;\n  /** 删除已编译的语法元素 */\n  removeProduct: (reserveVGrammarModel?: boolean) => void;\n  /** 获取该语法元素依赖的语法元素 */\n  getDepend: () => IGrammarItem[];\n  /** 设置该语法元素依赖的语法元素 */\n  setDepend: (...depend: IGrammarItem[]) => void;\n  /** 更新语法元素的依赖，返回是否全部成功更新 */\n  updateDepend: () => boolean;\n}\n\nexport type GrammarItemInitOption = ICompilableInitOption;\n\nexport type GrammarItemCompileOption = Record<string, any>;\n"]}

package/cjs/compile/mark/compilable-mark.js

@@ -167,11 +167,11 @@ class CompilableMark extends grammar_item_1.GrammarItem {
     compileEncode() {
         const _a = this.stateStyle, _b = interface_1.STATE_VALUE_ENUM.STATE_NORMAL, normalStyle = _a[_b], temp = __rest(_a, [ "symbol" == typeof _b ? _b : _b + "" ]), enterStyles = {}, updateStyles = {};
         Object.keys(normalStyle).forEach((key => {
-            this._unCompileChannel[key] || ((0, util_2.isStateAttrChangeable)(key, normalStyle) ? updateStyles[key] = {
+            this._unCompileChannel[key] || ((0, util_2.isStateAttrChangeable)(key, normalStyle, this.getFacet()) ? updateStyles[key] = {
                 callback: this.compileCommonAttributeCallback(key, "normal"),
                 dependency: [ this.stateKeyToSignalName("markUpdateRank") ]
             } : enterStyles[key] = this.compileCommonAttributeCallback(key, "normal"));
-        })), this._product.encode(updateStyles), this._product.encodeState("enter", enterStyles), 
+        })), this._product.encode(updateStyles), this._product.encodeState(this._facet ? "group" : "enter", enterStyles), 
         Object.keys(temp).forEach((state => {
             const styles = {};
             Object.keys(temp[state]).forEach((key => {
@@ -228,15 +228,14 @@ class CompilableMark extends grammar_item_1.GrammarItem {
         this.state.compile();
     }
     compileCommonAttributeCallback(key, state) {
-        return (datum, element) => {
-            const mark = element.mark, opt = {
-                mark: mark,
-                parent: mark.group,
-                states: element.getStates(),
-                element: element
-            };
-            return (0, util_2.attrTransform)(this.type, key, this.getAttribute(key, datum, state, opt));
+        const noAttrTransform = !(0, util_2.needAttrTransform)(this.type, key), opt = {
+            mark: null,
+            parent: null,
+            element: null
         };
+        return (datum, element) => (opt.mark = element.mark, opt.parent = element.mark.group, 
+        opt.element = element, noAttrTransform ? this.getAttribute(key, datum, state, opt) : (0, 
+        util_2.attrTransform)(this.type, key, this.getAttribute(key, datum, state, opt)));
     }
     compileTransform() {
         var _a;

package/cjs/compile/mark/compilable-mark.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/compile/mark/compilable-mark.ts"],"names":[],"mappings":"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","file":"compilable-mark.js","sourcesContent":["import type {\n  IElement,\n  IGroupMark,\n  IMark,\n  IMarkConfig,\n  MarkAnimationSpec,\n  MarkFunctionCallback,\n  MarkFunctionType,\n  Nil,\n  TransformSpec\n} from '@visactor/vgrammar';\n// eslint-disable-next-line no-duplicate-imports\nimport type { GrammarMarkType } from '@visactor/vgrammar';\nimport type { DataView } from '@visactor/vdataset';\nimport { GrammarItem } from '../grammar-item';\nimport type { Maybe, Datum, StringOrNumber } from '../../typings';\nimport { isNil, isValid } from '../../util';\nimport { LayoutZIndex, PREFIX, VGRAMMAR_HOOK_EVENT } from '../../constant';\nimport type { IMarkProgressiveConfig, IMarkStateStyle, MarkType } from '../../mark/interface';\nimport type { IModel } from '../../model/interface';\nimport type { ISeries } from '../../series/interface';\nimport { attrTransform, isStateAttrChangeable } from './util';\nimport { MarkStateManager } from './mark-state-manager';\nimport type {\n  ICompilableMark,\n  IMarkDataInitOption,\n  ICompilableMarkOption,\n  StateValueType,\n  IMarkCompileOption,\n  IAttributeOpt\n} from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { STATE_VALUE_ENUM } from './interface';\nimport { MarkData } from './mark-data';\nimport { GrammarType } from '../interface';\nimport type { IComponent } from '../../component/interface';\nimport type { IEvent } from '../../event/interface';\nimport { Event } from '../../event/event';\n// eslint-disable-next-line no-duplicate-imports\nimport { AnimationStateEnum } from '../../animation/interface';\nimport type { ILabelSpec } from '../../component/label';\n\n/** 可编译的 mark 对象，这个基类只存放编译相关的逻辑 */\nexport abstract class CompilableMark extends GrammarItem implements ICompilableMark {\n  readonly grammarType = GrammarType.mark;\n  /** 类型 */\n  readonly type: MarkType = undefined as unknown as MarkType;\n\n  /** name */\n  readonly name: string = 'mark';\n\n  /** key field */\n  readonly key: ICompilableMark['key'];\n\n  /** 3d开关 */\n  protected _support3d?: boolean;\n  getSupport3d() {\n    return this._support3d;\n  }\n  setSupport3d(support3d: boolean) {\n    this._support3d = support3d;\n  }\n\n  /** 分片 */\n  protected _facet?: string;\n  getFacet() {\n    return this._facet;\n  }\n  setFacet(facet: string) {\n    this._facet = facet;\n  }\n\n  /** 交互开关 */\n  protected _interactive: boolean = true;\n  getInteractive() {\n    return this._interactive;\n  }\n  setInteractive(interactive: boolean) {\n    this._interactive = interactive;\n  }\n\n  /** 层级 */\n  protected _zIndex: number = LayoutZIndex.Mark;\n  getZIndex() {\n    return this._zIndex;\n  }\n  setZIndex(zIndex: number) {\n    this._zIndex = zIndex;\n  }\n\n  /** 可见性 */\n  protected _visible: boolean = true;\n  getVisible() {\n    return this._visible;\n  }\n  setVisible(visible: boolean) {\n    this._visible = visible;\n  }\n\n  /**\n   * 用户设置的 id\n   */\n  protected _userId: StringOrNumber;\n  getUserId() {\n    return this._userId;\n  }\n  setUserId(userId: StringOrNumber) {\n    if (isValid(userId)) {\n      this._userId = userId;\n    }\n  }\n\n  /** parent model */\n  readonly model: IModel;\n\n  /** 数据（可以没有） */\n  protected _data: Maybe<MarkData>;\n  getDataView(): DataView | undefined {\n    return this._data?.getDataView();\n  }\n  setDataView(d?: DataView, productId?: string) {\n    if (isNil(this._data)) {\n      this.initMarkData({\n        ...this._option,\n        mark: this\n      });\n    }\n    if (isValid(productId)) {\n      this._data.setCompiledProductId(productId);\n    }\n    this._data.setDataView(d);\n  }\n  getData() {\n    return this._data;\n  }\n  setData(d?: MarkData) {\n    this._data = d;\n  }\n\n  /** 默认的stateStyle */\n  stateStyle: IMarkStateStyle<any> = {};\n\n  /** 状态管理器 */\n  state: MarkStateManager;\n\n  protected _unCompileChannel: { [key in string]: boolean } = {};\n\n  hasState(state: string) {\n    return state in this.state.getStateMap();\n  }\n  getState(state: string) {\n    return this.state.getStateMap()[state];\n  }\n\n  protected _event: IEvent;\n\n  protected _animationConfig: Partial<MarkAnimationSpec>;\n  getAnimationConfig() {\n    return this._animationConfig;\n  }\n  setAnimationConfig(config: Partial<MarkAnimationSpec>) {\n    this._animationConfig = config;\n  }\n\n  /** 布局标记 */\n  private _skipBeforeLayouted = false;\n\n  setSkipBeforeLayouted(skip: boolean) {\n    this._skipBeforeLayouted = skip;\n  }\n  getSkipBeforeLayouted(): boolean {\n    return this._skipBeforeLayouted;\n  }\n\n  /** morph动画关联关系配置 */\n  protected _morph: boolean = false;\n  getMorph() {\n    return this._morph;\n  }\n  setMorph(morph: boolean) {\n    this._morph = morph;\n  }\n  protected _morphKey?: string;\n  getMorphKey() {\n    return this._morphKey;\n  }\n  setMorphKey(morphKey: string) {\n    this._morphKey = morphKey;\n  }\n  protected _morphElementKey?: string;\n  getMorphElementKey() {\n    return this._morphElementKey;\n  }\n  setMorphElementKey(key: string) {\n    this._morphElementKey = key;\n  }\n\n  protected _groupKey?: string;\n  getGroupKey() {\n    return this._groupKey;\n  }\n  setGroupKey(groupKey: string) {\n    this._groupKey = groupKey;\n  }\n\n  protected _label?: ILabelSpec;\n  getLabelSpec() {\n    return this._label;\n  }\n  setLabelSpec(label: ILabelSpec) {\n    this._label = label;\n  }\n\n  protected _progressiveConfig: IMarkProgressiveConfig;\n  getProgressiveConfig() {\n    return this._progressiveConfig;\n  }\n  setProgressiveConfig(config: IMarkProgressiveConfig) {\n    this._progressiveConfig = config;\n  }\n\n  protected declare _option: ICompilableMarkOption;\n\n  constructor(option: ICompilableMarkOption, name: string, model: IModel) {\n    super(option);\n    this.name = name;\n    this.model = model;\n    this.key = option.key;\n    this.state = new MarkStateManager(\n      {\n        ...option,\n        stateKeyToSignalName: this.stateKeyToSignalName.bind(this)\n      },\n      this\n    );\n    this._option.support3d && this.setSupport3d(true);\n    this._event = new Event(model.getOption().eventDispatcher, model.getOption().mode);\n  }\n\n  protected declare _product: Maybe<IMark>;\n  declare getProduct: () => Maybe<IMark>;\n\n  // transform目前在形状词云中使用，但直接用的 vgrammar 接口 (this._wordMark as ICompilableMark).getProduct().transform(wordCloudTransforms);\n  // 暂时没有用到这里的setTransform()\n  protected _transform: TransformSpec[] | Nil;\n  setTransform(transform: TransformSpec[] | Nil) {\n    this._transform = transform;\n  }\n\n  /** 初始化 mark data */\n  protected initMarkData(option: IMarkDataInitOption) {\n    this._data = new MarkData(option);\n  }\n\n  protected stateKeyToSignalName(key: string) {\n    return `${PREFIX}_${this.type}_${this.id}_${key}`;\n  }\n\n  getAttribute(key: any, datum: any, state: StateValueType, opt?: IAttributeOpt) {\n    // do nothing\n  }\n\n  protected _compileProduct(option?: IMarkCompileOption) {\n    const product = this.getProduct();\n    // 处理 visible 为 false 的情况\n    if (!this.getVisible()) {\n      if (isValid(product)) {\n        this.removeProduct();\n      }\n      return;\n    } else if (isValid(product)) {\n      return; // 每个mark只执行一次编译\n    }\n\n    const compiler = this.getCompiler();\n    if (!compiler.isInited) {\n      return;\n    }\n    this._initProduct(option?.group);\n    if (isNil(this._product)) {\n      return;\n    }\n\n    this.compileSignal();\n    this.compileData();\n    this.compileState();\n    this.compileEncode();\n    this.compileAnimation();\n    this.compileContext();\n    this.compileTransform();\n  }\n\n  /** 创建语法元素对象 */\n  protected _initProduct(group?: string | IGroupMark) {\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n    this._product = view.mark(this.type as GrammarMarkType, group ?? view.rootMark).id(id);\n    this._compiledProductId = id;\n  }\n\n  generateProductId() {\n    if (this._userId) {\n      return `${this._userId}`;\n    }\n    return `${this.name}_${this.id}`;\n  }\n\n  compileData() {\n    if (isNil(this._data)) {\n      return;\n    }\n    this._data.compile();\n\n    // 绑定数据\n    const dataProduct = this._data.getProduct();\n    if (isValid(this._product) && isValid(dataProduct)) {\n      this._product.join(dataProduct, this.key, undefined, this._groupKey ?? this._facet);\n    }\n  }\n\n  compileEncode() {\n    const { [STATE_VALUE_ENUM.STATE_NORMAL]: normalStyle, ...temp } = this.stateStyle;\n\n    const enterStyles: Record<string, MarkFunctionType<any>> = {};\n    const updateStyles: Record<string, MarkFunctionType<any>> = {};\n    Object.keys(normalStyle).forEach(key => {\n      if (this._unCompileChannel[key]) {\n        return;\n      }\n      if (isStateAttrChangeable(key, normalStyle)) {\n        updateStyles[key] = {\n          callback: this.compileCommonAttributeCallback(key, 'normal'),\n          dependency: [this.stateKeyToSignalName('markUpdateRank')]\n        };\n      } else {\n        enterStyles[key] = this.compileCommonAttributeCallback(key, 'normal');\n      }\n    });\n\n    this._product.encode(updateStyles);\n    this._product.encodeState('enter', enterStyles);\n\n    Object.keys(temp).forEach(state => {\n      const styles: Record<string, MarkFunctionType<any>> = {};\n      Object.keys(temp[state]).forEach(key => {\n        if (this._unCompileChannel[key]) {\n          return;\n        }\n        styles[key] = {\n          callback: this.compileCommonAttributeCallback(key, state),\n          dependency: [this.stateKeyToSignalName('markUpdateRank')]\n        };\n      });\n      this._product.encodeState(state, styles);\n    });\n\n    // 在布局完成前不进行encode\n    if (this._skipBeforeLayouted) {\n      this._product.layout({\n        skipBeforeLayouted: this._skipBeforeLayouted\n      });\n    }\n  }\n\n  compileState() {\n    this.state.compileState(this._product);\n  }\n\n  compileAnimation() {\n    if (this._animationConfig) {\n      let stateSignal: any;\n      if (this.type === 'component') {\n        // 组件有自己的动画状态\n        stateSignal = (this.model as IComponent).animate?.getAnimationStateSignalName();\n      } else {\n        const region = (this.model as ISeries).getRegion();\n        stateSignal = region.animate?.getAnimationStateSignalName();\n      }\n      this._product.animation(this._animationConfig);\n      this._product.animationState({\n        callback: (datum: Datum, element: IElement, parameters: Record<string, any>) => {\n          return parameters[stateSignal]?.callback(datum, element);\n        },\n        dependency: stateSignal\n      });\n      if (this._animationConfig.normal) {\n        this._event.on(VGRAMMAR_HOOK_EVENT.ANIMATION_END, ({ event }) => {\n          if (event.mark === this.getProduct() && event.animationState === AnimationStateEnum.appear) {\n            this.runAnimationByState(AnimationStateEnum.normal);\n          }\n        });\n      }\n    }\n  }\n\n  compileContext() {\n    const config: IMarkConfig = {\n      interactive: this.getInteractive(),\n      zIndex: this.getZIndex(),\n      context: {\n        markId: this.id,\n        modelId: this.model.id,\n        markUserId: this._userId,\n        modelUserId: this.model.userId\n      },\n      support3d: this.getSupport3d()\n    };\n\n    if (this._progressiveConfig) {\n      config.progressiveStep = this._progressiveConfig.progressiveStep;\n      config.progressiveThreshold = this._progressiveConfig.progressiveThreshold;\n      config.large = this._progressiveConfig.large;\n      config.largeThreshold = this._progressiveConfig.largeThreshold;\n    }\n\n    if (this._morph && this._morphKey) {\n      config.morph = this._morph;\n      config.morphKey = this._morphKey;\n      config.morphElementKey = this._morphElementKey;\n    }\n\n    this._product.configure(config);\n  }\n\n  compileSignal() {\n    this.state.compile();\n  }\n\n  // TODO: 1. opt内容待定，确实需要再来补充（之前是scale.bindScales/bindSignals，从context.params中可以获取到）\n  // TODO: 2. stateSourceItem，是否根据attr区分，存在默认写死的情况，例如\"hover\"/\"normal\"；\n  protected compileCommonAttributeCallback(key: string, state: string): MarkFunctionCallback<any> {\n    return (datum: Datum, element: IElement) => {\n      const mark = element.mark;\n      const opt: IAttributeOpt = { mark: mark, parent: mark.group, states: element.getStates(), element };\n      return attrTransform(this.type, key, this.getAttribute(key as any, datum, state, opt));\n    };\n  }\n\n  protected compileTransform() {\n    if (this._transform?.length) {\n      this.getProduct().transform(this._transform);\n    }\n  }\n\n  protected _lookupGrammar(id: string) {\n    return this.getCompiler().getVGrammarView()?.getMarkById(id);\n  }\n\n  updateState(newState: Record<string, unknown>, noRender?: boolean) {\n    return this.state.updateState(newState, noRender);\n  }\n\n  updateLayoutState(noRender?: boolean, recursion?: boolean): Promise<void> {\n    if (recursion && this.getMarks().length > 0) {\n      this.getMarks().forEach(m => m.state.updateLayoutState(true));\n    }\n    return this.state.updateLayoutState(noRender);\n  }\n\n  updateMarkState(key: string): void {\n    if (!this._product) {\n      return;\n    }\n    const stateInfo = this.state.getStateInfo(key);\n    this._product.elements.forEach(e => {\n      if (this.state.checkOneState(e, e.getDatum(), stateInfo) === 'in') {\n        e.addState(key);\n      } else {\n        e.removeState(key);\n      }\n    });\n  }\n\n  getMarks(): ICompilableMark[] {\n    return [];\n  }\n\n  runAnimationByState(state?: string) {\n    return this.getProduct()?.animate?.runAnimationByState(state);\n  }\n\n  stopAnimationByState(state?: string) {\n    return this.getProduct()?.animate?.stopAnimationByState(state);\n  }\n\n  pauseAnimationByState(state?: string) {\n    return this.getProduct()?.animate?.pauseAnimationByState(state);\n  }\n\n  resumeAnimationByState(state?: string) {\n    return this.getProduct()?.animate?.resumeAnimationByState(state);\n  }\n\n  release() {\n    super.release();\n    this.state.release();\n  }\n}\n"]}
+{"version":3,"sources":["../src/compile/mark/compilable-mark.ts"],"names":[],"mappings":"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","file":"compilable-mark.js","sourcesContent":["import type {\n  IElement,\n  IGroupMark,\n  IMark,\n  IMarkConfig,\n  MarkAnimationSpec,\n  MarkFunctionCallback,\n  MarkFunctionType,\n  Nil,\n  TransformSpec\n} from '@visactor/vgrammar';\n// eslint-disable-next-line no-duplicate-imports\nimport type { GrammarMarkType } from '@visactor/vgrammar';\nimport type { DataView } from '@visactor/vdataset';\nimport { GrammarItem } from '../grammar-item';\nimport type { Maybe, Datum, StringOrNumber } from '../../typings';\nimport { isNil, isValid } from '../../util';\nimport { LayoutZIndex, PREFIX, VGRAMMAR_HOOK_EVENT } from '../../constant';\nimport type { IMarkProgressiveConfig, IMarkStateStyle, MarkType } from '../../mark/interface';\nimport type { IModel } from '../../model/interface';\nimport type { ISeries } from '../../series/interface';\nimport { attrTransform, isStateAttrChangeable, needAttrTransform } from './util';\nimport { MarkStateManager } from './mark-state-manager';\nimport type {\n  ICompilableMark,\n  IMarkDataInitOption,\n  ICompilableMarkOption,\n  StateValueType,\n  IMarkCompileOption,\n  IAttributeOpt\n} from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { STATE_VALUE_ENUM } from './interface';\nimport { MarkData } from './mark-data';\nimport { GrammarType } from '../interface';\nimport type { IComponent } from '../../component/interface';\nimport type { IEvent } from '../../event/interface';\nimport { Event } from '../../event/event';\n// eslint-disable-next-line no-duplicate-imports\nimport { AnimationStateEnum } from '../../animation/interface';\nimport type { ILabelSpec } from '../../component/label';\n\n/** 可编译的 mark 对象，这个基类只存放编译相关的逻辑 */\nexport abstract class CompilableMark extends GrammarItem implements ICompilableMark {\n  readonly grammarType = GrammarType.mark;\n  /** 类型 */\n  readonly type: MarkType = undefined as unknown as MarkType;\n\n  /** name */\n  readonly name: string = 'mark';\n\n  /** key field */\n  readonly key: ICompilableMark['key'];\n\n  /** 3d开关 */\n  protected _support3d?: boolean;\n  getSupport3d() {\n    return this._support3d;\n  }\n  setSupport3d(support3d: boolean) {\n    this._support3d = support3d;\n  }\n\n  /** 分片 */\n  protected _facet?: string;\n  getFacet() {\n    return this._facet;\n  }\n  setFacet(facet: string) {\n    this._facet = facet;\n  }\n\n  /** 交互开关 */\n  protected _interactive: boolean = true;\n  getInteractive() {\n    return this._interactive;\n  }\n  setInteractive(interactive: boolean) {\n    this._interactive = interactive;\n  }\n\n  /** 层级 */\n  protected _zIndex: number = LayoutZIndex.Mark;\n  getZIndex() {\n    return this._zIndex;\n  }\n  setZIndex(zIndex: number) {\n    this._zIndex = zIndex;\n  }\n\n  /** 可见性 */\n  protected _visible: boolean = true;\n  getVisible() {\n    return this._visible;\n  }\n  setVisible(visible: boolean) {\n    this._visible = visible;\n  }\n\n  /**\n   * 用户设置的 id\n   */\n  protected _userId: StringOrNumber;\n  getUserId() {\n    return this._userId;\n  }\n  setUserId(userId: StringOrNumber) {\n    if (isValid(userId)) {\n      this._userId = userId;\n    }\n  }\n\n  /** parent model */\n  readonly model: IModel;\n\n  /** 数据（可以没有） */\n  protected _data: Maybe<MarkData>;\n  getDataView(): DataView | undefined {\n    return this._data?.getDataView();\n  }\n  setDataView(d?: DataView, productId?: string) {\n    if (isNil(this._data)) {\n      this.initMarkData({\n        ...this._option,\n        mark: this\n      });\n    }\n    if (isValid(productId)) {\n      this._data.setCompiledProductId(productId);\n    }\n    this._data.setDataView(d);\n  }\n  getData() {\n    return this._data;\n  }\n  setData(d?: MarkData) {\n    this._data = d;\n  }\n\n  /** 默认的stateStyle */\n  stateStyle: IMarkStateStyle<any> = {};\n\n  /** 状态管理器 */\n  state: MarkStateManager;\n\n  protected _unCompileChannel: { [key in string]: boolean } = {};\n\n  hasState(state: string) {\n    return state in this.state.getStateMap();\n  }\n  getState(state: string) {\n    return this.state.getStateMap()[state];\n  }\n\n  protected _event: IEvent;\n\n  protected _animationConfig: Partial<MarkAnimationSpec>;\n  getAnimationConfig() {\n    return this._animationConfig;\n  }\n  setAnimationConfig(config: Partial<MarkAnimationSpec>) {\n    this._animationConfig = config;\n  }\n\n  /** 布局标记 */\n  private _skipBeforeLayouted = false;\n\n  setSkipBeforeLayouted(skip: boolean) {\n    this._skipBeforeLayouted = skip;\n  }\n  getSkipBeforeLayouted(): boolean {\n    return this._skipBeforeLayouted;\n  }\n\n  /** morph动画关联关系配置 */\n  protected _morph: boolean = false;\n  getMorph() {\n    return this._morph;\n  }\n  setMorph(morph: boolean) {\n    this._morph = morph;\n  }\n  protected _morphKey?: string;\n  getMorphKey() {\n    return this._morphKey;\n  }\n  setMorphKey(morphKey: string) {\n    this._morphKey = morphKey;\n  }\n  protected _morphElementKey?: string;\n  getMorphElementKey() {\n    return this._morphElementKey;\n  }\n  setMorphElementKey(key: string) {\n    this._morphElementKey = key;\n  }\n\n  protected _groupKey?: string;\n  getGroupKey() {\n    return this._groupKey;\n  }\n  setGroupKey(groupKey: string) {\n    this._groupKey = groupKey;\n  }\n\n  protected _label?: ILabelSpec;\n  getLabelSpec() {\n    return this._label;\n  }\n  setLabelSpec(label: ILabelSpec) {\n    this._label = label;\n  }\n\n  protected _progressiveConfig: IMarkProgressiveConfig;\n  getProgressiveConfig() {\n    return this._progressiveConfig;\n  }\n  setProgressiveConfig(config: IMarkProgressiveConfig) {\n    this._progressiveConfig = config;\n  }\n\n  protected declare _option: ICompilableMarkOption;\n\n  constructor(option: ICompilableMarkOption, name: string, model: IModel) {\n    super(option);\n    this.name = name;\n    this.model = model;\n    this.key = option.key;\n    this.state = new MarkStateManager(\n      {\n        ...option,\n        stateKeyToSignalName: this.stateKeyToSignalName.bind(this)\n      },\n      this\n    );\n    this._option.support3d && this.setSupport3d(true);\n    this._event = new Event(model.getOption().eventDispatcher, model.getOption().mode);\n  }\n\n  protected declare _product: Maybe<IMark>;\n  declare getProduct: () => Maybe<IMark>;\n\n  // transform目前在形状词云中使用，但直接用的 vgrammar 接口 (this._wordMark as ICompilableMark).getProduct().transform(wordCloudTransforms);\n  // 暂时没有用到这里的setTransform()\n  protected _transform: TransformSpec[] | Nil;\n  setTransform(transform: TransformSpec[] | Nil) {\n    this._transform = transform;\n  }\n\n  /** 初始化 mark data */\n  protected initMarkData(option: IMarkDataInitOption) {\n    this._data = new MarkData(option);\n  }\n\n  protected stateKeyToSignalName(key: string) {\n    return `${PREFIX}_${this.type}_${this.id}_${key}`;\n  }\n\n  getAttribute(key: any, datum: any, state: StateValueType, opt?: IAttributeOpt) {\n    // do nothing\n  }\n\n  protected _compileProduct(option?: IMarkCompileOption) {\n    const product = this.getProduct();\n    // 处理 visible 为 false 的情况\n    if (!this.getVisible()) {\n      if (isValid(product)) {\n        this.removeProduct();\n      }\n      return;\n    } else if (isValid(product)) {\n      return; // 每个mark只执行一次编译\n    }\n\n    const compiler = this.getCompiler();\n    if (!compiler.isInited) {\n      return;\n    }\n    this._initProduct(option?.group);\n    if (isNil(this._product)) {\n      return;\n    }\n\n    this.compileSignal();\n    this.compileData();\n    this.compileState();\n    this.compileEncode();\n    this.compileAnimation();\n    this.compileContext();\n    this.compileTransform();\n  }\n\n  /** 创建语法元素对象 */\n  protected _initProduct(group?: string | IGroupMark) {\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n    this._product = view.mark(this.type as GrammarMarkType, group ?? view.rootMark).id(id);\n    this._compiledProductId = id;\n  }\n\n  generateProductId() {\n    if (this._userId) {\n      return `${this._userId}`;\n    }\n    return `${this.name}_${this.id}`;\n  }\n\n  compileData() {\n    if (isNil(this._data)) {\n      return;\n    }\n    this._data.compile();\n\n    // 绑定数据\n    const dataProduct = this._data.getProduct();\n    if (isValid(this._product) && isValid(dataProduct)) {\n      this._product.join(dataProduct, this.key, undefined, this._groupKey ?? this._facet);\n    }\n  }\n\n  compileEncode() {\n    const { [STATE_VALUE_ENUM.STATE_NORMAL]: normalStyle, ...temp } = this.stateStyle;\n\n    const enterStyles: Record<string, MarkFunctionType<any>> = {};\n    const updateStyles: Record<string, MarkFunctionType<any>> = {};\n    Object.keys(normalStyle).forEach(key => {\n      if (this._unCompileChannel[key]) {\n        return;\n      }\n      if (isStateAttrChangeable(key, normalStyle, this.getFacet())) {\n        updateStyles[key] = {\n          callback: this.compileCommonAttributeCallback(key, 'normal'),\n          dependency: [this.stateKeyToSignalName('markUpdateRank')]\n        };\n      } else {\n        enterStyles[key] = this.compileCommonAttributeCallback(key, 'normal');\n      }\n    });\n    this._product.encode(updateStyles);\n    this._product.encodeState(this._facet ? 'group' : 'enter', enterStyles);\n\n    Object.keys(temp).forEach(state => {\n      const styles: Record<string, MarkFunctionType<any>> = {};\n      Object.keys(temp[state]).forEach(key => {\n        if (this._unCompileChannel[key]) {\n          return;\n        }\n        styles[key] = {\n          callback: this.compileCommonAttributeCallback(key, state),\n          dependency: [this.stateKeyToSignalName('markUpdateRank')]\n        };\n      });\n      this._product.encodeState(state, styles);\n    });\n\n    // 在布局完成前不进行encode\n    if (this._skipBeforeLayouted) {\n      this._product.layout({\n        skipBeforeLayouted: this._skipBeforeLayouted\n      });\n    }\n  }\n\n  compileState() {\n    this.state.compileState(this._product);\n  }\n\n  compileAnimation() {\n    if (this._animationConfig) {\n      let stateSignal: any;\n      if (this.type === 'component') {\n        // 组件有自己的动画状态\n        stateSignal = (this.model as IComponent).animate?.getAnimationStateSignalName();\n      } else {\n        const region = (this.model as ISeries).getRegion();\n        stateSignal = region.animate?.getAnimationStateSignalName();\n      }\n      this._product.animation(this._animationConfig);\n      this._product.animationState({\n        callback: (datum: Datum, element: IElement, parameters: Record<string, any>) => {\n          return parameters[stateSignal]?.callback(datum, element);\n        },\n        dependency: stateSignal\n      });\n      if (this._animationConfig.normal) {\n        this._event.on(VGRAMMAR_HOOK_EVENT.ANIMATION_END, ({ event }) => {\n          if (event.mark === this.getProduct() && event.animationState === AnimationStateEnum.appear) {\n            this.runAnimationByState(AnimationStateEnum.normal);\n          }\n        });\n      }\n    }\n  }\n\n  compileContext() {\n    const config: IMarkConfig = {\n      interactive: this.getInteractive(),\n      zIndex: this.getZIndex(),\n      context: {\n        markId: this.id,\n        modelId: this.model.id,\n        markUserId: this._userId,\n        modelUserId: this.model.userId\n      },\n      support3d: this.getSupport3d()\n    };\n\n    if (this._progressiveConfig) {\n      config.progressiveStep = this._progressiveConfig.progressiveStep;\n      config.progressiveThreshold = this._progressiveConfig.progressiveThreshold;\n      config.large = this._progressiveConfig.large;\n      config.largeThreshold = this._progressiveConfig.largeThreshold;\n    }\n\n    if (this._morph && this._morphKey) {\n      config.morph = this._morph;\n      config.morphKey = this._morphKey;\n      config.morphElementKey = this._morphElementKey;\n    }\n\n    this._product.configure(config);\n  }\n\n  compileSignal() {\n    this.state.compile();\n  }\n\n  // TODO: 1. opt内容待定，确实需要再来补充（之前是scale.bindScales/bindSignals，从context.params中可以获取到）\n  // TODO: 2. stateSourceItem，是否根据attr区分，存在默认写死的情况，例如\"hover\"/\"normal\"；\n  protected compileCommonAttributeCallback(key: string, state: string): MarkFunctionCallback<any> {\n    // check need transform attribute\n    const noAttrTransform = !needAttrTransform(this.type, key);\n    // remove state in opt\n    const opt: IAttributeOpt = { mark: null, parent: null, element: null };\n    return (datum: Datum, element: IElement) => {\n      opt.mark = element.mark;\n      opt.parent = element.mark.group;\n      opt.element = element;\n      if (noAttrTransform) {\n        return this.getAttribute(key as any, datum, state, opt);\n      }\n      return attrTransform(this.type, key, this.getAttribute(key as any, datum, state, opt));\n    };\n  }\n\n  protected compileTransform() {\n    if (this._transform?.length) {\n      this.getProduct().transform(this._transform);\n    }\n  }\n\n  protected _lookupGrammar(id: string) {\n    return this.getCompiler().getVGrammarView()?.getMarkById(id);\n  }\n\n  updateState(newState: Record<string, unknown>, noRender?: boolean) {\n    return this.state.updateState(newState, noRender);\n  }\n\n  updateLayoutState(noRender?: boolean, recursion?: boolean): Promise<void> {\n    if (recursion && this.getMarks().length > 0) {\n      this.getMarks().forEach(m => m.state.updateLayoutState(true));\n    }\n    return this.state.updateLayoutState(noRender);\n  }\n\n  updateMarkState(key: string): void {\n    if (!this._product) {\n      return;\n    }\n    const stateInfo = this.state.getStateInfo(key);\n    this._product.elements.forEach(e => {\n      if (this.state.checkOneState(e, e.getDatum(), stateInfo) === 'in') {\n        e.addState(key);\n      } else {\n        e.removeState(key);\n      }\n    });\n  }\n\n  getMarks(): ICompilableMark[] {\n    return [];\n  }\n\n  runAnimationByState(state?: string) {\n    return this.getProduct()?.animate?.runAnimationByState(state);\n  }\n\n  stopAnimationByState(state?: string) {\n    return this.getProduct()?.animate?.stopAnimationByState(state);\n  }\n\n  pauseAnimationByState(state?: string) {\n    return this.getProduct()?.animate?.pauseAnimationByState(state);\n  }\n\n  resumeAnimationByState(state?: string) {\n    return this.getProduct()?.animate?.resumeAnimationByState(state);\n  }\n\n  release() {\n    super.release();\n    this.state.release();\n  }\n}\n"]}

package/cjs/compile/mark/interface.d.ts

@@ -139,7 +139,6 @@ export interface IAttributeOpt {
     element: IElement;
     mark: IElement['mark'];
     parent: IElement['mark']['group'];
-    states: string[];
 }
 export interface IModelMarkAttributeContext {
     [key: string]: unknown;

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  states: string[];\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":";;;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"]}

package/cjs/compile/mark/util.d.ts

@@ -1,6 +1,7 @@
 import type { IAttrs, IMarkStateStyle, MarkType } from '../../mark/interface';
 export declare function isAttrChangeable<T>(key: string, stateStyle: IMarkStateStyle<T>): boolean;
-export declare function isStateAttrChangeable<T>(key: string, stateStyle: Partial<IAttrs<T>>): boolean;
+export declare function isStateAttrChangeable<T>(key: string, stateStyle: Partial<IAttrs<T>>, facetField: string): boolean;
+export declare function needAttrTransform(type: MarkType, attr: string): boolean;
 export declare function attrTransform(type: MarkType, attr: string, value: any): any;
 export declare function stateInDefaultEnum(state: string): boolean;
 export declare function stateToReverse(state: string): any;

package/cjs/compile/mark/util.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.stateToReverse = exports.stateInDefaultEnum = exports.attrTransform = exports.isStateAttrChangeable = exports.isAttrChangeable = void 0;
+}), exports.stateToReverse = exports.stateInDefaultEnum = exports.attrTransform = exports.needAttrTransform = exports.isStateAttrChangeable = exports.isAttrChangeable = void 0;
 
 const vutils_1 = require("@visactor/vutils"), interface_1 = require("./interface");
 
@@ -19,12 +19,12 @@ function isAttrChangeable(key, stateStyle) {
     return !1;
 }
 
-function isStateAttrChangeable(key, stateStyle) {
+function isStateAttrChangeable(key, stateStyle, facetField) {
     var _a;
     const style = null === (_a = stateStyle[key]) || void 0 === _a ? void 0 : _a.style;
     if (isGradientAttribute(key, style)) return !0;
     if ((0, vutils_1.isFunction)(style)) return !0;
-    return !!(null == style ? void 0 : style.scale);
+    return !(!(null == style ? void 0 : style.scale) || style.field === facetField);
 }
 
 function isGradientAttribute(key, style) {
@@ -33,7 +33,14 @@ function isGradientAttribute(key, style) {
 
 function symbolAttrTransform(attr, value) {
     var _a;
-    return "shape" === attr && null !== (_a = chartShapes[value]) && void 0 !== _a ? _a : value;
+    switch (attr) {
+      case "shape":
+      case "symbolType":
+        return null !== (_a = chartShapes[value]) && void 0 !== _a ? _a : value;
+
+      default:
+        return value;
+    }
 }
 
 exports.isAttrChangeable = isAttrChangeable, exports.isStateAttrChangeable = isStateAttrChangeable;
@@ -45,13 +52,22 @@ const chartShapes = {
     rectRound: "M 0.3 -0.5 C 0.41 -0.5 0.5 -0.41 0.5 -0.3 C 0.5 -0.3 0.5 0.3 0.5 0.3 C 0.5 0.41 0.41 0.5 0.3 0.5 C 0.3 0.5 -0.3 0.5 -0.3 0.5 C -0.41 0.5 -0.5 0.41 -0.5 0.3 C -0.5 0.3 -0.5 -0.3 -0.5 -0.3 C -0.5 -0.41 -0.41 -0.5 -0.3 -0.5 C -0.3 -0.5 0.3 -0.5 0.3 -0.5 Z"
 }, transforms = {
     symbol: symbolAttrTransform
+}, transformsCheck = {
+    symbol: {
+        shape: !0,
+        symbolType: !0
+    }
 };
 
+function needAttrTransform(type, attr) {
+    return !!transformsCheck[type] && !!transformsCheck[type][attr];
+}
+
 function attrTransform(type, attr, value) {
     return transforms[type] ? transforms[type](attr, value) : value;
 }
 
-exports.attrTransform = attrTransform;
+exports.needAttrTransform = needAttrTransform, exports.attrTransform = attrTransform;
 
 const DEFAULT_STATE_VALUE_ENUM = {};
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/compile/mark/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { isFunction } from '@visactor/vutils';\nimport type { IAttrs, IMarkStateStyle, MarkType } from '../../mark/interface';\nimport { STATE_VALUE_ENUM } from './interface';\n\nexport function isAttrChangeable<T>(key: string, stateStyle: IMarkStateStyle<T>) {\n  for (const state in stateStyle) {\n    if (state === STATE_VALUE_ENUM.STATE_NORMAL) {\n      const style = stateStyle[state][key]?.style;\n      const isGradient = isGradientAttribute(key, style);\n      if (isGradient) {\n        return true;\n      }\n      const isFunctionStyle = isFunction(style);\n      if (isFunctionStyle) {\n        return true;\n      }\n      const isScale = !!style?.scale;\n      if (isScale) {\n        return true;\n      }\n      continue;\n    }\n    if (key in stateStyle[state]) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport function isStateAttrChangeable<T>(key: string, stateStyle: Partial<IAttrs<T>>) {\n  const style = stateStyle[key]?.style;\n  const isGradient = isGradientAttribute(key, style);\n  if (isGradient) {\n    return true;\n  }\n  const isFunctionStyle = isFunction(style);\n  if (isFunctionStyle) {\n    return true;\n  }\n  const isScale = !!style?.scale;\n  if (isScale) {\n    return true;\n  }\n  return false;\n}\n\nfunction isGradientAttribute(key: string, style: any) {\n  return (key === 'fill' || key === 'stroke') && style?.gradient && style?.stops;\n}\n\nfunction symbolAttrTransform(attr: string, value: any) {\n  switch (attr) {\n    case 'shape':\n      return chartShapes[value] ?? value;\n    case 'size':\n      return value;\n    default:\n      return value;\n  }\n}\n\nconst chartShapes = {\n  arrowLeft: 'M 0.25 -0.5 L -0.25 0 l 0.5 0.5',\n  arrowRight: 'M -0.25 -0.5 l 0.5 0.5 l -0.5 0.5',\n  rect: 'M -0.5,0.25 L 0.5,0.25 L 0.5,-0.25,L -0.5,-0.25 Z',\n  rectRound:\n    // eslint-disable-next-line max-len\n    'M 0.3 -0.5 C 0.41 -0.5 0.5 -0.41 0.5 -0.3 C 0.5 -0.3 0.5 0.3 0.5 0.3 C 0.5 0.41 0.41 0.5 0.3 0.5 C 0.3 0.5 -0.3 0.5 -0.3 0.5 C -0.41 0.5 -0.5 0.41 -0.5 0.3 C -0.5 0.3 -0.5 -0.3 -0.5 -0.3 C -0.5 -0.41 -0.41 -0.5 -0.3 -0.5 C -0.3 -0.5 0.3 -0.5 0.3 -0.5 Z'\n};\n\nconst transforms = {\n  symbol: symbolAttrTransform\n};\n\nexport function attrTransform(type: MarkType, attr: string, value: any) {\n  if (!transforms[type]) {\n    return value;\n  }\n  return transforms[type](attr, value);\n}\n\nconst DEFAULT_STATE_VALUE_ENUM = {};\nObject.values(STATE_VALUE_ENUM).forEach(v => {\n  DEFAULT_STATE_VALUE_ENUM[v] = true;\n});\n\nexport function stateInDefaultEnum(state: string) {\n  return !!DEFAULT_STATE_VALUE_ENUM[state];\n}\n\nconst DEFAULT_STATE_VALUE_TO_REVERSE = {\n  [STATE_VALUE_ENUM.STATE_HOVER]: STATE_VALUE_ENUM.STATE_HOVER_REVERSE,\n  [STATE_VALUE_ENUM.STATE_SELECTED]: STATE_VALUE_ENUM.STATE_SELECTED_REVERSE,\n  [STATE_VALUE_ENUM.STATE_DIMENSION_HOVER]: STATE_VALUE_ENUM.STATE_DIMENSION_HOVER_REVERSE\n};\n\nexport function stateToReverse(state: string) {\n  return DEFAULT_STATE_VALUE_TO_REVERSE[state];\n}\n"]}
+{"version":3,"sources":["../src/compile/mark/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { isFunction } from '@visactor/vutils';\nimport type { IAttrs, IMarkStateStyle, MarkType } from '../../mark/interface';\nimport { STATE_VALUE_ENUM } from './interface';\n\nexport function isAttrChangeable<T>(key: string, stateStyle: IMarkStateStyle<T>) {\n  for (const state in stateStyle) {\n    if (state === STATE_VALUE_ENUM.STATE_NORMAL) {\n      const style = stateStyle[state][key]?.style;\n      const isGradient = isGradientAttribute(key, style);\n      if (isGradient) {\n        return true;\n      }\n      const isFunctionStyle = isFunction(style);\n      if (isFunctionStyle) {\n        return true;\n      }\n      const isScale = !!style?.scale;\n      if (isScale) {\n        return true;\n      }\n      continue;\n    }\n    if (key in stateStyle[state]) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport function isStateAttrChangeable<T>(key: string, stateStyle: Partial<IAttrs<T>>, facetField: string) {\n  const style = stateStyle[key]?.style;\n  const isGradient = isGradientAttribute(key, style);\n  if (isGradient) {\n    return true;\n  }\n  const isFunctionStyle = isFunction(style);\n  if (isFunctionStyle) {\n    return true;\n  }\n  const isScale = !!style?.scale;\n  if (isScale) {\n    if (style.field !== facetField) {\n      return true;\n    }\n  }\n  return false;\n}\n\nfunction isGradientAttribute(key: string, style: any) {\n  return (key === 'fill' || key === 'stroke') && style?.gradient && style?.stops;\n}\n\nfunction symbolAttrTransform(attr: string, value: any) {\n  switch (attr) {\n    case 'shape':\n    case 'symbolType':\n      return chartShapes[value] ?? value;\n    default:\n      return value;\n  }\n}\n\nconst chartShapes = {\n  arrowLeft: 'M 0.25 -0.5 L -0.25 0 l 0.5 0.5',\n  arrowRight: 'M -0.25 -0.5 l 0.5 0.5 l -0.5 0.5',\n  rect: 'M -0.5,0.25 L 0.5,0.25 L 0.5,-0.25,L -0.5,-0.25 Z',\n  rectRound:\n    // eslint-disable-next-line max-len\n    'M 0.3 -0.5 C 0.41 -0.5 0.5 -0.41 0.5 -0.3 C 0.5 -0.3 0.5 0.3 0.5 0.3 C 0.5 0.41 0.41 0.5 0.3 0.5 C 0.3 0.5 -0.3 0.5 -0.3 0.5 C -0.41 0.5 -0.5 0.41 -0.5 0.3 C -0.5 0.3 -0.5 -0.3 -0.5 -0.3 C -0.5 -0.41 -0.41 -0.5 -0.3 -0.5 C -0.3 -0.5 0.3 -0.5 0.3 -0.5 Z'\n};\n\nconst transforms = {\n  symbol: symbolAttrTransform\n};\nconst transformsCheck = {\n  symbol: {\n    shape: true,\n    symbolType: true\n  }\n};\n\nexport function needAttrTransform(type: MarkType, attr: string) {\n  if (!transformsCheck[type]) {\n    return false;\n  }\n  if (!transformsCheck[type][attr]) {\n    return false;\n  }\n  return true;\n}\n\nexport function attrTransform(type: MarkType, attr: string, value: any) {\n  if (!transforms[type]) {\n    return value;\n  }\n  return transforms[type](attr, value);\n}\n\nconst DEFAULT_STATE_VALUE_ENUM = {};\nObject.values(STATE_VALUE_ENUM).forEach(v => {\n  DEFAULT_STATE_VALUE_ENUM[v] = true;\n});\n\nexport function stateInDefaultEnum(state: string) {\n  return !!DEFAULT_STATE_VALUE_ENUM[state];\n}\n\nconst DEFAULT_STATE_VALUE_TO_REVERSE = {\n  [STATE_VALUE_ENUM.STATE_HOVER]: STATE_VALUE_ENUM.STATE_HOVER_REVERSE,\n  [STATE_VALUE_ENUM.STATE_SELECTED]: STATE_VALUE_ENUM.STATE_SELECTED_REVERSE,\n  [STATE_VALUE_ENUM.STATE_DIMENSION_HOVER]: STATE_VALUE_ENUM.STATE_DIMENSION_HOVER_REVERSE\n};\n\nexport function stateToReverse(state: string) {\n  return DEFAULT_STATE_VALUE_TO_REVERSE[state];\n}\n"]}

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

@@ -13,7 +13,7 @@ import type { ITransformOptions } from '@visactor/vdataset';
 export declare abstract class AxisComponent<T extends ICommonAxisSpec & Record<string, any> = any> extends BaseComponent<T> implements IAxis {
     static specKey: string;
     protected _orient: IPolarOrientType | IOrientType;
-    get orient(): IOrientType | IPolarOrientType;
+    getOrient(): IOrientType | IPolarOrientType;
     protected _scale: IBaseScale;
     getScale(): IBaseScale;
     protected _scales: IBaseScale[];
@@ -78,22 +78,9 @@ export declare abstract class AxisComponent<T extends ICommonAxisSpec & Record<s
         hover: boolean;
         line: any;
         label: {
-            visible: any;
-            space: any;
-            inside: any;
             style: any;
             formatMethod: (value: any, datum: any, index: number) => any;
             state: {};
-            autoRotate: boolean;
-            autoHide: boolean;
-            autoLimit: boolean;
-            autoRotateAngle: any;
-            autoHideMethod: any;
-            autoHideSeparation: any;
-            limitEllipsis: any;
-            layoutFunc: any;
-            dataFilter: any;
-            containerAlign: any;
         };
         tick: {
             visible: boolean;

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

@@ -4,10 +4,10 @@ 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"), utils_2 = require("./utils"), style_1 = require("../../util/style");
+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");
 
 class AxisComponent extends base_1.BaseComponent {
-    get orient() {
+    getOrient() {
         return this._orient;
     }
     getScale() {
@@ -54,9 +54,9 @@ class AxisComponent extends base_1.BaseComponent {
         this.updateSeriesScale(), this._initData(), this._visible) {
             const axisMark = this._createMark({
                 type: "component",
-                name: `axis-${this.orient}`
+                name: `axis-${this.getOrient()}`
             }, {
-                componentType: "angle" === this.orient ? "circleAxis" : "axis",
+                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), 
@@ -169,35 +169,24 @@ class AxisComponent extends base_1.BaseComponent {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const spec = this._spec;
         let titleTextStyle, titleAngle = spec.title.angle;
-        return "left" !== spec.orient && "right" !== spec.orient || (null === (_a = spec.title) || void 0 === _a ? void 0 : _a.autoRotate) && (0, 
+        "left" !== spec.orient && "right" !== spec.orient || (null === (_a = spec.title) || void 0 === _a ? void 0 : _a.autoRotate) && (0, 
         util_1.isNil)(spec.title.angle) && (titleAngle = "left" === spec.orient ? -90 : 90, 
-        titleTextStyle = utils_2.DEFAULT_TITLE_STYLE[spec.orient]), {
-            orient: this.orient,
+        titleTextStyle = util_2.DEFAULT_TITLE_STYLE[spec.orient]);
+        const labelSpec = (0, vutils_1.pickWithout)(spec.label, [ "style", "formatMethod", "state" ]);
+        return {
+            orient: this.getOrient(),
             select: spec.select,
             hover: spec.hover,
-            line: (0, utils_2.transformAxisLineStyle)(spec.domainLine),
-            label: {
-                visible: spec.label.visible,
-                space: spec.label.space,
-                inside: spec.label.inside,
+            line: (0, util_2.transformAxisLineStyle)(spec.domainLine),
+            label: Object.assign({
                 style: (0, util_1.isFunction)(spec.label.style) ? (datum, index, data, layer) => {
                     var _a;
                     const style = this._preprocessSpec(spec.label.style(datum.rawValue, index, datum, data, layer));
-                    return (0, style_1.transformToGraphic)(this._preprocessSpec((0, util_1.merge)({}, null === (_a = this._theme.label) || void 0 === _a ? void 0 : _a.style, style)));
+                    return (0, style_1.transformToGraphic)(this._preprocessSpec((0, util_1.mergeSpec)({}, null === (_a = this._theme.label) || void 0 === _a ? void 0 : _a.style, style)));
                 } : (0, style_1.transformToGraphic)(spec.label.style),
                 formatMethod: spec.label.formatMethod ? (value, datum, index) => spec.label.formatMethod(datum.rawValue, datum) : null,
-                state: (0, style_1.transformAxisLabelStateStyle)(spec.label.state),
-                autoRotate: !!spec.label.autoRotate,
-                autoHide: !!spec.label.autoHide,
-                autoLimit: !!spec.label.autoLimit,
-                autoRotateAngle: spec.label.autoRotateAngle,
-                autoHideMethod: spec.label.autoHideMethod,
-                autoHideSeparation: spec.label.autoHideSeparation,
-                limitEllipsis: spec.label.limitEllipsis,
-                layoutFunc: spec.label.layoutFunc,
-                dataFilter: spec.label.dataFilter,
-                containerAlign: spec.label.containerAlign
-            },
+                state: (0, style_1.transformAxisLabelStateStyle)(spec.label.state)
+            }, labelSpec),
             tick: {
                 visible: spec.tick.visible,
                 length: spec.tick.tickSize,
@@ -206,7 +195,7 @@ class AxisComponent extends base_1.BaseComponent {
                 style: (0, util_1.isFunction)(spec.tick.style) ? (value, index, datum, data) => {
                     var _a;
                     const style = this._preprocessSpec(spec.tick.style(value, index, datum, data));
-                    return (0, style_1.transformToGraphic)(this._preprocessSpec((0, util_1.merge)({}, null === (_a = this._theme.tick) || void 0 === _a ? void 0 : _a.style, style)));
+                    return (0, style_1.transformToGraphic)(this._preprocessSpec((0, util_1.mergeSpec)({}, null === (_a = this._theme.tick) || void 0 === _a ? void 0 : _a.style, style)));
                 } : (0, style_1.transformToGraphic)(spec.tick.style),
                 state: (0, style_1.transformStateStyle)(spec.tick.state),
                 dataFilter: spec.tick.dataFilter
@@ -219,7 +208,7 @@ class AxisComponent extends base_1.BaseComponent {
                 style: (0, util_1.isFunction)(spec.subTick.style) ? (value, index, datum, data) => {
                     var _a;
                     const style = spec.subTick.style(value, index, datum, data);
-                    return (0, style_1.transformToGraphic)((0, util_1.merge)({}, null === (_a = this._theme.subTick) || void 0 === _a ? void 0 : _a.style, style));
+                    return (0, style_1.transformToGraphic)((0, util_1.mergeSpec)({}, null === (_a = this._theme.subTick) || void 0 === _a ? void 0 : _a.style, style));
                 } : (0, style_1.transformToGraphic)(spec.subTick.style),
                 state: (0, style_1.transformStateStyle)(spec.subTick.state)
             },
@@ -231,7 +220,7 @@ class AxisComponent extends base_1.BaseComponent {
                 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._preprocessSpec((0, util_1.merge)({}, null === (_b = this._theme.grid) || void 0 === _b ? void 0 : _b.style, style)));
+                    return (0, style_1.transformToGraphic)(this._preprocessSpec((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: {
@@ -246,7 +235,7 @@ class AxisComponent extends base_1.BaseComponent {
                 space: spec.title.space,
                 autoRotate: !1,
                 angle: titleAngle ? (0, vutils_1.degreeToRadian)(titleAngle) : null,
-                textStyle: (0, util_1.merge)({}, titleTextStyle, (0, style_1.transformToGraphic)(spec.title.style)),
+                textStyle: (0, util_1.mergeSpec)({}, titleTextStyle, (0, style_1.transformToGraphic)(spec.title.style)),
                 padding: spec.title.padding,
                 shape: {
                     visible: null === (_b = spec.title.shape) || void 0 === _b ? void 0 : _b.visible,