@visactor/vchart 0.0.1-alpha.2 → 1.0.0-alpha.0

package/esm/series/progress/circular/circular.d.ts

@@ -1,10 +1,12 @@
 import type { Maybe, Datum } from '../../../typings';
+import type { SeriesMarkMap } from '../../interface';
 import { SeriesTypeEnum } from '../../interface';
 import type { ICircularProgressSeriesSpec, ICircularProgressSeriesTheme } from './interface';
 import { ProgressLikeSeries } from '../../polar/progress-like/progress-like';
 export declare class CircularProgressSeries extends ProgressLikeSeries<ICircularProgressSeriesSpec> {
     static readonly type: string;
     type: SeriesTypeEnum;
+    static readonly mark: SeriesMarkMap;
     protected _theme: Maybe<ICircularProgressSeriesTheme>;
     private _progressMark;
     private _trackMark;

package/esm/series/progress/circular/circular.js

@@ -2,7 +2,7 @@ import { MarkTypeEnum } from "../../../mark/interface";
 
 import { isValidNumber } from "../../../util";
 
-import { SeriesTypeEnum } from "../../interface";
+import { SeriesMarkNameEnum, SeriesTypeEnum } from "../../interface";
 
 import { animationConfig, userAnimationConfig } from "../../../animation/utils";
 
@@ -10,6 +10,8 @@ import { DEFAULT_MARK_ANIMATION } from "../../../animation/config";
 
 import { ProgressLikeSeries } from "../../polar/progress-like/progress-like";
 
+import { BaseSeries } from "../../base/base-series";
+
 export class CircularProgressSeries extends ProgressLikeSeries {
     constructor() {
         super(...arguments), this.type = SeriesTypeEnum.circularProgress, this._progressMark = null, 
@@ -22,7 +24,7 @@ export class CircularProgressSeries extends ProgressLikeSeries {
         return this._radiusField;
     }
     initMark() {
-        this._trackMark = this._createMark(MarkTypeEnum.progressArc, "track"), this._progressMark = this._createMark(MarkTypeEnum.progressArc, "progress", {
+        this._trackMark = this._createMark(CircularProgressSeries.mark.track), this._progressMark = this._createMark(CircularProgressSeries.mark.progress, {
             isSeriesMark: !0
         });
     }
@@ -43,7 +45,6 @@ export class CircularProgressSeries extends ProgressLikeSeries {
             boundsMode: "imprecise",
             cornerRadius: this._spec.cornerRadius,
             fill: this.getColorAttribute(),
-            fillOpacity: 1,
             zIndex: 200,
             forceShowCap: !0
         }), this._trigger.registerMark(progressMark), null === (_b = this._tooltipHelper) || void 0 === _b || _b.activeTriggerSet.mark.add(progressMark));
@@ -63,7 +64,6 @@ export class CircularProgressSeries extends ProgressLikeSeries {
             outerRadius: this._getRadiusValueEnd.bind(this),
             cornerRadius: this._spec.cornerRadius,
             fill: this.getColorAttribute(),
-            fillOpacity: .2,
             zIndex: 100
         }), this._trigger.registerMark(trackMark));
     }
@@ -87,9 +87,19 @@ export class CircularProgressSeries extends ProgressLikeSeries {
         const appearPreset = null === (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.animationAppear) || void 0 === _b ? void 0 : _b.preset;
         this._progressMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.circularProgress({
             startAngle: this._startAngle
-        }, appearPreset), userAnimationConfig("progress", this._spec))), this._trackMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.progressBackground(), userAnimationConfig("track", this._spec)));
+        }, appearPreset), userAnimationConfig(SeriesMarkNameEnum.progress, this._spec))), 
+        this._trackMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.progressBackground(), userAnimationConfig(SeriesMarkNameEnum.track, this._spec)));
     }
 }
 
-CircularProgressSeries.type = SeriesTypeEnum.circularProgress;
+CircularProgressSeries.type = SeriesTypeEnum.circularProgress, CircularProgressSeries.mark = Object.assign(Object.assign({}, BaseSeries.mark), {
+    [SeriesMarkNameEnum.track]: {
+        name: SeriesMarkNameEnum.track,
+        type: MarkTypeEnum.progressArc
+    },
+    [SeriesMarkNameEnum.progress]: {
+        name: SeriesMarkNameEnum.progress,
+        type: MarkTypeEnum.progressArc
+    }
+});
 //# sourceMappingURL=circular.js.map

