@visactor/vchart 0.0.1-alpha.1 → 0.2.1-alpha.0

package/esm/region/region.js

@@ -16,12 +16,7 @@ import { array, isValid, log } from "../util";
 
 import { AnimateManager } from "../animation/animate-manager";
 
-import { MarkSet } from "../mark/mark-set";
-
 export class Region extends BaseModel {
-    getMarks() {
-        return this._marks.getMarks();
-    }
     getGroupMark() {
         return this._groupMark;
     }
@@ -29,7 +24,7 @@ export class Region extends BaseModel {
         var _a;
         super(spec, ctx), this.modelType = "region", this.type = Region.type, this._series = [], 
         this.layoutType = "region", this.layoutZIndex = LayoutZIndex.Region, this.interaction = new Interaction, 
-        this._marks = new MarkSet, this.seriesDataFilterOver = () => {
+        this.seriesDataFilterOver = () => {
             this.event.emit(ChartEvent.regionSeriesDataFilterOver, {
                 model: this
             }), this._series.forEach((s => s.reTransformViewData()));
@@ -45,8 +40,10 @@ export class Region extends BaseModel {
     }
     created() {
         var _a, _b, _c, _d, _e, _f;
-        super.created(), this._groupMark = this._createMark(MarkTypeEnum.group, "regionGroup"), 
-        this._groupMark.setUserId(this.userId), this._groupMark.setZIndex(this.layoutZIndex);
+        super.created(), this._groupMark = this._createMark({
+            type: MarkTypeEnum.group,
+            name: "regionGroup"
+        }), this._groupMark.setUserId(this.userId), this._groupMark.setZIndex(this.layoutZIndex);
         const clip = null !== (_a = this._spec.clip) && void 0 !== _a ? _a : this._getClipDefaultValue();
         this.setMarkStyle(this._groupMark, {
             x: () => this.getLayoutStartPoint().x,
@@ -60,8 +57,13 @@ export class Region extends BaseModel {
             cornerRadiusTopRight: null === (_d = this._spec.style) || void 0 === _d ? void 0 : _d.cornerRadiusTopRight,
             cornerRadiusBottomLeft: null === (_e = this._spec.style) || void 0 === _e ? void 0 : _e.cornerRadiusBottomLeft,
             cornerRadiusBottomRight: null === (_f = this._spec.style) || void 0 === _f ? void 0 : _f.cornerRadiusBottomRight
-        }, "normal", AttributeLevel.User_Mark), this._marks.addMark(this._groupMark), this._spec.style && (this._backgroundMark = this._createMark("rect", "regionBackground"), 
-        clip && (this._foregroundMark = this._createMark("rect", "regionForeground")), [ this._backgroundMark, this._foregroundMark ].forEach((mark => {
+        }, "normal", AttributeLevel.User_Mark), this._marks.addMark(this._groupMark), this._spec.style && (this._backgroundMark = this._createMark({
+            type: MarkTypeEnum.rect,
+            name: "regionBackground"
+        }), clip && (this._foregroundMark = this._createMark({
+            type: MarkTypeEnum.rect,
+            name: "regionForeground"
+        })), [ this._backgroundMark, this._foregroundMark ].forEach((mark => {
             mark && (mark.created(), this.setMarkStyle(mark, {
                 width: () => this.getLayoutRect().width,
                 height: () => this.getLayoutRect().height
@@ -94,8 +96,8 @@ export class Region extends BaseModel {
         return originalSpec.style && !(null == spec ? void 0 : spec.style) || !originalSpec.style && (null == spec ? void 0 : spec.style) ? (result.reMake = !0, 
         result) : result;
     }
-    reInit() {
-        super.reInit(), this._initBackgroundMarkStyle(), this._initForegroundMarkStyle();
+    reInit(theme) {
+        super.reInit(theme), this._initBackgroundMarkStyle(), this._initForegroundMarkStyle();
     }
     addSeries(s) {
         s && (this._series.includes(s) || this._series.push(s));
@@ -147,7 +149,7 @@ export class Region extends BaseModel {
         this._option.dataSet.multipleDataViewAddListener(viewDataFilters, "change", this.seriesDataFilterOver);
     }
     release() {
-        super.release(), this._series = [], this._marks.clear();
+        super.release(), this._series = [];
     }
     createTrigger() {
         const triggerOptions = Object.assign(Object.assign({}, this._option), {

package/esm/region/region.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/region/region.ts"],"names":[],"mappings":"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","file":"region.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isEmpty } from '@visactor/vutils';\nimport type { Element, IElement, IGroupMark as IVGrammarGroupMark, ILayoutOptions, IMark } from '@visactor/vgrammar';\nimport { STATE_VALUE_ENUM_REVERSE } from '../compile/mark/interface';\nimport { DimensionTrigger } from '../interaction/dimension-trigger';\nimport { MarkTypeEnum } from '../mark/interface';\nimport { BaseModel } from '../model/base-model';\nimport type { ISeries } from '../series/interface';\nimport type { IModelOption, ILayoutItem } from '../model/interface';\nimport type { CoordinateType } from '../typings/coordinate';\nimport type { IRegion, IRegionSpec } from './interface';\nimport type { IGroupMark } from '../mark/group';\nimport type { IInteraction, ITrigger } from '../interaction/interface';\nimport { Interaction } from '../interaction/interaction';\nimport { AttributeLevel, ChartEvent, LayoutZIndex } from '../constant';\nimport { array, isValid, log } from '../util';\nimport type { IRectMark } from '../mark/rect';\nimport { AnimateManager } from '../animation/animate-manager';\nimport type { IAnimate } from '../animation/interface';\nimport { MarkSet } from '../mark/mark-set';\nimport type { StringOrNumber } from '../typings';\nimport type { IDataZoomSpec, IScrollBarSpec } from '../component/data-zoom';\n\nexport class Region extends BaseModel implements IRegion {\n  static type = 'region';\n  readonly modelType: string = 'region';\n\n  type = Region.type;\n  protected _series: ISeries[] = [];\n  layoutType: ILayoutItem['layoutType'] = 'region';\n  layoutZIndex: number = LayoutZIndex.Region;\n\n  animate?: IAnimate;\n\n  interaction: IInteraction = new Interaction();\n\n  // scrollBar\n  // scrollBar.scroll() => lineMark.x += offsetX\n  // lineMark.x = lineMark.baseX + offsetX\n  // scrollBar. regionGroup.clip = true;\n  protected _marks: MarkSet = new MarkSet();\n  getMarks() {\n    return this._marks.getMarks();\n  }\n\n  protected _groupMark!: IGroupMark;\n  getGroupMark() {\n    return this._groupMark;\n  }\n\n  protected _backgroundMark?: IRectMark;\n  protected _foregroundMark?: IRectMark;\n\n  protected _trigger: ITrigger;\n\n  protected declare _spec: IRegionSpec;\n\n  constructor(spec: IRegionSpec, ctx: IModelOption) {\n    super(spec, ctx);\n    this.userId = spec.id;\n    this.coordinate = spec.coordinate ?? 'cartesian';\n    if (this._option.animation) {\n      this.animate = new AnimateManager({\n        getCompiler: ctx.getCompiler\n      });\n    }\n    // 层级应当支持配置\n    if (isValid(spec.zIndex)) {\n      this.layoutZIndex = spec.zIndex;\n    }\n\n    if (true) {\n      // TODO: remove me\n      log('region created');\n    }\n  }\n\n  protected _getClipDefaultValue() {\n    const chartSpec = this._option.getChart().getSpec();\n    const hasDataZoom = (chartSpec as any).dataZoom?.some?.((entry: IDataZoomSpec) => entry.filterMode === 'axis');\n    const hasScrollBar = (chartSpec as any).scrollBar?.some?.((entry: IScrollBarSpec) => entry.filterMode === 'axis');\n\n    return hasDataZoom || hasScrollBar ? true : this.layoutClip;\n  }\n\n  created(): void {\n    super.created();\n    this._groupMark = this._createMark(MarkTypeEnum.group, 'regionGroup') as IGroupMark;\n    this._groupMark.setUserId(this.userId);\n    this._groupMark.setZIndex(this.layoutZIndex);\n    const clip = this._spec.clip ?? this._getClipDefaultValue();\n    this.setMarkStyle(\n      this._groupMark,\n      {\n        x: () => this.getLayoutStartPoint().x,\n        y: () => this.getLayoutStartPoint().y,\n        width: () => this.getLayoutRect().width,\n        height: () => this.getLayoutRect().height,\n        clip\n      },\n      'normal',\n      AttributeLevel.Built_In\n    );\n    this.setMarkStyle(\n      this._groupMark,\n      {\n        cornerRadius: this._spec.style?.cornerRadius,\n        cornerRadiusTopLeft: this._spec.style?.cornerRadiusTopLeft,\n        cornerRadiusTopRight: this._spec.style?.cornerRadiusTopRight,\n        cornerRadiusBottomLeft: this._spec.style?.cornerRadiusBottomLeft,\n        cornerRadiusBottomRight: this._spec.style?.cornerRadiusBottomRight\n      },\n      'normal',\n      AttributeLevel.User_Mark\n    );\n    this._marks.addMark(this._groupMark);\n    // hack: region 的样式不能设置在groupMark上，因为groupMark目前没有计算dirtyBound，会导致拖影问题\n    if (this._spec.style) {\n      this._backgroundMark = this._createMark('rect', 'regionBackground') as IRectMark;\n      if (clip) {\n        this._foregroundMark = this._createMark('rect', 'regionForeground') as IRectMark;\n      }\n      [this._backgroundMark, this._foregroundMark].forEach(mark => {\n        if (mark) {\n          mark.created();\n          this.setMarkStyle(\n            mark,\n            {\n              width: () => this.getLayoutRect().width,\n              height: () => this.getLayoutRect().height\n            },\n            'normal',\n            AttributeLevel.Built_In\n          );\n          this._groupMark.addMark(mark);\n        }\n      });\n      this._backgroundMark && this._backgroundMark.setZIndex(0);\n      this._foregroundMark && this._foregroundMark.setZIndex(LayoutZIndex.Mark + 1);\n    }\n    this.createTrigger();\n  }\n\n  init(option: any) {\n    super.init(option);\n    if (true) {\n      // TODO: remove me\n      log('region init');\n    }\n    this.initMark();\n    this.initSeriesDataflow();\n    this.initInteraction();\n    this.initTrigger();\n  }\n  initMark() {\n    this._initBackgroundMarkStyle();\n    this._initForegroundMarkStyle();\n  }\n\n  protected _initBackgroundMarkStyle() {\n    if (this._backgroundMark) {\n      this.setMarkStyle(\n        this._backgroundMark,\n        {\n          fillOpacity: this._spec.style?.fill ? 1 : 0,\n          ...this._spec.style\n        },\n        'normal',\n        AttributeLevel.User_Mark\n      );\n      if (this._spec.clip ?? this._getClipDefaultValue()) {\n        this.setMarkStyle(\n          this._backgroundMark,\n          {\n            strokeOpacity: 0\n          },\n          'normal',\n          AttributeLevel.Built_In\n        );\n      }\n    }\n  }\n\n  protected _initForegroundMarkStyle() {\n    if (this._foregroundMark) {\n      this.setMarkStyle(\n        this._foregroundMark,\n        {\n          ...this._spec.style,\n          fillOpacity: 0\n        },\n        'normal',\n        AttributeLevel.User_Mark\n      );\n    }\n  }\n\n  updateSpec(spec: any) {\n    const originalSpec = this._originalSpec;\n    const result = super.updateSpec(spec);\n    if ((originalSpec.style && !spec?.style) || (!originalSpec.style && spec?.style)) {\n      result.reMake = true;\n      return result;\n    }\n\n    return result;\n  }\n\n  reInit() {\n    super.reInit();\n    this._initBackgroundMarkStyle();\n    this._initForegroundMarkStyle();\n  }\n\n  addSeries(s: ISeries) {\n    if (!s) {\n      return;\n    }\n    if (!this._series.includes(s)) {\n      this._series.push(s);\n    }\n  }\n\n  removeSeries(s: ISeries) {\n    if (!s) {\n      return;\n    }\n    const index = this._series.findIndex(s_ => s_ === s);\n    if (index >= 0) {\n      this._series.splice(index, 1);\n    }\n  }\n\n  getSeries(\n    opt: {\n      name?: string;\n      userId?: StringOrNumber | StringOrNumber[];\n      specIndex?: number | number[];\n      id?: StringOrNumber;\n      type?: string;\n      coordinateType?: CoordinateType;\n      dataName?: string;\n    } = {}\n  ): ISeries[] {\n    return this._series.filter(\n      s =>\n        (opt.name ? s?.name === opt.name : true) &&\n        (opt.userId && s.userId ? array(opt.userId).includes(s.userId) : true) &&\n        (isValid(opt.specIndex) && s.getSpecIndex ? array(opt.specIndex).includes(s.getSpecIndex()) : true) &&\n        (opt.id ? s.id === opt.id : true) &&\n        (opt.type ? s.type === opt.type : true) &&\n        (opt.coordinateType ? s.coordinate === opt.coordinateType : true) &&\n        (opt.dataName ? s.getRawData?.()?.name === opt.dataName : true)\n    );\n  }\n\n  getSeriesInName(name: string): ISeries {\n    return this.getSeries({ name })[0];\n  }\n  getSeriesInUserId(userId: string): ISeries {\n    return this.getSeries({ userId })[0];\n  }\n  getSeriesInId(id: number): ISeries {\n    return this.getSeries({ id })[0];\n  }\n  getSeriesInType(type: string): ISeries[] {\n    return this.getSeries({ type });\n  }\n  getSeriesInCoordinateType(coordinateType: CoordinateType): ISeries[] {\n    return this.getSeries({ coordinateType });\n  }\n  getSeriesInDataName(dataName: string): ISeries[] {\n    return this.getSeries({ dataName });\n  }\n\n  onRender(ctx: any): void {\n    // do nothing\n  }\n\n  initSeriesDataflow() {\n    const viewDataFilters = this._series.map(s => s.getViewDataFilter()).filter(v => !!v);\n    this._option.dataSet.multipleDataViewAddListener(viewDataFilters, 'change', this.seriesDataFilterOver);\n  }\n\n  seriesDataFilterOver = () => {\n    this.event.emit(ChartEvent.regionSeriesDataFilterOver, { model: this });\n    this._series.forEach(s => s.reTransformViewData());\n  };\n\n  release() {\n    super.release();\n    this._series = [];\n    this._marks.clear();\n  }\n  /** dimension */\n  createTrigger() {\n    const triggerOptions = {\n      ...this._option,\n      model: this,\n      interaction: this.interaction\n    };\n    this._trigger = new DimensionTrigger(triggerOptions);\n  }\n\n  initTrigger() {\n    // register all mark\n    // trigger check mark enable\n    this._series.forEach(s => {\n      s.getMarksWithoutRoot().forEach(m => {\n        this._trigger.registerMark(m);\n      });\n    });\n    this._trigger.init();\n  }\n\n  initInteraction() {\n    // 注册所有支持反选状态mark\n    this._series.forEach(s => {\n      s.getMarksWithoutRoot().forEach(m => {\n        for (const key in STATE_VALUE_ENUM_REVERSE) {\n          if (!isEmpty(m.stateStyle[STATE_VALUE_ENUM_REVERSE[key]])) {\n            this.interaction.registerMark(STATE_VALUE_ENUM_REVERSE[key], m);\n          }\n        }\n      });\n    });\n  }\n\n  compileMarks(group?: string | IVGrammarGroupMark) {\n    this.getMarks().forEach(m => {\n      m.compile({ group });\n      m.getProduct()\n        ?.configure({\n          context: {\n            model: this\n          }\n        })\n        .layout(\n          (group: IVGrammarGroupMark, children: IMark[], parentLayoutBounds: IBoundsLike, options?: ILayoutOptions) => {\n            // console.log('region mark layout');\n          }\n        );\n    });\n  }\n\n  compileSignal() {\n    super.compileSignal();\n    this.animate?.compile();\n  }\n\n  compile() {\n    this.compileSignal();\n    this.compileMarks();\n  }\n\n  bindSceneNode(node: IElement) {\n    this._sceneNodeMap.set('default', node as Element);\n  }\n}\n"]}
+{"version":3,"sources":["../src/region/region.ts"],"names":[],"mappings":"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","file":"region.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isEmpty } from '@visactor/vutils';\nimport type { Element, IElement, IGroupMark as IVGrammarGroupMark, ILayoutOptions, IMark } from '@visactor/vgrammar';\nimport { STATE_VALUE_ENUM_REVERSE } from '../compile/mark/interface';\nimport { DimensionTrigger } from '../interaction/dimension-trigger';\nimport { MarkTypeEnum } from '../mark/interface';\nimport { BaseModel } from '../model/base-model';\nimport type { ISeries } from '../series/interface';\nimport type { IModelOption, ILayoutItem } from '../model/interface';\nimport type { CoordinateType } from '../typings/coordinate';\nimport type { IRegion, IRegionSpec } from './interface';\nimport type { IGroupMark } from '../mark/group';\nimport type { IInteraction, ITrigger } from '../interaction/interface';\nimport { Interaction } from '../interaction/interaction';\nimport { AttributeLevel, ChartEvent, LayoutZIndex } from '../constant';\nimport { array, isValid, log } from '../util';\nimport type { IRectMark } from '../mark/rect';\nimport { AnimateManager } from '../animation/animate-manager';\nimport type { IAnimate } from '../animation/interface';\nimport type { StringOrNumber } from '../typings';\nimport type { IDataZoomSpec, IScrollBarSpec } from '../component/data-zoom';\n\nexport class Region extends BaseModel implements IRegion {\n  static type = 'region';\n  readonly modelType: string = 'region';\n\n  type = Region.type;\n  protected _series: ISeries[] = [];\n  layoutType: ILayoutItem['layoutType'] = 'region';\n  layoutZIndex: number = LayoutZIndex.Region;\n\n  animate?: IAnimate;\n\n  interaction: IInteraction = new Interaction();\n\n  protected _groupMark!: IGroupMark;\n  getGroupMark() {\n    return this._groupMark;\n  }\n\n  protected _backgroundMark?: IRectMark;\n  protected _foregroundMark?: IRectMark;\n\n  protected _trigger: ITrigger;\n\n  protected declare _spec: IRegionSpec;\n\n  constructor(spec: IRegionSpec, ctx: IModelOption) {\n    super(spec, ctx);\n    this.userId = spec.id;\n    this.coordinate = spec.coordinate ?? 'cartesian';\n    if (this._option.animation) {\n      this.animate = new AnimateManager({\n        getCompiler: ctx.getCompiler\n      });\n    }\n    // 层级应当支持配置\n    if (isValid(spec.zIndex)) {\n      this.layoutZIndex = spec.zIndex;\n    }\n\n    if (true) {\n      // TODO: remove me\n      log('region created');\n    }\n  }\n\n  protected _getClipDefaultValue() {\n    const chartSpec = this._option.getChart().getSpec();\n    const hasDataZoom = (chartSpec as any).dataZoom?.some?.((entry: IDataZoomSpec) => entry.filterMode === 'axis');\n    const hasScrollBar = (chartSpec as any).scrollBar?.some?.((entry: IScrollBarSpec) => entry.filterMode === 'axis');\n\n    return hasDataZoom || hasScrollBar ? true : this.layoutClip;\n  }\n\n  created(): void {\n    super.created();\n    this._groupMark = this._createMark({ type: MarkTypeEnum.group, name: 'regionGroup' }) as IGroupMark;\n    this._groupMark.setUserId(this.userId);\n    this._groupMark.setZIndex(this.layoutZIndex);\n    const clip = this._spec.clip ?? this._getClipDefaultValue();\n    this.setMarkStyle(\n      this._groupMark,\n      {\n        x: () => this.getLayoutStartPoint().x,\n        y: () => this.getLayoutStartPoint().y,\n        width: () => this.getLayoutRect().width,\n        height: () => this.getLayoutRect().height,\n        clip\n      },\n      'normal',\n      AttributeLevel.Built_In\n    );\n    this.setMarkStyle(\n      this._groupMark,\n      {\n        cornerRadius: this._spec.style?.cornerRadius,\n        cornerRadiusTopLeft: this._spec.style?.cornerRadiusTopLeft,\n        cornerRadiusTopRight: this._spec.style?.cornerRadiusTopRight,\n        cornerRadiusBottomLeft: this._spec.style?.cornerRadiusBottomLeft,\n        cornerRadiusBottomRight: this._spec.style?.cornerRadiusBottomRight\n      },\n      'normal',\n      AttributeLevel.User_Mark\n    );\n    this._marks.addMark(this._groupMark);\n    // hack: region 的样式不能设置在groupMark上，因为groupMark目前没有计算dirtyBound，会导致拖影问题\n    if (this._spec.style) {\n      this._backgroundMark = this._createMark({ type: MarkTypeEnum.rect, name: 'regionBackground' }) as IRectMark;\n      if (clip) {\n        this._foregroundMark = this._createMark({ type: MarkTypeEnum.rect, name: 'regionForeground' }) as IRectMark;\n      }\n      [this._backgroundMark, this._foregroundMark].forEach(mark => {\n        if (mark) {\n          mark.created();\n          this.setMarkStyle(\n            mark,\n            {\n              width: () => this.getLayoutRect().width,\n              height: () => this.getLayoutRect().height\n            },\n            'normal',\n            AttributeLevel.Built_In\n          );\n          this._groupMark.addMark(mark);\n        }\n      });\n      this._backgroundMark && this._backgroundMark.setZIndex(0);\n      this._foregroundMark && this._foregroundMark.setZIndex(LayoutZIndex.Mark + 1);\n    }\n    this.createTrigger();\n  }\n\n  init(option: any) {\n    super.init(option);\n    if (true) {\n      // TODO: remove me\n      log('region init');\n    }\n    this.initMark();\n    this.initSeriesDataflow();\n    this.initInteraction();\n    this.initTrigger();\n  }\n  initMark() {\n    this._initBackgroundMarkStyle();\n    this._initForegroundMarkStyle();\n  }\n\n  protected _initBackgroundMarkStyle() {\n    if (this._backgroundMark) {\n      this.setMarkStyle(\n        this._backgroundMark,\n        {\n          fillOpacity: this._spec.style?.fill ? 1 : 0,\n          ...this._spec.style\n        },\n        'normal',\n        AttributeLevel.User_Mark\n      );\n      if (this._spec.clip ?? this._getClipDefaultValue()) {\n        this.setMarkStyle(\n          this._backgroundMark,\n          {\n            strokeOpacity: 0\n          },\n          'normal',\n          AttributeLevel.Built_In\n        );\n      }\n    }\n  }\n\n  protected _initForegroundMarkStyle() {\n    if (this._foregroundMark) {\n      this.setMarkStyle(\n        this._foregroundMark,\n        {\n          ...this._spec.style,\n          fillOpacity: 0\n        },\n        'normal',\n        AttributeLevel.User_Mark\n      );\n    }\n  }\n\n  updateSpec(spec: any) {\n    const originalSpec = this._originalSpec;\n    const result = super.updateSpec(spec);\n    if ((originalSpec.style && !spec?.style) || (!originalSpec.style && spec?.style)) {\n      result.reMake = true;\n      return result;\n    }\n\n    return result;\n  }\n\n  reInit(theme?: any) {\n    super.reInit(theme);\n    this._initBackgroundMarkStyle();\n    this._initForegroundMarkStyle();\n  }\n\n  addSeries(s: ISeries) {\n    if (!s) {\n      return;\n    }\n    if (!this._series.includes(s)) {\n      this._series.push(s);\n    }\n  }\n\n  removeSeries(s: ISeries) {\n    if (!s) {\n      return;\n    }\n    const index = this._series.findIndex(s_ => s_ === s);\n    if (index >= 0) {\n      this._series.splice(index, 1);\n    }\n  }\n\n  getSeries(\n    opt: {\n      name?: string;\n      userId?: StringOrNumber | StringOrNumber[];\n      specIndex?: number | number[];\n      id?: StringOrNumber;\n      type?: string;\n      coordinateType?: CoordinateType;\n      dataName?: string;\n    } = {}\n  ): ISeries[] {\n    return this._series.filter(\n      s =>\n        (opt.name ? s?.name === opt.name : true) &&\n        (opt.userId && s.userId ? array(opt.userId).includes(s.userId) : true) &&\n        (isValid(opt.specIndex) && s.getSpecIndex ? array(opt.specIndex).includes(s.getSpecIndex()) : true) &&\n        (opt.id ? s.id === opt.id : true) &&\n        (opt.type ? s.type === opt.type : true) &&\n        (opt.coordinateType ? s.coordinate === opt.coordinateType : true) &&\n        (opt.dataName ? s.getRawData?.()?.name === opt.dataName : true)\n    );\n  }\n\n  getSeriesInName(name: string): ISeries {\n    return this.getSeries({ name })[0];\n  }\n  getSeriesInUserId(userId: string): ISeries {\n    return this.getSeries({ userId })[0];\n  }\n  getSeriesInId(id: number): ISeries {\n    return this.getSeries({ id })[0];\n  }\n  getSeriesInType(type: string): ISeries[] {\n    return this.getSeries({ type });\n  }\n  getSeriesInCoordinateType(coordinateType: CoordinateType): ISeries[] {\n    return this.getSeries({ coordinateType });\n  }\n  getSeriesInDataName(dataName: string): ISeries[] {\n    return this.getSeries({ dataName });\n  }\n\n  onRender(ctx: any): void {\n    // do nothing\n  }\n\n  initSeriesDataflow() {\n    const viewDataFilters = this._series.map(s => s.getViewDataFilter()).filter(v => !!v);\n    this._option.dataSet.multipleDataViewAddListener(viewDataFilters, 'change', this.seriesDataFilterOver);\n  }\n\n  seriesDataFilterOver = () => {\n    this.event.emit(ChartEvent.regionSeriesDataFilterOver, { model: this });\n    this._series.forEach(s => s.reTransformViewData());\n  };\n\n  release() {\n    super.release();\n    this._series = [];\n  }\n  /** dimension */\n  createTrigger() {\n    const triggerOptions = {\n      ...this._option,\n      model: this,\n      interaction: this.interaction\n    };\n    this._trigger = new DimensionTrigger(triggerOptions);\n  }\n\n  initTrigger() {\n    // register all mark\n    // trigger check mark enable\n    this._series.forEach(s => {\n      s.getMarksWithoutRoot().forEach(m => {\n        this._trigger.registerMark(m);\n      });\n    });\n    this._trigger.init();\n  }\n\n  initInteraction() {\n    // 注册所有支持反选状态mark\n    this._series.forEach(s => {\n      s.getMarksWithoutRoot().forEach(m => {\n        for (const key in STATE_VALUE_ENUM_REVERSE) {\n          if (!isEmpty(m.stateStyle[STATE_VALUE_ENUM_REVERSE[key]])) {\n            this.interaction.registerMark(STATE_VALUE_ENUM_REVERSE[key], m);\n          }\n        }\n      });\n    });\n  }\n\n  compileMarks(group?: string | IVGrammarGroupMark) {\n    this.getMarks().forEach(m => {\n      m.compile({ group });\n      m.getProduct()\n        ?.configure({\n          context: {\n            model: this\n          }\n        })\n        .layout(\n          (group: IVGrammarGroupMark, children: IMark[], parentLayoutBounds: IBoundsLike, options?: ILayoutOptions) => {\n            // console.log('region mark layout');\n          }\n        );\n    });\n  }\n\n  compileSignal() {\n    super.compileSignal();\n    this.animate?.compile();\n  }\n\n  compile() {\n    this.compileSignal();\n    this.compileMarks();\n  }\n\n  bindSceneNode(node: IElement) {\n    this._sceneNodeMap.set('default', node as Element);\n  }\n}\n"]}

package/esm/scale/color-ordinal-scale.d.ts

@@ -0,0 +1,8 @@
+import { OrdinalScale } from '@visactor/vscale';
+import type { ColorSchemeItem, ProgressiveDataScheme } from '../theme/color-scheme/interface';
+export declare class ColorOrdinalScale extends OrdinalScale {
+    protected _range: Array<ColorSchemeItem> | ProgressiveDataScheme<ColorSchemeItem>;
+    range(value?: Array<ColorSchemeItem> | ProgressiveDataScheme<ColorSchemeItem>): this | any;
+    domain(value?: any[]): this | any;
+    protected _resetRange(): void;
+}

package/esm/scale/color-ordinal-scale.js

@@ -0,0 +1,18 @@
+import { OrdinalScale } from "@visactor/vscale";
+
+import { computeActualDataScheme, isProgressiveDataColorScheme } from "../theme/color-scheme/util";
+
+export class ColorOrdinalScale extends OrdinalScale {
+    range(value) {
+        return value ? (this._range = value, this._resetRange(), this) : super.range();
+    }
+    domain(value) {
+        return value ? (super.domain(value), this._resetRange(), this) : super.domain();
+    }
+    _resetRange() {
+        if (!isProgressiveDataColorScheme(this._range)) return void super.range(this._range);
+        const range = computeActualDataScheme(this._range, this._domain);
+        super.range(range);
+    }
+}
+//# sourceMappingURL=color-ordinal-scale.js.map

package/esm/scale/color-ordinal-scale.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/scale/color-ordinal-scale.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,uBAAuB,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC;AAGnG,MAAM,OAAO,iBAAkB,SAAQ,YAAY;IAIjD,KAAK,CAAC,KAAuE;QAC3E,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,KAAK,CAAC,KAAK,EAAE,CAAC;SACtB;QACD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAGD,MAAM,CAAC,KAAa;QAClB,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC;SACvB;QACD,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACpB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAGS,WAAW;QACnB,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAC9C,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzB,OAAO;SACR;QACD,MAAM,KAAK,GAAG,uBAAuB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACjE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;CACF","file":"color-ordinal-scale.js","sourcesContent":["import { OrdinalScale } from '@visactor/vscale';\nimport type { ColorSchemeItem, ProgressiveDataScheme } from '../theme/color-scheme/interface';\nimport { computeActualDataScheme, isProgressiveDataColorScheme } from '../theme/color-scheme/util';\n\n/** vchart 色板 ordinal scale 类型 */\nexport class ColorOrdinalScale extends OrdinalScale {\n  /** range（可能为渐进式色板） */\n  protected _range: Array<ColorSchemeItem> | ProgressiveDataScheme<ColorSchemeItem>;\n\n  range(value?: Array<ColorSchemeItem> | ProgressiveDataScheme<ColorSchemeItem>): this | any {\n    if (!value) {\n      return super.range();\n    }\n    this._range = value;\n    this._resetRange();\n    return this;\n  }\n\n  /** domain */\n  domain(value?: any[]): this | any {\n    if (!value) {\n      return super.domain();\n    }\n    super.domain(value);\n    this._resetRange();\n    return this;\n  }\n\n  /** 重新计算色板 */\n  protected _resetRange() {\n    if (!isProgressiveDataColorScheme(this._range)) {\n      super.range(this._range);\n      return;\n    }\n    const range = computeActualDataScheme(this._range, this._domain);\n    super.range(range);\n  }\n}\n"]}

package/esm/scale/global-scale.js

@@ -33,8 +33,9 @@ export class GlobalScale {
     _createFromSpec(s) {
         if (!s.id) return null;
         let scale = this._scaleMap.get(s.id);
-        return scale || (scale = createScale(s.type)), scale ? (isArray(s.range) && scale.range(s.range), 
-        isArray(s.domain) && (isDataDomainSpec(s.domain) || scale.domain(s.domain)), scale) : null;
+        return scale || (scale = "ordinal" === s.type && "color" === s.id ? createScale("colorOrdinal") : createScale(s.type)), 
+        scale ? (isArray(s.range) && scale.range(s.range), isArray(s.domain) && (isDataDomainSpec(s.domain) || scale.domain(s.domain)), 
+        scale) : null;
     }
     _setAttrFromSpec() {
         var _a;

package/esm/scale/global-scale.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/scale/global-scale.ts"],"names":[],"mappings":"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","file":"global-scale.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { IGlobalScale } from './interface';\nimport { isArray, isEqual, isNil } from '@visactor/vutils';\nimport type { IBaseScale } from '@visactor/vscale';\nimport { isContinuous } from '@visactor/vscale';\nimport type { IChart } from '../chart/interface';\nimport type { IChartSpec } from '../typings/spec';\nimport { createScale, isDataDomainSpec, mergeFields } from '../util';\nimport type { IVisualScale, IVisualSpecScale } from '../typings';\nimport type { StatisticOperations } from '../data/transforms/dimension-statistics';\n\nexport class GlobalScale implements IGlobalScale {\n  private _scaleSpecMap: Map<string, IVisualSpecScale<unknown, unknown>> = new Map();\n  private _scaleMap: Map<string, IBaseScale> = new Map();\n  private _modelScaleSpecMap: Map<string, IVisualSpecScale<unknown, unknown>> = new Map();\n  private _markAttributeScaleMap: Map<string, (IVisualScale & { dataStatistics: DataView; markScale: IBaseScale })[]> =\n    new Map();\n  private _spec: IChartSpec['scales'] = null;\n  private readonly _chart: IChart = null;\n  constructor(spec: IChartSpec['scales'], chart: IChart) {\n    this._spec = spec;\n    this._chart = chart;\n    this._setAttrFromSpec();\n  }\n\n  private _createFromSpec(s: IVisualSpecScale<unknown, unknown>): IBaseScale {\n    if (!s.id) {\n      return null;\n    }\n    let scale = this._scaleMap.get(s.id);\n    if (!scale) {\n      scale = createScale(s.type);\n    }\n    if (!scale) {\n      return null;\n    }\n    if (isArray(s.range)) {\n      scale.range(s.range);\n    }\n    if (isArray(s.domain)) {\n      if (!isDataDomainSpec(s.domain)) {\n        scale.domain(s.domain);\n      }\n    }\n    return scale;\n  }\n\n  private _setAttrFromSpec() {\n    if (!this._spec?.length) {\n      return;\n    }\n    const newScaleMap: Map<string, IBaseScale> = new Map();\n    const newScaleSpecMap: Map<string, IVisualSpecScale<unknown, unknown>> = new Map();\n    this._spec.forEach(s => {\n      const scale = this._createFromSpec(s);\n      if (!scale) {\n        return;\n      }\n      newScaleMap.set(s.id, scale);\n      newScaleSpecMap.set(s.id, s);\n    });\n    this._modelScaleSpecMap.forEach(s => {\n      const scale = this._createFromSpec(s);\n      if (!scale) {\n        return;\n      }\n      newScaleMap.set(s.id, scale);\n      newScaleSpecMap.set(s.id, s);\n    });\n\n    this._scaleSpecMap = newScaleSpecMap;\n    this._scaleMap = newScaleMap;\n  }\n\n  updateSpec(spec: IChartSpec['scales']) {\n    const result = {\n      change: false,\n      reMake: false,\n      reRender: false,\n      reSize: false,\n      reCompile: false\n    };\n    if (isEqual(spec, this._spec)) {\n      return result;\n    }\n    result.change = true;\n    this._spec = spec;\n    this._setAttrFromSpec();\n    return result;\n  }\n\n  registerModelScale(spec: IVisualSpecScale<unknown, unknown>) {\n    const scale = this._createFromSpec(spec);\n    if (!scale) {\n      return;\n    }\n    this._modelScaleSpecMap.set(spec.id, spec);\n    this._scaleSpecMap.set(spec.id, spec);\n    this._scaleMap.set(spec.id, scale);\n  }\n\n  removeModelScale(filter: (spec: IVisualSpecScale<unknown, unknown>) => boolean) {\n    this._modelScaleSpecMap.forEach(spec => {\n      if (filter(spec)) {\n        this._modelScaleSpecMap.delete(spec.id);\n        this._scaleSpecMap.delete(spec.id);\n        this._scaleMap.delete(spec.id);\n      }\n    });\n  }\n\n  getScale(user_id: string): IBaseScale | null {\n    return this._scaleMap.get(user_id);\n  }\n\n  getScaleSpec(user_id: string): IVisualSpecScale<unknown, unknown> | null {\n    return this._scaleSpecMap.get(user_id);\n  }\n\n  getStatisticalFields = (\n    dataId: string\n  ): {\n    key: string;\n    operations: StatisticOperations;\n  }[] => {\n    const result: {\n      key: string;\n      operations: StatisticOperations;\n    }[] = [];\n    this._scaleSpecMap.forEach((v, k) => {\n      if (!isDataDomainSpec(v.domain)) {\n        return;\n      }\n      v.domain.forEach(spec => {\n        if (spec.dataId === dataId) {\n          spec.fields.forEach(key => {\n            mergeFields(result, [\n              {\n                key,\n                operations: isContinuous(v.type) ? ['max', 'min'] : ['values']\n              }\n            ]);\n          });\n        }\n      });\n    });\n    this._markAttributeScaleMap.forEach((specList, scaleName) => {\n      const scale = this.getScale(scaleName);\n      specList.forEach(spec => {\n        if (spec.dataStatistics?.rawData[0].name === dataId && spec.field) {\n          mergeFields(result, [\n            {\n              key: spec.field,\n              operations: isContinuous(scale.type) ? ['max', 'min'] : ['values']\n            }\n          ]);\n        }\n      });\n    });\n    return result;\n  };\n\n  private _getStatistics(id: string) {\n    const series = this._chart.getAllSeries();\n    for (let i = 0; i < series.length; i++) {\n      const s = series[i];\n      if (s.getRawData().name === id) {\n        return s.getRawDataStatistics();\n      }\n    }\n    return null;\n  }\n\n  updateScaleDomain(defaultDomain: unknown[]) {\n    this._scaleSpecMap.forEach((scaleSpec, id) => {\n      const scale = this._scaleMap.get(id);\n      if (!scale) {\n        return;\n      }\n      if (!isDataDomainSpec(scaleSpec.domain)) {\n        if (!scaleSpec.domain || scaleSpec.domain.length === 0) {\n          scale.domain(defaultDomain);\n        }\n        this._updateMarkScale(id, scale, [...scale.domain()]);\n        return;\n      }\n      let domain: unknown[] | Set<string>;\n      if (isContinuous(scaleSpec.type)) {\n        domain = [null, null];\n      } else {\n        domain = new Set();\n      }\n      scaleSpec.domain.forEach(spec => {\n        const statistics = this._getStatistics(spec.dataId);\n        if (!statistics) {\n          return;\n        }\n        spec.fields.forEach(key => {\n          if (isContinuous(scaleSpec.type)) {\n            if (isNil(domain[0])) {\n              domain[0] = statistics.latestData[key].min;\n            } else {\n              domain[0] = Math.min(statistics.latestData[key].min, domain[0]);\n            }\n            if (isNil(domain[1])) {\n              domain[1] = statistics.latestData[key].max;\n            } else {\n              domain[1] = Math.max(statistics.latestData[key].max, domain[1]);\n            }\n          } else {\n            statistics.latestData[key].values.forEach((value: string) => {\n              (domain as Set<string>).add(value);\n            });\n          }\n        });\n      });\n\n      const scaleDomain = domain;\n      if (!isContinuous(scaleSpec.type)) {\n        domain = Array.from(domain);\n      }\n      scale.domain(domain as unknown[]);\n      this._updateMarkScale(id, scale, scaleDomain);\n    });\n  }\n\n  private _updateMarkScale(id: string, scale: IBaseScale, domain: any[] | Set<string>) {\n    const list = this._markAttributeScaleMap.get(id);\n    if (!list || list.length === 0) {\n      return;\n    }\n    list.forEach(info => {\n      if (!info.field || !info.markScale || info.markScale === scale) {\n        return;\n      }\n      if (\n        isNil(info.changeDomain) ||\n        info.changeDomain === 'none' ||\n        !info.dataStatistics ||\n        !info.dataStatistics.latestData[info.field]\n      ) {\n        isContinuous(scale.type) ? info.markScale.domain(domain as any[]) : scale.domain(Array.from(domain));\n        return;\n      }\n\n      if (info.changeDomain === 'expand') {\n        if (isContinuous(scale.type)) {\n          domain[0] = Math.min(domain[0], info.dataStatistics.latestData[info.field].min);\n          domain[1] = Math.max(domain[1], info.dataStatistics.latestData[info.field].max);\n        } else {\n          info.dataStatistics.latestData[info.field].values.forEach((value: string) => {\n            (domain as Set<string>).add(value);\n          });\n          domain = Array.from(domain);\n        }\n        info.markScale.domain(domain as any[]);\n        return;\n      }\n      if (info.changeDomain === 'replace') {\n        if (isContinuous(scale.type)) {\n          info.markScale.domain([\n            info.dataStatistics.latestData[info.field].min,\n            info.dataStatistics.latestData[info.field].max\n          ]);\n        } else {\n          info.markScale.domain(info.dataStatistics.latestData[info.field].values);\n        }\n        return;\n      }\n    });\n  }\n\n  registerMarkAttributeScale(spec: IVisualScale, dataStatistics: DataView): IBaseScale {\n    const scale = this._scaleMap.get(spec.scale);\n    let list = this._markAttributeScaleMap.get(spec.scale);\n    if (!list) {\n      list = [];\n      this._markAttributeScaleMap.set(spec.scale, list);\n    }\n    let markScale = scale;\n    if (isNil(spec.field) || !(isNil(spec.changeDomain) || spec.changeDomain === 'none' || isNil(dataStatistics))) {\n      markScale = scale.clone();\n    }\n    list.push({\n      ...spec,\n      dataStatistics,\n      markScale\n    });\n    return markScale;\n  }\n}\n"]}
+{"version":3,"sources":["../src/scale/global-scale.ts"],"names":[],"mappings":"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","file":"global-scale.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { IGlobalScale } from './interface';\nimport { isArray, isEqual, isNil } from '@visactor/vutils';\nimport type { IBaseScale } from '@visactor/vscale';\nimport { isContinuous } from '@visactor/vscale';\nimport type { IChart } from '../chart/interface';\nimport type { IChartSpec } from '../typings/spec';\nimport { createScale, isDataDomainSpec, mergeFields } from '../util';\nimport type { IVisualScale, IVisualSpecScale } from '../typings';\nimport type { StatisticOperations } from '../data/transforms/dimension-statistics';\n\nexport class GlobalScale implements IGlobalScale {\n  private _scaleSpecMap: Map<string, IVisualSpecScale<unknown, unknown>> = new Map();\n  private _scaleMap: Map<string, IBaseScale> = new Map();\n  private _modelScaleSpecMap: Map<string, IVisualSpecScale<unknown, unknown>> = new Map();\n  private _markAttributeScaleMap: Map<string, (IVisualScale & { dataStatistics: DataView; markScale: IBaseScale })[]> =\n    new Map();\n  private _spec: IChartSpec['scales'] = null;\n  private readonly _chart: IChart = null;\n  constructor(spec: IChartSpec['scales'], chart: IChart) {\n    this._spec = spec;\n    this._chart = chart;\n    this._setAttrFromSpec();\n  }\n\n  private _createFromSpec(s: IVisualSpecScale<unknown, unknown>): IBaseScale {\n    if (!s.id) {\n      return null;\n    }\n    let scale = this._scaleMap.get(s.id);\n    if (!scale) {\n      if (s.type === 'ordinal' && s.id === 'color') {\n        scale = createScale('colorOrdinal'); // 全局颜色色板的特殊逻辑\n      } else {\n        scale = createScale(s.type);\n      }\n    }\n    if (!scale) {\n      return null;\n    }\n    if (isArray(s.range)) {\n      scale.range(s.range);\n    }\n    if (isArray(s.domain)) {\n      if (!isDataDomainSpec(s.domain)) {\n        scale.domain(s.domain);\n      }\n    }\n    return scale;\n  }\n\n  private _setAttrFromSpec() {\n    if (!this._spec?.length) {\n      return;\n    }\n    const newScaleMap: Map<string, IBaseScale> = new Map();\n    const newScaleSpecMap: Map<string, IVisualSpecScale<unknown, unknown>> = new Map();\n    this._spec.forEach(s => {\n      const scale = this._createFromSpec(s);\n      if (!scale) {\n        return;\n      }\n      newScaleMap.set(s.id, scale);\n      newScaleSpecMap.set(s.id, s);\n    });\n    this._modelScaleSpecMap.forEach(s => {\n      const scale = this._createFromSpec(s);\n      if (!scale) {\n        return;\n      }\n      newScaleMap.set(s.id, scale);\n      newScaleSpecMap.set(s.id, s);\n    });\n\n    this._scaleSpecMap = newScaleSpecMap;\n    this._scaleMap = newScaleMap;\n  }\n\n  updateSpec(spec: IChartSpec['scales']) {\n    const result = {\n      change: false,\n      reMake: false,\n      reRender: false,\n      reSize: false,\n      reCompile: false\n    };\n    if (isEqual(spec, this._spec)) {\n      return result;\n    }\n    result.change = true;\n    this._spec = spec;\n    this._setAttrFromSpec();\n    return result;\n  }\n\n  registerModelScale(spec: IVisualSpecScale<unknown, unknown>) {\n    const scale = this._createFromSpec(spec);\n    if (!scale) {\n      return;\n    }\n    this._modelScaleSpecMap.set(spec.id, spec);\n    this._scaleSpecMap.set(spec.id, spec);\n    this._scaleMap.set(spec.id, scale);\n  }\n\n  removeModelScale(filter: (spec: IVisualSpecScale<unknown, unknown>) => boolean) {\n    this._modelScaleSpecMap.forEach(spec => {\n      if (filter(spec)) {\n        this._modelScaleSpecMap.delete(spec.id);\n        this._scaleSpecMap.delete(spec.id);\n        this._scaleMap.delete(spec.id);\n      }\n    });\n  }\n\n  getScale(user_id: string): IBaseScale | null {\n    return this._scaleMap.get(user_id);\n  }\n\n  getScaleSpec(user_id: string): IVisualSpecScale<unknown, unknown> | null {\n    return this._scaleSpecMap.get(user_id);\n  }\n\n  getStatisticalFields = (\n    dataId: string\n  ): {\n    key: string;\n    operations: StatisticOperations;\n  }[] => {\n    const result: {\n      key: string;\n      operations: StatisticOperations;\n    }[] = [];\n    this._scaleSpecMap.forEach((v, k) => {\n      if (!isDataDomainSpec(v.domain)) {\n        return;\n      }\n      v.domain.forEach(spec => {\n        if (spec.dataId === dataId) {\n          spec.fields.forEach(key => {\n            mergeFields(result, [\n              {\n                key,\n                operations: isContinuous(v.type) ? ['max', 'min'] : ['values']\n              }\n            ]);\n          });\n        }\n      });\n    });\n    this._markAttributeScaleMap.forEach((specList, scaleName) => {\n      const scale = this.getScale(scaleName);\n      specList.forEach(spec => {\n        if (spec.dataStatistics?.rawData[0].name === dataId && spec.field) {\n          mergeFields(result, [\n            {\n              key: spec.field,\n              operations: isContinuous(scale.type) ? ['max', 'min'] : ['values']\n            }\n          ]);\n        }\n      });\n    });\n    return result;\n  };\n\n  private _getStatistics(id: string) {\n    const series = this._chart.getAllSeries();\n    for (let i = 0; i < series.length; i++) {\n      const s = series[i];\n      if (s.getRawData().name === id) {\n        return s.getRawDataStatistics();\n      }\n    }\n    return null;\n  }\n\n  updateScaleDomain(defaultDomain: unknown[]) {\n    this._scaleSpecMap.forEach((scaleSpec, id) => {\n      const scale = this._scaleMap.get(id);\n      if (!scale) {\n        return;\n      }\n      if (!isDataDomainSpec(scaleSpec.domain)) {\n        if (!scaleSpec.domain || scaleSpec.domain.length === 0) {\n          scale.domain(defaultDomain);\n        }\n        this._updateMarkScale(id, scale, [...scale.domain()]);\n        return;\n      }\n      let domain: unknown[] | Set<string>;\n      if (isContinuous(scaleSpec.type)) {\n        domain = [null, null];\n      } else {\n        domain = new Set();\n      }\n      scaleSpec.domain.forEach(spec => {\n        const statistics = this._getStatistics(spec.dataId);\n        if (!statistics) {\n          return;\n        }\n        spec.fields.forEach(key => {\n          if (isContinuous(scaleSpec.type)) {\n            if (isNil(domain[0])) {\n              domain[0] = statistics.latestData[key].min;\n            } else {\n              domain[0] = Math.min(statistics.latestData[key].min, domain[0]);\n            }\n            if (isNil(domain[1])) {\n              domain[1] = statistics.latestData[key].max;\n            } else {\n              domain[1] = Math.max(statistics.latestData[key].max, domain[1]);\n            }\n          } else {\n            statistics.latestData[key].values.forEach((value: string) => {\n              (domain as Set<string>).add(value);\n            });\n          }\n        });\n      });\n\n      const scaleDomain = domain;\n      if (!isContinuous(scaleSpec.type)) {\n        domain = Array.from(domain);\n      }\n      scale.domain(domain as unknown[]);\n      this._updateMarkScale(id, scale, scaleDomain);\n    });\n  }\n\n  private _updateMarkScale(id: string, scale: IBaseScale, domain: any[] | Set<string>) {\n    const list = this._markAttributeScaleMap.get(id);\n    if (!list || list.length === 0) {\n      return;\n    }\n    list.forEach(info => {\n      if (!info.field || !info.markScale || info.markScale === scale) {\n        return;\n      }\n      if (\n        isNil(info.changeDomain) ||\n        info.changeDomain === 'none' ||\n        !info.dataStatistics ||\n        !info.dataStatistics.latestData[info.field]\n      ) {\n        isContinuous(scale.type) ? info.markScale.domain(domain as any[]) : scale.domain(Array.from(domain));\n        return;\n      }\n\n      if (info.changeDomain === 'expand') {\n        if (isContinuous(scale.type)) {\n          domain[0] = Math.min(domain[0], info.dataStatistics.latestData[info.field].min);\n          domain[1] = Math.max(domain[1], info.dataStatistics.latestData[info.field].max);\n        } else {\n          info.dataStatistics.latestData[info.field].values.forEach((value: string) => {\n            (domain as Set<string>).add(value);\n          });\n          domain = Array.from(domain);\n        }\n        info.markScale.domain(domain as any[]);\n        return;\n      }\n      if (info.changeDomain === 'replace') {\n        if (isContinuous(scale.type)) {\n          info.markScale.domain([\n            info.dataStatistics.latestData[info.field].min,\n            info.dataStatistics.latestData[info.field].max\n          ]);\n        } else {\n          info.markScale.domain(info.dataStatistics.latestData[info.field].values);\n        }\n        return;\n      }\n    });\n  }\n\n  registerMarkAttributeScale(spec: IVisualScale, dataStatistics: DataView): IBaseScale {\n    const scale = this._scaleMap.get(spec.scale);\n    let list = this._markAttributeScaleMap.get(spec.scale);\n    if (!list) {\n      list = [];\n      this._markAttributeScaleMap.set(spec.scale, list);\n    }\n    let markScale = scale;\n    if (isNil(spec.field) || !(isNil(spec.changeDomain) || spec.changeDomain === 'none' || isNil(dataStatistics))) {\n      markScale = scale.clone();\n    }\n    list.push({\n      ...spec,\n      dataStatistics,\n      markScale\n    });\n    return markScale;\n  }\n}\n"]}

package/esm/series/area/area.d.ts

@@ -2,6 +2,7 @@ import { LineLikeSeriesMixin } from '../mixin/line-mixin';
 import type { IAreaMark } from '../../mark/area';
 import { CartesianSeries } from '../cartesian/cartesian';
 import type { Maybe, IInvalidType } from '../../typings';
+import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface';
 import type { IAreaSeriesSpec, IAreaSeriesTheme } from './interface';
 export interface AreaSeries extends Pick<LineLikeSeriesMixin, 'initLineMark' | 'initSymbolMark' | 'initLabelMarkStyle' | 'initLineMarkStyle' | 'initSymbolMarkStyle' | '_lineMark' | '_symbolMark'>, CartesianSeries<IAreaSeriesSpec> {
@@ -9,6 +10,7 @@ export interface AreaSeries extends Pick<LineLikeSeriesMixin, 'initLineMark' | '
 export declare class AreaSeries extends CartesianSeries<IAreaSeriesSpec> {
     static readonly type: string;
     type: SeriesTypeEnum;
+    static readonly mark: SeriesMarkMap;
     protected _theme: Maybe<IAreaSeriesTheme>;
     protected _areaMark: IAreaMark;
     protected _stack: boolean;

package/esm/series/area/area.js

@@ -1,4 +1,4 @@
-import { LineLikeSeriesMixin } from "../mixin/line-mixin";
+import { LineLikeSeriesMixin, lineLikeSeriesMarkMap } from "../mixin/line-mixin";
 
 import { Direction } from "../../typings/space";
 
@@ -10,6 +10,8 @@ import { AttributeLevel } from "../../constant";
 
 import { valueInScaleRange, couldBeValidNumber } from "../../util";
 
+import { SeriesMarkNameEnum } from "../interface";
+
 import { SeriesTypeEnum } from "../interface";
 
 import { mixin } from "@visactor/vutils";
@@ -20,6 +22,8 @@ import { DEFAULT_MARK_ANIMATION } from "../../animation/config";
 
 import { DEFAULT_SMOOTH_INTERPOLATE } from "../../typings/interpolate";
 
+import { BaseSeries } from "../base/base-series";
+
 export class AreaSeries extends CartesianSeries {
     constructor() {
         super(...arguments), this.type = SeriesTypeEnum.area, this._stack = !0, this._invalidType = "break";
@@ -32,7 +36,7 @@ export class AreaSeries extends CartesianSeries {
             large: this._spec.large,
             largeThreshold: this._spec.largeThreshold
         }, isAreaVisible = !1 !== (null === (_a = this._spec.area) || void 0 === _a ? void 0 : _a.visible) && !1 !== (null === (_c = null === (_b = this._spec.area) || void 0 === _b ? void 0 : _b.style) || void 0 === _c ? void 0 : _c.visible);
-        this._areaMark = this._createMark(MarkTypeEnum.area, "area", {
+        this._areaMark = this._createMark(AreaSeries.mark.area, {
             groupKey: this._seriesField,
             defaultMorphElementKey: this.getDimensionField()[0],
             progressive: progressive,
@@ -73,11 +77,16 @@ export class AreaSeries extends CartesianSeries {
         const animationParams = {
             direction: this.direction
         }, appearPreset = null === (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.animationAppear) || void 0 === _b ? void 0 : _b.preset;
-        this._lineMark && this._lineMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.line(animationParams, appearPreset), userAnimationConfig(this._lineMark.name, this._spec))), 
-        this._areaMark && this._areaMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.area(animationParams, appearPreset), userAnimationConfig(this._areaMark.name, this._spec))), 
-        this._symbolMark && this._symbolMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.symbol(), userAnimationConfig(this._symbolMark.name, this._spec)));
+        this._lineMark && this._lineMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.line(animationParams, appearPreset), userAnimationConfig(SeriesMarkNameEnum.line, this._spec))), 
+        this._areaMark && this._areaMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.area(animationParams, appearPreset), userAnimationConfig(SeriesMarkNameEnum.area, this._spec))), 
+        this._symbolMark && this._symbolMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.symbol(), userAnimationConfig(SeriesMarkNameEnum.point, this._spec)));
     }
 }
 
-AreaSeries.type = SeriesTypeEnum.area, mixin(AreaSeries, LineLikeSeriesMixin);
+AreaSeries.type = SeriesTypeEnum.area, AreaSeries.mark = Object.assign(Object.assign(Object.assign({}, BaseSeries.mark), lineLikeSeriesMarkMap), {
+    [SeriesMarkNameEnum.area]: {
+        name: SeriesMarkNameEnum.area,
+        type: MarkTypeEnum.area
+    }
+}), mixin(AreaSeries, LineLikeSeriesMixin);
 //# sourceMappingURL=area.js.map

package/esm/series/area/area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/area/area.ts"],"names":[],"mappings":"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","file":"area.js","sourcesContent":["import { LineLikeSeriesMixin } from '../mixin/line-mixin';\nimport type { IAreaMark } from '../../mark/area';\nimport { Direction } from '../../typings/space';\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { AttributeLevel } from '../../constant';\nimport type { Maybe, Datum, IInvalidType } from '../../typings';\nimport { valueInScaleRange, couldBeValidNumber } from '../../util';\nimport { SeriesTypeEnum } from '../interface';\nimport { mixin } from '@visactor/vutils';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport { DEFAULT_SMOOTH_INTERPOLATE } from '../../typings/interpolate';\nimport type { IAreaSeriesSpec, IAreaSeriesTheme } from './interface';\nimport type { IMarkAnimateSpec } from '../../animation/spec';\n\nexport interface AreaSeries\n  extends Pick<\n      LineLikeSeriesMixin,\n      | 'initLineMark'\n      | 'initSymbolMark'\n      | 'initLabelMarkStyle'\n      | 'initLineMarkStyle'\n      | 'initSymbolMarkStyle'\n      | '_lineMark'\n      | '_symbolMark'\n    >,\n    CartesianSeries<IAreaSeriesSpec> {}\n\nexport class AreaSeries extends CartesianSeries<IAreaSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.area;\n  type = SeriesTypeEnum.area;\n\n  protected declare _theme: Maybe<IAreaSeriesTheme>;\n\n  protected _areaMark!: IAreaMark;\n  protected _stack: boolean = true;\n  protected _invalidType: IInvalidType = 'break';\n\n  initMark(): void {\n    const progressive = {\n      progressiveStep: this._spec.progressiveStep,\n      progressiveThreshold: this._spec.progressiveThreshold,\n      large: this._spec.large,\n      largeThreshold: this._spec.largeThreshold\n    };\n\n    const isAreaVisible = this._spec.area?.visible !== false && this._spec.area?.style?.visible !== false;\n    // area\n    this._areaMark = this._createMark(MarkTypeEnum.area, 'area', {\n      groupKey: this._seriesField,\n      defaultMorphElementKey: this.getDimensionField()[0],\n      progressive,\n      isSeriesMark: isAreaVisible\n    }) as IAreaMark;\n\n    this.initLineMark(progressive, !isAreaVisible);\n    this.initSymbolMark(progressive);\n  }\n\n  initMarkStyle(): void {\n    // FIXME 是不是应该把curveType提前到上层配置\n    // 不允许area和line的curveType不一致\n    const userCurveType = this.getSpec().area?.style?.curveType ?? this.getSpec().line?.style?.curveType;\n    const curveType =\n      userCurveType === DEFAULT_SMOOTH_INTERPOLATE\n        ? this._direction === Direction.vertical\n          ? 'monotoneX'\n          : 'monotoneY'\n        : userCurveType;\n\n    // area\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      if (this._direction === Direction.vertical) {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            y1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionY1(datum), this._yAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            z: this.dataToPositionZ.bind(this)\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      } else {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            x1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionX1(datum), this._xAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            z: this.dataToPositionZ.bind(this),\n            orient: this._direction\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          fill: this.getColorAttribute(),\n          defined: (datum: Datum) => {\n            if (this._invalidType === 'break') {\n              return couldBeValidNumber(datum[this.getStackValueField()]);\n            }\n            return true;\n          }\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      this.setMarkStyle(\n        areaMark,\n        {\n          curveType\n        },\n        'normal',\n        AttributeLevel.Built_In\n      );\n      this._trigger.registerMark(areaMark);\n      this._tooltipHelper.activeTriggerSet.dimension.add(areaMark);\n    }\n\n    this.initLineMarkStyle(this._direction, userCurveType);\n    this.initSymbolMarkStyle();\n    this.initLabelMarkStyle();\n  }\n\n  initAnimation() {\n    const animationParams = { direction: this.direction };\n    const appearPreset = (this._spec?.animationAppear as IMarkAnimateSpec<string>)?.preset;\n\n    if (this._lineMark) {\n      this._lineMark.setAnimationConfig(\n        animationConfig(\n          DEFAULT_MARK_ANIMATION.line(animationParams, appearPreset),\n          userAnimationConfig(this._lineMark.name, this._spec)\n        )\n      );\n    }\n\n    if (this._areaMark) {\n      this._areaMark.setAnimationConfig(\n        animationConfig(\n          DEFAULT_MARK_ANIMATION.area(animationParams, appearPreset),\n          userAnimationConfig(this._areaMark.name, this._spec)\n        )\n      );\n    }\n\n    if (this._symbolMark) {\n      this._symbolMark.setAnimationConfig(\n        animationConfig(DEFAULT_MARK_ANIMATION.symbol(), userAnimationConfig(this._symbolMark.name, this._spec))\n      );\n    }\n  }\n}\n\nmixin(AreaSeries, LineLikeSeriesMixin);\n"]}
+{"version":3,"sources":["../src/series/area/area.ts"],"names":[],"mappings":"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","file":"area.js","sourcesContent":["import { LineLikeSeriesMixin, lineLikeSeriesMarkMap } from '../mixin/line-mixin';\nimport type { IAreaMark } from '../../mark/area';\nimport { Direction } from '../../typings/space';\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { AttributeLevel } from '../../constant';\nimport type { Maybe, Datum, IInvalidType } from '../../typings';\nimport { valueInScaleRange, couldBeValidNumber } from '../../util';\nimport type { SeriesMarkMap } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesMarkNameEnum } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesTypeEnum } from '../interface';\nimport { mixin } from '@visactor/vutils';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport { DEFAULT_SMOOTH_INTERPOLATE } from '../../typings/interpolate';\nimport type { IAreaSeriesSpec, IAreaSeriesTheme } from './interface';\nimport type { IMarkAnimateSpec } from '../../animation/spec';\nimport { BaseSeries } from '../base/base-series';\n\nexport interface AreaSeries\n  extends Pick<\n      LineLikeSeriesMixin,\n      | 'initLineMark'\n      | 'initSymbolMark'\n      | 'initLabelMarkStyle'\n      | 'initLineMarkStyle'\n      | 'initSymbolMarkStyle'\n      | '_lineMark'\n      | '_symbolMark'\n    >,\n    CartesianSeries<IAreaSeriesSpec> {}\n\nexport class AreaSeries extends CartesianSeries<IAreaSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.area;\n  type = SeriesTypeEnum.area;\n\n  static readonly mark: SeriesMarkMap = {\n    ...BaseSeries.mark,\n    ...lineLikeSeriesMarkMap,\n    [SeriesMarkNameEnum.area]: { name: SeriesMarkNameEnum.area, type: MarkTypeEnum.area }\n  };\n\n  protected declare _theme: Maybe<IAreaSeriesTheme>;\n\n  protected _areaMark!: IAreaMark;\n  protected _stack: boolean = true;\n  protected _invalidType: IInvalidType = 'break';\n\n  initMark(): void {\n    const progressive = {\n      progressiveStep: this._spec.progressiveStep,\n      progressiveThreshold: this._spec.progressiveThreshold,\n      large: this._spec.large,\n      largeThreshold: this._spec.largeThreshold\n    };\n\n    const isAreaVisible = this._spec.area?.visible !== false && this._spec.area?.style?.visible !== false;\n    // area\n    this._areaMark = this._createMark(AreaSeries.mark.area, {\n      groupKey: this._seriesField,\n      defaultMorphElementKey: this.getDimensionField()[0],\n      progressive,\n      isSeriesMark: isAreaVisible\n    }) as IAreaMark;\n\n    this.initLineMark(progressive, !isAreaVisible);\n    this.initSymbolMark(progressive);\n  }\n\n  initMarkStyle(): void {\n    // FIXME 是不是应该把curveType提前到上层配置\n    // 不允许area和line的curveType不一致\n    const userCurveType = this.getSpec().area?.style?.curveType ?? this.getSpec().line?.style?.curveType;\n    const curveType =\n      userCurveType === DEFAULT_SMOOTH_INTERPOLATE\n        ? this._direction === Direction.vertical\n          ? 'monotoneX'\n          : 'monotoneY'\n        : userCurveType;\n\n    // area\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      if (this._direction === Direction.vertical) {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            y1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionY1(datum), this._yAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            z: this.dataToPositionZ.bind(this)\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      } else {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            x1: (datum: Datum) => {\n              return valueInScaleRange(this.dataToPositionX1(datum), this._xAxisHelper?.getScale?.(0));\n            },\n            y: this.dataToPositionY.bind(this),\n            z: this.dataToPositionZ.bind(this),\n            orient: this._direction\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          fill: this.getColorAttribute(),\n          defined: (datum: Datum) => {\n            if (this._invalidType === 'break') {\n              return couldBeValidNumber(datum[this.getStackValueField()]);\n            }\n            return true;\n          }\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      this.setMarkStyle(\n        areaMark,\n        {\n          curveType\n        },\n        'normal',\n        AttributeLevel.Built_In\n      );\n      this._trigger.registerMark(areaMark);\n      this._tooltipHelper.activeTriggerSet.dimension.add(areaMark);\n    }\n\n    this.initLineMarkStyle(this._direction, userCurveType);\n    this.initSymbolMarkStyle();\n    this.initLabelMarkStyle();\n  }\n\n  initAnimation() {\n    const animationParams = { direction: this.direction };\n    const appearPreset = (this._spec?.animationAppear as IMarkAnimateSpec<string>)?.preset;\n\n    if (this._lineMark) {\n      this._lineMark.setAnimationConfig(\n        animationConfig(\n          DEFAULT_MARK_ANIMATION.line(animationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.line, this._spec)\n        )\n      );\n    }\n\n    if (this._areaMark) {\n      this._areaMark.setAnimationConfig(\n        animationConfig(\n          DEFAULT_MARK_ANIMATION.area(animationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.area, this._spec)\n        )\n      );\n    }\n\n    if (this._symbolMark) {\n      this._symbolMark.setAnimationConfig(\n        animationConfig(DEFAULT_MARK_ANIMATION.symbol(), userAnimationConfig(SeriesMarkNameEnum.point, this._spec))\n      );\n    }\n  }\n}\n\nmixin(AreaSeries, LineLikeSeriesMixin);\n"]}

package/esm/series/area/interface.d.ts

@@ -1,17 +1,17 @@
 import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/interface';
 import type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';
 import type { ISymbolMarkSpec, ILineMarkSpec, IAreaMarkSpec } from '../../typings/visual';
-import type { SeriesTypeEnum } from '../interface';
+import type { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface';
 import type { ILineLikeSeriesTheme } from '../mixin/line-mixin';
 import type { IAnimationSpec } from '../../animation/spec';
 import type { AreaAppearPreset } from './animation';
 import type { IMarkProgressiveConfig } from '../../mark/interface';
 export interface IAreaSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<string, AreaAppearPreset>, IMarkProgressiveConfig {
     type: SeriesTypeEnum.area;
-    point?: IMarkSpec<ISymbolMarkSpec>;
-    line?: IMarkSpec<ILineMarkSpec>;
-    area?: IMarkSpec<IAreaMarkSpec>;
+    [SeriesMarkNameEnum.point]?: IMarkSpec<ISymbolMarkSpec>;
+    [SeriesMarkNameEnum.line]?: IMarkSpec<ILineMarkSpec>;
+    [SeriesMarkNameEnum.area]?: IMarkSpec<IAreaMarkSpec>;
 }
 export interface IAreaSeriesTheme extends ICartesianSeriesTheme, ILineLikeSeriesTheme {
-    area?: Partial<IMarkTheme<IAreaMarkSpec>>;
+    [SeriesMarkNameEnum.area]?: Partial<IMarkTheme<IAreaMarkSpec>>;
 }

package/esm/series/area/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/area/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/interface';\nimport type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';\nimport type { ISymbolMarkSpec, ILineMarkSpec, IAreaMarkSpec } from '../../typings/visual';\nimport type { SeriesTypeEnum } from '../interface';\nimport type { ILineLikeSeriesTheme } from '../mixin/line-mixin';\nimport type { IAnimationSpec } from '../../animation/spec';\nimport type { AreaAppearPreset } from './animation';\nimport type { IMarkProgressiveConfig } from '../../mark/interface';\n\nexport interface IAreaSeriesSpec\n  extends ICartesianSeriesSpec,\n    IAnimationSpec<string, AreaAppearPreset>,\n    IMarkProgressiveConfig {\n  /**\n   * 系列类型\n   */\n  type: SeriesTypeEnum.area;\n  /**\n   * 点图元配置\n   */\n  point?: IMarkSpec<ISymbolMarkSpec>;\n  /**\n   * 线图元配置\n   */\n  line?: IMarkSpec<ILineMarkSpec>;\n  /**\n   * 面积图元配置\n   */\n  area?: IMarkSpec<IAreaMarkSpec>;\n}\n\nexport interface IAreaSeriesTheme extends ICartesianSeriesTheme, ILineLikeSeriesTheme {\n  area?: Partial<IMarkTheme<IAreaMarkSpec>>;\n}\n"]}
+{"version":3,"sources":["../src/series/area/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/interface';\nimport type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';\nimport type { ISymbolMarkSpec, ILineMarkSpec, IAreaMarkSpec } from '../../typings/visual';\nimport type { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface';\nimport type { ILineLikeSeriesTheme } from '../mixin/line-mixin';\nimport type { IAnimationSpec } from '../../animation/spec';\nimport type { AreaAppearPreset } from './animation';\nimport type { IMarkProgressiveConfig } from '../../mark/interface';\n\nexport interface IAreaSeriesSpec\n  extends ICartesianSeriesSpec,\n    IAnimationSpec<string, AreaAppearPreset>,\n    IMarkProgressiveConfig {\n  /**\n   * 系列类型\n   */\n  type: SeriesTypeEnum.area;\n  /**\n   * 点图元配置\n   */\n  [SeriesMarkNameEnum.point]?: IMarkSpec<ISymbolMarkSpec>;\n  /**\n   * 线图元配置\n   */\n  [SeriesMarkNameEnum.line]?: IMarkSpec<ILineMarkSpec>;\n  /**\n   * 面积图元配置\n   */\n  [SeriesMarkNameEnum.area]?: IMarkSpec<IAreaMarkSpec>;\n}\n\nexport interface IAreaSeriesTheme extends ICartesianSeriesTheme, ILineLikeSeriesTheme {\n  [SeriesMarkNameEnum.area]?: Partial<IMarkTheme<IAreaMarkSpec>>;\n}\n"]}

package/esm/series/bar/bar.d.ts

@@ -6,12 +6,16 @@ import type { IAxisHelper } from '../../component/axis/cartesian/interface';
 import type { IRectMark } from '../../mark/rect';
 import type { IModelInitOption } from '../../model/interface';
 import type { ITextMark } from '../../mark/text';
+import type { SeriesMarkMap } from '../interface';
+import { SeriesMarkNameEnum } from '../interface';
 import { SeriesTypeEnum } from '../interface';
 export declare const DefaultBandWidth = 6;
 export declare class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extends CartesianSeries<T> {
     static readonly type: string;
     type: SeriesTypeEnum;
+    protected _barMarkName: SeriesMarkNameEnum;
     protected _barMarkType: MarkTypeEnum;
+    static readonly mark: SeriesMarkMap;
     protected _theme: Maybe<IBarSeriesTheme>;
     protected _stack: boolean;
     protected _bandPosition: number;
@@ -36,5 +40,7 @@ export declare class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extend
 export declare class Bar3dSeries extends BarSeries {
     static readonly type: string;
     type: SeriesTypeEnum;
+    static readonly mark: SeriesMarkMap;
+    protected _barMarkName: SeriesMarkNameEnum;
     protected _barMarkType: MarkTypeEnum;
 }

package/esm/series/bar/bar.js

@@ -12,29 +12,35 @@ import { getActualNumValue } from "../util/utils";
 
 import { merge, valueInScaleRange } from "../../util";
 
-import { animationConfig, userAnimationConfig } from "../../animation/utils";
+import { animationConfig, shouldDoMorph, userAnimationConfig } from "../../animation/utils";
+
+import { SeriesMarkNameEnum } from "../interface";
 
 import { SeriesTypeEnum } from "../interface";
 
 import { DEFAULT_MARK_ANIMATION } from "../../animation/config";
 
+import { BaseSeries } from "../base/base-series";
+
 export const DefaultBandWidth = 6;
 
 export class BarSeries extends CartesianSeries {
     constructor() {
-        super(...arguments), this.type = SeriesTypeEnum.bar, this._barMarkType = MarkTypeEnum.rect, 
-        this._stack = !0, this._bandPosition = 0;
+        super(...arguments), this.type = SeriesTypeEnum.bar, this._barMarkName = SeriesMarkNameEnum.bar, 
+        this._barMarkType = MarkTypeEnum.rect, this._stack = !0, this._bandPosition = 0;
     }
     initMark() {
-        var _a, _b;
         const progressive = {
             progressiveStep: this._spec.progressiveStep,
             progressiveThreshold: this._spec.progressiveThreshold,
             large: this._spec.large,
             largeThreshold: this._spec.largeThreshold
         };
-        this._rectMark = this._createMark(this._barMarkType, this.type, {
-            morph: null === (_b = null === (_a = this._spec.morph) || void 0 === _a ? void 0 : _a.enable) || void 0 === _b || _b,
+        this._rectMark = this._createMark(Object.assign(Object.assign({}, BarSeries.mark.bar), {
+            name: this._barMarkName,
+            type: this._barMarkType
+        }), {
+            morph: shouldDoMorph(this._spec.animation, this._spec.morph, userAnimationConfig(this.type, this._spec)),
             defaultMorphElementKey: this.getDimensionField()[0],
             groupKey: this._seriesField,
             isSeriesMark: !0,
@@ -106,7 +112,7 @@ export class BarSeries extends CartesianSeries {
                 return "horizontal" === this.direction ? null === (_a = this._xAxisHelper) || void 0 === _a ? void 0 : _a.getScale(0).scale(0) : null === (_b = this._yAxisHelper) || void 0 === _b ? void 0 : _b.getScale(0).scale(0);
             }
         }, appearPreset = null === (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.animationAppear) || void 0 === _b ? void 0 : _b.preset;
-        this._rectMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.bar(animationParams, appearPreset), userAnimationConfig(this.type, this._spec), {
+        this._rectMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.bar(animationParams, appearPreset), userAnimationConfig(this._barMarkName, this._spec), {
             dataIndex: datum => {
                 var _a, _b, _c;
                 const xValue = null == datum ? void 0 : datum[this._fieldX[0]];
@@ -134,13 +140,24 @@ export class BarSeries extends CartesianSeries {
     }
 }
 
-BarSeries.type = SeriesTypeEnum.bar;
+BarSeries.type = SeriesTypeEnum.bar, BarSeries.mark = Object.assign(Object.assign({}, BaseSeries.mark), {
+    [SeriesMarkNameEnum.bar]: {
+        name: SeriesMarkNameEnum.bar,
+        type: MarkTypeEnum.rect
+    }
+});
 
 export class Bar3dSeries extends BarSeries {
     constructor() {
-        super(...arguments), this.type = SeriesTypeEnum.bar3d, this._barMarkType = MarkTypeEnum.rect3d;
+        super(...arguments), this.type = SeriesTypeEnum.bar3d, this._barMarkName = SeriesMarkNameEnum.bar3d, 
+        this._barMarkType = MarkTypeEnum.rect3d;
     }
 }
 
-Bar3dSeries.type = SeriesTypeEnum.bar3d;
+Bar3dSeries.type = SeriesTypeEnum.bar3d, Bar3dSeries.mark = Object.assign(Object.assign({}, BaseSeries.mark), {
+    [SeriesMarkNameEnum.bar3d]: {
+        name: SeriesMarkNameEnum.bar3d,
+        type: MarkTypeEnum.rect3d
+    }
+});
 //# sourceMappingURL=bar.js.map