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

package/cjs/interaction/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interaction/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type {\n  ElementActiveByLegendSpec,\n  ElementActiveSpec,\n  ElementHighlightByGroupSpec,\n  ElementHighlightByKeySpec,\n  ElementHighlightByLegendSpec,\n  ElementHighlightByNameSpec,\n  ElementHighlightSpec,\n  ElementSelectSpec,\n  IElement\n} from '@visactor/vgrammar-core';\nimport type { IMark } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { BaseEventParams, IEventDispatcher, EventType } from '../event/interface';\nimport type { IModel } from '../model/interface';\nimport type { StateValue } from '../compile/mark';\nimport type { StringOrNumber } from '../typings/common';\n\nexport interface IInteraction {\n  registerMark: (state: StateValue, mark: IMark) => void;\n  filterEventMark: (params: BaseEventParams, state: StateValue) => boolean;\n  getStateMark: (state: StateValue) => IMark[] | null;\n\n  getEventElement: (stateValue: StateValue) => IElement[];\n  getEventElementData: (stateValue: StateValue) => any[];\n  addEventElement: (stateValue: StateValue, element: IElement) => void;\n  removeEventElement: (stateValue: StateValue, elements: IElement) => void;\n  exchangeEventElement: (stateValue: StateValue, elements: IElement) => void;\n  clearEventElement: (stateValue: StateValue, clearReverse: boolean) => void;\n  reverseEventElement: (stateValue: StateValue) => void;\n\n  setDisableActiveEffect: (disable: boolean) => void;\n}\n\nexport interface ITrigger {\n  init: () => void;\n  setStateKeys: (fields: string[]) => void;\n  registerMark: (mark: IMark) => void;\n  release: () => void;\n  hover?: IHoverSpec;\n  select?: ISelectSpec;\n}\n\nexport interface ITriggerOption {\n  mode: RenderMode;\n  interaction: IInteraction;\n  eventDispatcher: IEventDispatcher;\n  model: IModel;\n}\n\ntype Trigger = EventType | EventType[];\n\nexport type IHoverSpec = {\n  enable?: boolean;\n  trigger?: Trigger;\n  triggerOff?: Trigger;\n};\n\nexport type ISelectSpec = {\n  enable?: boolean;\n  mode?: 'single' | 'multiple';\n  trigger?: Trigger;\n  triggerOff?: Trigger | number;\n};\n\nexport interface ITriggerSpec {\n  hover?: IHoverSpec | boolean;\n  select?: ISelectSpec | boolean;\n}\n\ninterface IBaseInteractionSpec {\n  markIds?: StringOrNumber[];\n  markNames?: StringOrNumber[];\n}\n\nexport type IElementActiveSpec = IBaseInteractionSpec &\n  Pick<ElementActiveSpec, 'type' | 'trigger' | 'triggerOff' | 'state'>;\n\nexport type IElementSelectSpec = IBaseInteractionSpec &\n  Pick<ElementSelectSpec, 'type' | 'trigger' | 'triggerOff' | 'state' | 'isMultiple' | 'reverseState'>;\nexport type IElementHighlightSpec = IBaseInteractionSpec &\n  Pick<ElementHighlightSpec, 'type' | 'blurState' | 'highlightState' | 'triggerOff' | 'trigger'>;\n\nexport type IElementHighlightByKeySpec = IBaseInteractionSpec &\n  Pick<ElementHighlightByKeySpec, 'type' | 'blurState' | 'highlightState' | 'triggerOff' | 'trigger'>;\n\nexport type IElementHighlightByGroup = IBaseInteractionSpec &\n  Pick<ElementHighlightByGroupSpec, 'type' | 'blurState' | 'highlightState' | 'triggerOff' | 'trigger'>;\n\nexport type IElementActiveByLegend = IBaseInteractionSpec &\n  Pick<ElementActiveByLegendSpec, 'type' | 'filterType' | 'state'>;\n\nexport type IElementHighlightByLegend = IBaseInteractionSpec &\n  Pick<ElementHighlightByLegendSpec, 'type' | 'filterType' | 'blurState' | 'highlightState'>;\n\nexport type IElementHighlightByName = IBaseInteractionSpec &\n  Pick<ElementHighlightByNameSpec, 'type' | 'blurState' | 'highlightState' | 'graphicName' | 'parseData'>;\n\nexport interface ICustomInteraction extends IBaseInteractionSpec {\n  type: string;\n}\n\nexport type IInteractionItemSpec =\n  | IElementActiveSpec\n  | IElementSelectSpec\n  | IElementHighlightSpec\n  | IElementHighlightByKeySpec\n  | IElementHighlightByGroup\n  | IElementActiveByLegend\n  | IElementHighlightByLegend\n  | IElementHighlightByName;\n\nexport interface IInteractionSpec {\n  hover?: IHoverSpec | boolean;\n  select?: ISelectSpec | boolean;\n  interactions?: IInteractionItemSpec[];\n}\n"]}
+{"version":3,"sources":["../src/interaction/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type {\n  ElementActiveByLegendSpec,\n  ElementActiveSpec,\n  ElementHighlightByGroupSpec,\n  ElementHighlightByKeySpec,\n  ElementHighlightByLegendSpec,\n  ElementHighlightByNameSpec,\n  ElementHighlightSpec,\n  ElementSelectSpec,\n  IElement,\n  IInteraction as IVGrammarInteraction\n} from '@visactor/vgrammar-core';\nimport type { IMark } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { BaseEventParams, IEventDispatcher, EventType } from '../event/interface';\nimport type { IModel } from '../model/interface';\nimport type { StateValue } from '../compile/mark';\nimport type { StringOrNumber } from '../typings/common';\n\nexport interface IInteraction {\n  registerMark: (state: StateValue, mark: IMark) => void;\n  filterEventMark: (params: BaseEventParams, state: StateValue) => boolean;\n  getStateMark: (state: StateValue) => IMark[] | null;\n\n  getEventElement: (stateValue: StateValue) => IElement[];\n  getEventElementData: (stateValue: StateValue) => any[];\n  addEventElement: (stateValue: StateValue, element: IElement) => void;\n  removeEventElement: (stateValue: StateValue, elements: IElement) => void;\n  exchangeEventElement: (stateValue: StateValue, elements: IElement) => void;\n  clearEventElement: (stateValue: StateValue, clearReverse: boolean) => void;\n  reverseEventElement: (stateValue: StateValue) => void;\n\n  setDisableActiveEffect: (disable: boolean) => void;\n  addVgrammarInteraction: (state: StateValue, i: IVGrammarInteraction) => void;\n  startInteraction: (state: StateValue, element: IElement) => void;\n  resetInteraction: (state: StateValue, element: IElement) => void;\n}\n\nexport interface ITrigger {\n  init: () => void;\n  setStateKeys: (fields: string[]) => void;\n  registerMark: (mark: IMark) => void;\n  release: () => void;\n  hover?: IHoverSpec;\n  select?: ISelectSpec;\n}\n\nexport interface ITriggerOption {\n  mode: RenderMode;\n  interaction: IInteraction;\n  eventDispatcher: IEventDispatcher;\n  model: IModel;\n}\n\ntype Trigger = EventType | EventType[];\n\nexport type IHoverSpec = {\n  enable?: boolean;\n  trigger?: Trigger;\n  triggerOff?: Trigger;\n};\n\nexport type ISelectSpec = {\n  enable?: boolean;\n  mode?: 'single' | 'multiple';\n  trigger?: Trigger;\n  triggerOff?: Trigger | number;\n};\n\nexport interface ITriggerSpec {\n  hover?: IHoverSpec | boolean;\n  select?: ISelectSpec | boolean;\n}\n\ninterface IBaseInteractionSpec {\n  markIds?: StringOrNumber[];\n  markNames?: StringOrNumber[];\n}\n\nexport type IElementActiveSpec = IBaseInteractionSpec &\n  Pick<ElementActiveSpec, 'type' | 'trigger' | 'triggerOff' | 'state'>;\n\nexport type IElementSelectSpec = IBaseInteractionSpec &\n  Pick<ElementSelectSpec, 'type' | 'trigger' | 'triggerOff' | 'state' | 'isMultiple' | 'reverseState'>;\nexport type IElementHighlightSpec = IBaseInteractionSpec &\n  Pick<ElementHighlightSpec, 'type' | 'blurState' | 'highlightState' | 'triggerOff' | 'trigger'>;\n\nexport type IElementHighlightByKeySpec = IBaseInteractionSpec &\n  Pick<ElementHighlightByKeySpec, 'type' | 'blurState' | 'highlightState' | 'triggerOff' | 'trigger'>;\n\nexport type IElementHighlightByGroup = IBaseInteractionSpec &\n  Pick<ElementHighlightByGroupSpec, 'type' | 'blurState' | 'highlightState' | 'triggerOff' | 'trigger'>;\n\nexport type IElementActiveByLegend = IBaseInteractionSpec &\n  Pick<ElementActiveByLegendSpec, 'type' | 'filterType' | 'state'>;\n\nexport type IElementHighlightByLegend = IBaseInteractionSpec &\n  Pick<ElementHighlightByLegendSpec, 'type' | 'filterType' | 'blurState' | 'highlightState'>;\n\nexport type IElementHighlightByName = IBaseInteractionSpec &\n  Pick<ElementHighlightByNameSpec, 'type' | 'blurState' | 'highlightState' | 'graphicName' | 'parseData'>;\n\nexport interface ICustomInteraction extends IBaseInteractionSpec {\n  type: string;\n}\n\nexport type IInteractionItemSpec =\n  | IElementActiveSpec\n  | IElementSelectSpec\n  | IElementHighlightSpec\n  | IElementHighlightByKeySpec\n  | IElementHighlightByGroup\n  | IElementActiveByLegend\n  | IElementHighlightByLegend\n  | IElementHighlightByName;\n\nexport interface IInteractionSpec {\n  hover?: IHoverSpec | boolean;\n  select?: ISelectSpec | boolean;\n  interactions?: IInteractionItemSpec[];\n}\n"]}

package/cjs/mark/arc.js

@@ -29,7 +29,9 @@ class BaseArcMark extends base_mark_1.BaseMark {
             outerRadius: 0,
             innerRadius: 0,
             cornerRadius: 0,
-            lineWidth: 0
+            lineWidth: 0,
+            innerPadding: 0,
+            outerPadding: 0
         });
     }
 }

