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

package/cjs/series/gauge/gauge-pointer.d.ts

@@ -1,4 +1,5 @@
 import { MarkTypeEnum } from '../../mark/interface';
+import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface';
 import type { IGaugePointerSeriesSpec, IGaugePointerSeriesTheme } from './interface';
 import type { Datum, Maybe } from '../../typings';
@@ -6,6 +7,7 @@ import { ProgressLikeSeries } from '../polar/progress-like';
 export declare class GaugePointerSeries extends ProgressLikeSeries<IGaugePointerSeriesSpec> {
     static readonly type: string;
     type: SeriesTypeEnum;
+    static readonly mark: SeriesMarkMap;
     protected _theme: Maybe<IGaugePointerSeriesTheme>;
     protected _spec: IGaugePointerSeriesSpec;
     private _pinMark;

package/cjs/series/gauge/gauge-pointer.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.GaugePointerSeries = void 0;
 
-const interface_1 = require("../../mark/interface"), util_1 = require("../../util"), interface_2 = require("../interface"), utils_1 = require("../../animation/utils"), config_1 = require("../../animation/config"), progress_like_1 = require("../polar/progress-like");
+const interface_1 = require("../../mark/interface"), util_1 = require("../../util"), interface_2 = require("../interface"), utils_1 = require("../../animation/utils"), config_1 = require("../../animation/config"), progress_like_1 = require("../polar/progress-like"), base_series_1 = require("../base/base-series");
 
 class GaugePointerSeries extends progress_like_1.ProgressLikeSeries {
     constructor() {
@@ -16,10 +16,12 @@ class GaugePointerSeries extends progress_like_1.ProgressLikeSeries {
         super.setAttrFromSpec(), this.setRadiusField(this._spec.radiusField), this._pointerType = "rect" === (null === (_a = this._spec.pointer) || void 0 === _a ? void 0 : _a.type) ? interface_1.MarkTypeEnum.rect : interface_1.MarkTypeEnum.path;
     }
     initMark() {
-        this._pinBackgroundMark = this._createMark(interface_1.MarkTypeEnum.path, "pinBackground"), 
-        this._pointerMark = this._createMark(this._pointerType, "pointer", {
+        this._pinBackgroundMark = this._createMark(GaugePointerSeries.mark.pinBackground), 
+        this._pointerMark = this._createMark(Object.assign(Object.assign({}, GaugePointerSeries.mark.pointer), {
+            type: this._pointerType
+        }), {
             isSeriesMark: !0
-        }), this._pinMark = this._createMark(interface_1.MarkTypeEnum.path, "pin");
+        }), this._pinMark = this._createMark(GaugePointerSeries.mark.pin);
     }
     initMarkStyle() {
         this.initPinBackgroundMarkStyle(), this.initPointerMarkStyle(), this.initPinMarkStyle();
@@ -101,9 +103,23 @@ class GaugePointerSeries extends progress_like_1.ProgressLikeSeries {
         const appearPreset = null === (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.animationAppear) || void 0 === _b ? void 0 : _b.preset;
         this._pointerMark.setAnimationConfig((0, utils_1.animationConfig)(config_1.DEFAULT_MARK_ANIMATION.circularProgress({
             startAngle: this._startAngle
-        }, appearPreset), (0, utils_1.userAnimationConfig)("pointer", this._spec)));
+        }, appearPreset), (0, utils_1.userAnimationConfig)(interface_2.SeriesMarkNameEnum.pointer, this._spec)));
     }
 }
 
-exports.GaugePointerSeries = GaugePointerSeries, GaugePointerSeries.type = interface_2.SeriesTypeEnum.gaugePointer;
+exports.GaugePointerSeries = GaugePointerSeries, GaugePointerSeries.type = interface_2.SeriesTypeEnum.gaugePointer, 
+GaugePointerSeries.mark = Object.assign(Object.assign({}, base_series_1.BaseSeries.mark), {
+    [interface_2.SeriesMarkNameEnum.pin]: {
+        name: interface_2.SeriesMarkNameEnum.pin,
+        type: interface_1.MarkTypeEnum.path
+    },
+    [interface_2.SeriesMarkNameEnum.pinBackground]: {
+        name: interface_2.SeriesMarkNameEnum.pinBackground,
+        type: interface_1.MarkTypeEnum.path
+    },
+    [interface_2.SeriesMarkNameEnum.pointer]: {
+        name: interface_2.SeriesMarkNameEnum.pointer,
+        type: [ interface_1.MarkTypeEnum.path, interface_1.MarkTypeEnum.rect ]
+    }
+});
 //# sourceMappingURL=gauge-pointer.js.map