package/esm/series/progress/circular/circular.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/progress/circular/circular.ts"],"names":[],"mappings":"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","file":"circular.js","sourcesContent":["import type { BandScale } from '@visactor/vscale';\nimport type { IArcMark } from '../../../mark/arc';\nimport { MarkTypeEnum } from '../../../mark/interface';\nimport type { Maybe, Datum } from '../../../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport { isValidNumber } from '../../../util';\nimport { SeriesTypeEnum } from '../../interface';\nimport { animationConfig, userAnimationConfig } from '../../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../../animation/config';\nimport type { ICircularProgressSeriesSpec, ICircularProgressSeriesTheme } from './interface';\nimport { ProgressLikeSeries } from '../../polar/progress-like/progress-like';\nimport type { IStateAnimateSpec } from '../../../animation/spec';\nimport type { IProgressArcMark } from '../../../mark/progress-arc';\n\nexport class CircularProgressSeries extends ProgressLikeSeries<ICircularProgressSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.circularProgress;\n  type = SeriesTypeEnum.circularProgress;\n\n  protected declare _theme: Maybe<ICircularProgressSeriesTheme>;\n\n  private _progressMark: IProgressArcMark | null = null;\n  private _trackMark: IProgressArcMark | null = null;\n\n  getStackGroupFields(): string[] {\n    return this.getGroupFields();\n  }\n\n  getGroupFields() {\n    return this._radiusField;\n  }\n\n  initMark(): void {\n    this._trackMark = this._createMark(MarkTypeEnum.progressArc, 'track') as IArcMark;\n    this._progressMark = this._createMark(MarkTypeEnum.progressArc, 'progress', {\n      isSeriesMark: true\n    }) as IArcMark;\n  }\n\n  initMarkStyle(): void {\n    this.initTrackMarkStyle();\n    this.initProgressMarkStyle();\n  }\n\n  private initProgressMarkStyle() {\n    const progressMark = this._progressMark;\n    if (progressMark) {\n      this.setMarkStyle(progressMark, {\n        x: () => this.angleAxisHelper.center().x,\n        y: () => this.angleAxisHelper.center().y,\n        startAngle: this._getAngleValueStart.bind(this),\n        endAngle: this._getAngleValueEnd.bind(this),\n        innerRadius: this._getRadiusValueStart.bind(this),\n        outerRadius: this._getRadiusValueEnd.bind(this),\n        cap: this._spec.roundCap ?? false,\n        boundsMode: 'imprecise',\n        cornerRadius: this._spec.cornerRadius,\n        fill: this.getColorAttribute(),\n        fillOpacity: 1,\n        zIndex: 200,\n        // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n        // @ts-ignore\n        // forceShowCap 是内部属性，不在接口中暴露\n        forceShowCap: true\n      });\n      this._trigger.registerMark(progressMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(progressMark);\n    }\n  }\n\n  private initTrackMarkStyle() {\n    const trackMark = this._trackMark;\n    if (trackMark) {\n      this.setMarkStyle(trackMark, {\n        visible: (datum: Datum) => {\n          const scale = this.angleAxisHelper.getScale(0);\n          const range = scale.range();\n          const min = Math.min(range[0], range[range.length - 1]);\n          const startValue = this._getAngleValueStart(datum);\n          // 堆叠情况只显示第一组的背景\n          return Math.abs(startValue - min) <= 1e-14;\n        },\n        x: () => this.angleAxisHelper.center().x,\n        y: () => this.angleAxisHelper.center().y,\n        startAngle: this._startAngle,\n        endAngle: this._endAngle,\n        innerRadius: this._getRadiusValueStart.bind(this),\n        outerRadius: this._getRadiusValueEnd.bind(this),\n        cornerRadius: this._spec.cornerRadius,\n        fill: this.getColorAttribute(),\n        fillOpacity: 0.2,\n        zIndex: 100\n      });\n      this._trigger.registerMark(trackMark);\n    }\n  }\n\n  protected _getRadiusValueStart(datum: Datum) {\n    if (this.getGroupFields().length > 1) {\n      const value = this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields()));\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]);\n  }\n\n  protected _getRadiusValueEnd(datum: Datum) {\n    if (this.getGroupFields().length > 1) {\n      const value =\n        this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields())) +\n        this.radiusAxisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0);\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return (\n      this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]) +\n      (this.radiusAxisHelper.getScale(0) as BandScale).step()\n    );\n  }\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<any>)?.preset;\n\n    this._progressMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.circularProgress(\n          {\n            startAngle: this._startAngle\n          },\n          appearPreset\n        ),\n        userAnimationConfig('progress', this._spec)\n      )\n    );\n\n    this._trackMark.setAnimationConfig(\n      animationConfig(DEFAULT_MARK_ANIMATION.progressBackground(), userAnimationConfig('track', this._spec))\n    );\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/progress/circular/circular.ts"],"names":[],"mappings":"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","file":"circular.js","sourcesContent":["import type { BandScale } from '@visactor/vscale';\nimport type { IArcMark } from '../../../mark/arc';\nimport { MarkTypeEnum } from '../../../mark/interface';\nimport type { Maybe, Datum } from '../../../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport { isValidNumber } from '../../../util';\nimport type { SeriesMarkMap } from '../../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../../interface';\nimport { animationConfig, userAnimationConfig } from '../../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../../animation/config';\nimport type { ICircularProgressSeriesSpec, ICircularProgressSeriesTheme } from './interface';\nimport { ProgressLikeSeries } from '../../polar/progress-like/progress-like';\nimport type { IStateAnimateSpec } from '../../../animation/spec';\nimport type { IProgressArcMark } from '../../../mark/progress-arc';\nimport { BaseSeries } from '../../base/base-series';\n\nexport class CircularProgressSeries extends ProgressLikeSeries<ICircularProgressSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.circularProgress;\n  type = SeriesTypeEnum.circularProgress;\n\n  static readonly mark: SeriesMarkMap = {\n    ...BaseSeries.mark,\n    [SeriesMarkNameEnum.track]: { name: SeriesMarkNameEnum.track, type: MarkTypeEnum.progressArc },\n    [SeriesMarkNameEnum.progress]: { name: SeriesMarkNameEnum.progress, type: MarkTypeEnum.progressArc }\n  };\n\n  protected declare _theme: Maybe<ICircularProgressSeriesTheme>;\n\n  private _progressMark: IProgressArcMark | null = null;\n  private _trackMark: IProgressArcMark | null = null;\n\n  getStackGroupFields(): string[] {\n    return this.getGroupFields();\n  }\n\n  getGroupFields() {\n    return this._radiusField;\n  }\n\n  initMark(): void {\n    this._trackMark = this._createMark(CircularProgressSeries.mark.track) as IArcMark;\n    this._progressMark = this._createMark(CircularProgressSeries.mark.progress, {\n      isSeriesMark: true\n    }) as IArcMark;\n  }\n\n  initMarkStyle(): void {\n    this.initTrackMarkStyle();\n    this.initProgressMarkStyle();\n  }\n\n  private initProgressMarkStyle() {\n    const progressMark = this._progressMark;\n    if (progressMark) {\n      this.setMarkStyle(progressMark, {\n        x: () => this.angleAxisHelper.center().x,\n        y: () => this.angleAxisHelper.center().y,\n        startAngle: this._getAngleValueStart.bind(this),\n        endAngle: this._getAngleValueEnd.bind(this),\n        innerRadius: this._getRadiusValueStart.bind(this),\n        outerRadius: this._getRadiusValueEnd.bind(this),\n        cap: this._spec.roundCap ?? false,\n        boundsMode: 'imprecise',\n        cornerRadius: this._spec.cornerRadius,\n        fill: this.getColorAttribute(),\n        zIndex: 200,\n        // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n        // @ts-ignore\n        // forceShowCap 是内部属性，不在接口中暴露\n        forceShowCap: true\n      });\n      this._trigger.registerMark(progressMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(progressMark);\n    }\n  }\n\n  private initTrackMarkStyle() {\n    const trackMark = this._trackMark;\n    if (trackMark) {\n      this.setMarkStyle(trackMark, {\n        visible: (datum: Datum) => {\n          const scale = this.angleAxisHelper.getScale(0);\n          const range = scale.range();\n          const min = Math.min(range[0], range[range.length - 1]);\n          const startValue = this._getAngleValueStart(datum);\n          // 堆叠情况只显示第一组的背景\n          return Math.abs(startValue - min) <= 1e-14;\n        },\n        x: () => this.angleAxisHelper.center().x,\n        y: () => this.angleAxisHelper.center().y,\n        startAngle: this._startAngle,\n        endAngle: this._endAngle,\n        innerRadius: this._getRadiusValueStart.bind(this),\n        outerRadius: this._getRadiusValueEnd.bind(this),\n        cornerRadius: this._spec.cornerRadius,\n        fill: this.getColorAttribute(),\n        zIndex: 100\n      });\n      this._trigger.registerMark(trackMark);\n    }\n  }\n\n  protected _getRadiusValueStart(datum: Datum) {\n    if (this.getGroupFields().length > 1) {\n      const value = this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields()));\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]);\n  }\n\n  protected _getRadiusValueEnd(datum: Datum) {\n    if (this.getGroupFields().length > 1) {\n      const value =\n        this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields())) +\n        this.radiusAxisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0);\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return (\n      this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]) +\n      (this.radiusAxisHelper.getScale(0) as BandScale).step()\n    );\n  }\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<any>)?.preset;\n\n    this._progressMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.circularProgress(\n          {\n            startAngle: this._startAngle\n          },\n          appearPreset\n        ),\n        userAnimationConfig(SeriesMarkNameEnum.progress, this._spec)\n      )\n    );\n\n    this._trackMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.progressBackground(),\n        userAnimationConfig(SeriesMarkNameEnum.track, this._spec)\n      )\n    );\n  }\n}\n"]}

package/esm/series/progress/circular/interface.d.ts

@@ -4,16 +4,17 @@ import type { IProgressArcMarkSpec } from '../../../typings/visual';
 import type { ProgressLikeAppearPreset } from '../../polar/progress-like/animation';
 import type { IProgressSeriesSpec } from '../interface';
 import type { IProgressLikeSeriesSpec, IProgressLikeSeriesTheme } from '../../polar/progress-like/interface';
+import type { SeriesMarkNameEnum } from '../../interface';
 export type CircularProgressMarks = 'progress' | 'track';
 export interface ICircularProgressSeriesSpec extends IProgressSeriesSpec, IProgressLikeSeriesSpec, IAnimationSpec<CircularProgressMarks, ProgressLikeAppearPreset> {
     type: 'circularProgress';
     categoryField?: string | string[];
     radiusField?: string;
     maxValue?: number;
-    progress?: IMarkSpec<IProgressArcMarkSpec>;
-    track?: IMarkSpec<IProgressArcMarkSpec>;
+    [SeriesMarkNameEnum.progress]?: IMarkSpec<IProgressArcMarkSpec>;
+    [SeriesMarkNameEnum.track]?: IMarkSpec<IProgressArcMarkSpec>;
 }
 export interface ICircularProgressSeriesTheme extends IProgressLikeSeriesTheme {
-    progress?: Partial<IMarkTheme<IProgressArcMarkSpec>>;
-    track?: Partial<IMarkTheme<IProgressArcMarkSpec>>;
+    [SeriesMarkNameEnum.progress]?: Partial<IMarkTheme<IProgressArcMarkSpec>>;
+    [SeriesMarkNameEnum.track]?: Partial<IMarkTheme<IProgressArcMarkSpec>>;
 }

package/esm/series/progress/circular/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/progress/circular/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IAnimationSpec } from '../../../animation/spec';\nimport type { IMarkSpec, IMarkTheme } from '../../../typings/spec/common';\nimport type { IProgressArcMarkSpec } from '../../../typings/visual';\nimport type { ProgressLikeAppearPreset } from '../../polar/progress-like/animation';\nimport type { IProgressSeriesSpec } from '../interface';\nimport type { IProgressLikeSeriesSpec, IProgressLikeSeriesTheme } from '../../polar/progress-like/interface';\n\nexport type CircularProgressMarks = 'progress' | 'track';\n\nexport interface ICircularProgressSeriesSpec\n  extends IProgressSeriesSpec,\n    IProgressLikeSeriesSpec,\n    IAnimationSpec<CircularProgressMarks, ProgressLikeAppearPreset> {\n  type: 'circularProgress';\n\n  /** 分类字段 */\n  categoryField?: string | string[];\n\n  radiusField?: string;\n\n  /** 数据最大值，默认为 1 */\n  maxValue?: number;\n\n  /** 进度条样式 */\n  progress?: IMarkSpec<IProgressArcMarkSpec>;\n\n  /** 背景样式 */\n  track?: IMarkSpec<IProgressArcMarkSpec>;\n}\n\nexport interface ICircularProgressSeriesTheme extends IProgressLikeSeriesTheme {\n  progress?: Partial<IMarkTheme<IProgressArcMarkSpec>>;\n  track?: Partial<IMarkTheme<IProgressArcMarkSpec>>;\n}\n"]}
+{"version":3,"sources":["../src/series/progress/circular/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IAnimationSpec } from '../../../animation/spec';\nimport type { IMarkSpec, IMarkTheme } from '../../../typings/spec/common';\nimport type { IProgressArcMarkSpec } from '../../../typings/visual';\nimport type { ProgressLikeAppearPreset } from '../../polar/progress-like/animation';\nimport type { IProgressSeriesSpec } from '../interface';\nimport type { IProgressLikeSeriesSpec, IProgressLikeSeriesTheme } from '../../polar/progress-like/interface';\nimport type { SeriesMarkNameEnum } from '../../interface';\n\nexport type CircularProgressMarks = 'progress' | 'track';\n\nexport interface ICircularProgressSeriesSpec\n  extends IProgressSeriesSpec,\n    IProgressLikeSeriesSpec,\n    IAnimationSpec<CircularProgressMarks, ProgressLikeAppearPreset> {\n  type: 'circularProgress';\n\n  /** 分类字段 */\n  categoryField?: string | string[];\n\n  radiusField?: string;\n\n  /** 数据最大值，默认为 1 */\n  maxValue?: number;\n\n  /** 进度条样式 */\n  [SeriesMarkNameEnum.progress]?: IMarkSpec<IProgressArcMarkSpec>;\n\n  /** 背景样式 */\n  [SeriesMarkNameEnum.track]?: IMarkSpec<IProgressArcMarkSpec>;\n}\n\nexport interface ICircularProgressSeriesTheme extends IProgressLikeSeriesTheme {\n  [SeriesMarkNameEnum.progress]?: Partial<IMarkTheme<IProgressArcMarkSpec>>;\n  [SeriesMarkNameEnum.track]?: Partial<IMarkTheme<IProgressArcMarkSpec>>;\n}\n"]}

package/esm/series/progress/linear/interface.d.ts

@@ -1,7 +1,8 @@
 import type { IAnimationSpec } from '../../../animation/spec';
 import type { DirectionType } from '../../../typings';
 import type { IMarkSpec, IMarkTheme } from '../../../typings/spec/common';
-import type { IGroupMarkSpec, IRectMarkSpec } from '../../../typings/visual';
+import type { IRectMarkSpec } from '../../../typings/visual';
+import type { SeriesMarkNameEnum } from '../../interface';
 import type { IProgressSeriesSpec } from '../interface';
 import type { LinearProgressAppearPreset } from './animation';
 export interface ILinearProgressSeriesSpec extends IProgressSeriesSpec, IAnimationSpec<string, LinearProgressAppearPreset> {
@@ -10,16 +11,16 @@ export interface ILinearProgressSeriesSpec extends IProgressSeriesSpec, IAnimati
     yField: string | string[];
     direction?: DirectionType;
     bandWidth?: number;
-    progress?: IMarkSpec<IRectMarkSpec> & {
+    [SeriesMarkNameEnum.progress]?: IMarkSpec<IRectMarkSpec> & {
         topPadding?: number;
         bottomPadding?: number;
         leftPadding?: number;
         rightPadding?: number;
     };
-    track?: IMarkSpec<IGroupMarkSpec>;
+    [SeriesMarkNameEnum.track]?: IMarkSpec<IRectMarkSpec>;
 }
 export interface ILinearProgressSeriesTheme {
     bandWidth?: number;
-    progress?: Partial<IMarkTheme<IRectMarkSpec>>;
-    track?: Partial<IMarkTheme<IGroupMarkSpec>>;
+    [SeriesMarkNameEnum.progress]?: Partial<IMarkTheme<IRectMarkSpec>>;
+    [SeriesMarkNameEnum.track]?: Partial<IMarkTheme<IRectMarkSpec>>;
 }

package/esm/series/progress/linear/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/progress/linear/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IAnimationSpec } from '../../../animation/spec';\nimport type { DirectionType } from '../../../typings';\nimport type { IMarkSpec, IMarkTheme } from '../../../typings/spec/common';\nimport type { IGroupMarkSpec, IRectMarkSpec } from '../../../typings/visual';\nimport type { IProgressSeriesSpec } from '../interface';\nimport type { LinearProgressAppearPreset } from './animation';\n\nexport interface ILinearProgressSeriesSpec\n  extends IProgressSeriesSpec,\n    // TODO: 补充MarkName类型 @liupei\n    IAnimationSpec<string, LinearProgressAppearPreset> {\n  type: 'linearProgress';\n  /**\n   * coordinate: 'cartesian'\n   * x轴字段\n   */\n  xField: string | string[];\n  /**\n   * y轴字段\n   * 因为存在 direction，运行双轴都为离散，连续。所以 yField 也可以像 xField 一样支持多维度\n   */\n  yField: string | string[];\n\n  /**\n   * 方向\n   * @default Direction.horizontal\n   */\n  direction?: DirectionType;\n\n  /**\n   * 进度条宽度\n   * 以像素值(px)为单位\n   */\n  bandWidth?: number;\n\n  /**\n   * 进度条样式\n   * TODO: 支持百分比作为padding, 类型为string\n   */\n  progress?: IMarkSpec<IRectMarkSpec> & {\n    /** 进度条上侧 padding（水平生效） */\n    topPadding?: number;\n    /** 进度条下侧 padding（水平生效） */\n    bottomPadding?: number;\n    /** 进度条左侧 padding（垂直生效） */\n    leftPadding?: number;\n    /** 进度条右侧 padding（垂直生效） */\n    rightPadding?: number;\n  };\n\n  /** 背景条样式 */\n  track?: IMarkSpec<IGroupMarkSpec>;\n}\n\nexport interface ILinearProgressSeriesTheme {\n  bandWidth?: number;\n  progress?: Partial<IMarkTheme<IRectMarkSpec>>;\n  track?: Partial<IMarkTheme<IGroupMarkSpec>>;\n}\n"]}
+{"version":3,"sources":["../src/series/progress/linear/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IAnimationSpec } from '../../../animation/spec';\nimport type { DirectionType } from '../../../typings';\nimport type { IMarkSpec, IMarkTheme } from '../../../typings/spec/common';\nimport type { IRectMarkSpec } from '../../../typings/visual';\nimport type { SeriesMarkNameEnum } from '../../interface';\nimport type { IProgressSeriesSpec } from '../interface';\nimport type { LinearProgressAppearPreset } from './animation';\n\nexport interface ILinearProgressSeriesSpec\n  extends IProgressSeriesSpec,\n    // TODO: 补充MarkName类型 @liupei\n    IAnimationSpec<string, LinearProgressAppearPreset> {\n  type: 'linearProgress';\n  /**\n   * coordinate: 'cartesian'\n   * x轴字段\n   */\n  xField: string | string[];\n  /**\n   * y轴字段\n   * 因为存在 direction，运行双轴都为离散，连续。所以 yField 也可以像 xField 一样支持多维度\n   */\n  yField: string | string[];\n\n  /**\n   * 方向\n   * @default Direction.horizontal\n   */\n  direction?: DirectionType;\n\n  /**\n   * 进度条宽度\n   * 以像素值(px)为单位\n   */\n  bandWidth?: number;\n\n  /**\n   * 进度条样式\n   * TODO: 支持百分比作为padding, 类型为string\n   */\n  [SeriesMarkNameEnum.progress]?: IMarkSpec<IRectMarkSpec> & {\n    /** 进度条上侧 padding（水平生效） */\n    topPadding?: number;\n    /** 进度条下侧 padding（水平生效） */\n    bottomPadding?: number;\n    /** 进度条左侧 padding（垂直生效） */\n    leftPadding?: number;\n    /** 进度条右侧 padding（垂直生效） */\n    rightPadding?: number;\n  };\n\n  /** 背景条样式 */\n  [SeriesMarkNameEnum.track]?: IMarkSpec<IRectMarkSpec>;\n}\n\nexport interface ILinearProgressSeriesTheme {\n  bandWidth?: number;\n  [SeriesMarkNameEnum.progress]?: Partial<IMarkTheme<IRectMarkSpec>>;\n  [SeriesMarkNameEnum.track]?: Partial<IMarkTheme<IRectMarkSpec>>;\n}\n"]}

package/esm/series/progress/linear/linear.d.ts

@@ -1,10 +1,12 @@
 import { CartesianSeries } from '../../cartesian/cartesian';
+import type { SeriesMarkMap } from '../../interface';
 import { SeriesTypeEnum } from '../../interface';
 import type { Maybe } from '../../../typings';
 import type { ILinearProgressSeriesSpec, ILinearProgressSeriesTheme } from './interface';
 export declare class LinearProgressSeries extends CartesianSeries<ILinearProgressSeriesSpec> {
     static readonly type: string;
     type: SeriesTypeEnum;
+    static readonly mark: SeriesMarkMap;
     protected _theme: Maybe<ILinearProgressSeriesTheme>;
     private _progressMark;
     private _trackMark;

package/esm/series/progress/linear/linear.js

@@ -1,6 +1,6 @@
 import { CartesianSeries } from "../../cartesian/cartesian";
 
-import { SeriesTypeEnum } from "../../interface";
+import { SeriesMarkNameEnum, SeriesTypeEnum } from "../../interface";
 
 import { MarkTypeEnum } from "../../../mark/interface";
 
@@ -14,6 +14,8 @@ import { DEFAULT_MARK_ANIMATION } from "../../../animation/config";
 
 import { LinearProgressSeriesTooltipHelper } from "./tooltip-helper";
 
+import { BaseSeries } from "../../base/base-series";
+
 export class LinearProgressSeries extends CartesianSeries {
     constructor() {
         super(...arguments), this.type = SeriesTypeEnum.linearProgress, this._progressMark = null, 
@@ -26,13 +28,13 @@ export class LinearProgressSeries extends CartesianSeries {
         this.initProgressGroupMarkStyle(), this.initTrackMarkStyle(), this.initProgressMarkStyle();
     }
     initProgressMark() {
-        return this._progressMark = this._createMark(MarkTypeEnum.rect, "progress", {
+        return this._progressMark = this._createMark(LinearProgressSeries.mark.progress, {
             isSeriesMark: !0,
             parent: this._progressGroupMark
         }), this._progressMark;
     }
     initProgressMarkStyle() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const progressMark = this._progressMark;
         if (progressMark) {
             if ("vertical" === this._spec.direction) {
@@ -51,11 +53,10 @@ export class LinearProgressSeries extends CartesianSeries {
                     },
                     width: this._spec.bandWidth - leftPadding - rightPadding,
                     cornerRadius: this._spec.cornerRadius,
-                    fill: this.getColorAttribute(),
-                    fillOpacity: null !== (_g = null === (_f = null === (_e = this._spec.progress) || void 0 === _e ? void 0 : _e.style) || void 0 === _f ? void 0 : _f.fillOpacity) && void 0 !== _g ? _g : 1
+                    fill: this.getColorAttribute()
                 });
             } else {
-                const topPadding = null !== (_j = null === (_h = this._spec.progress) || void 0 === _h ? void 0 : _h.topPadding) && void 0 !== _j ? _j : 0, bottomPadding = null !== (_l = null === (_k = this._spec.progress) || void 0 === _k ? void 0 : _k.bottomPadding) && void 0 !== _l ? _l : 0;
+                const topPadding = null !== (_f = null === (_e = this._spec.progress) || void 0 === _e ? void 0 : _e.topPadding) && void 0 !== _f ? _f : 0, bottomPadding = null !== (_h = null === (_g = this._spec.progress) || void 0 === _g ? void 0 : _g.bottomPadding) && void 0 !== _h ? _h : 0;
                 this.setMarkStyle(progressMark, {
                     x: datum => {
                         var _a, _b;
@@ -72,20 +73,19 @@ export class LinearProgressSeries extends CartesianSeries {
                         });
                     },
                     cornerRadius: this._spec.cornerRadius,
-                    fill: this.getColorAttribute(),
-                    fillOpacity: null !== (_p = null === (_o = null === (_m = this._spec.progress) || void 0 === _m ? void 0 : _m.style) || void 0 === _o ? void 0 : _o.fillOpacity) && void 0 !== _p ? _p : 1
+                    fill: this.getColorAttribute()
                 });
             }
-            this._trigger.registerMark(progressMark), null === (_q = this._tooltipHelper) || void 0 === _q || _q.activeTriggerSet.mark.add(progressMark);
+            this._trigger.registerMark(progressMark), null === (_j = this._tooltipHelper) || void 0 === _j || _j.activeTriggerSet.mark.add(progressMark);
         }
     }
     initTrackMark() {
-        return this._trackMark = this._createMark(MarkTypeEnum.rect, "track", {
+        return this._trackMark = this._createMark(LinearProgressSeries.mark.track, {
             parent: this._progressGroupMark
         }), this._trackMark;
     }
     initTrackMarkStyle() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e;
         const trackMark = this._trackMark;
         trackMark && ("vertical" === this._spec.direction ? this.setMarkStyle(trackMark, {
             x: 0,
@@ -93,20 +93,18 @@ export class LinearProgressSeries extends CartesianSeries {
             width: this._spec.bandWidth,
             height: () => this._scaleY.range()[0],
             cornerRadius: this._spec.cornerRadius,
-            fill: null === (_b = null === (_a = this._spec.track) || void 0 === _a ? void 0 : _a.style) || void 0 === _b ? void 0 : _b.fill,
-            fillOpacity: null !== (_e = null === (_d = null === (_c = this._spec.progress) || void 0 === _c ? void 0 : _c.style) || void 0 === _d ? void 0 : _d.fillOpacity) && void 0 !== _e ? _e : 1
+            fill: null === (_b = null === (_a = this._spec.track) || void 0 === _a ? void 0 : _a.style) || void 0 === _b ? void 0 : _b.fill
         }) : this.setMarkStyle(trackMark, {
             x: 0,
             y: 0,
             height: this._spec.bandWidth,
             width: () => this._scaleX.range()[1],
             cornerRadius: this._spec.cornerRadius,
-            fill: null === (_g = null === (_f = this._spec.track) || void 0 === _f ? void 0 : _f.style) || void 0 === _g ? void 0 : _g.fill,
-            fillOpacity: null === (_j = null === (_h = this._spec.track) || void 0 === _h ? void 0 : _h.style) || void 0 === _j ? void 0 : _j.fillOpacity
-        }), this._trigger.registerMark(trackMark), null === (_k = this._tooltipHelper) || void 0 === _k || _k.activeTriggerSet.mark.add(trackMark));
+            fill: null === (_d = null === (_c = this._spec.track) || void 0 === _c ? void 0 : _c.style) || void 0 === _d ? void 0 : _d.fill
+        }), this._trigger.registerMark(trackMark), null === (_e = this._tooltipHelper) || void 0 === _e || _e.activeTriggerSet.mark.add(trackMark));
     }
     initProgressGroupMark() {
-        return this._progressGroupMark = this._createMark(MarkTypeEnum.group, "group"), 
+        return this._progressGroupMark = this._createMark(LinearProgressSeries.mark.group), 
         this._progressGroupMark;
     }
     initProgressGroupMarkStyle() {
@@ -142,13 +140,26 @@ export class LinearProgressSeries 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._progressMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.linearProgress(animationParams, appearPreset), userAnimationConfig("progress", this._spec))), 
-        this._trackMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.progressBackground(), userAnimationConfig("track", this._spec)));
+        this._progressMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.linearProgress(animationParams, appearPreset), userAnimationConfig(SeriesMarkNameEnum.progress, this._spec))), 
+        this._trackMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.progressBackground(), userAnimationConfig(SeriesMarkNameEnum.track, this._spec)));
     }
     initTooltip() {
         this._tooltipHelper = new LinearProgressSeriesTooltipHelper(this);
     }
 }
 