package/cjs/mark/arc.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/arc.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAC5C,0CAA+C;AAE/C,uCAAgD;AAEhD,gDAA4C;AAI5C,2DAA6D;AAC7D,gDAAmE;AAInE,MAAa,WAAoC,SAAQ,oBAAW;IAKlE,YAAY,IAAY,EAAE,MAAmB;QAC3C,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QALb,SAAI,GAAiB,OAAO,CAAC,IAAI,CAAC;QAE3C,sBAAiB,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;QA2BrD,uBAAkB,GAAG,CAC7B,GAAW,EACX,KAAY,EACZ,SAAyB,QAAQ,EACjC,GAAQ,EACR,UAAkB,EACV,EAAE;;YACV,MAAM,MAAM,GAAG,MAAC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAY,mCAAI,CAAC,CAAC;YACtF,OAAO,UAAU,GAAG,MAAM,CAAC;QAC7B,CAAC,CAAC;QAEQ,kBAAa,GAAG,CACxB,GAAc,EACd,KAAY,EACZ,SAAyB,QAAQ,EACjC,GAAQ,EACR,MAAc,EACd,EAAE;YACF,MAAM,MAAM,GAAG,IAAA,uBAAgB,EAAC;gBAC9B,KAAK,EAAE,KAAK,CAAC,2BAAgB,CAAC;gBAC9B,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAW;aACxE,CAAC,CAAC;YACH,OAAO,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC,CAAC;QA5CA,IAAI,CAAC,iBAAiB,CAAC,CAAC,GAAG,IAAI,CAAC,aAA8B,CAAC;QAC/D,IAAI,CAAC,iBAAiB,CAAC,CAAC,GAAG,IAAI,CAAC,aAA8B,CAAC;QAC/D,IAAI,CAAC,iBAAiB,CAAC,WAAW,GAAG,IAAI,CAAC,kBAAmC,CAAC;QAE9E,IAAI,CAAC,iBAAiB,CAAC,YAAY,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACjD,IAAI,CAAC,iBAAiB,CAAC,YAAY,GAAG,CAAC,aAAa,CAAC,CAAC;IACxD,CAAC;IAES,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,UAAU,EAAE,CAAC,EACb,QAAQ,EAAE,CAAC,EACX,WAAW,EAAE,CAAC,EACd,WAAW,EAAE,CAAC,EACd,YAAY,EAAE,CAAC,EACf,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;CA0BF;AAtDD,kCAsDC;AAED,MAAa,OAAQ,SAAQ,WAAyB;IAAtD;;QAEW,SAAI,GAAiB,OAAO,CAAC,IAAI,CAAC;IAC7C,CAAC;;AAHD,0BAGC;AAFiB,YAAI,SAAoB;AAInC,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,IAAA,kCAAkB,GAAE,CAAC;IACrB,IAAA,qCAA4B,GAAE,CAAC;IAC/B,iBAAO,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B","file":"arc.js","sourcesContent":["import { Factory } from './../core/factory';\nimport { ARC_MIDDLE_ANGLE } from '../constant';\nimport type { IArcMarkSpec, Datum, StateValueType } from '../typings';\nimport { polarToCartesian } from '../util/math';\nimport type { ExChannelCall } from './base/base-mark';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkOption, IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { registerArcGraphic } from '@visactor/vgrammar-core';\nimport { registerVGrammarArcAnimation } from '../animation/config';\n\nexport type IArcMark = IMarkRaw<IArcMarkSpec>;\n\nexport class BaseArcMark<T extends IArcMarkSpec> extends BaseMark<T> implements IMarkRaw<T> {\n  readonly type: MarkTypeEnum = ArcMark.type;\n\n  _unCompileChannel = { centerOffset: true, radiusOffset: true };\n\n  constructor(name: string, option: IMarkOption) {\n    super(name, option);\n\n    // because of set object.function, this setting should be write after object init\n    this._computeExChannel.x = this.computeCenter as ExChannelCall;\n    this._computeExChannel.y = this.computeCenter as ExChannelCall;\n    this._computeExChannel.outerRadius = this.computeOuterRadius as ExChannelCall;\n\n    this._extensionChannel.centerOffset = ['x', 'y'];\n    this._extensionChannel.radiusOffset = ['outerRadius'];\n  }\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<T> = {\n      ...super._getDefaultStyle(),\n      startAngle: 0,\n      endAngle: 0,\n      outerRadius: 0,\n      innerRadius: 0,\n      cornerRadius: 0,\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n\n  protected computeOuterRadius = (\n    key: string,\n    datum: Datum,\n    states: StateValueType = 'normal',\n    opt: any,\n    superValue: number\n  ): number => {\n    const offset = (this.getAttribute('radiusOffset', datum, states, opt) as number) ?? 0;\n    return superValue + offset;\n  };\n\n  protected computeCenter = (\n    key: 'x' | 'y',\n    datum: Datum,\n    states: StateValueType = 'normal',\n    opt: any,\n    center: number\n  ) => {\n    const offset = polarToCartesian({\n      angle: datum[ARC_MIDDLE_ANGLE],\n      radius: this.getAttribute('centerOffset', datum, states, opt) as number\n    });\n    return center + offset[key];\n  };\n}\n\nexport class ArcMark extends BaseArcMark<IArcMarkSpec> implements IArcMark {\n  static readonly type = MarkTypeEnum.arc;\n  readonly type: MarkTypeEnum = ArcMark.type;\n}\n\nexport const registerArcMark = () => {\n  registerArcGraphic();\n  registerVGrammarArcAnimation();\n  Factory.registerMark(ArcMark.type, ArcMark);\n};\n"]}
+{"version":3,"sources":["../src/mark/arc.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAC5C,0CAA+C;AAE/C,uCAAgD;AAGhD,gDAA4C;AAI5C,2DAA6D;AAC7D,gDAAmE;AAKnE,MAAa,WAAoC,SAAQ,oBAAW;IAKlE,YAAY,IAAY,EAAE,MAAmB;QAC3C,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QALb,SAAI,GAAiB,OAAO,CAAC,IAAI,CAAC;QAE3C,sBAAiB,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;QA6BrD,uBAAkB,GAAG,CAC7B,GAAW,EACX,KAAY,EACZ,SAAyB,QAAQ,EACjC,GAAQ,EACR,UAAkB,EACV,EAAE;;YACV,MAAM,MAAM,GAAG,MAAC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAY,mCAAI,CAAC,CAAC;YACtF,OAAO,UAAU,GAAG,MAAM,CAAC;QAC7B,CAAC,CAAC;QAEQ,kBAAa,GAAG,CACxB,GAAc,EACd,KAAY,EACZ,SAAyB,QAAQ,EACjC,GAAQ,EACR,MAAc,EACd,EAAE;YACF,MAAM,MAAM,GAAG,IAAA,uBAAgB,EAAC;gBAC9B,KAAK,EAAE,KAAK,CAAC,2BAAgB,CAAC;gBAC9B,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAW;aACxE,CAAC,CAAC;YACH,OAAO,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC,CAAC;QA9CA,IAAI,CAAC,iBAAiB,CAAC,CAAC,GAAG,IAAI,CAAC,aAA8B,CAAC;QAC/D,IAAI,CAAC,iBAAiB,CAAC,CAAC,GAAG,IAAI,CAAC,aAA8B,CAAC;QAC/D,IAAI,CAAC,iBAAiB,CAAC,WAAW,GAAG,IAAI,CAAC,kBAAmC,CAAC;QAE9E,IAAI,CAAC,iBAAiB,CAAC,YAAY,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACjD,IAAI,CAAC,iBAAiB,CAAC,YAAY,GAAG,CAAC,aAAa,CAAC,CAAC;IACxD,CAAC;IAES,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,UAAU,EAAE,CAAC,EACb,QAAQ,EAAE,CAAC,EACX,WAAW,EAAE,CAAC,EACd,WAAW,EAAE,CAAC,EACd,YAAY,EAAE,CAAC,EACf,SAAS,EAAE,CAAC,EACZ,YAAY,EAAE,CAAC,EACf,YAAY,EAAE,CAAC,GAChB,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;CA0BF;AAxDD,kCAwDC;AAED,MAAa,OAAQ,SAAQ,WAAyB;IAAtD;;QAEW,SAAI,GAAiB,OAAO,CAAC,IAAI,CAAC;IAC7C,CAAC;;AAHD,0BAGC;AAFiB,YAAI,SAAoB;AAInC,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,IAAA,kCAAkB,GAAE,CAAC;IACrB,IAAA,qCAA4B,GAAE,CAAC;IAC/B,iBAAO,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B","file":"arc.js","sourcesContent":["import { Factory } from './../core/factory';\nimport { ARC_MIDDLE_ANGLE } from '../constant';\nimport type { IArcMarkSpec, Datum, StateValueType } from '../typings';\nimport { polarToCartesian } from '../util/math';\nimport type { ExChannelCall } from './base/base-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkOption, IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { registerArcGraphic } from '@visactor/vgrammar-core';\nimport { registerVGrammarArcAnimation } from '../animation/config';\nimport { isValid } from '@visactor/vutils';\n\nexport type IArcMark = IMarkRaw<IArcMarkSpec>;\n\nexport class BaseArcMark<T extends IArcMarkSpec> extends BaseMark<T> implements IMarkRaw<T> {\n  readonly type: MarkTypeEnum = ArcMark.type;\n\n  _unCompileChannel = { centerOffset: true, radiusOffset: true };\n\n  constructor(name: string, option: IMarkOption) {\n    super(name, option);\n\n    // because of set object.function, this setting should be write after object init\n    this._computeExChannel.x = this.computeCenter as ExChannelCall;\n    this._computeExChannel.y = this.computeCenter as ExChannelCall;\n    this._computeExChannel.outerRadius = this.computeOuterRadius as ExChannelCall;\n\n    this._extensionChannel.centerOffset = ['x', 'y'];\n    this._extensionChannel.radiusOffset = ['outerRadius'];\n  }\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<T> = {\n      ...super._getDefaultStyle(),\n      startAngle: 0,\n      endAngle: 0,\n      outerRadius: 0,\n      innerRadius: 0,\n      cornerRadius: 0,\n      lineWidth: 0,\n      innerPadding: 0,\n      outerPadding: 0\n    };\n    return defaultStyle;\n  }\n\n  protected computeOuterRadius = (\n    key: string,\n    datum: Datum,\n    states: StateValueType = 'normal',\n    opt: any,\n    superValue: number\n  ): number => {\n    const offset = (this.getAttribute('radiusOffset', datum, states, opt) as number) ?? 0;\n    return superValue + offset;\n  };\n\n  protected computeCenter = (\n    key: 'x' | 'y',\n    datum: Datum,\n    states: StateValueType = 'normal',\n    opt: any,\n    center: number\n  ) => {\n    const offset = polarToCartesian({\n      angle: datum[ARC_MIDDLE_ANGLE],\n      radius: this.getAttribute('centerOffset', datum, states, opt) as number\n    });\n    return center + offset[key];\n  };\n}\n\nexport class ArcMark extends BaseArcMark<IArcMarkSpec> implements IArcMark {\n  static readonly type = MarkTypeEnum.arc;\n  readonly type: MarkTypeEnum = ArcMark.type;\n}\n\nexport const registerArcMark = () => {\n  registerArcGraphic();\n  registerVGrammarArcAnimation();\n  Factory.registerMark(ArcMark.type, ArcMark);\n};\n"]}

package/cjs/mark/base/base-mark.d.ts

@@ -1,5 +1,5 @@
 import type { IAttributeOpt, IModelMarkAttributeContext } from '../../compile/mark/interface';
-import type { Datum, IMarkSpec, ICommonSpec } from '../../typings';
+import type { Datum, IMarkSpec, ICommonSpec, ValueType } from '../../typings';
 import type { IMarkRaw, IMarkStateStyle, IMarkStyle, IMarkOption, StyleConvert, MarkInputStyle } from '../interface';
 import { CompilableMark } from '../../compile/mark/compilable-mark';
 import type { StateValueType } from '../../compile/mark';
@@ -17,11 +17,11 @@ export declare class BaseMark<T extends ICommonSpec> extends CompilableMark impl
     constructor(name: string, option: IMarkOption);
     created(): void;
     initStyleWithSpec(spec: IMarkSpec<T>, key?: string): void;
-    convertAngleToRadian(styleConverter: StyleConvert<number>): StyleConvert<any>;
+    protected _transformStyleValue<T>(styleConverter: StyleConvert<T>, transform: (value: ValueType<T>) => ValueType<T>): StyleConvert<any>;
+    convertAngleToRadian(styleConverter: StyleConvert<number>): any;
     isUserLevel(level: number): boolean;
     setStyle<U extends keyof T>(style: Partial<IMarkStyle<T>>, state?: StateValueType, level?: number, stateStyle?: IMarkStateStyle<T>): void;
     getStyle(key: string, state?: StateValueType): any;
-    protected _filterStyle(style: Partial<IMarkStyle<T>>, state: StateValueType, level: number, stateStyle?: IMarkStateStyle<T>): Partial<IMarkStyle<T>>;
     protected _filterAttribute<U extends keyof T>(attr: U, style: MarkInputStyle<T[U]>, state: StateValueType, level: number, isUserLevel: boolean, stateStyle?: IMarkStateStyle<T>): StyleConvert<T[U]>;
     setReferer<U extends keyof T>(mark: IMarkRaw<T>, styleKey?: U, state?: StateValueType, stateStyle?: IMarkStateStyle<T>): void;
     setPostProcess<U extends keyof T>(key: U, postProcessFunc: any, state?: StateValueType): void;

package/cjs/mark/base/base-mark.js

@@ -30,20 +30,22 @@ class BaseMark extends compilable_mark_1.CompilableMark {
         (0, vutils_1.isValid)(spec.zIndex) && this.setZIndex(spec.zIndex), (0, vutils_1.isBoolean)(spec.visible) && this.setVisible(spec.visible), 
         this._initSpecStyle(spec, this.stateStyle, key));
     }
-    convertAngleToRadian(styleConverter) {
-        if ((0, vutils_1.isNumber)(styleConverter)) return (0, vutils_1.degreeToRadian)(styleConverter);
+    _transformStyleValue(styleConverter, transform) {
         if (styleConverter.scale) {
-            const range = styleConverter.scale.range();
-            return styleConverter.scale.range(range.map(vutils_1.degreeToRadian)), styleConverter;
+            const scale = styleConverter.scale, range = scale.range();
+            return scale.range(range.map(transform)), styleConverter;
         }
-        return "function" == typeof styleConverter ? (item, ctx, opt, source) => (0, vutils_1.degreeToRadian)(styleConverter(item, ctx, opt, source)) : styleConverter;
+        return "function" == typeof styleConverter ? (...args) => transform(styleConverter(...args)) : transform(styleConverter);
+    }
+    convertAngleToRadian(styleConverter) {
+        return this._transformStyleValue(styleConverter, vutils_1.degreeToRadian);
     }
     isUserLevel(level) {
         return [ constant_1.AttributeLevel.User_Mark, constant_1.AttributeLevel.User_Series, constant_1.AttributeLevel.User_Chart ].includes(level);
     }
     setStyle(style, state = "normal", level = 0, stateStyle = this.stateStyle) {
         if ((0, vutils_1.isNil)(style)) return;
-        style = this._filterStyle(style, state, level, stateStyle), void 0 === stateStyle[state] && (stateStyle[state] = {});
+        void 0 === stateStyle[state] && (stateStyle[state] = {});
         const isUserLevel = this.isUserLevel(level);
         Object.keys(style).forEach((attr => {
             let attrStyle = style[attr];
@@ -55,13 +57,18 @@ class BaseMark extends compilable_mark_1.CompilableMark {
         var _a;
         return null === (_a = this.stateStyle[state][key]) || void 0 === _a ? void 0 : _a.style;
     }
-    _filterStyle(style, state, level, stateStyle = this.stateStyle) {
-        return style;
-    }
     _filterAttribute(attr, style, state, level, isUserLevel, stateStyle = this.stateStyle) {
         let newStyle = this._styleConvert(style);
-        return isUserLevel && "angle" === attr && (newStyle = this.convertAngleToRadian(newStyle)), 
-        newStyle;
+        if (isUserLevel) switch (attr) {
+          case "angle":
+            newStyle = this.convertAngleToRadian(newStyle);
+            break;
+
+          case "innerPadding":
+          case "outerPadding":
+            newStyle = this._transformStyleValue(newStyle, (value => -value));
+        }
+        return newStyle;
     }
     setReferer(mark, styleKey, state, stateStyle = this.stateStyle) {
         var _a;
@@ -145,8 +152,8 @@ class BaseMark extends compilable_mark_1.CompilableMark {
     }
     _computeStateAttribute(stateStyle, key, state) {
         var _a;
-        return stateStyle ? stateStyle.referer ? stateStyle.referer._computeAttribute(key, state) : "function" == typeof stateStyle.style ? (datum, opt) => stateStyle.style(datum, this._attributeContext, opt, this.getDataView()) : constant_1.GradientType.includes(stateStyle.style.gradient) ? this._computeGradientAttr(stateStyle.style) : [ "outerBorder", "innerBorder" ].includes(key) ? this._computeBorderAttr(stateStyle.style) : (0, 
-        vscale_1.isValidScaleType)(null === (_a = stateStyle.style.scale) || void 0 === _a ? void 0 : _a.type) ? (datum, opt) => stateStyle.style.scale.scale(datum[stateStyle.style.field]) : (datum, opt) => stateStyle.style : (datum, opt) => {};
+        return stateStyle ? stateStyle.referer ? stateStyle.referer._computeAttribute(key, state) : stateStyle.style ? "function" == typeof stateStyle.style ? (datum, opt) => stateStyle.style(datum, this._attributeContext, opt, this.getDataView()) : constant_1.GradientType.includes(stateStyle.style.gradient) ? this._computeGradientAttr(stateStyle.style) : [ "outerBorder", "innerBorder" ].includes(key) ? this._computeBorderAttr(stateStyle.style) : (0, 
+        vscale_1.isValidScaleType)(null === (_a = stateStyle.style.scale) || void 0 === _a ? void 0 : _a.type) ? (datum, opt) => stateStyle.style.scale.scale(datum[stateStyle.style.field]) : (datum, opt) => stateStyle.style : (datum, opt) => stateStyle.style : (datum, opt) => {};
     }
     _initStyle() {
         const defaultStyle = this._getDefaultStyle();

package/cjs/mark/base/base-mark.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/base/base-mark.ts"],"names":[],"mappings":"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","file":"base-mark.js","sourcesContent":["import type { IStateInfo, IAttributeOpt, IModelMarkAttributeContext } from '../../compile/mark/interface';\nimport type { BaseSeries } from '../../series/base/base-series';\nimport type {\n  Datum,\n  IMarkSpec,\n  ConvertToMarkStyleSpec,\n  GradientStop,\n  IVisual,\n  IVisualScale,\n  IVisualSpecStyle,\n  ICommonSpec,\n  FunctionType\n} from '../../typings';\n\nimport { mergeSpec } from '../../util/spec/merge-spec';\nimport { Color } from '../../util/color';\nimport { createScaleWithSpec } from '../../util/scale';\nimport type {\n  IMarkRaw,\n  IMarkStateStyle,\n  IMarkStyle,\n  IMark,\n  IMarkOption,\n  StyleConvert,\n  VisualScaleType,\n  MarkInputStyle\n} from '../interface';\nimport { AttributeLevel, GradientType, DEFAULT_GRADIENT_CONFIG } from '../../constant';\nimport { isValidScaleType } from '@visactor/vscale';\nimport type { DataView } from '@visactor/vdataset';\nimport { computeActualDataScheme, getDataScheme } from '../../theme/color-scheme/util';\nimport type { ISeries } from '../../series/interface';\nimport { CompilableMark } from '../../compile/mark/compilable-mark';\nimport type { StateValueType } from '../../compile/mark';\nimport { degreeToRadian, isBoolean, isFunction, isNil, isValid, isNumber } from '@visactor/vutils';\n\nexport type ExChannelCall = (\n  key: string | number | symbol,\n  datum: Datum,\n  states: StateValueType,\n  opt: unknown,\n  baseValue: unknown\n) => unknown;\n\nexport class BaseMark<T extends ICommonSpec> extends CompilableMark implements IMarkRaw<T> {\n  declare stateStyle: IMarkStateStyle<T>;\n\n  protected declare _option: IMarkOption;\n\n  protected _attributeContext: IModelMarkAttributeContext;\n\n  /** by _unCompileChannel, some channel need add default channel to make sure update available */\n  _extensionChannel: {\n    [key: string | number | symbol]: string[];\n  } = {};\n  /** same as _extensionChannel. when compute channel, add extension channel effect */\n  _computeExChannel: {\n    [key: string | number | symbol]: ExChannelCall;\n  } = {};\n\n  constructor(name: string, option: IMarkOption) {\n    super(option, name, option.model);\n    // 这里的上下文多数情况下与 mark 是什么是没有关系的，与mark的使用者，也就是series，component有的逻辑有关。\n    this._attributeContext = option.attributeContext;\n    option.map?.set(this.id, this as unknown as IMark);\n  }\n\n  created(): void {\n    this._initStyle();\n  }\n\n  /**\n   * 外部调用，根据 spec 初始化 style（如果由 IModel 派生类调用，请使用 IModel.initMarkStyleWithSpec）\n   * @param spec\n   * @param key\n   * @returns\n   */\n  initStyleWithSpec(spec: IMarkSpec<T>, key?: string) {\n    if (!spec) {\n      return;\n    }\n\n    if (isValid(spec.id)) {\n      this._userId = spec.id;\n    }\n\n    // interactive\n    if (isBoolean(spec.interactive)) {\n      this._interactive = spec.interactive;\n    }\n    // zIndex\n    if (isValid(spec.zIndex)) {\n      this.setZIndex(spec.zIndex);\n    }\n    // visible\n    if (isBoolean(spec.visible)) {\n      this.setVisible(spec.visible);\n    }\n    // style\n    this._initSpecStyle(spec, this.stateStyle, key);\n  }\n\n  convertAngleToRadian(styleConverter: StyleConvert<number>): StyleConvert<any> {\n    // 用户传入的angle配置，需要做一层转换\n    if (isNumber(styleConverter)) {\n      return degreeToRadian(styleConverter) as StyleConvert<any>;\n    } else if ((styleConverter as VisualScaleType).scale) {\n      const range = (styleConverter as VisualScaleType).scale.range();\n\n      (styleConverter as VisualScaleType).scale.range(range.map(degreeToRadian));\n\n      return styleConverter as StyleConvert<any>;\n    } else if (typeof styleConverter === 'function') {\n      return ((item: any, ctx: any, opt: IAttributeOpt, source?: DataView) => {\n        return degreeToRadian((styleConverter as FunctionType<number>)(item, ctx, opt, source));\n      }) as StyleConvert<any>;\n    }\n\n    return styleConverter;\n  }\n\n  isUserLevel(level: number) {\n    return [AttributeLevel.User_Mark, AttributeLevel.User_Series, AttributeLevel.User_Chart].includes(level);\n  }\n\n  /**\n   * 由外部series调用，设置markStyle的接口（如果由 IModel 派生类调用，请使用 IModel.setMarkStyle）\n   * @param style\n   * @param level\n   * @param state\n   */\n  setStyle<U extends keyof T>(\n    style: Partial<IMarkStyle<T>>,\n    state: StateValueType = 'normal',\n    level: number = 0,\n    stateStyle = this.stateStyle\n  ): void {\n    if (isNil(style)) {\n      return;\n    }\n    style = this._filterStyle(style, state, level, stateStyle);\n\n    if (stateStyle[state] === undefined) {\n      stateStyle[state] = {};\n    }\n\n    const isUserLevel = this.isUserLevel(level);\n\n    Object.keys(style).forEach((attr: string) => {\n      let attrStyle = style[attr] as MarkInputStyle<T[U]>;\n      if (isNil(attrStyle)) {\n        return;\n      }\n\n      attrStyle = this._filterAttribute(attr as any, attrStyle, state, level, isUserLevel, stateStyle);\n\n      this.setAttribute(attr as any, attrStyle, state, level, stateStyle);\n    });\n  }\n\n  getStyle(key: string, state: StateValueType = 'normal'): any {\n    return this.stateStyle[state][key]?.style;\n  }\n\n  /** 过滤用户传来的 style 对象 */\n  protected _filterStyle(\n    style: Partial<IMarkStyle<T>>,\n    state: StateValueType,\n    level: number,\n    stateStyle = this.stateStyle\n  ): Partial<IMarkStyle<T>> {\n    return style;\n  }\n\n  /** 过滤单个 attribute */\n  protected _filterAttribute<U extends keyof T>(\n    attr: U,\n    style: MarkInputStyle<T[U]>,\n    state: StateValueType,\n    level: number,\n    isUserLevel: boolean,\n    stateStyle = this.stateStyle\n  ): StyleConvert<T[U]> {\n    let newStyle = this._styleConvert(style);\n    if (isUserLevel && attr === 'angle') {\n      newStyle = this.convertAngleToRadian(newStyle as StyleConvert<number>);\n    }\n    return newStyle;\n  }\n\n  /**\n   * TODO: 没有外部调用\n   * 设置mark样式所参考的图元\n   */\n  setReferer<U extends keyof T>(mark: IMarkRaw<T>, styleKey?: U, state?: StateValueType, stateStyle = this.stateStyle) {\n    if (!mark) {\n      return;\n    }\n    if (styleKey && state) {\n      const style = stateStyle[state] ?? { [styleKey]: {} };\n      stateStyle[state][styleKey] = {\n        ...(style[styleKey] as unknown as any),\n        ...{ referer: mark }\n      };\n      return;\n    }\n\n    Object.entries(stateStyle).forEach(([state, style]) => {\n      Object.entries(style).forEach(([styleKey, style]) => {\n        stateStyle[state][styleKey].referer = mark;\n      });\n    });\n  }\n\n  setPostProcess<U extends keyof T>(key: U, postProcessFunc: any, state: StateValueType = 'normal') {\n    if (this.stateStyle[state]?.[key]) {\n      this.stateStyle[state][key].postProcess = postProcessFunc;\n    }\n  }\n\n  getAttribute<U extends keyof T>(key: U, datum: Datum, state: StateValueType = 'normal', opt?: IAttributeOpt) {\n    return this._computeAttribute(key, state)(datum, opt);\n  }\n\n  setAttribute<U extends keyof T>(\n    attr: U,\n    style: MarkInputStyle<T[U]>,\n    state: StateValueType = 'normal',\n    level: number = 0,\n    stateStyle = this.stateStyle\n  ) {\n    if (stateStyle[state] === undefined) {\n      stateStyle[state] = {};\n    }\n\n    if (stateStyle[state][attr] === undefined) {\n      // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n      // @ts-ignore\n      stateStyle[state][attr] = {\n        level,\n        style,\n        referer: undefined\n      };\n    }\n    const attrLevel = stateStyle[state][attr]?.level;\n    if (isValid(attrLevel) && attrLevel <= level) {\n      mergeSpec(stateStyle[state][attr], { style, level });\n    }\n\n    // some attr has extension channel in VChart to make some effect\n    if (state !== 'normal') {\n      if (attr in this._extensionChannel) {\n        this._extensionChannel[attr].forEach(key => {\n          if (stateStyle[state][key] === undefined) {\n            // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n            // @ts-ignore\n            stateStyle[state][key as keyof T] = stateStyle.normal[key];\n          }\n        });\n      }\n    }\n  }\n\n  /**\n   * 与 vgrammar 默认值一致的样式可以不设置默认值或设置为undefined, 减少encode属性\n   */\n  protected _getDefaultStyle() {\n    return {\n      visible: true,\n      // mark的层级应该在mark层 不在encode属性层\n      // zIndex: LayoutZIndex.Mark,\n      x: 0,\n      y: 0\n    } as IMarkStyle<T>;\n  }\n\n  // /**\n  //  * 获取该 mark 不支持的图形属性，由子类覆写\n  //  * @returns\n  //  */\n  // protected getIgnoreAttributes(): string[] {\n  //   return [];\n  // }\n\n  protected _styleConvert<U extends keyof T>(style?: MarkInputStyle<T[U]>): StyleConvert<T[U]> | undefined {\n    if (!style) {\n      return style as undefined;\n    }\n    // visual spec 转换为 scale 类型的mark style\n    if (isValidScaleType((style as IVisualSpecStyle<unknown, T[U]>).type) || (style as IVisualScale).scale) {\n      // const _style = style as IVisual<T[U]>;\n      const scale = createScaleWithSpec(style as IVisual<T[U]>, {\n        globalScale: this._option.globalScale,\n        seriesId: this._option.seriesId\n      });\n      if (scale) {\n        return {\n          scale,\n          field: (style as IVisual<T[U]>).field,\n          changeDomain: (style as IVisualScale).changeDomain\n        };\n      }\n    }\n    return style as StyleConvert<T[U]>;\n  }\n\n  protected _computeAttribute<U extends keyof T>(key: U, state: StateValueType) {\n    let stateStyle = this.stateStyle[state]?.[key];\n    if (!stateStyle) {\n      stateStyle = this.stateStyle.normal[key];\n    }\n    const baseValueFunctor = this._computeStateAttribute(stateStyle, key, state);\n    const hasPostProcess = isFunction(stateStyle?.postProcess);\n    const hasExCompute = key in this._computeExChannel;\n\n    if (hasPostProcess && hasExCompute) {\n      const exCompute = this._computeExChannel[key];\n      return (datum: Datum, opt: IAttributeOpt) => {\n        let baseValue = baseValueFunctor(datum, opt);\n\n        baseValue = stateStyle.postProcess(baseValue, datum, this._attributeContext, opt, this.getDataView());\n\n        return exCompute(key, datum, state, opt, baseValue);\n      };\n    } else if (hasPostProcess) {\n      return (datum: Datum, opt: IAttributeOpt) => {\n        return stateStyle.postProcess(\n          baseValueFunctor(datum, opt),\n          datum,\n          this._attributeContext,\n          opt,\n          this.getDataView()\n        );\n      };\n    } else if (hasExCompute) {\n      const exCompute = this._computeExChannel[key];\n      return (datum: Datum, opt: IAttributeOpt) => {\n        return exCompute(key, datum, state, opt, baseValueFunctor(datum, opt));\n      };\n    }\n    return baseValueFunctor;\n  }\n\n  protected _computeStateAttribute<U extends keyof T>(stateStyle: any, key: U, state: StateValueType) {\n    if (!stateStyle) {\n      return (datum: Datum, opt: IAttributeOpt) => undefined as any;\n    }\n    if (stateStyle.referer) {\n      return stateStyle.referer._computeAttribute(key, state);\n    }\n\n    if (typeof stateStyle.style === 'function') {\n      return (datum: Datum, opt: IAttributeOpt) =>\n        stateStyle.style(datum, this._attributeContext, opt, this.getDataView());\n    }\n\n    if (GradientType.includes(stateStyle.style.gradient)) {\n      // 渐变色处理，支持各个属性回调\n      return this._computeGradientAttr(stateStyle.style);\n    }\n\n    if (['outerBorder', 'innerBorder'].includes(key as string)) {\n      // 内外描边处理，支持各个属性回调\n      return this._computeBorderAttr(stateStyle.style);\n    }\n\n    if (isValidScaleType(stateStyle.style.scale?.type)) {\n      return (datum: Datum, opt: IAttributeOpt) => stateStyle.style.scale.scale(datum[stateStyle.style.field]);\n    }\n    return (datum: Datum, opt: IAttributeOpt) => {\n      return stateStyle.style;\n    };\n  }\n\n  private _initStyle(): void {\n    const defaultStyle = this._getDefaultStyle();\n    this.setStyle(defaultStyle, 'normal', 0);\n  }\n\n  private _initSpecStyle(spec: IMarkSpec<T>, stateStyle: IMarkStateStyle<T>, key?: string) {\n    // style\n    if (spec.style) {\n      this.setStyle(spec.style, 'normal', AttributeLevel.User_Mark, stateStyle);\n    }\n    const state = spec.state;\n    if (state) {\n      Object.keys(state).forEach(key => {\n        const stateTemp = state[key];\n        if ('style' in stateTemp) {\n          const style = stateTemp.style;\n          let stateInfo: IStateInfo = { stateValue: key };\n          if ('level' in stateTemp) {\n            stateInfo.level = stateTemp.level as number;\n          }\n          if ('filter' in stateTemp) {\n            if (isFunction(stateTemp.filter)) {\n              stateInfo = {\n                filter: stateTemp.filter as (datum: any, options: Record<string, any>) => boolean,\n                ...stateInfo\n              };\n            } else {\n              stateInfo = { ...stateTemp.filter, ...stateInfo };\n            }\n          }\n          this.state.addStateInfo(stateInfo);\n          this.setStyle(style as ConvertToMarkStyleSpec<T>, key, AttributeLevel.User_Mark, stateStyle);\n        } else {\n          this.setStyle(stateTemp, key, AttributeLevel.User_Mark, stateStyle);\n        }\n      });\n    }\n  }\n\n  private _computeGradientAttr(gradientStyle: any) {\n    const { gradient, scale, field, ...rest } = gradientStyle;\n\n    let colorScale = scale;\n    let colorField = field;\n    if ((!scale || !field) && this.model.modelType === 'series') {\n      // 目前只有series有这个属性\n      const { scale: globalColorScale, field: globalField } = (this.model as BaseSeries<any>).getColorAttribute();\n      if (!scale) {\n        // 获取全局的 colorScale\n        colorScale = globalColorScale;\n      }\n      if (!colorField) {\n        colorField = globalField;\n      }\n    }\n\n    const themeColor = computeActualDataScheme(\n      getDataScheme(\n        this.model.getColorScheme(),\n        this.model.modelType === 'series' ? this.model.getSpec?.() : undefined\n      ),\n      (this.model as ISeries).getDefaultColorDomain()\n    );\n    // 默认配置处理\n    const mergedStyle = {\n      ...DEFAULT_GRADIENT_CONFIG[gradient],\n      ...rest\n    };\n    return (data: Datum, opt: IAttributeOpt) => {\n      const computeStyle: any = {};\n      const markData = this.getDataView();\n      Object.keys(mergedStyle).forEach(key => {\n        const value = mergedStyle[key];\n        if (key === 'stops') {\n          computeStyle.stops = value.map((stop: GradientStop) => {\n            const { opacity, color, offset } = stop;\n            let computeColor = color ?? colorScale?.scale(data[colorField]);\n            if (isFunction(color)) {\n              computeColor = color(data, this._attributeContext, opt, markData);\n            }\n\n            if (isValid(opacity)) {\n              computeColor = Color.SetOpacity(computeColor as string, opacity);\n            }\n\n            return {\n              offset: isFunction(offset) ? offset(data, this._attributeContext, opt, markData) : offset,\n              color: computeColor || themeColor[0]\n            };\n          });\n        } else if (isFunction(value)) {\n          computeStyle[key] = value(data, this._attributeContext, opt, markData);\n        } else {\n          computeStyle[key] = value;\n        }\n      });\n\n      computeStyle.gradient = gradient;\n\n      return computeStyle;\n    };\n  }\n\n  private _computeBorderAttr(borderStyle: any) {\n    const { scale, field, ...mergedStyle } = borderStyle;\n\n    return (data: Datum, opt: IAttributeOpt) => {\n      const computeStyle: any = {};\n\n      Object.keys(mergedStyle).forEach(key => {\n        const value = mergedStyle[key];\n        if (isFunction(value)) {\n          computeStyle[key] = value(data, this._attributeContext, opt, this.getDataView());\n        } else {\n          computeStyle[key] = value;\n        }\n      });\n      if (!('stroke' in computeStyle)) {\n        const themeColor = computeActualDataScheme(\n          getDataScheme(\n            this.model.getColorScheme(),\n            this.model.modelType === 'series' ? this.model.getSpec?.() : undefined\n          ),\n          (this.model as ISeries).getDefaultColorDomain()\n        );\n        let colorScale = scale;\n        let colorField = field;\n        if ((!scale || !field) && this.model.modelType === 'series') {\n          // 目前只有series有这个属性\n          const { scale: globalColorScale, field: globalField } = (this.model as BaseSeries<any>).getColorAttribute();\n          if (!scale) {\n            // 获取全局的 colorScale\n            colorScale = globalColorScale;\n          }\n          if (!colorField) {\n            colorField = globalField;\n          }\n          computeStyle.stroke = colorScale?.scale(data[colorField]) || themeColor[0];\n        }\n      } else if (GradientType.includes(mergedStyle.stroke?.gradient)) {\n        computeStyle.stroke = this._computeGradientAttr(mergedStyle.stroke)(data, opt);\n      }\n      return computeStyle;\n    };\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/base/base-mark.ts"],"names":[],"mappings":"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","file":"base-mark.js","sourcesContent":["import type { IStateInfo, IAttributeOpt, IModelMarkAttributeContext } from '../../compile/mark/interface';\nimport type { BaseSeries } from '../../series/base/base-series';\nimport type {\n  Datum,\n  IMarkSpec,\n  ConvertToMarkStyleSpec,\n  GradientStop,\n  IVisual,\n  IVisualScale,\n  IVisualSpecStyle,\n  ICommonSpec,\n  FunctionType,\n  ValueType\n} from '../../typings';\n\nimport { mergeSpec } from '../../util/spec/merge-spec';\nimport { Color } from '../../util/color';\nimport { createScaleWithSpec } from '../../util/scale';\nimport type {\n  IMarkRaw,\n  IMarkStateStyle,\n  IMarkStyle,\n  IMark,\n  IMarkOption,\n  StyleConvert,\n  VisualScaleType,\n  MarkInputStyle\n} from '../interface';\nimport { AttributeLevel, GradientType, DEFAULT_GRADIENT_CONFIG } from '../../constant';\nimport { isValidScaleType } from '@visactor/vscale';\nimport type { DataView } from '@visactor/vdataset';\nimport { computeActualDataScheme, getDataScheme } from '../../theme/color-scheme/util';\nimport type { ISeries } from '../../series/interface';\nimport { CompilableMark } from '../../compile/mark/compilable-mark';\nimport type { StateValueType } from '../../compile/mark';\nimport { degreeToRadian, isBoolean, isFunction, isNil, isValid, isNumber } from '@visactor/vutils';\n\nexport type ExChannelCall = (\n  key: string | number | symbol,\n  datum: Datum,\n  states: StateValueType,\n  opt: unknown,\n  baseValue: unknown\n) => unknown;\n\nexport class BaseMark<T extends ICommonSpec> extends CompilableMark implements IMarkRaw<T> {\n  declare stateStyle: IMarkStateStyle<T>;\n\n  protected declare _option: IMarkOption;\n\n  protected _attributeContext: IModelMarkAttributeContext;\n\n  /** by _unCompileChannel, some channel need add default channel to make sure update available */\n  _extensionChannel: {\n    [key: string | number | symbol]: string[];\n  } = {};\n  /** same as _extensionChannel. when compute channel, add extension channel effect */\n  _computeExChannel: {\n    [key: string | number | symbol]: ExChannelCall;\n  } = {};\n\n  constructor(name: string, option: IMarkOption) {\n    super(option, name, option.model);\n    // 这里的上下文多数情况下与 mark 是什么是没有关系的，与mark的使用者，也就是series，component有的逻辑有关。\n    this._attributeContext = option.attributeContext;\n    option.map?.set(this.id, this as unknown as IMark);\n  }\n\n  created(): void {\n    this._initStyle();\n  }\n\n  /**\n   * 外部调用，根据 spec 初始化 style（如果由 IModel 派生类调用，请使用 IModel.initMarkStyleWithSpec）\n   * @param spec\n   * @param key\n   * @returns\n   */\n  initStyleWithSpec(spec: IMarkSpec<T>, key?: string) {\n    if (!spec) {\n      return;\n    }\n\n    if (isValid(spec.id)) {\n      this._userId = spec.id;\n    }\n\n    // interactive\n    if (isBoolean(spec.interactive)) {\n      this._interactive = spec.interactive;\n    }\n    // zIndex\n    if (isValid(spec.zIndex)) {\n      this.setZIndex(spec.zIndex);\n    }\n    // visible\n    if (isBoolean(spec.visible)) {\n      this.setVisible(spec.visible);\n    }\n    // style\n    this._initSpecStyle(spec, this.stateStyle, key);\n  }\n\n  protected _transformStyleValue<T>(\n    styleConverter: StyleConvert<T>,\n    transform: (value: ValueType<T>) => ValueType<T>\n  ): StyleConvert<any> {\n    if ((styleConverter as VisualScaleType).scale) {\n      const scale = (styleConverter as VisualScaleType).scale;\n      const range = scale.range();\n      scale.range(range.map(transform));\n      return styleConverter as StyleConvert<T>;\n    } else if (typeof styleConverter === 'function') {\n      return ((...args) => {\n        return transform((styleConverter as FunctionType<number>)(...args) as ValueType<T>);\n      }) as StyleConvert<T>;\n    }\n    return transform(styleConverter as ValueType<T>);\n  }\n\n  convertAngleToRadian(styleConverter: StyleConvert<number>) {\n    // 用户传入的角度配置，需要做一层转换\n    return this._transformStyleValue(styleConverter, degreeToRadian);\n  }\n\n  isUserLevel(level: number) {\n    return [AttributeLevel.User_Mark, AttributeLevel.User_Series, AttributeLevel.User_Chart].includes(level);\n  }\n\n  /**\n   * 由外部series调用，设置markStyle的接口（如果由 IModel 派生类调用，请使用 IModel.setMarkStyle）\n   * @param style\n   * @param level\n   * @param state\n   */\n  setStyle<U extends keyof T>(\n    style: Partial<IMarkStyle<T>>,\n    state: StateValueType = 'normal',\n    level: number = 0,\n    stateStyle = this.stateStyle\n  ): void {\n    if (isNil(style)) {\n      return;\n    }\n\n    if (stateStyle[state] === undefined) {\n      stateStyle[state] = {};\n    }\n\n    const isUserLevel = this.isUserLevel(level);\n\n    Object.keys(style).forEach((attr: string) => {\n      let attrStyle = style[attr] as MarkInputStyle<T[U]>;\n      if (isNil(attrStyle)) {\n        return;\n      }\n\n      attrStyle = this._filterAttribute(attr as any, attrStyle, state, level, isUserLevel, stateStyle);\n\n      this.setAttribute(attr as any, attrStyle, state, level, stateStyle);\n    });\n  }\n\n  getStyle(key: string, state: StateValueType = 'normal'): any {\n    return this.stateStyle[state][key]?.style;\n  }\n\n  /** 过滤单个 attribute */\n  protected _filterAttribute<U extends keyof T>(\n    attr: U,\n    style: MarkInputStyle<T[U]>,\n    state: StateValueType,\n    level: number,\n    isUserLevel: boolean,\n    stateStyle = this.stateStyle\n  ): StyleConvert<T[U]> {\n    let newStyle = this._styleConvert(style);\n    if (isUserLevel) {\n      switch (attr) {\n        case 'angle':\n          newStyle = this.convertAngleToRadian(newStyle);\n          break;\n        case 'innerPadding':\n        case 'outerPadding':\n          // VRender 的 padding 定义基于 centent-box 盒模型，默认正方向是向外扩，与 VChart 不一致。这里将 padding 符号取反\n          newStyle = this._transformStyleValue(newStyle, (value: number) => -value);\n          break;\n      }\n    }\n    return newStyle;\n  }\n\n  /**\n   * TODO: 没有外部调用\n   * 设置mark样式所参考的图元\n   */\n  setReferer<U extends keyof T>(mark: IMarkRaw<T>, styleKey?: U, state?: StateValueType, stateStyle = this.stateStyle) {\n    if (!mark) {\n      return;\n    }\n    if (styleKey && state) {\n      const style = stateStyle[state] ?? { [styleKey]: {} };\n      stateStyle[state][styleKey] = {\n        ...(style[styleKey] as unknown as any),\n        ...{ referer: mark }\n      };\n      return;\n    }\n\n    Object.entries(stateStyle).forEach(([state, style]) => {\n      Object.entries(style).forEach(([styleKey, style]) => {\n        stateStyle[state][styleKey].referer = mark;\n      });\n    });\n  }\n\n  setPostProcess<U extends keyof T>(key: U, postProcessFunc: any, state: StateValueType = 'normal') {\n    if (this.stateStyle[state]?.[key]) {\n      this.stateStyle[state][key].postProcess = postProcessFunc;\n    }\n  }\n\n  getAttribute<U extends keyof T>(key: U, datum: Datum, state: StateValueType = 'normal', opt?: IAttributeOpt) {\n    return this._computeAttribute(key, state)(datum, opt);\n  }\n\n  setAttribute<U extends keyof T>(\n    attr: U,\n    style: MarkInputStyle<T[U]>,\n    state: StateValueType = 'normal',\n    level: number = 0,\n    stateStyle = this.stateStyle\n  ) {\n    if (stateStyle[state] === undefined) {\n      stateStyle[state] = {};\n    }\n\n    if (stateStyle[state][attr] === undefined) {\n      // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n      // @ts-ignore\n      stateStyle[state][attr] = {\n        level,\n        style,\n        referer: undefined\n      };\n    }\n    const attrLevel = stateStyle[state][attr]?.level;\n    if (isValid(attrLevel) && attrLevel <= level) {\n      mergeSpec(stateStyle[state][attr], { style, level });\n    }\n\n    // some attr has extension channel in VChart to make some effect\n    if (state !== 'normal') {\n      if (attr in this._extensionChannel) {\n        this._extensionChannel[attr].forEach(key => {\n          if (stateStyle[state][key] === undefined) {\n            // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n            // @ts-ignore\n            stateStyle[state][key as keyof T] = stateStyle.normal[key];\n          }\n        });\n      }\n    }\n  }\n\n  /**\n   * 与 vgrammar 默认值一致的样式可以不设置默认值或设置为undefined, 减少encode属性\n   */\n  protected _getDefaultStyle() {\n    return {\n      visible: true,\n      // mark的层级应该在mark层 不在encode属性层\n      // zIndex: LayoutZIndex.Mark,\n      x: 0,\n      y: 0\n    } as IMarkStyle<T>;\n  }\n\n  // /**\n  //  * 获取该 mark 不支持的图形属性，由子类覆写\n  //  * @returns\n  //  */\n  // protected getIgnoreAttributes(): string[] {\n  //   return [];\n  // }\n\n  protected _styleConvert<U extends keyof T>(style?: MarkInputStyle<T[U]>): StyleConvert<T[U]> | undefined {\n    if (!style) {\n      return style as undefined;\n    }\n    // visual spec 转换为 scale 类型的mark style\n    if (isValidScaleType((style as IVisualSpecStyle<unknown, T[U]>).type) || (style as IVisualScale).scale) {\n      // const _style = style as IVisual<T[U]>;\n      const scale = createScaleWithSpec(style as IVisual<T[U]>, {\n        globalScale: this._option.globalScale,\n        seriesId: this._option.seriesId\n      });\n      if (scale) {\n        return {\n          scale,\n          field: (style as IVisual<T[U]>).field,\n          changeDomain: (style as IVisualScale).changeDomain\n        };\n      }\n    }\n    return style as StyleConvert<T[U]>;\n  }\n\n  protected _computeAttribute<U extends keyof T>(key: U, state: StateValueType) {\n    let stateStyle = this.stateStyle[state]?.[key];\n    if (!stateStyle) {\n      stateStyle = this.stateStyle.normal[key];\n    }\n    const baseValueFunctor = this._computeStateAttribute(stateStyle, key, state);\n    const hasPostProcess = isFunction(stateStyle?.postProcess);\n    const hasExCompute = key in this._computeExChannel;\n\n    if (hasPostProcess && hasExCompute) {\n      const exCompute = this._computeExChannel[key];\n      return (datum: Datum, opt: IAttributeOpt) => {\n        let baseValue = baseValueFunctor(datum, opt);\n\n        baseValue = stateStyle.postProcess(baseValue, datum, this._attributeContext, opt, this.getDataView());\n\n        return exCompute(key, datum, state, opt, baseValue);\n      };\n    } else if (hasPostProcess) {\n      return (datum: Datum, opt: IAttributeOpt) => {\n        return stateStyle.postProcess(\n          baseValueFunctor(datum, opt),\n          datum,\n          this._attributeContext,\n          opt,\n          this.getDataView()\n        );\n      };\n    } else if (hasExCompute) {\n      const exCompute = this._computeExChannel[key];\n      return (datum: Datum, opt: IAttributeOpt) => {\n        return exCompute(key, datum, state, opt, baseValueFunctor(datum, opt));\n      };\n    }\n    return baseValueFunctor;\n  }\n\n  protected _computeStateAttribute<U extends keyof T>(stateStyle: any, key: U, state: StateValueType) {\n    if (!stateStyle) {\n      return (datum: Datum, opt: IAttributeOpt) => undefined as any;\n    }\n    if (stateStyle.referer) {\n      return stateStyle.referer._computeAttribute(key, state);\n    }\n    if (!stateStyle.style) {\n      return (datum: Datum, opt: IAttributeOpt) => stateStyle.style;\n    }\n\n    if (typeof stateStyle.style === 'function') {\n      return (datum: Datum, opt: IAttributeOpt) =>\n        stateStyle.style(datum, this._attributeContext, opt, this.getDataView());\n    }\n\n    if (GradientType.includes(stateStyle.style.gradient)) {\n      // 渐变色处理，支持各个属性回调\n      return this._computeGradientAttr(stateStyle.style);\n    }\n\n    if (['outerBorder', 'innerBorder'].includes(key as string)) {\n      // 内外描边处理，支持各个属性回调\n      return this._computeBorderAttr(stateStyle.style);\n    }\n\n    if (isValidScaleType(stateStyle.style.scale?.type)) {\n      return (datum: Datum, opt: IAttributeOpt) => stateStyle.style.scale.scale(datum[stateStyle.style.field]);\n    }\n    return (datum: Datum, opt: IAttributeOpt) => {\n      return stateStyle.style;\n    };\n  }\n\n  private _initStyle(): void {\n    const defaultStyle = this._getDefaultStyle();\n    this.setStyle(defaultStyle, 'normal', 0);\n  }\n\n  private _initSpecStyle(spec: IMarkSpec<T>, stateStyle: IMarkStateStyle<T>, key?: string) {\n    // style\n    if (spec.style) {\n      this.setStyle(spec.style, 'normal', AttributeLevel.User_Mark, stateStyle);\n    }\n    const state = spec.state;\n    if (state) {\n      Object.keys(state).forEach(key => {\n        const stateTemp = state[key];\n        if ('style' in stateTemp) {\n          const style = stateTemp.style;\n          let stateInfo: IStateInfo = { stateValue: key };\n          if ('level' in stateTemp) {\n            stateInfo.level = stateTemp.level as number;\n          }\n          if ('filter' in stateTemp) {\n            if (isFunction(stateTemp.filter)) {\n              stateInfo = {\n                filter: stateTemp.filter as (datum: any, options: Record<string, any>) => boolean,\n                ...stateInfo\n              };\n            } else {\n              stateInfo = { ...stateTemp.filter, ...stateInfo };\n            }\n          }\n          this.state.addStateInfo(stateInfo);\n          this.setStyle(style as ConvertToMarkStyleSpec<T>, key, AttributeLevel.User_Mark, stateStyle);\n        } else {\n          this.setStyle(stateTemp, key, AttributeLevel.User_Mark, stateStyle);\n        }\n      });\n    }\n  }\n\n  private _computeGradientAttr(gradientStyle: any) {\n    const { gradient, scale, field, ...rest } = gradientStyle;\n\n    let colorScale = scale;\n    let colorField = field;\n    if ((!scale || !field) && this.model.modelType === 'series') {\n      // 目前只有series有这个属性\n      const { scale: globalColorScale, field: globalField } = (this.model as BaseSeries<any>).getColorAttribute();\n      if (!scale) {\n        // 获取全局的 colorScale\n        colorScale = globalColorScale;\n      }\n      if (!colorField) {\n        colorField = globalField;\n      }\n    }\n\n    const themeColor = computeActualDataScheme(\n      getDataScheme(\n        this.model.getColorScheme(),\n        this.model.modelType === 'series' ? this.model.getSpec?.() : undefined\n      ),\n      (this.model as ISeries).getDefaultColorDomain()\n    );\n    // 默认配置处理\n    const mergedStyle = {\n      ...DEFAULT_GRADIENT_CONFIG[gradient],\n      ...rest\n    };\n    return (data: Datum, opt: IAttributeOpt) => {\n      const computeStyle: any = {};\n      const markData = this.getDataView();\n      Object.keys(mergedStyle).forEach(key => {\n        const value = mergedStyle[key];\n        if (key === 'stops') {\n          computeStyle.stops = value.map((stop: GradientStop) => {\n            const { opacity, color, offset } = stop;\n            let computeColor = color ?? colorScale?.scale(data[colorField]);\n            if (isFunction(color)) {\n              computeColor = color(data, this._attributeContext, opt, markData);\n            }\n\n            if (isValid(opacity)) {\n              computeColor = Color.SetOpacity(computeColor as string, opacity);\n            }\n\n            return {\n              offset: isFunction(offset) ? offset(data, this._attributeContext, opt, markData) : offset,\n              color: computeColor || themeColor[0]\n            };\n          });\n        } else if (isFunction(value)) {\n          computeStyle[key] = value(data, this._attributeContext, opt, markData);\n        } else {\n          computeStyle[key] = value;\n        }\n      });\n\n      computeStyle.gradient = gradient;\n\n      return computeStyle;\n    };\n  }\n\n  private _computeBorderAttr(borderStyle: any) {\n    const { scale, field, ...mergedStyle } = borderStyle;\n\n    return (data: Datum, opt: IAttributeOpt) => {\n      const computeStyle: any = {};\n\n      Object.keys(mergedStyle).forEach(key => {\n        const value = mergedStyle[key];\n        if (isFunction(value)) {\n          computeStyle[key] = value(data, this._attributeContext, opt, this.getDataView());\n        } else {\n          computeStyle[key] = value;\n        }\n      });\n      if (!('stroke' in computeStyle)) {\n        const themeColor = computeActualDataScheme(\n          getDataScheme(\n            this.model.getColorScheme(),\n            this.model.modelType === 'series' ? this.model.getSpec?.() : undefined\n          ),\n          (this.model as ISeries).getDefaultColorDomain()\n        );\n        let colorScale = scale;\n        let colorField = field;\n        if ((!scale || !field) && this.model.modelType === 'series') {\n          // 目前只有series有这个属性\n          const { scale: globalColorScale, field: globalField } = (this.model as BaseSeries<any>).getColorAttribute();\n          if (!scale) {\n            // 获取全局的 colorScale\n            colorScale = globalColorScale;\n          }\n          if (!colorField) {\n            colorField = globalField;\n          }\n          computeStyle.stroke = colorScale?.scale(data[colorField]) || themeColor[0];\n        }\n      } else if (GradientType.includes(mergedStyle.stroke?.gradient)) {\n        computeStyle.stroke = this._computeGradientAttr(mergedStyle.stroke)(data, opt);\n      }\n      return computeStyle;\n    };\n  }\n}\n"]}

package/cjs/mark/index.d.ts

@@ -13,10 +13,9 @@ import { Arc3dMark } from './arc-3d';
 import { ComponentMark } from './component';
 import { LinkPathMark } from './link-path';
 import { RippleMark } from './ripple';
-import { ProgressArcMark } from './progress-arc';
 import { CellMark } from './cell';
 import { BaseMark } from './base';
 import { PolygonMark } from './polygon/polygon';
 import { Pyramid3dMark } from './polygon/pyramid-3d';
-export type { IBoxPlotMarkSpec, ILineMarkSpec, ISymbolMarkSpec, IGroupMarkSpec, IRuleMarkSpec, ITextMarkSpec, IAreaMarkSpec, IRect3dMarkSpec, IRectMarkSpec, IPathMarkSpec, IArcMarkSpec, IArc3dMarkSpec, ICommonSpec, IPolygonMarkSpec, IPyramid3dMarkSpec, ILinkPathMarkSpec, IRippleMarkSpec, IProgressArcMarkSpec, ConvertToMarkStyleSpec, ICellMarkSpec } from '../typings/visual';
-export { BoxPlotMark, LineMark, SymbolMark, GroupMark, RuleMark, TextMark, AreaMark, Rect3dMark, RectMark, PathMark, Arc3dMark, ArcMark, ComponentMark, PolygonMark, Pyramid3dMark, LinkPathMark, RippleMark, ProgressArcMark, CellMark, BaseMark };
+export type { IBoxPlotMarkSpec, ILineMarkSpec, ISymbolMarkSpec, IGroupMarkSpec, IRuleMarkSpec, ITextMarkSpec, IAreaMarkSpec, IRect3dMarkSpec, IRectMarkSpec, IPathMarkSpec, IArcMarkSpec, IArc3dMarkSpec, ICommonSpec, IPolygonMarkSpec, IPyramid3dMarkSpec, ILinkPathMarkSpec, IRippleMarkSpec, ConvertToMarkStyleSpec, ICellMarkSpec } from '../typings/visual';
+export { BoxPlotMark, LineMark, SymbolMark, GroupMark, RuleMark, TextMark, AreaMark, Rect3dMark, RectMark, PathMark, Arc3dMark, ArcMark, ComponentMark, PolygonMark, Pyramid3dMark, LinkPathMark, RippleMark, CellMark, BaseMark };

package/cjs/mark/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.BaseMark = exports.CellMark = exports.ProgressArcMark = exports.RippleMark = exports.LinkPathMark = exports.Pyramid3dMark = exports.PolygonMark = exports.ComponentMark = exports.ArcMark = exports.Arc3dMark = exports.PathMark = exports.RectMark = exports.Rect3dMark = exports.AreaMark = exports.TextMark = exports.RuleMark = exports.GroupMark = exports.SymbolMark = exports.LineMark = exports.BoxPlotMark = void 0;
+}), exports.BaseMark = exports.CellMark = exports.RippleMark = exports.LinkPathMark = exports.Pyramid3dMark = exports.PolygonMark = exports.ComponentMark = exports.ArcMark = exports.Arc3dMark = exports.PathMark = exports.RectMark = exports.Rect3dMark = exports.AreaMark = exports.TextMark = exports.RuleMark = exports.GroupMark = exports.SymbolMark = exports.LineMark = exports.BoxPlotMark = void 0;
 
 const box_plot_1 = require("./box-plot");
 
@@ -139,15 +139,6 @@ Object.defineProperty(exports, "RippleMark", {
     }
 });
 
-const progress_arc_1 = require("./progress-arc");
-
-Object.defineProperty(exports, "ProgressArcMark", {
-    enumerable: !0,
-    get: function() {
-        return progress_arc_1.ProgressArcMark;
-    }
-});
-
 const cell_1 = require("./cell");
 
 Object.defineProperty(exports, "CellMark", {

package/cjs/mark/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/index.ts"],"names":[],"mappings":";;;AAIA,yCAAyC;AA6CvC,4FA7CO,sBAAW,OA6CP;AA5Cb,iCAAkC;AA6ChC,yFA7CO,eAAQ,OA6CP;AA5CV,qCAAsC;AA6CpC,2FA7CO,mBAAU,OA6CP;AA5CZ,mCAAoC;AA6ClC,0FA7CO,iBAAS,OA6CP;AA5CX,iCAAkC;AA6ChC,yFA7CO,eAAQ,OA6CP;AA5CV,iCAAkC;AA6ChC,yFA7CO,eAAQ,OA6CP;AA5CV,iCAAkC;AA6ChC,yFA7CO,eAAQ,OA6CP;AA5CV,iCAAkC;AA8ChC,yFA9CO,eAAQ,OA8CP;AA7CV,uCAAuC;AA4CrC,2FA5CO,oBAAU,OA4CP;AA3CZ,iCAAkC;AA6ChC,yFA7CO,eAAQ,OA6CP;AA5CV,+BAAgC;AA8C9B,wFA9CO,aAAO,OA8CP;AA7CT,qCAAqC;AA4CnC,0FA5CO,kBAAS,OA4CP;AA3CX,2CAA4C;AA6C1C,8FA7CO,yBAAa,OA6CP;AA5Cf,2CAA2C;AA+CzC,6FA/CO,wBAAY,OA+CP;AA9Cd,qCAAsC;AA+CpC,2FA/CO,mBAAU,OA+CP;AA9CZ,iDAAiD;AA+C/C,gGA/CO,8BAAe,OA+CP;AA9CjB,iCAAkC;AA+ChC,yFA/CO,eAAQ,OA+CP;AA9CV,iCAAkC;AA+ChC,yFA/CO,eAAQ,OA+CP;AA9CV,+CAAgD;AAwC9C,4FAxCO,qBAAW,OAwCP;AAvCb,qDAAqD;AAwCnD,8FAxCO,0BAAa,OAwCP","file":"index.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\n/**\n * @description export all mark modules\n */\nimport { BoxPlotMark } from './box-plot';\nimport { LineMark } from './line';\nimport { SymbolMark } from './symbol';\nimport { GroupMark } from './group';\nimport { RuleMark } from './rule';\nimport { TextMark } from './text';\nimport { AreaMark } from './area';\nimport { RectMark } from './rect';\nimport { Rect3dMark } from './rect-3d';\nimport { PathMark } from './path';\nimport { ArcMark } from './arc';\nimport { Arc3dMark } from './arc-3d';\nimport { ComponentMark } from './component';\nimport { LinkPathMark } from './link-path';\nimport { RippleMark } from './ripple';\nimport { ProgressArcMark } from './progress-arc';\nimport { CellMark } from './cell';\nimport { BaseMark } from './base';\nimport { PolygonMark } from './polygon/polygon';\nimport { Pyramid3dMark } from './polygon/pyramid-3d';\n\nexport type {\n  IBoxPlotMarkSpec,\n  ILineMarkSpec,\n  ISymbolMarkSpec,\n  IGroupMarkSpec,\n  IRuleMarkSpec,\n  ITextMarkSpec,\n  IAreaMarkSpec,\n  IRect3dMarkSpec,\n  IRectMarkSpec,\n  IPathMarkSpec,\n  IArcMarkSpec,\n  IArc3dMarkSpec,\n  ICommonSpec,\n  IPolygonMarkSpec,\n  IPyramid3dMarkSpec,\n  ILinkPathMarkSpec,\n  IRippleMarkSpec,\n  IProgressArcMarkSpec,\n  ConvertToMarkStyleSpec,\n  ICellMarkSpec\n} from '../typings/visual';\n\nexport {\n  BoxPlotMark,\n  LineMark,\n  SymbolMark,\n  GroupMark,\n  RuleMark,\n  TextMark,\n  AreaMark,\n  Rect3dMark,\n  RectMark,\n  PathMark,\n  Arc3dMark,\n  ArcMark,\n  ComponentMark,\n  PolygonMark,\n  Pyramid3dMark,\n  LinkPathMark,\n  RippleMark,\n  ProgressArcMark,\n  CellMark,\n  BaseMark\n};\n"]}
+{"version":3,"sources":["../src/mark/index.ts"],"names":[],"mappings":";;;AAIA,yCAAyC;AA2CvC,4FA3CO,sBAAW,OA2CP;AA1Cb,iCAAkC;AA2ChC,yFA3CO,eAAQ,OA2CP;AA1CV,qCAAsC;AA2CpC,2FA3CO,mBAAU,OA2CP;AA1CZ,mCAAoC;AA2ClC,0FA3CO,iBAAS,OA2CP;AA1CX,iCAAkC;AA2ChC,yFA3CO,eAAQ,OA2CP;AA1CV,iCAAkC;AA2ChC,yFA3CO,eAAQ,OA2CP;AA1CV,iCAAkC;AA2ChC,yFA3CO,eAAQ,OA2CP;AA1CV,iCAAkC;AA4ChC,yFA5CO,eAAQ,OA4CP;AA3CV,uCAAuC;AA0CrC,2FA1CO,oBAAU,OA0CP;AAzCZ,iCAAkC;AA2ChC,yFA3CO,eAAQ,OA2CP;AA1CV,+BAAgC;AA4C9B,wFA5CO,aAAO,OA4CP;AA3CT,qCAAqC;AA0CnC,0FA1CO,kBAAS,OA0CP;AAzCX,2CAA4C;AA2C1C,8FA3CO,yBAAa,OA2CP;AA1Cf,2CAA2C;AA6CzC,6FA7CO,wBAAY,OA6CP;AA5Cd,qCAAsC;AA6CpC,2FA7CO,mBAAU,OA6CP;AA5CZ,iCAAkC;AA6ChC,yFA7CO,eAAQ,OA6CP;AA5CV,iCAAkC;AA6ChC,yFA7CO,eAAQ,OA6CP;AA5CV,+CAAgD;AAuC9C,4FAvCO,qBAAW,OAuCP;AAtCb,qDAAqD;AAuCnD,8FAvCO,0BAAa,OAuCP","file":"index.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\n/**\n * @description export all mark modules\n */\nimport { BoxPlotMark } from './box-plot';\nimport { LineMark } from './line';\nimport { SymbolMark } from './symbol';\nimport { GroupMark } from './group';\nimport { RuleMark } from './rule';\nimport { TextMark } from './text';\nimport { AreaMark } from './area';\nimport { RectMark } from './rect';\nimport { Rect3dMark } from './rect-3d';\nimport { PathMark } from './path';\nimport { ArcMark } from './arc';\nimport { Arc3dMark } from './arc-3d';\nimport { ComponentMark } from './component';\nimport { LinkPathMark } from './link-path';\nimport { RippleMark } from './ripple';\nimport { CellMark } from './cell';\nimport { BaseMark } from './base';\nimport { PolygonMark } from './polygon/polygon';\nimport { Pyramid3dMark } from './polygon/pyramid-3d';\n\nexport type {\n  IBoxPlotMarkSpec,\n  ILineMarkSpec,\n  ISymbolMarkSpec,\n  IGroupMarkSpec,\n  IRuleMarkSpec,\n  ITextMarkSpec,\n  IAreaMarkSpec,\n  IRect3dMarkSpec,\n  IRectMarkSpec,\n  IPathMarkSpec,\n  IArcMarkSpec,\n  IArc3dMarkSpec,\n  ICommonSpec,\n  IPolygonMarkSpec,\n  IPyramid3dMarkSpec,\n  ILinkPathMarkSpec,\n  IRippleMarkSpec,\n  ConvertToMarkStyleSpec,\n  ICellMarkSpec\n} from '../typings/visual';\n\nexport {\n  BoxPlotMark,\n  LineMark,\n  SymbolMark,\n  GroupMark,\n  RuleMark,\n  TextMark,\n  AreaMark,\n  Rect3dMark,\n  RectMark,\n  PathMark,\n  Arc3dMark,\n  ArcMark,\n  ComponentMark,\n  PolygonMark,\n  Pyramid3dMark,\n  LinkPathMark,\n  RippleMark,\n  CellMark,\n  BaseMark\n};\n"]}

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

@@ -16,7 +16,6 @@ export declare const enum MarkTypeEnum {
     pyramid3d = "pyramid3d",
     boxPlot = "boxPlot",
     linkPath = "linkPath",
-    progressArc = "progressArc",
     cell = "cell",
     ripple = "ripple",
     liquid = "liquid",

package/cjs/mark/interface/type.js

@@ -10,8 +10,7 @@ Object.defineProperty(exports, "__esModule", {
     MarkTypeEnum.rect3d = "rect3d", MarkTypeEnum.image = "image", MarkTypeEnum.path = "path", 
     MarkTypeEnum.area = "area", MarkTypeEnum.arc = "arc", MarkTypeEnum.arc3d = "arc3d", 
     MarkTypeEnum.polygon = "polygon", MarkTypeEnum.pyramid3d = "pyramid3d", MarkTypeEnum.boxPlot = "boxPlot", 
-    MarkTypeEnum.linkPath = "linkPath", MarkTypeEnum.progressArc = "progressArc", MarkTypeEnum.cell = "cell", 
-    MarkTypeEnum.ripple = "ripple", MarkTypeEnum.liquid = "liquid", MarkTypeEnum.component = "component", 
-    MarkTypeEnum.label = "label";
+    MarkTypeEnum.linkPath = "linkPath", MarkTypeEnum.cell = "cell", MarkTypeEnum.ripple = "ripple", 
+    MarkTypeEnum.liquid = "liquid", MarkTypeEnum.component = "component", MarkTypeEnum.label = "label";
 }(MarkTypeEnum = exports.MarkTypeEnum || (exports.MarkTypeEnum = {}));
 //# sourceMappingURL=type.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/interface/type.ts"],"names":[],"mappings":";;;AAEA,IAAkB,YAyBjB;AAzBD,WAAkB,YAAY;IAC5B,+BAAe,CAAA;IAEf,iCAAiB,CAAA;IACjB,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,iCAAiB,CAAA;IACjB,+BAAe,CAAA;IACf,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,2BAAW,CAAA;IACX,+BAAe,CAAA;IACf,mCAAmB,CAAA;IACnB,uCAAuB,CAAA;IACvB,mCAAmB,CAAA;IACnB,qCAAqB,CAAA;IACrB,2CAA2B,CAAA;IAC3B,6BAAa,CAAA;IACb,iCAAiB,CAAA;IACjB,iCAAiB,CAAA;IAEjB,uCAAuB,CAAA;IACvB,+BAAe,CAAA;AACjB,CAAC,EAzBiB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAyB7B","file":"type.js","sourcesContent":["export type MarkType = keyof typeof MarkTypeEnum | string;\n\nexport const enum MarkTypeEnum {\n  group = 'group',\n\n  symbol = 'symbol',\n  rule = 'rule',\n  line = 'line',\n  text = 'text',\n  rect = 'rect',\n  rect3d = 'rect3d',\n  image = 'image',\n  path = 'path',\n  area = 'area',\n  arc = 'arc',\n  arc3d = 'arc3d',\n  polygon = 'polygon',\n  pyramid3d = 'pyramid3d',\n  boxPlot = 'boxPlot',\n  linkPath = 'linkPath',\n  progressArc = 'progressArc',\n  cell = 'cell',\n  ripple = 'ripple',\n  liquid = 'liquid',\n\n  component = 'component',\n  label = 'label'\n}\n"]}
+{"version":3,"sources":["../src/mark/interface/type.ts"],"names":[],"mappings":";;;AAEA,IAAkB,YAwBjB;AAxBD,WAAkB,YAAY;IAC5B,+BAAe,CAAA;IAEf,iCAAiB,CAAA;IACjB,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,iCAAiB,CAAA;IACjB,+BAAe,CAAA;IACf,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,2BAAW,CAAA;IACX,+BAAe,CAAA;IACf,mCAAmB,CAAA;IACnB,uCAAuB,CAAA;IACvB,mCAAmB,CAAA;IACnB,qCAAqB,CAAA;IACrB,6BAAa,CAAA;IACb,iCAAiB,CAAA;IACjB,iCAAiB,CAAA;IAEjB,uCAAuB,CAAA;IACvB,+BAAe,CAAA;AACjB,CAAC,EAxBiB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAwB7B","file":"type.js","sourcesContent":["export type MarkType = keyof typeof MarkTypeEnum | string;\n\nexport const enum MarkTypeEnum {\n  group = 'group',\n\n  symbol = 'symbol',\n  rule = 'rule',\n  line = 'line',\n  text = 'text',\n  rect = 'rect',\n  rect3d = 'rect3d',\n  image = 'image',\n  path = 'path',\n  area = 'area',\n  arc = 'arc',\n  arc3d = 'arc3d',\n  polygon = 'polygon',\n  pyramid3d = 'pyramid3d',\n  boxPlot = 'boxPlot',\n  linkPath = 'linkPath',\n  cell = 'cell',\n  ripple = 'ripple',\n  liquid = 'liquid',\n\n  component = 'component',\n  label = 'label'\n}\n"]}

package/cjs/mark/label.d.ts

@@ -1,7 +1,7 @@
 import type { IComponentMark } from './component';
 import type { IMark } from './interface/common';
 import { MarkTypeEnum } from './interface/type';
-import { TextMark } from './text';
+import { ITextMark, TextMark } from './text';
 export declare class LabelMark extends TextMark implements ILabelMark {
     static readonly type = MarkTypeEnum.text;
     static readonly constructorType = MarkTypeEnum.label;
@@ -16,7 +16,7 @@ export declare class LabelMark extends TextMark implements ILabelMark {
     getComponent(): IMark;
     setComponent(component: IMark): void;
 }
-export interface ILabelMark extends IMark {
+export interface ILabelMark extends ITextMark {
     skipEncode: boolean;
     getRule: () => string;
     setRule: (rule: string) => void;

package/cjs/mark/label.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/label.ts"],"names":[],"mappings":";;;AAAA,2DAA8D;AAC9D,+CAA4C;AAI5C,iCAAkC;AAElC,MAAa,SAAU,SAAQ,eAAQ;IAAvC;;QAIE,eAAU,GAAG,KAAK,CAAC;IA4BrB,CAAC;IAzBC,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IACD,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAGD,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,SAAS,CAAC,MAAa;QACrB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC3B;IACH,CAAC;IAGD,YAAY;QACV,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IACD,YAAY,CAAC,SAAgB;QAC3B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;;AA/BH,8BAgCC;AA/BiB,cAAI,UAAqB;AACzB,yBAAe,WAAsB;AA6ChD,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,iBAAO,CAAC,YAAY,CAAC,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAC3D,IAAA,mCAAmB,GAAE,CAAC;AACxB,CAAC,CAAC;AAHW,QAAA,iBAAiB,qBAG5B","file":"label.js","sourcesContent":["import { registerTextGraphic } from '@visactor/vgrammar-core';\nimport { Factory } from './../core/factory';\nimport type { IComponentMark } from './component';\nimport type { IMark } from './interface/common';\nimport { MarkTypeEnum } from './interface/type';\nimport { TextMark } from './text';\n\nexport class LabelMark extends TextMark implements ILabelMark {\n  static readonly type = MarkTypeEnum.text;\n  static readonly constructorType = MarkTypeEnum.label;\n\n  skipEncode = false;\n\n  private _rule: string;\n  getRule() {\n    return this._rule;\n  }\n  setRule(rule: string) {\n    this._rule = rule;\n  }\n\n  private _target: IMark;\n  getTarget() {\n    return this._target;\n  }\n  setTarget(target: IMark) {\n    this._target = target;\n    if (!this._rule) {\n      this.setRule(target.type);\n    }\n  }\n\n  private _component: IMark;\n  getComponent() {\n    return this._component;\n  }\n  setComponent(component: IMark) {\n    this._component = component;\n  }\n}\n\nexport interface ILabelMark extends IMark {\n  skipEncode: boolean;\n\n  getRule: () => string;\n  setRule: (rule: string) => void;\n\n  getTarget: () => IMark;\n  setTarget: (target: IMark) => void;\n\n  getComponent: () => IComponentMark;\n  setComponent: (component: IComponentMark) => void;\n}\n\nexport const registerLabelMark = () => {\n  Factory.registerMark(LabelMark.constructorType, LabelMark);\n  registerTextGraphic();\n};\n"]}
+{"version":3,"sources":["../src/mark/label.ts"],"names":[],"mappings":";;;AAAA,2DAA8D;AAC9D,+CAA4C;AAI5C,iCAA6C;AAE7C,MAAa,SAAU,SAAQ,eAAQ;IAAvC;;QAIE,eAAU,GAAG,KAAK,CAAC;IA4BrB,CAAC;IAzBC,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IACD,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAGD,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,SAAS,CAAC,MAAa;QACrB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC3B;IACH,CAAC;IAGD,YAAY;QACV,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IACD,YAAY,CAAC,SAAgB;QAC3B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;;AA/BH,8BAgCC;AA/BiB,cAAI,UAAqB;AACzB,yBAAe,WAAsB;AA6ChD,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,iBAAO,CAAC,YAAY,CAAC,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAC3D,IAAA,mCAAmB,GAAE,CAAC;AACxB,CAAC,CAAC;AAHW,QAAA,iBAAiB,qBAG5B","file":"label.js","sourcesContent":["import { registerTextGraphic } from '@visactor/vgrammar-core';\nimport { Factory } from './../core/factory';\nimport type { IComponentMark } from './component';\nimport type { IMark } from './interface/common';\nimport { MarkTypeEnum } from './interface/type';\nimport { ITextMark, TextMark } from './text';\n\nexport class LabelMark extends TextMark implements ILabelMark {\n  static readonly type = MarkTypeEnum.text;\n  static readonly constructorType = MarkTypeEnum.label;\n\n  skipEncode = false;\n\n  private _rule: string;\n  getRule() {\n    return this._rule;\n  }\n  setRule(rule: string) {\n    this._rule = rule;\n  }\n\n  private _target: IMark;\n  getTarget() {\n    return this._target;\n  }\n  setTarget(target: IMark) {\n    this._target = target;\n    if (!this._rule) {\n      this.setRule(target.type);\n    }\n  }\n\n  private _component: IMark;\n  getComponent() {\n    return this._component;\n  }\n  setComponent(component: IMark) {\n    this._component = component;\n  }\n}\n\nexport interface ILabelMark extends ITextMark {\n  skipEncode: boolean;\n\n  getRule: () => string;\n  setRule: (rule: string) => void;\n\n  getTarget: () => IMark;\n  setTarget: (target: IMark) => void;\n\n  getComponent: () => IComponentMark;\n  setComponent: (component: IComponentMark) => void;\n}\n\nexport const registerLabelMark = () => {\n  Factory.registerMark(LabelMark.constructorType, LabelMark);\n  registerTextGraphic();\n};\n"]}

package/cjs/mark/text.d.ts

@@ -1,13 +1,22 @@
-import type { ITextMarkSpec } from '../typings/visual';
+import type { IComposedTextMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
-import type { IMarkRaw, IMarkStyle } from './interface';
+import type { IMarkOption, IMarkRaw, IMarkStyle } from './interface';
 import { MarkTypeEnum } from './interface';
-import type { IGroupMark } from '@visactor/vgrammar-core';
-export type ITextMark = IMarkRaw<ITextMarkSpec>;
-export declare class TextMark extends BaseMark<ITextMarkSpec> implements ITextMark {
+import { IMarkSpec } from '../typings/spec/common';
+export type ITextMark = IMarkRaw<IComposedTextMarkSpec> & {
+    getTextType: () => 'text' | 'rich';
+};
+export type ITextSpec<T> = IMarkSpec<T> & {
+    textType?: 'rich' | 'text';
+};
+export declare class TextMark extends BaseMark<IComposedTextMarkSpec> implements ITextMark {
     static readonly type = MarkTypeEnum.text;
     readonly type = MarkTypeEnum.text;
-    protected _getDefaultStyle(): IMarkStyle<ITextMarkSpec>;
-    protected _initProduct(group?: string | IGroupMark): void;
+    protected _textType: 'text' | 'rich';
+    getTextType(): "text" | "rich";
+    constructor(name: string, option: IMarkOption);
+    protected _getDefaultStyle(): IMarkStyle<IComposedTextMarkSpec>;
+    initStyleWithSpec(spec: ITextSpec<IComposedTextMarkSpec>, key?: string): void;
+    compileEncode(): void;
 }
 export declare const registerTextMark: () => void;

package/cjs/mark/text.js

@@ -7,8 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 class TextMark extends base_mark_1.BaseMark {
-    constructor() {
-        super(...arguments), this.type = TextMark.type;
+    getTextType() {
+        return this._textType;
+    }
+    constructor(name, option) {
+        super(name, option), this.type = TextMark.type, this._textType = "text";
     }
     _getDefaultStyle() {
         return Object.assign(Object.assign({}, super._getDefaultStyle()), {
@@ -18,10 +21,13 @@ class TextMark extends base_mark_1.BaseMark {
             textConfig: []
         });
     }
-    _initProduct(group) {
-        const view = this.getVGrammarView(), id = this.getProductId();
-        "rich" === this.getStyle("textType") ? this._product = view.mark(vgrammar_core_1.GrammarMarkType.richtext, null != group ? group : view.rootMark).id(id) : this._product = view.mark(vgrammar_core_1.GrammarMarkType.text, null != group ? group : view.rootMark).id(id), 
-        this._compiledProductId = id;
+    initStyleWithSpec(spec, key) {
+        super.initStyleWithSpec(spec, key), spec.textType && (this._textType = spec.textType);
+    }
+    compileEncode() {
+        super.compileEncode(), "rich" === this._textType && this._product.encodeState("group", {
+            textType: this._textType
+        });
     }
 }
 

package/cjs/mark/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/text.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAI5C,2DAAwG;AAKxG,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IA4BhC,CAAC;IA1BW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAE3B,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,QAAQ,EACnB,SAAS,EAAE,CAAC,EACZ,UAAU,EAAE,EAAE,GACf,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,YAAY,CAAC,KAA2B;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAGpC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAE/B,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,MAAM,EAAE;YACxC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,+BAAe,CAAC,QAA2B,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACvG;aAAM;YACL,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,+BAAe,CAAC,IAAuB,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACnG;QAED,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AA7BH,4BA8BC;AA7BiB,aAAI,UAAqB;AA+BpC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,iBAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAA,mCAAmB,GAAE,CAAC;IACtB,IAAA,uCAAuB,GAAE,CAAC;AAC5B,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B","file":"text.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { ITextMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\nimport { GrammarMarkType, registerRichTextGraphic, registerTextGraphic } from '@visactor/vgrammar-core';\nimport type { IGroupMark } from '@visactor/vgrammar-core';\n\nexport type ITextMark = IMarkRaw<ITextMarkSpec>;\n\nexport class TextMark extends BaseMark<ITextMarkSpec> implements ITextMark {\n  static readonly type = MarkTypeEnum.text;\n  readonly type = TextMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ITextMarkSpec> = {\n      ...super._getDefaultStyle(),\n      // TODO: 删除后会有显示问题，待排查\n      angle: 0,\n      textAlign: 'center',\n      lineWidth: 0,\n      textConfig: []\n    };\n    return defaultStyle;\n  }\n\n  protected _initProduct(group?: string | IGroupMark) {\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n\n    if (this.getStyle('textType') === 'rich') {\n      this._product = view.mark(GrammarMarkType.richtext as GrammarMarkType, group ?? view.rootMark).id(id);\n    } else {\n      this._product = view.mark(GrammarMarkType.text as GrammarMarkType, group ?? view.rootMark).id(id);\n    }\n\n    this._compiledProductId = id;\n  }\n}\n\nexport const registerTextMark = () => {\n  Factory.registerMark(TextMark.type, TextMark);\n  registerTextGraphic();\n  registerRichTextGraphic();\n};\n"]}
+{"version":3,"sources":["../src/mark/text.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAI5C,2DAAuF;AAOvF,MAAa,QAAS,SAAQ,oBAA+B;IAK3D,WAAW;QACT,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,YAAY,IAAY,EAAE,MAAmB;QAC3C,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QARb,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAEpB,cAAS,GAAoB,MAAM,CAAC;IAO9C,CAAC;IAES,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAE3B,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,QAAQ,EACnB,SAAS,EAAE,CAAC,EACZ,UAAU,EAAE,EAAE,GACf,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,iBAAiB,CAAC,IAAsC,EAAE,GAAY;QACpE,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;SAChC;IACH,CAAC;IAED,aAAa;QACX,KAAK,CAAC,aAAa,EAAE,CAAC;QACtB,IAAI,IAAI,CAAC,SAAS,KAAK,MAAM,EAAE;YAC7B,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;SAClE;IACH,CAAC;;AArCH,4BAsCC;AArCiB,aAAI,UAAqB;AAuCpC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,iBAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAA,mCAAmB,GAAE,CAAC;IACtB,IAAA,uCAAuB,GAAE,CAAC;AAC5B,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B","file":"text.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { IComposedTextMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkOption, IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\nimport { registerRichTextGraphic, registerTextGraphic } from '@visactor/vgrammar-core';\nimport { IMarkSpec } from '../typings/spec/common';\n\nexport type ITextMark = IMarkRaw<IComposedTextMarkSpec> & { getTextType: () => 'text' | 'rich' };\n\nexport type ITextSpec<T> = IMarkSpec<T> & { textType?: 'rich' | 'text' };\n\nexport class TextMark extends BaseMark<IComposedTextMarkSpec> implements ITextMark {\n  static readonly type = MarkTypeEnum.text;\n  readonly type = TextMark.type;\n\n  protected _textType: 'text' | 'rich' = 'text';\n  getTextType() {\n    return this._textType;\n  }\n\n  constructor(name: string, option: IMarkOption) {\n    super(name, option);\n  }\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IComposedTextMarkSpec> = {\n      ...super._getDefaultStyle(),\n      // TODO: 删除后会有显示问题，待排查\n      angle: 0,\n      textAlign: 'center',\n      lineWidth: 0,\n      textConfig: []\n    };\n    return defaultStyle;\n  }\n\n  initStyleWithSpec(spec: ITextSpec<IComposedTextMarkSpec>, key?: string) {\n    super.initStyleWithSpec(spec, key);\n    if (spec.textType) {\n      this._textType = spec.textType;\n    }\n  }\n\n  compileEncode() {\n    super.compileEncode();\n    if (this._textType === 'rich') {\n      this._product.encodeState('group', { textType: this._textType });\n    }\n  }\n}\n\nexport const registerTextMark = () => {\n  Factory.registerMark(TextMark.type, TextMark);\n  registerTextGraphic();\n  registerRichTextGraphic();\n};\n"]}

package/cjs/plugin/chart/formatter/formatter.d.ts

@@ -0,0 +1,28 @@
+import { BasePlugin } from '../../base/base-plugin';
+import { IChartPlugin, IChartPluginService } from '../interface';
+export declare class FormatterPlugin extends BasePlugin implements IChartPlugin {
+    static readonly pluginType: 'chart';
+    static readonly specKey = "formatter";
+    static readonly type: string;
+    readonly type: string;
+    private readonly _timeModeFormat;
+    protected _spec: {
+        timeMode: 'utc' | 'local';
+        customFormatter: (specifier: string, text: string | number | string[] | number[], datum: any) => string | string[];
+        numericFormatter: (specifier: string, text: string | number | string[] | number[]) => string;
+        timeFormatter: (specifier: string, text: string | number | string[] | number[]) => string;
+    };
+    protected _formatter: (text: string | number | string[] | number[], datum: any, formatter: string | string[]) => string | number | (string | number)[];
+    private _timeFormatter;
+    private _numericFormatter;
+    private _numericSpecifier;
+    private _numericFormatterCache;
+    private _isNumericFormatterCache;
+    constructor();
+    onInit(service: IChartPluginService, chartSpec: any): void;
+    protected _format(text: string | number | string[] | number[], datum: any, formatter: string | string[]): string | number | (string | number)[];
+    protected _formatSingleLine(text: string | number, datum: any, formatter: string): string | number;
+    protected _formatSingleText(text: string | number, formatter: string): string | number;
+    dispose(): void;
+}
+export declare const registerFormatPlugin: () => void;