package/cjs/series/gauge/gauge-pointer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/gauge/gauge-pointer.ts"],"names":[],"mappings":"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","file":"gauge-pointer.js","sourcesContent":["import { MarkTypeEnum } from '../../mark/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { isValid } from '../../util';\nimport { SeriesTypeEnum } from '../interface';\nimport type { IGaugePointerSeriesSpec, IGaugePointerSeriesTheme } from './interface';\nimport type { Datum, Maybe } from '../../typings';\nimport type { IPathMark } from '../../mark/path';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport { ProgressLikeSeries } from '../polar/progress-like';\nimport type { IRectMark } from '../../mark/rect';\nimport type { IStateAnimateSpec } from '../../animation/spec';\n\nexport class GaugePointerSeries extends ProgressLikeSeries<IGaugePointerSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.gaugePointer;\n  type = SeriesTypeEnum.gaugePointer;\n\n  protected declare _theme: Maybe<IGaugePointerSeriesTheme>;\n  protected declare _spec: IGaugePointerSeriesSpec;\n\n  private _pinMark: IPathMark | null = null;\n  private _pointerMark: IPathMark | IRectMark | null = null;\n  private _pinBackgroundMark: IPathMark | null = null;\n\n  protected _pointerType: MarkTypeEnum;\n\n  setAttrFromSpec(): void {\n    super.setAttrFromSpec();\n    // 半径信息\n    this.setRadiusField(this._spec.radiusField);\n\n    this._pointerType = this._spec.pointer?.type === 'rect' ? MarkTypeEnum.rect : MarkTypeEnum.path;\n  }\n\n  initMark(): void {\n    this._pinBackgroundMark = this._createMark(MarkTypeEnum.path, 'pinBackground') as IPathMark;\n    this._pointerMark = this._createMark(this._pointerType, 'pointer', {\n      isSeriesMark: true\n    }) as IPathMark;\n    this._pinMark = this._createMark(MarkTypeEnum.path, 'pin') as IPathMark;\n  }\n\n  initMarkStyle(): void {\n    this.initPinBackgroundMarkStyle();\n    this.initPointerMarkStyle();\n    this.initPinMarkStyle();\n  }\n\n  initGroups() {\n    // do nothing\n  }\n\n  private initPointerMarkStyle() {\n    const pointerMark = this._pointerMark;\n    const pointerSpec = this._spec.pointer;\n    if (pointerMark) {\n      this.setMarkStyle(pointerMark, {\n        x: () => {\n          const { x } = this.angleAxisHelper.center();\n          const dx = this._getPointerWidth() * (pointerSpec?.center?.[0] ?? 0);\n          return x - dx;\n        },\n        y: (datum: Datum) => {\n          const { y } = this.angleAxisHelper.center();\n          const dy = this._getPointerHeight(datum) * (pointerSpec?.center?.[1] ?? 0);\n          return y - dy;\n        },\n        anchor: () => {\n          const { x, y } = this.angleAxisHelper.center();\n          return [x, y];\n        },\n        fill: this.getColorAttribute(),\n        zIndex: 200\n      });\n      if (this._pointerType === MarkTypeEnum.path) {\n        this.setMarkStyle(pointerMark as IPathMark, {\n          scaleX: this._getPointerWidth.bind(this),\n          scaleY: this._getPointerHeight.bind(this),\n          angle: (datum: Datum) => this._getPointerAngle(datum) + Math.PI / 2\n        });\n      } else {\n        this.setMarkStyle(pointerMark as IRectMark, {\n          width: this._getPointerWidth.bind(this),\n          height: this._getPointerHeight.bind(this),\n          angle: (datum: Datum) => this._getPointerAngle(datum) - Math.PI / 2\n        });\n      }\n      this._trigger.registerMark(pointerMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(pointerMark);\n    }\n  }\n\n  protected _getPointerWidth() {\n    return this._spec.pointer.width * this._computeLayoutRadius();\n  }\n\n  protected _getPointerHeight(datum: Datum) {\n    const pointerSpec = this._spec.pointer;\n    const radiusField = this._radiusField[0];\n    if (isValid(this.radiusAxisHelper) && isValid(radiusField)) {\n      return (\n        this.radiusAxisHelper.dataToPosition([datum[radiusField]]) -\n        (pointerSpec?.innerPadding ?? 0) -\n        (pointerSpec?.outerPadding ?? 10)\n      );\n    }\n    return pointerSpec.height * this._computeLayoutRadius();\n  }\n\n  protected _getPointerAngle(datum: Datum) {\n    return this.angleAxisHelper.dataToPosition([datum[this._angleField[0]]]);\n  }\n\n  protected _getRotatedPointerCenterOffset(datum: Datum) {\n    const pointerSpec = this._spec.pointer;\n    const x = this._getPointerWidth() * (pointerSpec?.center?.[0] ?? 0);\n    const y = -this._getPointerHeight(datum) * (pointerSpec?.center?.[1] ?? 0);\n    const angle = this._getPointerAngle(datum) - Math.PI / 2;\n    const cos = Math.cos(angle);\n    const sin = Math.sin(angle);\n    const x1 = x * cos + y * sin;\n    const y1 = y * cos - x * sin;\n    return {\n      x: x1,\n      y: -y1\n    };\n  }\n\n  private initPinBackgroundMarkStyle() {\n    const pinBackgroundMark = this._pinBackgroundMark;\n    const pinBackgroundSpec = this._spec.pinBackground;\n    if (pinBackgroundMark) {\n      this.setMarkStyle(pinBackgroundMark, {\n        x: () => this.angleAxisHelper.center().x,\n        y: () => this.angleAxisHelper.center().y,\n        scaleX: () => pinBackgroundSpec.width * this._computeLayoutRadius(),\n        scaleY: () => pinBackgroundSpec.height * this._computeLayoutRadius(),\n        fill: this.getColorAttribute(),\n        zIndex: 100\n      });\n    }\n  }\n\n  private initPinMarkStyle() {\n    const pinMark = this._pinMark;\n    const pinSpec = this._spec.pin;\n    if (pinMark) {\n      this.setMarkStyle(pinMark, {\n        x: () => this.angleAxisHelper.center().x,\n        y: () => this.angleAxisHelper.center().y,\n        scaleX: () => pinSpec.width * this._computeLayoutRadius(),\n        scaleY: () => pinSpec.height * this._computeLayoutRadius(),\n        fill: this.getColorAttribute(),\n        zIndex: 300\n      });\n    }\n  }\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<any>)?.preset;\n\n    this._pointerMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.circularProgress(\n          {\n            startAngle: this._startAngle\n          },\n          appearPreset\n        ),\n        userAnimationConfig('pointer', this._spec)\n      )\n    );\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/gauge/gauge-pointer.ts"],"names":[],"mappings":"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","file":"gauge-pointer.js","sourcesContent":["import { MarkTypeEnum } from '../../mark/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { isValid } from '../../util';\nimport type { SeriesMarkMap } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface';\nimport type { IGaugePointerSeriesSpec, IGaugePointerSeriesTheme } from './interface';\nimport type { Datum, Maybe } from '../../typings';\nimport type { IPathMark } from '../../mark/path';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport { ProgressLikeSeries } from '../polar/progress-like';\nimport type { IRectMark } from '../../mark/rect';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport { BaseSeries } from '../base/base-series';\n\nexport class GaugePointerSeries extends ProgressLikeSeries<IGaugePointerSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.gaugePointer;\n  type = SeriesTypeEnum.gaugePointer;\n\n  static readonly mark: SeriesMarkMap = {\n    ...BaseSeries.mark,\n    [SeriesMarkNameEnum.pin]: { name: SeriesMarkNameEnum.pin, type: MarkTypeEnum.path },\n    [SeriesMarkNameEnum.pinBackground]: { name: SeriesMarkNameEnum.pinBackground, type: MarkTypeEnum.path },\n    [SeriesMarkNameEnum.pointer]: { name: SeriesMarkNameEnum.pointer, type: [MarkTypeEnum.path, MarkTypeEnum.rect] }\n  };\n\n  protected declare _theme: Maybe<IGaugePointerSeriesTheme>;\n  protected declare _spec: IGaugePointerSeriesSpec;\n\n  private _pinMark: IPathMark | null = null;\n  private _pointerMark: IPathMark | IRectMark | null = null;\n  private _pinBackgroundMark: IPathMark | null = null;\n\n  protected _pointerType: MarkTypeEnum;\n\n  setAttrFromSpec(): void {\n    super.setAttrFromSpec();\n    // 半径信息\n    this.setRadiusField(this._spec.radiusField);\n\n    this._pointerType = this._spec.pointer?.type === 'rect' ? MarkTypeEnum.rect : MarkTypeEnum.path;\n  }\n\n  initMark(): void {\n    this._pinBackgroundMark = this._createMark(GaugePointerSeries.mark.pinBackground) as IPathMark;\n    this._pointerMark = this._createMark(\n      {\n        ...GaugePointerSeries.mark.pointer,\n        type: this._pointerType\n      },\n      {\n        isSeriesMark: true\n      }\n    ) as IPathMark;\n    this._pinMark = this._createMark(GaugePointerSeries.mark.pin) as IPathMark;\n  }\n\n  initMarkStyle(): void {\n    this.initPinBackgroundMarkStyle();\n    this.initPointerMarkStyle();\n    this.initPinMarkStyle();\n  }\n\n  initGroups() {\n    // do nothing\n  }\n\n  private initPointerMarkStyle() {\n    const pointerMark = this._pointerMark;\n    const pointerSpec = this._spec.pointer;\n    if (pointerMark) {\n      this.setMarkStyle(pointerMark, {\n        x: () => {\n          const { x } = this.angleAxisHelper.center();\n          const dx = this._getPointerWidth() * (pointerSpec?.center?.[0] ?? 0);\n          return x - dx;\n        },\n        y: (datum: Datum) => {\n          const { y } = this.angleAxisHelper.center();\n          const dy = this._getPointerHeight(datum) * (pointerSpec?.center?.[1] ?? 0);\n          return y - dy;\n        },\n        anchor: () => {\n          const { x, y } = this.angleAxisHelper.center();\n          return [x, y];\n        },\n        fill: this.getColorAttribute(),\n        zIndex: 200\n      });\n      if (this._pointerType === MarkTypeEnum.path) {\n        this.setMarkStyle(pointerMark as IPathMark, {\n          scaleX: this._getPointerWidth.bind(this),\n          scaleY: this._getPointerHeight.bind(this),\n          angle: (datum: Datum) => this._getPointerAngle(datum) + Math.PI / 2\n        });\n      } else {\n        this.setMarkStyle(pointerMark as IRectMark, {\n          width: this._getPointerWidth.bind(this),\n          height: this._getPointerHeight.bind(this),\n          angle: (datum: Datum) => this._getPointerAngle(datum) - Math.PI / 2\n        });\n      }\n      this._trigger.registerMark(pointerMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(pointerMark);\n    }\n  }\n\n  protected _getPointerWidth() {\n    return this._spec.pointer.width * this._computeLayoutRadius();\n  }\n\n  protected _getPointerHeight(datum: Datum) {\n    const pointerSpec = this._spec.pointer;\n    const radiusField = this._radiusField[0];\n    if (isValid(this.radiusAxisHelper) && isValid(radiusField)) {\n      return (\n        this.radiusAxisHelper.dataToPosition([datum[radiusField]]) -\n        (pointerSpec?.innerPadding ?? 0) -\n        (pointerSpec?.outerPadding ?? 10)\n      );\n    }\n    return pointerSpec.height * this._computeLayoutRadius();\n  }\n\n  protected _getPointerAngle(datum: Datum) {\n    return this.angleAxisHelper.dataToPosition([datum[this._angleField[0]]]);\n  }\n\n  protected _getRotatedPointerCenterOffset(datum: Datum) {\n    const pointerSpec = this._spec.pointer;\n    const x = this._getPointerWidth() * (pointerSpec?.center?.[0] ?? 0);\n    const y = -this._getPointerHeight(datum) * (pointerSpec?.center?.[1] ?? 0);\n    const angle = this._getPointerAngle(datum) - Math.PI / 2;\n    const cos = Math.cos(angle);\n    const sin = Math.sin(angle);\n    const x1 = x * cos + y * sin;\n    const y1 = y * cos - x * sin;\n    return {\n      x: x1,\n      y: -y1\n    };\n  }\n\n  private initPinBackgroundMarkStyle() {\n    const pinBackgroundMark = this._pinBackgroundMark;\n    const pinBackgroundSpec = this._spec.pinBackground;\n    if (pinBackgroundMark) {\n      this.setMarkStyle(pinBackgroundMark, {\n        x: () => this.angleAxisHelper.center().x,\n        y: () => this.angleAxisHelper.center().y,\n        scaleX: () => pinBackgroundSpec.width * this._computeLayoutRadius(),\n        scaleY: () => pinBackgroundSpec.height * this._computeLayoutRadius(),\n        fill: this.getColorAttribute(),\n        zIndex: 100\n      });\n    }\n  }\n\n  private initPinMarkStyle() {\n    const pinMark = this._pinMark;\n    const pinSpec = this._spec.pin;\n    if (pinMark) {\n      this.setMarkStyle(pinMark, {\n        x: () => this.angleAxisHelper.center().x,\n        y: () => this.angleAxisHelper.center().y,\n        scaleX: () => pinSpec.width * this._computeLayoutRadius(),\n        scaleY: () => pinSpec.height * this._computeLayoutRadius(),\n        fill: this.getColorAttribute(),\n        zIndex: 300\n      });\n    }\n  }\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<any>)?.preset;\n\n    this._pointerMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.circularProgress(\n          {\n            startAngle: this._startAngle\n          },\n          appearPreset\n        ),\n        userAnimationConfig(SeriesMarkNameEnum.pointer, this._spec)\n      )\n    );\n  }\n}\n"]}