-LinearProgressSeries.type = SeriesTypeEnum.linearProgress;
+LinearProgressSeries.type = SeriesTypeEnum.linearProgress, LinearProgressSeries.mark = Object.assign(Object.assign({}, BaseSeries.mark), {
+    [SeriesMarkNameEnum.track]: {
+        name: SeriesMarkNameEnum.track,
+        type: MarkTypeEnum.rect
+    },
+    [SeriesMarkNameEnum.progress]: {
+        name: SeriesMarkNameEnum.progress,
+        type: MarkTypeEnum.rect
+    },
+    [SeriesMarkNameEnum.group]: {
+        name: SeriesMarkNameEnum.group,
+        type: MarkTypeEnum.group
+    }
+});
 //# sourceMappingURL=linear.js.map

package/esm/series/progress/linear/linear.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/progress/linear/linear.ts"],"names":[],"mappings":"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","file":"linear.js","sourcesContent":["import { CartesianSeries } from '../../cartesian/cartesian';\nimport { SeriesTypeEnum } from '../../interface';\nimport type { IRectMark } from '../../../mark/rect';\nimport type { IGroupMark } from '../../../mark/group';\nimport { MarkTypeEnum } from '../../../mark/interface';\nimport { valueInScaleRange } from '../../../util';\nimport { AttributeLevel } from '../../../constant';\nimport type { Datum, Maybe } from '../../../typings';\nimport { animationConfig, userAnimationConfig } from '../../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../../animation/config';\nimport type { ILinearProgressAnimationParams, LinearProgressAppearPreset } from './animation';\nimport type { ILinearProgressSeriesSpec, ILinearProgressSeriesTheme } from './interface';\nimport { LinearProgressSeriesTooltipHelper } from './tooltip-helper';\nimport type { IStateAnimateSpec } from '../../../animation/spec';\n\nexport class LinearProgressSeries extends CartesianSeries<ILinearProgressSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.linearProgress;\n  type = SeriesTypeEnum.linearProgress;\n\n  protected declare _theme: Maybe<ILinearProgressSeriesTheme>;\n\n  private _progressMark: IRectMark | null = null;\n  private _trackMark: IRectMark | null = null;\n  private _progressGroupMark: IGroupMark | null = null;\n\n  /**\n   * 为了解决在圆角情况下，在数值较小时，rect绘图效果不好的问题\n   * 1. trackMark的所有样式设置在groupMark上，定位也依靠这个groupMark\n   * 2. progressMark长度固定为整个进度条长度，通过x的偏移体现当前进度\n   *\n   * 为了解决在配置tooltip时，trackMark设置为GroupMark无法绑定数据的问题，\n   * 1. 原本的设置为groupMark的trackMark更名为GroupMark。用来保证在clip效果下progressMark小数据值的绘图效果。\n   * 1. 增加一层设置为rectMark的trackMark，形状大小与GroupMark相同\n   */\n  initMark(): void {\n    this.initProgressGroupMark();\n    this.initTrackMark();\n    this.initProgressMark();\n  }\n\n  initMarkStyle(): void {\n    this.initProgressGroupMarkStyle();\n    this.initTrackMarkStyle();\n    this.initProgressMarkStyle();\n  }\n\n  private initProgressMark() {\n    this._progressMark = this._createMark(MarkTypeEnum.rect, 'progress', {\n      isSeriesMark: true,\n      parent: this._progressGroupMark\n    }) as IRectMark;\n    return this._progressMark;\n  }\n\n  private initProgressMarkStyle() {\n    const progressMark = this._progressMark;\n    if (progressMark) {\n      if (this._spec.direction === 'vertical') {\n        const leftPadding = this._spec.progress?.leftPadding ?? 0;\n        const rightPadding = this._spec.progress?.rightPadding ?? 0;\n\n        this.setMarkStyle(progressMark, {\n          x: leftPadding,\n          y: (datum: Datum) => valueInScaleRange(this.dataToPositionY(datum), this._yAxisHelper?.getScale?.(0)),\n          height: () => this._yAxisHelper?.dataToPosition([0], { bandPosition: this._bandPosition }),\n          width: this._spec.bandWidth - leftPadding - rightPadding,\n          cornerRadius: this._spec.cornerRadius,\n          fill: this.getColorAttribute(),\n          fillOpacity: this._spec.progress?.style?.fillOpacity ?? 1\n        });\n      } else {\n        const topPadding = this._spec.progress?.topPadding ?? 0;\n        const bottomPadding = this._spec.progress?.bottomPadding ?? 0;\n\n        this.setMarkStyle(progressMark, {\n          x: (datum: Datum) =>\n            valueInScaleRange(this.dataToPositionX(datum), this._xAxisHelper?.getScale?.(0)) -\n            this._xAxisHelper.dataToPosition([1], { bandPosition: this._bandPosition }),\n          y: topPadding,\n          height: this._spec.bandWidth - topPadding - bottomPadding,\n          width: () => this._xAxisHelper?.dataToPosition([1], { bandPosition: this._bandPosition }),\n          cornerRadius: this._spec.cornerRadius,\n          fill: this.getColorAttribute(),\n          fillOpacity: this._spec.progress?.style?.fillOpacity ?? 1\n        });\n      }\n      this._trigger.registerMark(progressMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(progressMark);\n    }\n  }\n\n  private initTrackMark() {\n    this._trackMark = this._createMark(MarkTypeEnum.rect, 'track', {\n      parent: this._progressGroupMark\n    }) as IRectMark;\n    return this._trackMark;\n  }\n\n  private initTrackMarkStyle() {\n    const trackMark = this._trackMark;\n    if (trackMark) {\n      if (this._spec.direction === 'vertical') {\n        this.setMarkStyle(trackMark, {\n          x: 0,\n          y: 0,\n          width: this._spec.bandWidth,\n          height: () => this._scaleY.range()[0],\n          cornerRadius: this._spec.cornerRadius,\n          fill: this._spec.track?.style?.fill,\n          fillOpacity: this._spec.progress?.style?.fillOpacity ?? 1\n        });\n      } else {\n        this.setMarkStyle(trackMark, {\n          x: 0,\n          y: 0,\n          height: this._spec.bandWidth,\n          width: () => this._scaleX.range()[1],\n          cornerRadius: this._spec.cornerRadius,\n          fill: this._spec.track?.style?.fill,\n          fillOpacity: this._spec.track?.style?.fillOpacity\n        });\n      }\n      this._trigger.registerMark(trackMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(trackMark);\n    }\n  }\n\n  private initProgressGroupMark() {\n    this._progressGroupMark = this._createMark(MarkTypeEnum.group, 'group') as IGroupMark;\n    return this._progressGroupMark;\n  }\n\n  private initProgressGroupMarkStyle() {\n    const groupMark = this._progressGroupMark;\n    if (groupMark) {\n      const datum = this._rawData?.rawData[0];\n      groupMark.setZIndex(this.layoutZIndex);\n      groupMark.created();\n      if (this._spec.direction === 'vertical') {\n        this.setMarkStyle(\n          groupMark,\n          {\n            x: () =>\n              valueInScaleRange(this.dataToPositionX(datum), this._xAxisHelper?.getScale?.(0)) -\n              this._spec.bandWidth / 2,\n            y: 0,\n            height: () => this._scaleY.range()[0],\n            width: this._spec.bandWidth,\n            clip: true,\n            cornerRadius: this._spec.cornerRadius\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      } else {\n        this.setMarkStyle(\n          groupMark,\n          {\n            x: 0,\n            y: () =>\n              valueInScaleRange(this.dataToPositionY(datum), this._yAxisHelper?.getScale?.(0)) -\n              this._spec.bandWidth / 2,\n            height: this._spec.bandWidth,\n            width: () => this._scaleX.range()[1],\n            clip: true,\n            cornerRadius: this._spec.cornerRadius\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n\n      this._progressGroupMark.setInteractive(false);\n    }\n  }\n\n  initAnimation() {\n    const animationParams: ILinearProgressAnimationParams = {\n      direction: this.direction\n    };\n\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<LinearProgressAppearPreset>)?.preset;\n\n    this._progressMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.linearProgress(animationParams, appearPreset),\n        userAnimationConfig('progress', this._spec)\n      )\n    );\n\n    this._trackMark.setAnimationConfig(\n      animationConfig(DEFAULT_MARK_ANIMATION.progressBackground(), userAnimationConfig('track', this._spec))\n    );\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new LinearProgressSeriesTooltipHelper(this);\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/progress/linear/linear.ts"],"names":[],"mappings":"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","file":"linear.js","sourcesContent":["import { CartesianSeries } from '../../cartesian/cartesian';\nimport type { SeriesMarkMap } from '../../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../../interface';\nimport type { IRectMark } from '../../../mark/rect';\nimport type { IGroupMark } from '../../../mark/group';\nimport { MarkTypeEnum } from '../../../mark/interface';\nimport { valueInScaleRange } from '../../../util';\nimport { AttributeLevel } from '../../../constant';\nimport type { Datum, Maybe } from '../../../typings';\nimport { animationConfig, userAnimationConfig } from '../../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../../animation/config';\nimport type { ILinearProgressAnimationParams, LinearProgressAppearPreset } from './animation';\nimport type { ILinearProgressSeriesSpec, ILinearProgressSeriesTheme } from './interface';\nimport { LinearProgressSeriesTooltipHelper } from './tooltip-helper';\nimport type { IStateAnimateSpec } from '../../../animation/spec';\nimport { BaseSeries } from '../../base/base-series';\n\nexport class LinearProgressSeries extends CartesianSeries<ILinearProgressSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.linearProgress;\n  type = SeriesTypeEnum.linearProgress;\n\n  static readonly mark: SeriesMarkMap = {\n    ...BaseSeries.mark,\n    [SeriesMarkNameEnum.track]: { name: SeriesMarkNameEnum.track, type: MarkTypeEnum.rect },\n    [SeriesMarkNameEnum.progress]: { name: SeriesMarkNameEnum.progress, type: MarkTypeEnum.rect },\n    [SeriesMarkNameEnum.group]: { name: SeriesMarkNameEnum.group, type: MarkTypeEnum.group }\n  };\n\n  protected declare _theme: Maybe<ILinearProgressSeriesTheme>;\n\n  private _progressMark: IRectMark | null = null;\n  private _trackMark: IRectMark | null = null;\n  private _progressGroupMark: IGroupMark | null = null;\n\n  /**\n   * 为了解决在圆角情况下，在数值较小时，rect绘图效果不好的问题\n   * 1. trackMark的所有样式设置在groupMark上，定位也依靠这个groupMark\n   * 2. progressMark长度固定为整个进度条长度，通过x的偏移体现当前进度\n   *\n   * 为了解决在配置tooltip时，trackMark设置为GroupMark无法绑定数据的问题，\n   * 1. 原本的设置为groupMark的trackMark更名为GroupMark。用来保证在clip效果下progressMark小数据值的绘图效果。\n   * 1. 增加一层设置为rectMark的trackMark，形状大小与GroupMark相同\n   */\n  initMark(): void {\n    this.initProgressGroupMark();\n    this.initTrackMark();\n    this.initProgressMark();\n  }\n\n  initMarkStyle(): void {\n    this.initProgressGroupMarkStyle();\n    this.initTrackMarkStyle();\n    this.initProgressMarkStyle();\n  }\n\n  private initProgressMark() {\n    this._progressMark = this._createMark(LinearProgressSeries.mark.progress, {\n      isSeriesMark: true,\n      parent: this._progressGroupMark\n    }) as IRectMark;\n    return this._progressMark;\n  }\n\n  private initProgressMarkStyle() {\n    const progressMark = this._progressMark;\n    if (progressMark) {\n      if (this._spec.direction === 'vertical') {\n        const leftPadding = this._spec.progress?.leftPadding ?? 0;\n        const rightPadding = this._spec.progress?.rightPadding ?? 0;\n\n        this.setMarkStyle(progressMark, {\n          x: leftPadding,\n          y: (datum: Datum) => valueInScaleRange(this.dataToPositionY(datum), this._yAxisHelper?.getScale?.(0)),\n          height: () => this._yAxisHelper?.dataToPosition([0], { bandPosition: this._bandPosition }),\n          width: this._spec.bandWidth - leftPadding - rightPadding,\n          cornerRadius: this._spec.cornerRadius,\n          fill: this.getColorAttribute()\n        });\n      } else {\n        const topPadding = this._spec.progress?.topPadding ?? 0;\n        const bottomPadding = this._spec.progress?.bottomPadding ?? 0;\n\n        this.setMarkStyle(progressMark, {\n          x: (datum: Datum) =>\n            valueInScaleRange(this.dataToPositionX(datum), this._xAxisHelper?.getScale?.(0)) -\n            this._xAxisHelper.dataToPosition([1], { bandPosition: this._bandPosition }),\n          y: topPadding,\n          height: this._spec.bandWidth - topPadding - bottomPadding,\n          width: () => this._xAxisHelper?.dataToPosition([1], { bandPosition: this._bandPosition }),\n          cornerRadius: this._spec.cornerRadius,\n          fill: this.getColorAttribute()\n        });\n      }\n      this._trigger.registerMark(progressMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(progressMark);\n    }\n  }\n\n  private initTrackMark() {\n    this._trackMark = this._createMark(LinearProgressSeries.mark.track, {\n      parent: this._progressGroupMark\n    }) as IRectMark;\n    return this._trackMark;\n  }\n\n  private initTrackMarkStyle() {\n    const trackMark = this._trackMark;\n    if (trackMark) {\n      if (this._spec.direction === 'vertical') {\n        this.setMarkStyle(trackMark, {\n          x: 0,\n          y: 0,\n          width: this._spec.bandWidth,\n          height: () => this._scaleY.range()[0],\n          cornerRadius: this._spec.cornerRadius,\n          fill: this._spec.track?.style?.fill\n        });\n      } else {\n        this.setMarkStyle(trackMark, {\n          x: 0,\n          y: 0,\n          height: this._spec.bandWidth,\n          width: () => this._scaleX.range()[1],\n          cornerRadius: this._spec.cornerRadius,\n          fill: this._spec.track?.style?.fill\n        });\n      }\n      this._trigger.registerMark(trackMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(trackMark);\n    }\n  }\n\n  private initProgressGroupMark() {\n    this._progressGroupMark = this._createMark(LinearProgressSeries.mark.group) as IGroupMark;\n    return this._progressGroupMark;\n  }\n\n  private initProgressGroupMarkStyle() {\n    const groupMark = this._progressGroupMark;\n    if (groupMark) {\n      const datum = this._rawData?.rawData[0];\n      groupMark.setZIndex(this.layoutZIndex);\n      groupMark.created();\n      if (this._spec.direction === 'vertical') {\n        this.setMarkStyle(\n          groupMark,\n          {\n            x: () =>\n              valueInScaleRange(this.dataToPositionX(datum), this._xAxisHelper?.getScale?.(0)) -\n              this._spec.bandWidth / 2,\n            y: 0,\n            height: () => this._scaleY.range()[0],\n            width: this._spec.bandWidth,\n            clip: true,\n            cornerRadius: this._spec.cornerRadius\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      } else {\n        this.setMarkStyle(\n          groupMark,\n          {\n            x: 0,\n            y: () =>\n              valueInScaleRange(this.dataToPositionY(datum), this._yAxisHelper?.getScale?.(0)) -\n              this._spec.bandWidth / 2,\n            height: this._spec.bandWidth,\n            width: () => this._scaleX.range()[1],\n            clip: true,\n            cornerRadius: this._spec.cornerRadius\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n\n      this._progressGroupMark.setInteractive(false);\n    }\n  }\n\n  initAnimation() {\n    const animationParams: ILinearProgressAnimationParams = {\n      direction: this.direction\n    };\n\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<LinearProgressAppearPreset>)?.preset;\n\n    this._progressMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.linearProgress(animationParams, appearPreset),\n        userAnimationConfig(SeriesMarkNameEnum.progress, this._spec)\n      )\n    );\n\n    this._trackMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.progressBackground(),\n        userAnimationConfig(SeriesMarkNameEnum.track, this._spec)\n      )\n    );\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new LinearProgressSeriesTooltipHelper(this);\n  }\n}\n"]}

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

@@ -2,17 +2,18 @@ import type { IAnimationSpec } from '../../animation/spec';
 import type { IMarkProgressiveConfig } from '../../mark/interface';
 import type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';
 import type { IAreaMarkSpec, ILineMarkSpec, ISymbolMarkSpec } from '../../typings/visual';
+import type { SeriesMarkNameEnum } from '../interface';
 import type { ILineLikeSeriesTheme } from '../mixin/line-mixin';
 import type { IRoseLikeSeriesSpec, IRoseLikeSeriesTheme } from '../polar/rose-like';
 import type { RadarAppearPreset } from './animation';
 type RadarMarks = 'point' | 'line' | 'area';
 export interface IRadarSeriesSpec extends IRoseLikeSeriesSpec, IAnimationSpec<RadarMarks, RadarAppearPreset>, IMarkProgressiveConfig {
     type: 'radar';
-    point?: IMarkSpec<ISymbolMarkSpec>;
-    line?: IMarkSpec<ILineMarkSpec>;
-    area?: IMarkSpec<IAreaMarkSpec>;
+    [SeriesMarkNameEnum.point]?: IMarkSpec<ISymbolMarkSpec>;
+    [SeriesMarkNameEnum.line]?: IMarkSpec<ILineMarkSpec>;
+    [SeriesMarkNameEnum.area]?: IMarkSpec<IAreaMarkSpec>;
 }
 export interface IRadarSeriesTheme extends IRoseLikeSeriesTheme, ILineLikeSeriesTheme {
-    area?: Partial<IMarkTheme<IAreaMarkSpec>>;
+    [SeriesMarkNameEnum.area]?: Partial<IMarkTheme<IAreaMarkSpec>>;
 }
 export {};

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/radar/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IAnimationSpec } from '../../animation/spec';\nimport type { IMarkProgressiveConfig } from '../../mark/interface';\nimport type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';\nimport type { IAreaMarkSpec, ILineMarkSpec, ISymbolMarkSpec } from '../../typings/visual';\nimport type { ILineLikeSeriesTheme } from '../mixin/line-mixin';\nimport type { IRoseLikeSeriesSpec, IRoseLikeSeriesTheme } from '../polar/rose-like';\nimport type { RadarAppearPreset } from './animation';\n\ntype RadarMarks = 'point' | 'line' | 'area';\n\nexport interface IRadarSeriesSpec\n  extends IRoseLikeSeriesSpec,\n    IAnimationSpec<RadarMarks, RadarAppearPreset>,\n    IMarkProgressiveConfig {\n  type: 'radar';\n\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 IRadarSeriesTheme extends IRoseLikeSeriesTheme, ILineLikeSeriesTheme {\n  area?: Partial<IMarkTheme<IAreaMarkSpec>>;\n}\n"]}
+{"version":3,"sources":["../src/series/radar/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IAnimationSpec } from '../../animation/spec';\nimport type { IMarkProgressiveConfig } from '../../mark/interface';\nimport type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';\nimport type { IAreaMarkSpec, ILineMarkSpec, ISymbolMarkSpec } from '../../typings/visual';\nimport type { SeriesMarkNameEnum } from '../interface';\nimport type { ILineLikeSeriesTheme } from '../mixin/line-mixin';\nimport type { IRoseLikeSeriesSpec, IRoseLikeSeriesTheme } from '../polar/rose-like';\nimport type { RadarAppearPreset } from './animation';\n\ntype RadarMarks = 'point' | 'line' | 'area';\n\nexport interface IRadarSeriesSpec\n  extends IRoseLikeSeriesSpec,\n    IAnimationSpec<RadarMarks, RadarAppearPreset>,\n    IMarkProgressiveConfig {\n  type: 'radar';\n\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 IRadarSeriesTheme extends IRoseLikeSeriesTheme, ILineLikeSeriesTheme {\n  [SeriesMarkNameEnum.area]?: Partial<IMarkTheme<IAreaMarkSpec>>;\n}\n"]}

package/esm/series/radar/radar.d.ts

@@ -1,6 +1,7 @@
 import { LineLikeSeriesMixin } from '../mixin/line-mixin';
 import type { IMarkProgressiveConfig } from '../../mark/interface';
 import type { Maybe } from '../../typings';
+import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface';
 import type { IRadarSeriesSpec, IRadarSeriesTheme } from './interface';
 import { RoseLikeSeries } from '../polar/rose-like';
@@ -9,6 +10,7 @@ export interface RadarSeries extends Pick<LineLikeSeriesMixin, 'initLineMark' |
 export declare class RadarSeries extends RoseLikeSeries<IRadarSeriesSpec> {
     static readonly type: string;
     type: SeriesTypeEnum;
+    static readonly mark: SeriesMarkMap;
     protected _theme: Maybe<IRadarSeriesTheme>;
     private _areaMark;
     initGroups(): void;

package/esm/series/radar/radar.js

@@ -1,4 +1,4 @@
-import { LineLikeSeriesMixin } from "../mixin/line-mixin";
+import { LineLikeSeriesMixin, lineLikeSeriesMarkMap } from "../mixin/line-mixin";
 
 import { MarkTypeEnum } from "../../mark/interface";
 
@@ -8,7 +8,7 @@ import { DEFAULT_LINEAR_CLOSED_INTERPOLATE } from "../../typings";
 
 import { isValid, radians } from "../../util";
 
-import { SeriesTypeEnum } from "../interface";
+import { SeriesMarkNameEnum, SeriesTypeEnum } from "../interface";
 
 import { mixin } from "@visactor/vutils";
 
@@ -18,6 +18,8 @@ import { DEFAULT_MARK_ANIMATION } from "../../animation/config";
 
 import { RoseLikeSeries } from "../polar/rose-like";
 
+import { BaseSeries } from "../base/base-series";
+
 export class RadarSeries extends RoseLikeSeries {
     constructor() {
         super(...arguments), this.type = SeriesTypeEnum.radar;
@@ -38,7 +40,7 @@ export class RadarSeries extends RoseLikeSeries {
         this.initAreaMarkStyle(), this.initLineMarkStyle(), this.initSymbolMarkStyle();
     }
     initAreaMark(progressive, isSeriesMark) {
-        this._areaMark = this._createMark(MarkTypeEnum.area, "area", {
+        this._areaMark = this._createMark(RadarSeries.mark.area, {
             progressive: progressive,
             isSeriesMark: isSeriesMark
         });
@@ -76,7 +78,7 @@ export class RadarSeries extends RoseLikeSeries {
             },
             coordToPoint: coord => this.angleAxisHelper.coordToPoint(coord)
         }, appearPreset = null !== (_d = null === (_c = null === (_b = this._spec) || void 0 === _b ? void 0 : _b.animationAppear) || void 0 === _c ? void 0 : _c.preset) && void 0 !== _d ? _d : "clipIn";
-        "clipIn" === appearPreset && this._rootMark && this._rootMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.radarGroup(animationParams, appearPreset), userAnimationConfig("group", this._spec)));
+        "clipIn" === appearPreset && this._rootMark && this._rootMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.radarGroup(animationParams, appearPreset), userAnimationConfig(SeriesMarkNameEnum.group, this._spec)));
         [ [ this._areaMark, "radar" ], [ this._lineMark, "radar" ], [ this._symbolMark, "radarSymbol" ] ].forEach((([mark, animation]) => {
             if (isValid(mark)) {
                 const getAnimation = DEFAULT_MARK_ANIMATION[animation];
@@ -86,5 +88,10 @@ export class RadarSeries extends RoseLikeSeries {
     }
 }
 
-RadarSeries.type = SeriesTypeEnum.radar, mixin(RadarSeries, LineLikeSeriesMixin);
+RadarSeries.type = SeriesTypeEnum.radar, RadarSeries.mark = Object.assign(Object.assign(Object.assign({}, BaseSeries.mark), lineLikeSeriesMarkMap), {
+    [SeriesMarkNameEnum.area]: {
+        name: SeriesMarkNameEnum.area,
+        type: MarkTypeEnum.area
+    }
+}), mixin(RadarSeries, LineLikeSeriesMixin);
 //# sourceMappingURL=radar.js.map

package/esm/series/radar/radar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/radar/radar.ts"],"names":[],"mappings":"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","file":"radar.js","sourcesContent":["import { LineLikeSeriesMixin } from '../mixin/line-mixin';\nimport type { ILineMark } from '../../mark/line';\nimport type { IMark, IMarkProgressiveConfig } from '../../mark/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { AttributeLevel, POLAR_START_RADIAN } from '../../constant';\nimport { DEFAULT_LINEAR_CLOSED_INTERPOLATE } from '../../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport type { Datum, IPoint, IPolarPoint, Maybe } from '../../typings';\nimport { isValid, radians } from '../../util';\n\nimport { SeriesTypeEnum } from '../interface';\nimport { mixin } from '@visactor/vutils';\nimport type { IRadarSeriesSpec, IRadarSeriesTheme } from './interface';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { IRadarAnimationParams, RadarAppearPreset } from './animation';\nimport { RoseLikeSeries } from '../polar/rose-like';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport type { IAreaMark } from '../../mark/area';\n\nexport interface RadarSeries\n  extends Pick<\n      LineLikeSeriesMixin,\n      | 'initLineMark'\n      | 'initSymbolMark'\n      | 'initLabelMarkStyle'\n      | 'initLineMarkStyle'\n      | 'initSymbolMarkStyle'\n      | '_lineMark'\n      | '_symbolMark'\n    >,\n    RoseLikeSeries<IRadarSeriesSpec> {}\n\nexport class RadarSeries extends RoseLikeSeries<IRadarSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.radar;\n  type = SeriesTypeEnum.radar;\n\n  protected declare _theme: Maybe<IRadarSeriesTheme>;\n\n  private _areaMark: ILineMark;\n\n  initGroups() {\n    // do nothing\n  }\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    this.initAreaMark(progressive, isAreaVisible);\n    this.initLineMark(progressive, !isAreaVisible);\n    this.initSymbolMark(progressive);\n  }\n\n  initMarkStyle(): void {\n    this.initAreaMarkStyle();\n    this.initLineMarkStyle();\n    this.initSymbolMarkStyle();\n  }\n\n  initAreaMark(progressive: IMarkProgressiveConfig, isSeriesMark: boolean) {\n    this._areaMark = this._createMark(MarkTypeEnum.area, 'area', {\n      progressive,\n      isSeriesMark\n    }) as IAreaMark;\n  }\n\n  initAreaMarkStyle() {\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      this.setMarkStyle(\n        areaMark,\n        {\n          x: this.dataToPositionX.bind(this),\n          y: this.dataToPositionY.bind(this),\n          x1: (datum: Datum) => {\n            if (!datum || !this.angleAxisHelper || !this.radiusAxisHelper) {\n              return Number.NaN;\n            }\n\n            return this.valueToPosition(\n              this.getDatumPositionValues(datum, this._angleField),\n              this._stack ? this.getDatumPositionValues(datum, this._innerRadiusField) : 0\n            ).x;\n          },\n          y1: (datum: Datum) => {\n            if (!datum || !this.angleAxisHelper || !this.radiusAxisHelper) {\n              return Number.NaN;\n            }\n            const value = this.valueToPosition(\n              this.getDatumPositionValues(datum, this._angleField),\n              this._stack ? this.getDatumPositionValues(datum, this._innerRadiusField) : 0\n            ).y;\n            return value;\n          },\n          fill: this.getColorAttribute(),\n          curveType: DEFAULT_LINEAR_CLOSED_INTERPOLATE\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      this._trigger.registerMark(areaMark);\n      this._tooltipHelper?.activeTriggerSet.dimension.add(areaMark);\n    }\n  }\n\n  initAnimation() {\n    const animationParams: IRadarAnimationParams = {\n      center: () => this.angleAxisHelper?.center(),\n      radius: () => {\n        const rect = this.getLayoutRect();\n        return Math.min(rect.width, rect.height);\n      },\n      startAngle: radians(this._spec.startAngle) ?? POLAR_START_RADIAN,\n      pointToCoord: (point: IPoint) => this.angleAxisHelper?.pointToCoord(point),\n      coordToPoint: (coord: IPolarPoint) => this.angleAxisHelper.coordToPoint(coord)\n    };\n    const appearPreset = ((this._spec?.animationAppear as IStateAnimateSpec<RadarAppearPreset>)?.preset ??\n      'clipIn') as RadarAppearPreset;\n\n    if (appearPreset === 'clipIn') {\n      if (this._rootMark) {\n        this._rootMark.setAnimationConfig(\n          animationConfig(\n            DEFAULT_MARK_ANIMATION.radarGroup(animationParams, appearPreset),\n            userAnimationConfig('group', this._spec)\n          )\n        );\n      }\n    }\n\n    const markAnimationMap: [IMark, keyof typeof DEFAULT_MARK_ANIMATION][] = [\n      [this._areaMark, 'radar'],\n      [this._lineMark, 'radar'],\n      [this._symbolMark, 'radarSymbol']\n    ];\n\n    // 为 mark 添加动画\n    markAnimationMap.forEach(([mark, animation]) => {\n      if (isValid(mark)) {\n        const getAnimation = DEFAULT_MARK_ANIMATION[animation];\n        mark.setAnimationConfig(\n          animationConfig(getAnimation(animationParams, appearPreset), userAnimationConfig(mark.name, this._spec))\n        );\n      }\n    });\n  }\n}\n\nmixin(RadarSeries, LineLikeSeriesMixin);\n"]}
+{"version":3,"sources":["../src/series/radar/radar.ts"],"names":[],"mappings":"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","file":"radar.js","sourcesContent":["import { LineLikeSeriesMixin, lineLikeSeriesMarkMap } from '../mixin/line-mixin';\nimport type { ILineMark } from '../../mark/line';\nimport type { IMark, IMarkProgressiveConfig } from '../../mark/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { AttributeLevel, POLAR_START_RADIAN } from '../../constant';\nimport { DEFAULT_LINEAR_CLOSED_INTERPOLATE } from '../../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport type { Datum, IPoint, IPolarPoint, Maybe } from '../../typings';\nimport { isValid, radians } from '../../util';\n\nimport type { SeriesMarkMap } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface';\nimport { mixin } from '@visactor/vutils';\nimport type { IRadarSeriesSpec, IRadarSeriesTheme } from './interface';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { IRadarAnimationParams, RadarAppearPreset } from './animation';\nimport { RoseLikeSeries } from '../polar/rose-like';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport type { IAreaMark } from '../../mark/area';\nimport { BaseSeries } from '../base/base-series';\n\nexport interface RadarSeries\n  extends Pick<\n      LineLikeSeriesMixin,\n      | 'initLineMark'\n      | 'initSymbolMark'\n      | 'initLabelMarkStyle'\n      | 'initLineMarkStyle'\n      | 'initSymbolMarkStyle'\n      | '_lineMark'\n      | '_symbolMark'\n    >,\n    RoseLikeSeries<IRadarSeriesSpec> {}\n\nexport class RadarSeries extends RoseLikeSeries<IRadarSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.radar;\n  type = SeriesTypeEnum.radar;\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<IRadarSeriesTheme>;\n\n  private _areaMark: ILineMark;\n\n  initGroups() {\n    // do nothing\n  }\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    this.initAreaMark(progressive, isAreaVisible);\n    this.initLineMark(progressive, !isAreaVisible);\n    this.initSymbolMark(progressive);\n  }\n\n  initMarkStyle(): void {\n    this.initAreaMarkStyle();\n    this.initLineMarkStyle();\n    this.initSymbolMarkStyle();\n  }\n\n  initAreaMark(progressive: IMarkProgressiveConfig, isSeriesMark: boolean) {\n    this._areaMark = this._createMark(RadarSeries.mark.area, {\n      progressive,\n      isSeriesMark\n    }) as IAreaMark;\n  }\n\n  initAreaMarkStyle() {\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      this.setMarkStyle(\n        areaMark,\n        {\n          x: this.dataToPositionX.bind(this),\n          y: this.dataToPositionY.bind(this),\n          x1: (datum: Datum) => {\n            if (!datum || !this.angleAxisHelper || !this.radiusAxisHelper) {\n              return Number.NaN;\n            }\n\n            return this.valueToPosition(\n              this.getDatumPositionValues(datum, this._angleField),\n              this._stack ? this.getDatumPositionValues(datum, this._innerRadiusField) : 0\n            ).x;\n          },\n          y1: (datum: Datum) => {\n            if (!datum || !this.angleAxisHelper || !this.radiusAxisHelper) {\n              return Number.NaN;\n            }\n            const value = this.valueToPosition(\n              this.getDatumPositionValues(datum, this._angleField),\n              this._stack ? this.getDatumPositionValues(datum, this._innerRadiusField) : 0\n            ).y;\n            return value;\n          },\n          fill: this.getColorAttribute(),\n          curveType: DEFAULT_LINEAR_CLOSED_INTERPOLATE\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      this._trigger.registerMark(areaMark);\n      this._tooltipHelper?.activeTriggerSet.dimension.add(areaMark);\n    }\n  }\n\n  initAnimation() {\n    const animationParams: IRadarAnimationParams = {\n      center: () => this.angleAxisHelper?.center(),\n      radius: () => {\n        const rect = this.getLayoutRect();\n        return Math.min(rect.width, rect.height);\n      },\n      startAngle: radians(this._spec.startAngle) ?? POLAR_START_RADIAN,\n      pointToCoord: (point: IPoint) => this.angleAxisHelper?.pointToCoord(point),\n      coordToPoint: (coord: IPolarPoint) => this.angleAxisHelper.coordToPoint(coord)\n    };\n    const appearPreset = ((this._spec?.animationAppear as IStateAnimateSpec<RadarAppearPreset>)?.preset ??\n      'clipIn') as RadarAppearPreset;\n\n    if (appearPreset === 'clipIn') {\n      if (this._rootMark) {\n        this._rootMark.setAnimationConfig(\n          animationConfig(\n            DEFAULT_MARK_ANIMATION.radarGroup(animationParams, appearPreset),\n            userAnimationConfig(SeriesMarkNameEnum.group, this._spec)\n          )\n        );\n      }\n    }\n\n    const markAnimationMap: [IMark, keyof typeof DEFAULT_MARK_ANIMATION][] = [\n      [this._areaMark, 'radar'],\n      [this._lineMark, 'radar'],\n      [this._symbolMark, 'radarSymbol']\n    ];\n\n    // 为 mark 添加动画\n    markAnimationMap.forEach(([mark, animation]) => {\n      if (isValid(mark)) {\n        const getAnimation = DEFAULT_MARK_ANIMATION[animation];\n        mark.setAnimationConfig(\n          animationConfig(getAnimation(animationParams, appearPreset), userAnimationConfig(mark.name, this._spec))\n        );\n      }\n    });\n  }\n}\n\nmixin(RadarSeries, LineLikeSeriesMixin);\n"]}

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

@@ -1,8 +1,10 @@
 import { AreaSeries } from '../area/area';
+import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface';
 export declare class RangeAreaSeries extends AreaSeries {
     static readonly type: string;
     type: SeriesTypeEnum;
+    static readonly mark: SeriesMarkMap;
     initMark(): void;
     initMarkStyle(): void;
     protected initTooltip(): void;

package/esm/series/range-area/range-area.js

@@ -12,14 +12,12 @@ import { AttributeLevel } from "../../constant";
 
 import { RangeAreaSeriesTooltipHelper } from "./tooltip-helper";
 
-import { MarkTypeEnum } from "../../mark/interface";
-
 export class RangeAreaSeries extends AreaSeries {
     constructor() {
         super(...arguments), this.type = SeriesTypeEnum.rangeArea;
     }
     initMark() {
-        this._areaMark = this._createMark(MarkTypeEnum.area, "area", {
+        this._areaMark = this._createMark(RangeAreaSeries.mark.area, {
             defaultMorphElementKey: this.getDimensionField()[0],
             groupKey: this._seriesField,
             isSeriesMark: !0
@@ -61,5 +59,5 @@ export class RangeAreaSeries extends AreaSeries {
     }
 }
 
-RangeAreaSeries.type = SeriesTypeEnum.rangeArea;
+RangeAreaSeries.type = SeriesTypeEnum.rangeArea, RangeAreaSeries.mark = Object.assign({}, AreaSeries.mark);
 //# sourceMappingURL=range-area.js.map