package/cjs/series/gauge/gauge.d.ts

@@ -1,18 +1,18 @@
+import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface';
 import type { IGaugeSeriesSpec, IGaugeSeriesTheme } from './interface';
 import { ProgressLikeSeries } from '../polar/progress-like/progress-like';
-import { DataView } from '@visactor/vdataset';
 import type { Datum } from '@visactor/vgrammar';
 import type { Maybe } from '../../typings';
 export declare class GaugeSeries extends ProgressLikeSeries<IGaugeSeriesSpec> {
     static readonly type: string;
     type: SeriesTypeEnum;
+    static readonly mark: SeriesMarkMap;
     protected _theme: Maybe<IGaugeSeriesTheme>;
     private _segmentMark;
     private _trackMark;
     protected _stack: boolean;
     protected _padAngle: number;
-    protected _segmentData: DataView;
     setAttrFromSpec(): void;
     initData(): void;
     initMark(): void;
@@ -21,4 +21,5 @@ export declare class GaugeSeries extends ProgressLikeSeries<IGaugeSeriesSpec> {
     private initTrackMarkStyle;
     protected _getAngleValueStart(datum: Datum): number;
     protected _getAngleValueEnd(datum: Datum): number;
+    initAnimation(): void;
 }

package/cjs/series/gauge/gauge.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.GaugeSeries = void 0;
 
-const interface_1 = require("../../mark/interface"), util_1 = require("../../util"), interface_2 = require("../interface"), progress_like_1 = require("../polar/progress-like/progress-like"), vdataset_1 = require("@visactor/vdataset"), register_1 = require("../../data/register"), constant_1 = require("../../constant");
+const interface_1 = require("../../mark/interface"), util_1 = require("../../util"), interface_2 = require("../interface"), progress_like_1 = require("../polar/progress-like/progress-like"), register_1 = require("../../data/register"), constant_1 = require("../../constant"), utils_1 = require("../../animation/utils"), config_1 = require("../../animation/config"), base_series_1 = require("../base/base-series");
 
 class GaugeSeries extends progress_like_1.ProgressLikeSeries {
     constructor() {
@@ -16,28 +16,21 @@ class GaugeSeries extends progress_like_1.ProgressLikeSeries {
         super.setAttrFromSpec(), this._padAngle = (0, util_1.radians)(null !== (_a = this._spec.padAngle) && void 0 !== _a ? _a : 0);
     }
     initData() {
+        var _a;
         super.initData();
-        const dataSet = new vdataset_1.DataSet;
-        (0, register_1.registerDataSetInstanceParser)(dataSet, "dataview", vdataset_1.dataViewParser), 
-        (0, register_1.registerDataSetInstanceTransform)(dataSet, "spiltSegment", ((data, op) => {
-            const dataCollect = [ ...data[0].latestData ];
+        (0, register_1.registerDataSetInstanceTransform)(this._option.dataSet, "spiltSegment", ((data, op) => {
+            const dataCollect = [ ...data ];
             return dataCollect.sort(((a, b) => a[this._angleField[0]] - b[this._angleField[0]])), 
             dataCollect.forEach(((datum, i) => {
                 datum[constant_1.SEGMENT_FIELD_END] = datum[this._angleField[0]], datum[constant_1.SEGMENT_FIELD_START] = i > 0 ? dataCollect[i - 1][constant_1.SEGMENT_FIELD_END] : void 0;
             })), dataCollect;
-        }));
-        const segmentDataView = new vdataset_1.DataView(dataSet);
-        segmentDataView.parse([ this.getViewData() ], {
-            type: "dataview"
-        }), segmentDataView.transform({
+        })), null === (_a = this.getViewDataFilter()) || void 0 === _a || _a.transform({
             type: "spiltSegment"
-        }, !1), this._segmentData = segmentDataView;
+        }, !1);
     }
     initMark() {
-        this._trackMark = this._createMark(interface_1.MarkTypeEnum.progressArc, "track"), 
-        this._segmentMark = this._createMark(interface_1.MarkTypeEnum.progressArc, "segment", {
-            isSeriesMark: !0,
-            dataView: this._segmentData
+        this._trackMark = this._createMark(GaugeSeries.mark.track), this._segmentMark = this._createMark(GaugeSeries.mark.segment, {
+            isSeriesMark: !0
         });
     }
     initMarkStyle() {
@@ -63,7 +56,6 @@ class GaugeSeries extends progress_like_1.ProgressLikeSeries {
             boundsMode: "imprecise",
             cornerRadius: this._spec.cornerRadius,
             fill: this.getColorAttribute(),
-            fillOpacity: 1,
             zIndex: 200,
             forceShowCap: !0
         }), this._trigger.registerMark(segmentMark), null === (_b = this._tooltipHelper) || void 0 === _b || _b.activeTriggerSet.mark.add(segmentMark));
@@ -87,7 +79,24 @@ class GaugeSeries extends progress_like_1.ProgressLikeSeries {
         var _a;
         return this.angleAxisHelper.dataToPosition([ datum[constant_1.SEGMENT_FIELD_END] ]) - (null !== (_a = this._spec.padAngle) && void 0 !== _a ? _a : 0) / 2;
     }
+    initAnimation() {
+        var _a, _b;
+        const appearPreset = null === (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.animationAppear) || void 0 === _b ? void 0 : _b.preset;
+        this._segmentMark.setAnimationConfig((0, utils_1.animationConfig)(config_1.DEFAULT_MARK_ANIMATION.circularProgress({
+            startAngle: this._startAngle
+        }, appearPreset), (0, utils_1.userAnimationConfig)(interface_2.SeriesMarkNameEnum.segment, this._spec)));
+    }
 }
 
-exports.GaugeSeries = GaugeSeries, GaugeSeries.type = interface_2.SeriesTypeEnum.gauge;
+exports.GaugeSeries = GaugeSeries, GaugeSeries.type = interface_2.SeriesTypeEnum.gauge, 
+GaugeSeries.mark = Object.assign(Object.assign({}, base_series_1.BaseSeries.mark), {
+    [interface_2.SeriesMarkNameEnum.segment]: {
+        name: interface_2.SeriesMarkNameEnum.segment,
+        type: interface_1.MarkTypeEnum.progressArc
+    },
+    [interface_2.SeriesMarkNameEnum.track]: {
+        name: interface_2.SeriesMarkNameEnum.track,
+        type: interface_1.MarkTypeEnum.progressArc
+    }
+});
 //# sourceMappingURL=gauge.js.map

package/cjs/series/gauge/gauge.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/gauge/gauge.ts"],"names":[],"mappings":"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","file":"gauge.js","sourcesContent":["import { MarkTypeEnum } from '../../mark/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { isValid, radians } from '../../util';\nimport { SeriesTypeEnum } from '../interface';\nimport type { IGaugeSeriesSpec, IGaugeSeriesTheme } from './interface';\nimport { ProgressLikeSeries } from '../polar/progress-like/progress-like';\nimport type { IProgressArcMark } from '../../mark/progress-arc';\nimport { DataSet, DataView, dataViewParser } from '@visactor/vdataset';\nimport { registerDataSetInstanceParser, registerDataSetInstanceTransform } from '../../data/register';\nimport { SEGMENT_FIELD_END, SEGMENT_FIELD_START } from '../../constant';\nimport type { Datum } from '@visactor/vgrammar';\nimport type { Maybe } from '../../typings';\n\nexport class GaugeSeries extends ProgressLikeSeries<IGaugeSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.gauge;\n  type = SeriesTypeEnum.gauge;\n\n  protected declare _theme: Maybe<IGaugeSeriesTheme>;\n\n  private _segmentMark: IProgressArcMark | null = null;\n  private _trackMark: IProgressArcMark | null = null;\n\n  protected _stack: boolean = false;\n  protected _padAngle: number = 0;\n\n  protected _segmentData: DataView;\n\n  setAttrFromSpec(): void {\n    super.setAttrFromSpec();\n\n    this._padAngle = radians(this._spec.padAngle ?? 0);\n  }\n\n  initData(): void {\n    super.initData();\n\n    /**\n     * @description 将数据排序并调整图元的起始点为上一个数据的终点，但是终点维持不变\n     */\n    const spiltSegment = (data: Array<DataView>, op: string) => {\n      // 数据处理\n      const dataCollect = [...data[0].latestData];\n      dataCollect.sort((a, b) => a[this._angleField[0]] - b[this._angleField[0]]);\n      dataCollect.forEach((datum: any, i) => {\n        datum[SEGMENT_FIELD_END] = datum[this._angleField[0]];\n        if (i > 0) {\n          datum[SEGMENT_FIELD_START] = dataCollect[i - 1][SEGMENT_FIELD_END];\n        } else {\n          datum[SEGMENT_FIELD_START] = undefined;\n        }\n      });\n      return dataCollect;\n    };\n\n    // data to dataview\n    const dataSet = new DataSet();\n    registerDataSetInstanceParser(dataSet, 'dataview', dataViewParser);\n    registerDataSetInstanceTransform(dataSet, 'spiltSegment', spiltSegment);\n    const segmentDataView = new DataView(dataSet);\n    segmentDataView.parse([this.getViewData()], {\n      type: 'dataview'\n    });\n    segmentDataView.transform(\n      {\n        type: 'spiltSegment'\n      },\n      false\n    );\n\n    this._segmentData = segmentDataView;\n  }\n\n  initMark(): void {\n    this._trackMark = this._createMark(MarkTypeEnum.progressArc, 'track') as IProgressArcMark;\n    this._segmentMark = this._createMark(MarkTypeEnum.progressArc, 'segment', {\n      isSeriesMark: true,\n      dataView: this._segmentData\n    }) as IProgressArcMark;\n  }\n\n  initMarkStyle(): void {\n    this.initTrackMarkStyle();\n    this.initSegmentMarkStyle();\n  }\n\n  private initSegmentMarkStyle() {\n    const segmentMark = this._segmentMark;\n    if (segmentMark) {\n      this.setMarkStyle(segmentMark, {\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._computeLayoutRadius() * (this._spec.innerRadius ?? 0),\n        // 需要优先兼容this._spec.radius\n        outerRadius: () => this._computeLayoutRadius() * (this._spec.radius ?? this._spec.outerRadius ?? 1),\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(segmentMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(segmentMark);\n    }\n  }\n\n  private initTrackMarkStyle() {\n    const trackMark = this._trackMark;\n    if (trackMark) {\n      this.setMarkStyle(trackMark, {\n        x: () => this.angleAxisHelper.center().x,\n        y: () => this.angleAxisHelper.center().y,\n        startAngle: this._startAngle,\n        endAngle: this._endAngle,\n        cornerRadius: this._spec.cornerRadius,\n        zIndex: 100\n      });\n      this._trigger.registerMark(trackMark);\n    }\n  }\n\n  protected _getAngleValueStart(datum: Datum) {\n    const angle = isValid(datum[SEGMENT_FIELD_START])\n      ? this.angleAxisHelper.dataToPosition([datum[SEGMENT_FIELD_START]])\n      : this._startAngle;\n    return angle + (this._spec.padAngle ?? 0) / 2;\n  }\n\n  protected _getAngleValueEnd(datum: Datum) {\n    const angle = this.angleAxisHelper.dataToPosition([datum[SEGMENT_FIELD_END]]);\n    return angle - (this._spec.padAngle ?? 0) / 2;\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/gauge/gauge.ts"],"names":[],"mappings":"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","file":"gauge.js","sourcesContent":["import { MarkTypeEnum } from '../../mark/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { isValid, radians } from '../../util';\nimport type { SeriesMarkMap } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface';\nimport type { IGaugeSeriesSpec, IGaugeSeriesTheme } from './interface';\nimport { ProgressLikeSeries } from '../polar/progress-like/progress-like';\nimport type { IProgressArcMark } from '../../mark/progress-arc';\nimport { registerDataSetInstanceTransform } from '../../data/register';\nimport { SEGMENT_FIELD_END, SEGMENT_FIELD_START } from '../../constant';\nimport type { Datum } from '@visactor/vgrammar';\nimport type { Maybe } from '../../typings';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport { BaseSeries } from '../base/base-series';\n\nexport class GaugeSeries extends ProgressLikeSeries<IGaugeSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.gauge;\n  type = SeriesTypeEnum.gauge;\n\n  static readonly mark: SeriesMarkMap = {\n    ...BaseSeries.mark,\n    [SeriesMarkNameEnum.segment]: { name: SeriesMarkNameEnum.segment, type: MarkTypeEnum.progressArc },\n    [SeriesMarkNameEnum.track]: { name: SeriesMarkNameEnum.track, type: MarkTypeEnum.progressArc }\n  };\n\n  protected declare _theme: Maybe<IGaugeSeriesTheme>;\n\n  private _segmentMark: IProgressArcMark | null = null;\n  private _trackMark: IProgressArcMark | null = null;\n\n  protected _stack: boolean = false;\n  protected _padAngle: number = 0;\n\n  setAttrFromSpec(): void {\n    super.setAttrFromSpec();\n\n    this._padAngle = radians(this._spec.padAngle ?? 0);\n  }\n\n  initData(): void {\n    super.initData();\n\n    /**\n     * @description 将数据排序并调整图元的起始点为上一个数据的终点，但是终点维持不变\n     */\n    const spiltSegment = (data: Datum[], op: string) => {\n      // 数据处理\n      const dataCollect = [...data];\n      dataCollect.sort((a, b) => a[this._angleField[0]] - b[this._angleField[0]]);\n      dataCollect.forEach((datum: any, i) => {\n        datum[SEGMENT_FIELD_END] = datum[this._angleField[0]];\n        if (i > 0) {\n          datum[SEGMENT_FIELD_START] = dataCollect[i - 1][SEGMENT_FIELD_END];\n        } else {\n          datum[SEGMENT_FIELD_START] = undefined;\n        }\n      });\n      return dataCollect;\n    };\n\n    registerDataSetInstanceTransform(this._option.dataSet, 'spiltSegment', spiltSegment);\n    this.getViewDataFilter()?.transform(\n      {\n        type: 'spiltSegment'\n      },\n      false\n    );\n  }\n\n  initMark(): void {\n    this._trackMark = this._createMark(GaugeSeries.mark.track) as IProgressArcMark;\n    this._segmentMark = this._createMark(GaugeSeries.mark.segment, {\n      isSeriesMark: true\n    }) as IProgressArcMark;\n  }\n\n  initMarkStyle(): void {\n    this.initTrackMarkStyle();\n    this.initSegmentMarkStyle();\n  }\n\n  private initSegmentMarkStyle() {\n    const segmentMark = this._segmentMark;\n    if (segmentMark) {\n      this.setMarkStyle(segmentMark, {\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._computeLayoutRadius() * (this._spec.innerRadius ?? 0),\n        // 需要优先兼容this._spec.radius\n        outerRadius: () => this._computeLayoutRadius() * (this._spec.radius ?? this._spec.outerRadius ?? 1),\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(segmentMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(segmentMark);\n    }\n  }\n\n  private initTrackMarkStyle() {\n    const trackMark = this._trackMark;\n    if (trackMark) {\n      this.setMarkStyle(trackMark, {\n        x: () => this.angleAxisHelper.center().x,\n        y: () => this.angleAxisHelper.center().y,\n        startAngle: this._startAngle,\n        endAngle: this._endAngle,\n        cornerRadius: this._spec.cornerRadius,\n        zIndex: 100\n      });\n      this._trigger.registerMark(trackMark);\n    }\n  }\n\n  protected _getAngleValueStart(datum: Datum) {\n    const angle = isValid(datum[SEGMENT_FIELD_START])\n      ? this.angleAxisHelper.dataToPosition([datum[SEGMENT_FIELD_START]])\n      : this._startAngle;\n    return angle + (this._spec.padAngle ?? 0) / 2;\n  }\n\n  protected _getAngleValueEnd(datum: Datum) {\n    const angle = this.angleAxisHelper.dataToPosition([datum[SEGMENT_FIELD_END]]);\n    return angle - (this._spec.padAngle ?? 0) / 2;\n  }\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<any>)?.preset;\n\n    this._segmentMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.circularProgress(\n          {\n            startAngle: this._startAngle\n          },\n          appearPreset\n        ),\n        userAnimationConfig(SeriesMarkNameEnum.segment, this._spec)\n      )\n    );\n  }\n}\n"]}

package/cjs/series/gauge/interface.d.ts

@@ -3,14 +3,15 @@ import type { IArcMarkSpec, IPathMarkSpec, IProgressArcMarkSpec, IRectMarkSpec }
 import type { IProgressLikeSeriesSpec, IProgressLikeSeriesTheme } from '../polar/progress-like/interface';
 import type { IAnimationSpec } from '../../animation/spec';
 import type { ProgressLikeAppearPreset } from '../polar/progress-like';
+import type { SeriesMarkNameEnum } from '../interface';
 export type GaugePointerMarks = 'pointer' | 'pin' | 'pinBackground';
 export interface IGaugePointerSeriesSpec extends IProgressLikeSeriesSpec, IAnimationSpec<GaugePointerMarks, ProgressLikeAppearPreset> {
     type: 'gaugePointer';
     valueField: string | string[];
     radiusField: string;
-    pin?: IMarkSpec<IPathMarkSpec> & PinMarkSpec;
-    pinBackground?: IMarkSpec<IPathMarkSpec> & PinMarkSpec;
-    pointer?: IMarkSpec<IPathMarkSpec | IRectMarkSpec> & PointerMarkSpec;
+    [SeriesMarkNameEnum.pin]?: IMarkSpec<IPathMarkSpec> & PinMarkSpec;
+    [SeriesMarkNameEnum.pinBackground]?: IMarkSpec<IPathMarkSpec> & PinMarkSpec;
+    [SeriesMarkNameEnum.pointer]?: IMarkSpec<IPathMarkSpec | IRectMarkSpec> & PointerMarkSpec;
 }
 export type PointerMarkSpec = {
     type: 'path' | 'rect';
@@ -25,19 +26,19 @@ export type PinMarkSpec = {
     height?: number;
 };
 export interface IGaugePointerSeriesTheme extends IProgressLikeSeriesTheme {
-    pin?: Partial<IMarkTheme<IPathMarkSpec> & PinMarkSpec>;
-    pinBackground?: Partial<IMarkTheme<IPathMarkSpec> & PinMarkSpec>;
-    pointer?: Partial<IMarkTheme<IPathMarkSpec | IRectMarkSpec> & PointerMarkSpec>;
+    [SeriesMarkNameEnum.pin]?: Partial<IMarkTheme<IPathMarkSpec> & PinMarkSpec>;
+    [SeriesMarkNameEnum.pinBackground]?: Partial<IMarkTheme<IPathMarkSpec> & PinMarkSpec>;
+    [SeriesMarkNameEnum.pointer]?: Partial<IMarkTheme<IPathMarkSpec | IRectMarkSpec> & PointerMarkSpec>;
 }
 export type GaugeMarks = 'segment' | 'track';
-export interface IGaugeSeriesSpec extends IProgressLikeSeriesSpec {
+export interface IGaugeSeriesSpec extends IProgressLikeSeriesSpec, IAnimationSpec<GaugeMarks, ProgressLikeAppearPreset> {
     type: 'gauge';
     padAngle?: number;
-    segment?: IMarkSpec<IProgressArcMarkSpec>;
-    track?: IMarkSpec<IArcMarkSpec>;
+    [SeriesMarkNameEnum.segment]?: IMarkSpec<IProgressArcMarkSpec>;
+    [SeriesMarkNameEnum.track]?: IMarkSpec<IArcMarkSpec>;
 }
 export interface IGaugeSeriesTheme extends IProgressLikeSeriesTheme {
     padAngle?: number;
-    segment?: Partial<IMarkTheme<IProgressArcMarkSpec>>;
-    track?: Partial<IMarkTheme<IArcMarkSpec>>;
+    [SeriesMarkNameEnum.segment]?: Partial<IMarkTheme<IProgressArcMarkSpec>>;
+    [SeriesMarkNameEnum.track]?: Partial<IMarkTheme<IArcMarkSpec>>;
 }

package/cjs/series/gauge/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/gauge/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IMarkSpec, IMarkTheme } from '../../typings/spec';\nimport type { IArcMarkSpec, IPathMarkSpec, IProgressArcMarkSpec, IRectMarkSpec } from '../../typings/visual';\nimport type { IProgressLikeSeriesSpec, IProgressLikeSeriesTheme } from '../polar/progress-like/interface';\nimport type { IAnimationSpec } from '../../animation/spec';\nimport type { ProgressLikeAppearPreset } from '../polar/progress-like';\n\nexport type GaugePointerMarks = 'pointer' | 'pin' | 'pinBackground';\n\nexport interface IGaugePointerSeriesSpec\n  extends IProgressLikeSeriesSpec,\n    IAnimationSpec<GaugePointerMarks, ProgressLikeAppearPreset> {\n  type: 'gaugePointer';\n\n  /** 数值字段（可影响指针角度） */\n  valueField: string | string[];\n\n  /** 半径字段（可影响指针长度，GaugePointerSeries 没有 categoryField） */\n  radiusField: string;\n\n  /** 图钉前景样式 */\n  pin?: IMarkSpec<IPathMarkSpec> & PinMarkSpec;\n  /** 图钉背景样式 */\n  pinBackground?: IMarkSpec<IPathMarkSpec> & PinMarkSpec;\n  /** 指针样式 */\n  pointer?: IMarkSpec<IPathMarkSpec | IRectMarkSpec> & PointerMarkSpec;\n}\n\nexport type PointerMarkSpec = {\n  type: 'path' | 'rect';\n\n  /** 指针宽度比例（0~1） */\n  width?: number;\n  /** 指针长度比例（0~1）（为空则挂载 radius） */\n  height?: number;\n  /** 指针靠近圆心的一端离圆心的距离 */\n  innerPadding?: number;\n  /** 指针靠近边缘的一端离边缘的距离 */\n  outerPadding?: number;\n\n  /** 中心点坐标（0~1） */\n  center?: [number, number];\n};\n\nexport type PinMarkSpec = {\n  /** 宽度 */\n  width?: number;\n  /** 高度 */\n  height?: number;\n};\n\nexport interface IGaugePointerSeriesTheme extends IProgressLikeSeriesTheme {\n  /** 图钉前景样式 */\n  pin?: Partial<IMarkTheme<IPathMarkSpec> & PinMarkSpec>;\n  /** 图钉背景样式 */\n  pinBackground?: Partial<IMarkTheme<IPathMarkSpec> & PinMarkSpec>;\n  /** 指针样式 */\n  pointer?: Partial<IMarkTheme<IPathMarkSpec | IRectMarkSpec> & PointerMarkSpec>;\n}\n\nexport type GaugeMarks = 'segment' | 'track';\n\nexport interface IGaugeSeriesSpec extends IProgressLikeSeriesSpec {\n  type: 'gauge';\n\n  /** 扇区间隔角度 */\n  padAngle?: number;\n\n  /** 扇区样式 */\n  segment?: IMarkSpec<IProgressArcMarkSpec>;\n  /** 背景样式 */\n  track?: IMarkSpec<IArcMarkSpec>;\n}\n\nexport interface IGaugeSeriesTheme extends IProgressLikeSeriesTheme {\n  /** 扇区间隔角度 */\n  padAngle?: number;\n\n  /** 扇区样式 */\n  segment?: Partial<IMarkTheme<IProgressArcMarkSpec>>;\n  /** 背景样式 */\n  track?: Partial<IMarkTheme<IArcMarkSpec>>;\n}\n"]}
+{"version":3,"sources":["../src/series/gauge/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IMarkSpec, IMarkTheme } from '../../typings/spec';\nimport type { IArcMarkSpec, IPathMarkSpec, IProgressArcMarkSpec, IRectMarkSpec } from '../../typings/visual';\nimport type { IProgressLikeSeriesSpec, IProgressLikeSeriesTheme } from '../polar/progress-like/interface';\nimport type { IAnimationSpec } from '../../animation/spec';\nimport type { ProgressLikeAppearPreset } from '../polar/progress-like';\nimport type { SeriesMarkNameEnum } from '../interface';\n\nexport type GaugePointerMarks = 'pointer' | 'pin' | 'pinBackground';\n\nexport interface IGaugePointerSeriesSpec\n  extends IProgressLikeSeriesSpec,\n    IAnimationSpec<GaugePointerMarks, ProgressLikeAppearPreset> {\n  type: 'gaugePointer';\n\n  /** 数值字段（可影响指针角度） */\n  valueField: string | string[];\n\n  /** 半径字段（可影响指针长度，GaugePointerSeries 没有 categoryField） */\n  radiusField: string;\n\n  /** 图钉前景样式 */\n  [SeriesMarkNameEnum.pin]?: IMarkSpec<IPathMarkSpec> & PinMarkSpec;\n  /** 图钉背景样式 */\n  [SeriesMarkNameEnum.pinBackground]?: IMarkSpec<IPathMarkSpec> & PinMarkSpec;\n  /** 指针样式 */\n  [SeriesMarkNameEnum.pointer]?: IMarkSpec<IPathMarkSpec | IRectMarkSpec> & PointerMarkSpec;\n}\n\nexport type PointerMarkSpec = {\n  type: 'path' | 'rect';\n\n  /** 指针宽度比例（0~1） */\n  width?: number;\n  /** 指针长度比例（0~1）（为空则挂载 radius） */\n  height?: number;\n  /** 指针靠近圆心的一端离圆心的距离 */\n  innerPadding?: number;\n  /** 指针靠近边缘的一端离边缘的距离 */\n  outerPadding?: number;\n\n  /** 中心点坐标（0~1） */\n  center?: [number, number];\n};\n\nexport type PinMarkSpec = {\n  /** 宽度 */\n  width?: number;\n  /** 高度 */\n  height?: number;\n};\n\nexport interface IGaugePointerSeriesTheme extends IProgressLikeSeriesTheme {\n  /** 图钉前景样式 */\n  [SeriesMarkNameEnum.pin]?: Partial<IMarkTheme<IPathMarkSpec> & PinMarkSpec>;\n  /** 图钉背景样式 */\n  [SeriesMarkNameEnum.pinBackground]?: Partial<IMarkTheme<IPathMarkSpec> & PinMarkSpec>;\n  /** 指针样式 */\n  [SeriesMarkNameEnum.pointer]?: Partial<IMarkTheme<IPathMarkSpec | IRectMarkSpec> & PointerMarkSpec>;\n}\n\nexport type GaugeMarks = 'segment' | 'track';\n\nexport interface IGaugeSeriesSpec\n  extends IProgressLikeSeriesSpec,\n    IAnimationSpec<GaugeMarks, ProgressLikeAppearPreset> {\n  type: 'gauge';\n\n  /** 扇区间隔角度 */\n  padAngle?: number;\n\n  /** 扇区样式 */\n  [SeriesMarkNameEnum.segment]?: IMarkSpec<IProgressArcMarkSpec>;\n  /** 背景样式 */\n  [SeriesMarkNameEnum.track]?: IMarkSpec<IArcMarkSpec>;\n}\n\nexport interface IGaugeSeriesTheme extends IProgressLikeSeriesTheme {\n  /** 扇区间隔角度 */\n  padAngle?: number;\n\n  /** 扇区样式 */\n  [SeriesMarkNameEnum.segment]?: Partial<IMarkTheme<IProgressArcMarkSpec>>;\n  /** 背景样式 */\n  [SeriesMarkNameEnum.track]?: Partial<IMarkTheme<IArcMarkSpec>>;\n}\n"]}

package/cjs/series/heatmap/heatmap.d.ts

@@ -3,12 +3,14 @@ import type { Maybe } from '../../typings';
 import type { IHeatmapSeriesSpec, IHeatmapSeriesTheme } from './interface';
 import type { IAxisHelper } from '../../component/axis/cartesian/interface';
 import type { ITextMark } from '../../mark/text';
+import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface';
 import type { ICellMark } from '../../mark/cell';
 export declare const DefaultBandWidth = 6;
 export declare class HeatmapSeries extends CartesianSeries<IHeatmapSeriesSpec> {
     static readonly type: string;
     type: SeriesTypeEnum;
+    static readonly mark: SeriesMarkMap;
     protected _theme: Maybe<IHeatmapSeriesTheme>;
     protected _cellMark: ICellMark;
     protected _backgroundMark: ICellMark;
@@ -22,7 +24,7 @@ export declare class HeatmapSeries extends CartesianSeries<IHeatmapSeriesSpec> {
     initCellMarkStyle(): void;
     initCellBackgroundMarkStyle(): void;
     getColorAttribute(): {
-        scale: import("@visactor/vscale").IBaseScale | import("@visactor/vscale").OrdinalScale;
+        scale: any;
         field: any;
     };
     initAnimation(): void;

package/cjs/series/heatmap/heatmap.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.HeatmapSeries = exports.DefaultBandWidth = void 0;
 
-const cartesian_1 = require("../cartesian/cartesian"), interface_1 = require("../../mark/interface"), constant_1 = require("../../constant"), util_1 = require("../../util"), utils_1 = require("../../animation/utils"), interface_2 = require("../interface"), config_1 = require("../../animation/config"), vutils_1 = require("@visactor/vutils"), tooltip_helper_1 = require("./tooltip-helper");
+const cartesian_1 = require("../cartesian/cartesian"), interface_1 = require("../../mark/interface"), constant_1 = require("../../constant"), util_1 = require("../../util"), utils_1 = require("../../animation/utils"), interface_2 = require("../interface"), config_1 = require("../../animation/config"), vutils_1 = require("@visactor/vutils"), tooltip_helper_1 = require("./tooltip-helper"), base_series_1 = require("../base/base-series");
 
 exports.DefaultBandWidth = 6;
 
@@ -28,7 +28,7 @@ class HeatmapSeries extends cartesian_1.CartesianSeries {
             large: this._spec.large,
             largeThreshold: this._spec.largeThreshold
         };
-        this._cellMark = this._createMark(interface_1.MarkTypeEnum.cell, "cell", {
+        this._cellMark = this._createMark(HeatmapSeries.mark.cell, {
             morph: (0, utils_1.shouldDoMorph)(this._spec.animation, this._spec.morph, (0, utils_1.userAnimationConfig)("cell", this._spec)),
             defaultMorphElementKey: this.getDimensionField()[0],
             isSeriesMark: !0,
@@ -36,7 +36,7 @@ class HeatmapSeries extends cartesian_1.CartesianSeries {
                 animation: this._spec.animation
             }, this._spec.label),
             progressive: progressive
-        }), this._backgroundMark = this._createMark(interface_1.MarkTypeEnum.cell, "cellBackground", {
+        }), this._backgroundMark = this._createMark(HeatmapSeries.mark.cellBackground, {
             progressive: progressive
         });
     }
@@ -50,15 +50,14 @@ class HeatmapSeries extends cartesian_1.CartesianSeries {
         });
     }
     initCellMarkStyle() {
-        var _a, _b, _c, _d;
+        var _a;
         this.setMarkStyle(this._cellMark, {
             x: datum => this.dataToPositionX(datum),
             y: datum => this.dataToPositionY(datum),
             size: () => [ this.getCellSize(this._xAxisHelper), this.getCellSize(this._yAxisHelper) ],
-            fill: this.getColorAttribute(),
-            fillOpacity: null !== (_c = null === (_b = null === (_a = this._theme.cell) || void 0 === _a ? void 0 : _a.style) || void 0 === _b ? void 0 : _b.fillOpacity) && void 0 !== _c ? _c : 1
+            fill: this.getColorAttribute()
         }, "normal", constant_1.AttributeLevel.Series), this._trigger.registerMark(this._cellMark), 
-        null === (_d = this._tooltipHelper) || void 0 === _d || _d.activeTriggerSet.mark.add(this._cellMark);
+        null === (_a = this._tooltipHelper) || void 0 === _a || _a.activeTriggerSet.mark.add(this._cellMark);
     }
     initCellBackgroundMarkStyle() {
         var _a, _b, _c;
@@ -87,7 +86,7 @@ class HeatmapSeries extends cartesian_1.CartesianSeries {
         var _a, _b;
         const appearPreset = null === (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.animationAppear) || void 0 === _b ? void 0 : _b.preset;
         this._cellMark.setAnimationConfig((0, utils_1.animationConfig)(config_1.DEFAULT_MARK_ANIMATION.heatmap(appearPreset), (0, 
-        utils_1.userAnimationConfig)("cell", this._spec), {
+        utils_1.userAnimationConfig)(interface_2.SeriesMarkNameEnum.cell, this._spec), {
             dataIndex: datum => {
                 var _a, _b, _c;
                 const xValue = null == datum ? void 0 : datum[this._fieldX[0]];
@@ -118,5 +117,15 @@ class HeatmapSeries extends cartesian_1.CartesianSeries {
     }
 }
 
-exports.HeatmapSeries = HeatmapSeries, HeatmapSeries.type = interface_2.SeriesTypeEnum.heatmap;
+exports.HeatmapSeries = HeatmapSeries, HeatmapSeries.type = interface_2.SeriesTypeEnum.heatmap, 
+HeatmapSeries.mark = Object.assign(Object.assign({}, base_series_1.BaseSeries.mark), {
+    [interface_2.SeriesMarkNameEnum.cell]: {
+        name: interface_2.SeriesMarkNameEnum.cell,
+        type: interface_1.MarkTypeEnum.cell
+    },
+    [interface_2.SeriesMarkNameEnum.cellBackground]: {
+        name: interface_2.SeriesMarkNameEnum.cellBackground,
+        type: interface_1.MarkTypeEnum.cell
+    }
+});
 //# sourceMappingURL=heatmap.js.map

package/cjs/series/heatmap/heatmap.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/heatmap/heatmap.ts"],"names":[],"mappings":"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","file":"heatmap.js","sourcesContent":["import { CartesianSeries } from '../cartesian/cartesian';\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { AttributeLevel } from '../../constant';\nimport type { Maybe, Datum } from '../../typings';\nimport { array, merge } from '../../util';\nimport type { HeatmapAppearPreset } from './animation';\nimport { animationConfig, shouldDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { IHeatmapSeriesSpec, IHeatmapSeriesTheme } from './interface';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { ITextMark } from '../../mark/text';\nimport { SeriesTypeEnum } from '../interface';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport type { ICellMark } from '../../mark/cell';\nimport { normalizePadding } from '@visactor/vutils';\nimport { HeatmapSeriesTooltipHelper } from './tooltip-helper';\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\n\nexport class HeatmapSeries extends CartesianSeries<IHeatmapSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.heatmap;\n  type = SeriesTypeEnum.heatmap;\n\n  protected declare _theme: Maybe<IHeatmapSeriesTheme>;\n\n  protected _cellMark: ICellMark;\n  protected _backgroundMark: ICellMark;\n\n  protected _fieldValue!: string[];\n  getFieldValue() {\n    return this._fieldValue;\n  }\n  setFieldValue(f: string | string[]) {\n    this._fieldValue = array(f);\n  }\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec();\n    this.setFieldValue(this._spec.valueField);\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    this._cellMark = this._createMark(MarkTypeEnum.cell, 'cell', {\n      morph: shouldDoMorph(this._spec.animation, this._spec.morph, userAnimationConfig('cell', this._spec)),\n      defaultMorphElementKey: this.getDimensionField()[0],\n      isSeriesMark: true,\n      label: merge({ animation: this._spec.animation }, this._spec.label),\n      progressive\n    }) as ICellMark;\n\n    this._backgroundMark = this._createMark(MarkTypeEnum.cell, 'cellBackground', {\n      progressive\n    }) as ICellMark;\n  }\n\n  initMarkStyle(): void {\n    this.initCellMarkStyle();\n    this.initCellBackgroundMarkStyle();\n  }\n\n  initLabelMarkStyle(textMark: ITextMark) {\n    if (!textMark) {\n      return;\n    }\n    this.setMarkStyle(textMark, {\n      fill: this.getColorAttribute(),\n      text: (datum: Datum) => {\n        return datum[this.getMeasureField()[0]];\n      }\n    });\n  }\n\n  initCellMarkStyle() {\n    this.setMarkStyle(\n      this._cellMark,\n      {\n        x: (datum: Datum) => {\n          const pos = this.dataToPositionX(datum);\n          return pos;\n        },\n        y: (datum: Datum) => {\n          const pos = this.dataToPositionY(datum);\n          return pos;\n        },\n        size: () => {\n          return [this.getCellSize(this._xAxisHelper), this.getCellSize(this._yAxisHelper)];\n        },\n        fill: this.getColorAttribute(),\n        fillOpacity: this._theme.cell?.style?.fillOpacity ?? 1\n      },\n      'normal',\n      AttributeLevel.Series\n    );\n\n    this._trigger.registerMark(this._cellMark);\n    this._tooltipHelper?.activeTriggerSet.mark.add(this._cellMark);\n  }\n\n  initCellBackgroundMarkStyle() {\n    const padding = normalizePadding(this._spec.cellBackground?.style?.padding ?? 0);\n    this.setMarkStyle(\n      this._backgroundMark,\n      {\n        x: (datum: Datum) => {\n          const width = this.getCellSize(this._xAxisHelper);\n          const pos = this.dataToPositionX(datum);\n          return pos - width / 2 + padding[3];\n        },\n        y: (datum: Datum) => {\n          const height = this.getCellSize(this._yAxisHelper);\n          const pos = this.dataToPositionY(datum);\n          return pos - height / 2 + padding[0];\n        },\n        width: () => {\n          return this.getCellSize(this._xAxisHelper) - padding[1] - padding[3];\n        },\n        height: () => {\n          return this.getCellSize(this._yAxisHelper) - padding[0] - padding[2];\n        }\n      },\n      'normal',\n      AttributeLevel.Series\n    );\n  }\n\n  // 通用的默认颜色映射 用户设置优先级比这个高，会在setStyle中处理\n  getColorAttribute() {\n    return {\n      // TODO: 为热力图实现默认线性颜色 scale\n      scale: this._option.globalScale.getScale('color') ?? this.getDefaultColorScale(),\n      field: this.getFieldValue[0]\n    };\n  }\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<HeatmapAppearPreset>)?.preset;\n    // 分组数据的dataIndex应该与x轴顺序一致，而非data[DEFAULT_DATA_INDEX]顺序\n    const dataIndex = (datum: any) => {\n      const xValue = datum?.[this._fieldX[0]];\n      const xIndex = this.getViewDataStatistics()?.latestData?.[this._fieldX[0]]?.values.indexOf(xValue);\n      // 不应该出现xIndex === -1 || undefined的情况\n      return xIndex || 0;\n    };\n\n    this._cellMark.setAnimationConfig(\n      animationConfig(DEFAULT_MARK_ANIMATION.heatmap(appearPreset), userAnimationConfig('cell', this._spec), {\n        dataIndex\n      })\n    );\n  }\n\n  protected getCellSize(axisHelper: IAxisHelper) {\n    return axisHelper.getBandwidth?.(0) ?? DefaultBandWidth;\n  }\n\n  /**\n   * spec 更新\n   * @param spec\n   * @returns\n   */\n  updateSpec(spec: IHeatmapSeriesSpec) {\n    // super updateSpec 会执行 setAttrFromSpec 所以先缓存比对值\n    const { direction } = this._spec;\n    const result = super.updateSpec(spec);\n    if (spec.direction !== direction) {\n      result.change = true;\n      result.reRender = true;\n      result.reMake = true;\n    }\n    return result;\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new HeatmapSeriesTooltipHelper(this);\n  }\n\n  getDefaultShapeType(): string {\n    return 'square';\n  }\n\n  getDimensionField(): string[] {\n    return [].concat(this.fieldX, this.fieldY);\n  }\n\n  getMeasureField(): string[] {\n    return this.getFieldValue();\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/heatmap/heatmap.ts"],"names":[],"mappings":"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","file":"heatmap.js","sourcesContent":["import { CartesianSeries } from '../cartesian/cartesian';\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { AttributeLevel } from '../../constant';\nimport type { Maybe, Datum } from '../../typings';\nimport { array, merge } from '../../util';\nimport type { HeatmapAppearPreset } from './animation';\nimport { animationConfig, shouldDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { IHeatmapSeriesSpec, IHeatmapSeriesTheme } from './interface';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { ITextMark } from '../../mark/text';\nimport type { SeriesMarkMap } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport type { ICellMark } from '../../mark/cell';\nimport { normalizePadding } from '@visactor/vutils';\nimport { HeatmapSeriesTooltipHelper } from './tooltip-helper';\nimport { BaseSeries } from '../base/base-series';\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\n\nexport class HeatmapSeries extends CartesianSeries<IHeatmapSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.heatmap;\n  type = SeriesTypeEnum.heatmap;\n\n  static readonly mark: SeriesMarkMap = {\n    ...BaseSeries.mark,\n    [SeriesMarkNameEnum.cell]: { name: SeriesMarkNameEnum.cell, type: MarkTypeEnum.cell },\n    [SeriesMarkNameEnum.cellBackground]: { name: SeriesMarkNameEnum.cellBackground, type: MarkTypeEnum.cell }\n  };\n\n  protected declare _theme: Maybe<IHeatmapSeriesTheme>;\n\n  protected _cellMark: ICellMark;\n  protected _backgroundMark: ICellMark;\n\n  protected _fieldValue!: string[];\n  getFieldValue() {\n    return this._fieldValue;\n  }\n  setFieldValue(f: string | string[]) {\n    this._fieldValue = array(f);\n  }\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec();\n    this.setFieldValue(this._spec.valueField);\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    this._cellMark = this._createMark(HeatmapSeries.mark.cell, {\n      morph: shouldDoMorph(this._spec.animation, this._spec.morph, userAnimationConfig('cell', this._spec)),\n      defaultMorphElementKey: this.getDimensionField()[0],\n      isSeriesMark: true,\n      label: merge({ animation: this._spec.animation }, this._spec.label),\n      progressive\n    }) as ICellMark;\n\n    this._backgroundMark = this._createMark(HeatmapSeries.mark.cellBackground, {\n      progressive\n    }) as ICellMark;\n  }\n\n  initMarkStyle(): void {\n    this.initCellMarkStyle();\n    this.initCellBackgroundMarkStyle();\n  }\n\n  initLabelMarkStyle(textMark: ITextMark) {\n    if (!textMark) {\n      return;\n    }\n    this.setMarkStyle(textMark, {\n      fill: this.getColorAttribute(),\n      text: (datum: Datum) => {\n        return datum[this.getMeasureField()[0]];\n      }\n    });\n  }\n\n  initCellMarkStyle() {\n    this.setMarkStyle(\n      this._cellMark,\n      {\n        x: (datum: Datum) => {\n          const pos = this.dataToPositionX(datum);\n          return pos;\n        },\n        y: (datum: Datum) => {\n          const pos = this.dataToPositionY(datum);\n          return pos;\n        },\n        size: () => {\n          return [this.getCellSize(this._xAxisHelper), this.getCellSize(this._yAxisHelper)];\n        },\n        fill: this.getColorAttribute()\n      },\n      'normal',\n      AttributeLevel.Series\n    );\n\n    this._trigger.registerMark(this._cellMark);\n    this._tooltipHelper?.activeTriggerSet.mark.add(this._cellMark);\n  }\n\n  initCellBackgroundMarkStyle() {\n    const padding = normalizePadding(this._spec.cellBackground?.style?.padding ?? 0);\n    this.setMarkStyle(\n      this._backgroundMark,\n      {\n        x: (datum: Datum) => {\n          const width = this.getCellSize(this._xAxisHelper);\n          const pos = this.dataToPositionX(datum);\n          return pos - width / 2 + padding[3];\n        },\n        y: (datum: Datum) => {\n          const height = this.getCellSize(this._yAxisHelper);\n          const pos = this.dataToPositionY(datum);\n          return pos - height / 2 + padding[0];\n        },\n        width: () => {\n          return this.getCellSize(this._xAxisHelper) - padding[1] - padding[3];\n        },\n        height: () => {\n          return this.getCellSize(this._yAxisHelper) - padding[0] - padding[2];\n        }\n      },\n      'normal',\n      AttributeLevel.Series\n    );\n  }\n\n  // 通用的默认颜色映射 用户设置优先级比这个高，会在setStyle中处理\n  getColorAttribute() {\n    return {\n      // TODO: 为热力图实现默认线性颜色 scale\n      scale: this._option.globalScale.getScale('color') ?? this.getDefaultColorScale(),\n      field: this.getFieldValue[0]\n    };\n  }\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<HeatmapAppearPreset>)?.preset;\n    // 分组数据的dataIndex应该与x轴顺序一致，而非data[DEFAULT_DATA_INDEX]顺序\n    const dataIndex = (datum: any) => {\n      const xValue = datum?.[this._fieldX[0]];\n      const xIndex = this.getViewDataStatistics()?.latestData?.[this._fieldX[0]]?.values.indexOf(xValue);\n      // 不应该出现xIndex === -1 || undefined的情况\n      return xIndex || 0;\n    };\n\n    this._cellMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.heatmap(appearPreset),\n        userAnimationConfig(SeriesMarkNameEnum.cell, this._spec),\n        {\n          dataIndex\n        }\n      )\n    );\n  }\n\n  protected getCellSize(axisHelper: IAxisHelper) {\n    return axisHelper.getBandwidth?.(0) ?? DefaultBandWidth;\n  }\n\n  /**\n   * spec 更新\n   * @param spec\n   * @returns\n   */\n  updateSpec(spec: IHeatmapSeriesSpec) {\n    // super updateSpec 会执行 setAttrFromSpec 所以先缓存比对值\n    const { direction } = this._spec;\n    const result = super.updateSpec(spec);\n    if (spec.direction !== direction) {\n      result.change = true;\n      result.reRender = true;\n      result.reMake = true;\n    }\n    return result;\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new HeatmapSeriesTooltipHelper(this);\n  }\n\n  getDefaultShapeType(): string {\n    return 'square';\n  }\n\n  getDimensionField(): string[] {\n    return [].concat(this.fieldX, this.fieldY);\n  }\n\n  getMeasureField(): string[] {\n    return this.getFieldValue();\n  }\n}\n"]}

package/cjs/series/heatmap/interface.d.ts

@@ -5,18 +5,19 @@ import type { IAnimationSpec } from '../../animation/spec';
 import type { HeatmapAppearPreset } from './animation';
 import type { ILabelSpec } from '../../component/label';
 import type { IMarkProgressiveConfig } from '../../mark/interface';
+import type { SeriesMarkNameEnum } from '../interface';
 type HeatmapMarks = 'cell' | 'background' | 'label';
 export interface IHeatmapSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<HeatmapMarks, HeatmapAppearPreset>, IMarkProgressiveConfig {
     type: 'heatmap';
     valueField?: string;
-    cell?: IMarkSpec<IRectMarkSpec>;
-    cellBackground?: IMarkSpec<IRectMarkSpec>;
-    label?: ILabelSpec & {
+    [SeriesMarkNameEnum.cell]?: IMarkSpec<IRectMarkSpec>;
+    [SeriesMarkNameEnum.cellBackground]?: IMarkSpec<IRectMarkSpec>;
+    [SeriesMarkNameEnum.label]?: ILabelSpec & {
         position?: 'inside' | 'inside-top' | 'inside-bottom' | 'inside-right' | 'inside-left';
     };
 }
 export interface IHeatmapSeriesTheme extends ICartesianSeriesTheme {
-    cell?: Partial<IMarkTheme<IRectMarkSpec>>;
-    cellBackground?: Partial<IMarkTheme<IRectMarkSpec>>;
+    [SeriesMarkNameEnum.cell]?: Partial<IMarkTheme<IRectMarkSpec>>;
+    [SeriesMarkNameEnum.cellBackground]?: Partial<IMarkTheme<IRectMarkSpec>>;
 }
 export {};

package/cjs/series/heatmap/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/heatmap/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 { IRectMarkSpec } from '../../typings/visual';\nimport type { IAnimationSpec } from '../../animation/spec';\nimport type { HeatmapAppearPreset } from './animation';\nimport type { ILabelSpec } from '../../component/label';\nimport type { IMarkProgressiveConfig } from '../../mark/interface';\n\ntype HeatmapMarks = 'cell' | 'background' | 'label';\n\nexport interface IHeatmapSeriesSpec\n  extends ICartesianSeriesSpec,\n    IAnimationSpec<HeatmapMarks, HeatmapAppearPreset>,\n    IMarkProgressiveConfig {\n  /**\n   *  系列类型\n   */\n  type: 'heatmap';\n\n  /** 值 field */\n  valueField?: string;\n\n  /** 图元配置 */\n  cell?: IMarkSpec<IRectMarkSpec>;\n\n  /** 图元背景配置 */\n  cellBackground?: IMarkSpec<IRectMarkSpec>;\n\n  /** 标签配置*/\n  label?: ILabelSpec & {\n    /** 标签位置 */\n    position?: 'inside' | 'inside-top' | 'inside-bottom' | 'inside-right' | 'inside-left';\n  };\n}\n\nexport interface IHeatmapSeriesTheme extends ICartesianSeriesTheme {\n  cell?: Partial<IMarkTheme<IRectMarkSpec>>;\n  cellBackground?: Partial<IMarkTheme<IRectMarkSpec>>;\n}\n"]}
+{"version":3,"sources":["../src/series/heatmap/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 { IRectMarkSpec } from '../../typings/visual';\nimport type { IAnimationSpec } from '../../animation/spec';\nimport type { HeatmapAppearPreset } from './animation';\nimport type { ILabelSpec } from '../../component/label';\nimport type { IMarkProgressiveConfig } from '../../mark/interface';\nimport type { SeriesMarkNameEnum } from '../interface';\n\ntype HeatmapMarks = 'cell' | 'background' | 'label';\n\nexport interface IHeatmapSeriesSpec\n  extends ICartesianSeriesSpec,\n    IAnimationSpec<HeatmapMarks, HeatmapAppearPreset>,\n    IMarkProgressiveConfig {\n  /**\n   *  系列类型\n   */\n  type: 'heatmap';\n\n  /** 值 field */\n  valueField?: string;\n\n  /** 图元配置 */\n  [SeriesMarkNameEnum.cell]?: IMarkSpec<IRectMarkSpec>;\n\n  /** 图元背景配置 */\n  [SeriesMarkNameEnum.cellBackground]?: IMarkSpec<IRectMarkSpec>;\n\n  /** 标签配置*/\n  [SeriesMarkNameEnum.label]?: ILabelSpec & {\n    /** 标签位置 */\n    position?: 'inside' | 'inside-top' | 'inside-bottom' | 'inside-right' | 'inside-left';\n  };\n}\n\nexport interface IHeatmapSeriesTheme extends ICartesianSeriesTheme {\n  [SeriesMarkNameEnum.cell]?: Partial<IMarkTheme<IRectMarkSpec>>;\n  [SeriesMarkNameEnum.cellBackground]?: Partial<IMarkTheme<IRectMarkSpec>>;\n}\n"]}