@visactor/vchart 1.9.0-alpha.0 → 1.9.0-alpha.2

package/cjs/series/gauge/gauge.js

@@ -19,7 +19,7 @@ class GaugeSeries extends progress_like_1.ProgressLikeSeries {
         var _a;
         super.initData();
         (0, register_1.registerDataSetInstanceTransform)(this._option.dataSet, "spiltSegment", ((data, op) => {
-            const dataCollect = [ ...data ];
+            const dataCollect = data.slice();
             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;
@@ -43,7 +43,7 @@ class GaugeSeries extends progress_like_1.ProgressLikeSeries {
     initSegmentMarkStyle() {
         var _a;
         const segmentMark = this._segmentMark;
-        segmentMark && (this.setMarkStyle(segmentMark, {
+        segmentMark && this.setMarkStyle(segmentMark, {
             x: () => this.angleAxisHelper.center().x,
             y: () => this.angleAxisHelper.center().y,
             startAngle: this._getAngleValueStart.bind(this),
@@ -62,7 +62,7 @@ class GaugeSeries extends progress_like_1.ProgressLikeSeries {
             fill: this.getColorAttribute(),
             zIndex: 200,
             forceShowCap: !0
-        }), this._trigger.registerMark(segmentMark));
+        });
     }
     initTooltip() {
         super.initTooltip(), this._segmentMark && this._tooltipHelper.activeTriggerSet.mark.add(this._segmentMark);
@@ -70,7 +70,7 @@ class GaugeSeries extends progress_like_1.ProgressLikeSeries {
     initTrackMarkStyle() {
         var _a;
         const trackMark = this._trackMark;
-        trackMark && (this.setMarkStyle(trackMark, {
+        trackMark && this.setMarkStyle(trackMark, {
             x: () => this.angleAxisHelper.center().x,
             y: () => this.angleAxisHelper.center().y,
             startAngle: this._startAngle,
@@ -87,7 +87,7 @@ class GaugeSeries extends progress_like_1.ProgressLikeSeries {
             boundsMode: "imprecise",
             cornerRadius: this._spec.cornerRadius,
             zIndex: 100
-        }), this._trigger.registerMark(trackMark));
+        });
     }
     _getAngleValueStartWithoutMask(datum) {
         const startAngle = this._getAngleValueStartWithoutPadAngle(datum), endAngle = this._getAngleValueEndWithoutPadAngle(datum);
@@ -108,7 +108,7 @@ class GaugeSeries 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._segmentMark.setAnimationConfig((0, utils_1.animationConfig)(null === (_c = factory_1.Factory.getAnimationInKey("circularProgress")) || void 0 === _c ? void 0 : _c({
             startAngle: this._startAngle
-        }, appearPreset), (0, utils_1.userAnimationConfig)(type_1.SeriesMarkNameEnum.segment, this._spec, this._markAttributeContext)));
+        }, appearPreset), (0, utils_1.userAnimationConfig)("segment", this._spec, this._markAttributeContext)));
     }
     getDefaultShapeType() {
         return "circle";

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 type { SeriesMarkMap } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\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-core';\nimport type { Maybe } from '../../typings';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\n// eslint-disable-next-line no-duplicate-imports\nimport { ProgressArcMark, registerProgressArcMark } from '../../mark/progress-arc';\nimport { gaugeSeriesMark } from './constant';\nimport { degreeToRadian, isValid } from '@visactor/vutils';\nimport { Factory } from '../../core/factory';\nimport { registerProgressLikeAnimation } from '../polar/progress-like';\nimport type { IMark } from '../../mark/interface';\nimport { GaugeSeriesSpecTransformer } from './gauge-transformer';\n\nexport class GaugeSeries<T extends IGaugeSeriesSpec = IGaugeSeriesSpec> extends ProgressLikeSeries<T> {\n  static readonly type: string = SeriesTypeEnum.gauge;\n  type = SeriesTypeEnum.gauge;\n\n  static readonly mark: SeriesMarkMap = gaugeSeriesMark;\n  static readonly transformerConstructor = GaugeSeriesSpecTransformer as any;\n  readonly transformerConstructor = GaugeSeriesSpecTransformer;\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    this._padAngle = degreeToRadian(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.getViewData()?.transform(\n      {\n        type: 'spiltSegment'\n      },\n      false\n    );\n  }\n\n  initMark(): void {\n    super.initMark();\n    this._trackMark = this._createMark(GaugeSeries.mark.track, {\n      parent: this._arcGroupMark,\n      dataView: false\n    }) as IProgressArcMark;\n    this._segmentMark = this._createMark(GaugeSeries.mark.segment, {\n      parent: this._arcGroupMark,\n      isSeriesMark: true\n    }) as IProgressArcMark;\n  }\n\n  initMarkStyle(): void {\n    super.initMarkStyle();\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        outerRadius: () => this._computeLayoutRadius() * (this._spec.radius ?? this._spec.outerRadius ?? 1), // 需要优先兼容this._spec.radius\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    }\n  }\n\n  protected initTooltip() {\n    super.initTooltip();\n\n    this._segmentMark && this._tooltipHelper.activeTriggerSet.mark.add(this._segmentMark);\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        innerRadius: () => this._computeLayoutRadius() * (this._spec.innerRadius ?? 0),\n        outerRadius: () => this._computeLayoutRadius() * (this._spec.radius ?? this._spec.outerRadius ?? 1), // 需要优先兼容this._spec.radius\n        cap: this._spec.roundCap ?? false,\n        boundsMode: 'imprecise',\n        cornerRadius: this._spec.cornerRadius,\n        zIndex: 100\n      });\n      this._trigger.registerMark(trackMark);\n    }\n  }\n\n  protected _getAngleValueStartWithoutMask(datum: Datum) {\n    const startAngle = this._getAngleValueStartWithoutPadAngle(datum);\n    const endAngle = this._getAngleValueEndWithoutPadAngle(datum);\n    return Math.min(startAngle + this._padAngle / 2, (startAngle + endAngle) / 2);\n  }\n\n  protected _getAngleValueEndWithoutMask(datum: Datum) {\n    const startAngle = this._getAngleValueStartWithoutPadAngle(datum);\n    const endAngle = this._getAngleValueEndWithoutPadAngle(datum);\n    return Math.max(endAngle - this._padAngle / 2, (startAngle + endAngle) / 2);\n  }\n\n  protected _getAngleValueStartWithoutPadAngle(datum: Datum) {\n    return isValid(datum[SEGMENT_FIELD_START])\n      ? this.angleAxisHelper.dataToPosition([datum[SEGMENT_FIELD_START]])\n      : this._startAngle;\n  }\n\n  protected _getAngleValueEndWithoutPadAngle(datum: Datum) {\n    return this.angleAxisHelper.dataToPosition([datum[SEGMENT_FIELD_END]]);\n  }\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<any>)?.preset;\n\n    this._segmentMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('circularProgress')?.(\n          {\n            startAngle: this._startAngle\n          },\n          appearPreset\n        ),\n        userAnimationConfig(SeriesMarkNameEnum.segment, this._spec, this._markAttributeContext)\n      )\n    );\n  }\n\n  getDefaultShapeType() {\n    return 'circle';\n  }\n\n  getActiveMarks(): IMark[] {\n    return [];\n  }\n}\n\nexport const registerGaugeSeries = () => {\n  registerProgressArcMark();\n  registerProgressLikeAnimation();\n  Factory.registerSeries(GaugeSeries.type, GaugeSeries);\n};\n"]}
+{"version":3,"sources":["../src/series/gauge/gauge.ts"],"names":[],"mappings":"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","file":"gauge.js","sourcesContent":["import type { SeriesMarkMap } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\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-core';\nimport type { Maybe } from '../../typings';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\n// eslint-disable-next-line no-duplicate-imports\nimport { ProgressArcMark, registerProgressArcMark } from '../../mark/progress-arc';\nimport { gaugeSeriesMark } from './constant';\nimport { degreeToRadian, isValid } from '@visactor/vutils';\nimport { Factory } from '../../core/factory';\nimport { registerProgressLikeAnimation } from '../polar/progress-like';\nimport type { IMark } from '../../mark/interface';\nimport { GaugeSeriesSpecTransformer } from './gauge-transformer';\n\nexport class GaugeSeries<T extends IGaugeSeriesSpec = IGaugeSeriesSpec> extends ProgressLikeSeries<T> {\n  static readonly type: string = SeriesTypeEnum.gauge;\n  type = SeriesTypeEnum.gauge;\n\n  static readonly mark: SeriesMarkMap = gaugeSeriesMark;\n  static readonly transformerConstructor = GaugeSeriesSpecTransformer as any;\n  readonly transformerConstructor = GaugeSeriesSpecTransformer;\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    this._padAngle = degreeToRadian(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.slice();\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.getViewData()?.transform(\n      {\n        type: 'spiltSegment'\n      },\n      false\n    );\n  }\n\n  initMark(): void {\n    super.initMark();\n    this._trackMark = this._createMark(GaugeSeries.mark.track, {\n      parent: this._arcGroupMark,\n      dataView: false\n    }) as IProgressArcMark;\n    this._segmentMark = this._createMark(GaugeSeries.mark.segment, {\n      parent: this._arcGroupMark,\n      isSeriesMark: true\n    }) as IProgressArcMark;\n  }\n\n  initMarkStyle(): void {\n    super.initMarkStyle();\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        outerRadius: () => this._computeLayoutRadius() * (this._spec.radius ?? this._spec.outerRadius ?? 1), // 需要优先兼容this._spec.radius\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    }\n  }\n\n  protected initTooltip() {\n    super.initTooltip();\n\n    this._segmentMark && this._tooltipHelper.activeTriggerSet.mark.add(this._segmentMark);\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        innerRadius: () => this._computeLayoutRadius() * (this._spec.innerRadius ?? 0),\n        outerRadius: () => this._computeLayoutRadius() * (this._spec.radius ?? this._spec.outerRadius ?? 1), // 需要优先兼容this._spec.radius\n        cap: this._spec.roundCap ?? false,\n        boundsMode: 'imprecise',\n        cornerRadius: this._spec.cornerRadius,\n        zIndex: 100\n      });\n    }\n  }\n\n  protected _getAngleValueStartWithoutMask(datum: Datum) {\n    const startAngle = this._getAngleValueStartWithoutPadAngle(datum);\n    const endAngle = this._getAngleValueEndWithoutPadAngle(datum);\n    return Math.min(startAngle + this._padAngle / 2, (startAngle + endAngle) / 2);\n  }\n\n  protected _getAngleValueEndWithoutMask(datum: Datum) {\n    const startAngle = this._getAngleValueStartWithoutPadAngle(datum);\n    const endAngle = this._getAngleValueEndWithoutPadAngle(datum);\n    return Math.max(endAngle - this._padAngle / 2, (startAngle + endAngle) / 2);\n  }\n\n  protected _getAngleValueStartWithoutPadAngle(datum: Datum) {\n    return isValid(datum[SEGMENT_FIELD_START])\n      ? this.angleAxisHelper.dataToPosition([datum[SEGMENT_FIELD_START]])\n      : this._startAngle;\n  }\n\n  protected _getAngleValueEndWithoutPadAngle(datum: Datum) {\n    return this.angleAxisHelper.dataToPosition([datum[SEGMENT_FIELD_END]]);\n  }\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<any>)?.preset;\n\n    this._segmentMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('circularProgress')?.(\n          {\n            startAngle: this._startAngle\n          },\n          appearPreset\n        ),\n        userAnimationConfig(SeriesMarkNameEnum.segment, this._spec, this._markAttributeContext)\n      )\n    );\n  }\n\n  getDefaultShapeType() {\n    return 'circle';\n  }\n\n  getActiveMarks(): IMark[] {\n    return [];\n  }\n}\n\nexport const registerGaugeSeries = () => {\n  registerProgressArcMark();\n  registerProgressLikeAnimation();\n  Factory.registerSeries(GaugeSeries.type, GaugeSeries);\n};\n"]}

package/cjs/series/heatmap/constant.js

@@ -4,16 +4,16 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.heatmapSeriesMark = void 0;
 
-const type_1 = require("../../mark/interface/type"), constant_1 = require("../base/constant"), type_2 = require("../interface/type");
+const constant_1 = require("../base/constant");
 
 exports.heatmapSeriesMark = Object.assign(Object.assign({}, constant_1.baseSeriesMark), {
-    [type_2.SeriesMarkNameEnum.cell]: {
-        name: type_2.SeriesMarkNameEnum.cell,
-        type: type_1.MarkTypeEnum.cell
+    cell: {
+        name: "cell",
+        type: "cell"
     },
-    [type_2.SeriesMarkNameEnum.cellBackground]: {
-        name: type_2.SeriesMarkNameEnum.cellBackground,
-        type: type_1.MarkTypeEnum.cell
+    cellBackground: {
+        name: "cellBackground",
+        type: "cell"
     }
 });
 //# sourceMappingURL=constant.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/heatmap/constant.ts"],"names":[],"mappings":";;;AAAA,oDAAyD;AACzD,+CAAkD;AAElD,4CAAuD;AAE1C,QAAA,iBAAiB,mCACzB,yBAAc,KACjB,CAAC,yBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,yBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,mBAAY,CAAC,IAAI,EAAE,EACrF,CAAC,yBAAkB,CAAC,cAAc,CAAC,EAAE,EAAE,IAAI,EAAE,yBAAkB,CAAC,cAAc,EAAE,IAAI,EAAE,mBAAY,CAAC,IAAI,EAAE,IACzG","file":"constant.js","sourcesContent":["import { MarkTypeEnum } from '../../mark/interface/type';\nimport { baseSeriesMark } from '../base/constant';\nimport type { SeriesMarkMap } from '../interface/common';\nimport { SeriesMarkNameEnum } from '../interface/type';\n\nexport const heatmapSeriesMark: SeriesMarkMap = {\n  ...baseSeriesMark,\n  [SeriesMarkNameEnum.cell]: { name: SeriesMarkNameEnum.cell, type: MarkTypeEnum.cell },\n  [SeriesMarkNameEnum.cellBackground]: { name: SeriesMarkNameEnum.cellBackground, type: MarkTypeEnum.cell }\n};\n"]}
+{"version":3,"sources":["../src/series/heatmap/constant.ts"],"names":[],"mappings":";;;AACA,+CAAkD;AAIrC,QAAA,iBAAiB,mCACzB,yBAAc,KACjB,QAAyB,EAAE,EAAE,IAAI,QAAyB,EAAE,IAAI,QAAmB,EAAE,EACrF,kBAAmC,EAAE,EAAE,IAAI,kBAAmC,EAAE,IAAI,QAAmB,EAAE,IACzG","file":"constant.js","sourcesContent":["import { MarkTypeEnum } from '../../mark/interface/type';\nimport { baseSeriesMark } from '../base/constant';\nimport type { SeriesMarkMap } from '../interface/common';\nimport { SeriesMarkNameEnum } from '../interface/type';\n\nexport const heatmapSeriesMark: SeriesMarkMap = {\n  ...baseSeriesMark,\n  [SeriesMarkNameEnum.cell]: { name: SeriesMarkNameEnum.cell, type: MarkTypeEnum.cell },\n  [SeriesMarkNameEnum.cellBackground]: { name: SeriesMarkNameEnum.cellBackground, type: MarkTypeEnum.cell }\n};\n"]}

package/cjs/series/heatmap/heatmap-transformer.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.HeatmapSeriesSpecTransformer = void 0;
 
-const base_1 = require("../base"), interface_1 = require("../interface");
+const base_1 = require("../base");
 
 class HeatmapSeriesSpecTransformer extends base_1.BaseSeriesSpecTransformer {
     _transformLabelSpec(spec) {
-        this._addMarkLabelSpec(spec, interface_1.SeriesMarkNameEnum.cell);
+        this._addMarkLabelSpec(spec, "cell");
     }
 }
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/heatmap/heatmap-transformer.ts"],"names":[],"mappings":";;;AAAA,kCAAoD;AACpD,4CAAkD;AAGlD,MAAa,4BAGX,SAAQ,gCAA+B;IAC7B,mBAAmB,CAAC,IAAO;QACnC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,8BAAkB,CAAC,IAAI,CAAC,CAAC;IACxD,CAAC;CACF;AAPD,oEAOC","file":"heatmap-transformer.js","sourcesContent":["import { BaseSeriesSpecTransformer } from '../base';\nimport { SeriesMarkNameEnum } from '../interface';\nimport type { IHeatmapSeriesSpec, IHeatmapSeriesTheme } from './interface';\n\nexport class HeatmapSeriesSpecTransformer<\n  T extends IHeatmapSeriesSpec = IHeatmapSeriesSpec,\n  K extends IHeatmapSeriesTheme = IHeatmapSeriesTheme\n> extends BaseSeriesSpecTransformer<T, K> {\n  protected _transformLabelSpec(spec: T): void {\n    this._addMarkLabelSpec(spec, SeriesMarkNameEnum.cell);\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/heatmap/heatmap-transformer.ts"],"names":[],"mappings":";;;AAAA,kCAAoD;AAIpD,MAAa,4BAGX,SAAQ,gCAA+B;IAC7B,mBAAmB,CAAC,IAAO;QACnC,IAAI,CAAC,iBAAiB,CAAC,IAAI,SAA0B,CAAC;IACxD,CAAC;CACF;AAPD,oEAOC","file":"heatmap-transformer.js","sourcesContent":["import { BaseSeriesSpecTransformer } from '../base';\nimport { SeriesMarkNameEnum } from '../interface';\nimport type { IHeatmapSeriesSpec, IHeatmapSeriesTheme } from './interface';\n\nexport class HeatmapSeriesSpecTransformer<\n  T extends IHeatmapSeriesSpec = IHeatmapSeriesSpec,\n  K extends IHeatmapSeriesTheme = IHeatmapSeriesTheme\n> extends BaseSeriesSpecTransformer<T, K> {\n  protected _transformLabelSpec(spec: T): void {\n    this._addMarkLabelSpec(spec, SeriesMarkNameEnum.cell);\n  }\n}\n"]}

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

@@ -29,6 +29,7 @@ export declare class HeatmapSeries<T extends IHeatmapSeriesSpec = IHeatmapSeries
         scale: any;
         field: any;
     };
+    initInteraction(): void;
     initAnimation(): void;
     protected getCellSize(axisHelper: IAxisHelper): number;
     protected initTooltip(): void;

package/cjs/series/heatmap/heatmap.js

@@ -22,7 +22,7 @@ class HeatmapSeries extends cartesian_1.CartesianSeries {
         super.setAttrFromSpec(), this.setFieldValue(this._spec.valueField);
     }
     initMark() {
-        var _a, _b;
+        var _a, _b, _c, _d;
         const progressive = {
             progressiveStep: this._spec.progressiveStep,
             progressiveThreshold: this._spec.progressiveThreshold,
@@ -34,10 +34,12 @@ class HeatmapSeries extends cartesian_1.CartesianSeries {
             defaultMorphElementKey: this.getDimensionField()[0],
             isSeriesMark: !0,
             progressive: progressive,
-            customShape: null === (_a = this._spec.cell) || void 0 === _a ? void 0 : _a.customShape
+            customShape: null === (_a = this._spec.cell) || void 0 === _a ? void 0 : _a.customShape,
+            stateSort: null === (_b = this._spec.cell) || void 0 === _b ? void 0 : _b.stateSort
         }), this._backgroundMark = this._createMark(HeatmapSeries.mark.cellBackground, {
             progressive: progressive,
-            customShape: null === (_b = this._spec.cellBackground) || void 0 === _b ? void 0 : _b.customShape
+            customShape: null === (_c = this._spec.cellBackground) || void 0 === _c ? void 0 : _c.customShape,
+            stateSort: null === (_d = this._spec.cellBackground) || void 0 === _d ? void 0 : _d.stateSort
         });
     }
     initMarkStyle() {
@@ -55,7 +57,7 @@ class HeatmapSeries extends cartesian_1.CartesianSeries {
             y: datum => this.dataToPositionY(datum),
             size: () => [ this.getCellSize(this._xAxisHelper), this.getCellSize(this._yAxisHelper) ],
             fill: this.getColorAttribute()
-        }, "normal", constant_1.AttributeLevel.Series), this._trigger.registerMark(this._cellMark);
+        }, "normal", constant_1.AttributeLevel.Series);
     }
     initCellBackgroundMarkStyle() {
         var _a, _b, _c;
@@ -80,12 +82,15 @@ class HeatmapSeries extends cartesian_1.CartesianSeries {
             field: this.getFieldValue[0]
         };
     }
+    initInteraction() {
+        this._parseInteractionConfig(this._cellMark ? [ this._cellMark ] : []);
+    }
     initAnimation() {
         var _a, _b, _c;
         const appearPreset = null === (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.animationAppear) || void 0 === _b ? void 0 : _b.preset, animationParams = (0, 
         utils_2.getGroupAnimationParams)(this);
         this._cellMark.setAnimationConfig((0, utils_1.animationConfig)(null === (_c = factory_1.Factory.getAnimationInKey("heatmap")) || void 0 === _c ? void 0 : _c(appearPreset), (0, 
-        utils_1.userAnimationConfig)(type_1.SeriesMarkNameEnum.cell, this._spec, this._markAttributeContext), animationParams));
+        utils_1.userAnimationConfig)("cell", this._spec, this._markAttributeContext), animationParams));
     }
     getCellSize(axisHelper) {
         var _a, _b;

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 { registerCellMark } from './../../mark/cell';\n/* eslint-disable no-duplicate-imports */\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { AttributeLevel } from '../../constant';\nimport type { Maybe, Datum } from '../../typings';\nimport { registerHeatmapAnimation, type HeatmapAppearPreset } from './animation';\nimport { animationConfig, shouldMarkDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { IHeatmapSeriesSpec, IHeatmapSeriesTheme } from './interface';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport { registerTextMark, type ITextMark } from '../../mark/text';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport type { ICellMark } from '../../mark/cell';\nimport { normalizePadding, array } from '@visactor/vutils';\nimport { HeatmapSeriesTooltipHelper } from './tooltip-helper';\nimport { heatmapSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport type { IMark } from '../../mark/interface';\nimport { getGroupAnimationParams } from '../util/utils';\nimport { HeatmapSeriesSpecTransformer } from './heatmap-transformer';\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\n\nexport class HeatmapSeries<T extends IHeatmapSeriesSpec = IHeatmapSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.heatmap;\n  type = SeriesTypeEnum.heatmap;\n\n  static readonly mark: SeriesMarkMap = heatmapSeriesMark;\n  static readonly transformerConstructor = HeatmapSeriesSpecTransformer as any;\n  readonly transformerConstructor = HeatmapSeriesSpecTransformer;\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: shouldMarkDoMorph(this._spec, HeatmapSeries.mark.cell.name),\n      defaultMorphElementKey: this.getDimensionField()[0],\n      isSeriesMark: true,\n      progressive,\n      customShape: this._spec.cell?.customShape\n    }) as ICellMark;\n\n    this._backgroundMark = this._createMark(HeatmapSeries.mark.cellBackground, {\n      progressive,\n      customShape: this._spec.cellBackground?.customShape\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  }\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    const animationParams = getGroupAnimationParams(this);\n\n    this._cellMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('heatmap')?.(appearPreset),\n        userAnimationConfig(SeriesMarkNameEnum.cell, this._spec, this._markAttributeContext),\n        animationParams\n      )\n    );\n  }\n\n  protected getCellSize(axisHelper: IAxisHelper) {\n    return axisHelper.getBandwidth?.(0) ?? DefaultBandWidth;\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new HeatmapSeriesTooltipHelper(this);\n    this._cellMark && this._tooltipHelper.activeTriggerSet.mark.add(this._cellMark);\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  getActiveMarks(): IMark[] {\n    return [this._cellMark];\n  }\n}\n\nexport const registerHeatmapSeries = () => {\n  registerTextMark();\n  registerCellMark();\n  registerHeatmapAnimation();\n  Factory.registerSeries(HeatmapSeries.type, HeatmapSeries);\n};\n"]}
+{"version":3,"sources":["../src/series/heatmap/heatmap.ts"],"names":[],"mappings":"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","file":"heatmap.js","sourcesContent":["import { registerCellMark } from './../../mark/cell';\n/* eslint-disable no-duplicate-imports */\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { AttributeLevel } from '../../constant';\nimport type { Maybe, Datum } from '../../typings';\nimport { registerHeatmapAnimation, type HeatmapAppearPreset } from './animation';\nimport { animationConfig, shouldMarkDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { IHeatmapSeriesSpec, IHeatmapSeriesTheme } from './interface';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport { registerTextMark, type ITextMark } from '../../mark/text';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport type { ICellMark } from '../../mark/cell';\nimport { normalizePadding, array } from '@visactor/vutils';\nimport { HeatmapSeriesTooltipHelper } from './tooltip-helper';\nimport { heatmapSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport type { IMark } from '../../mark/interface';\nimport { getGroupAnimationParams } from '../util/utils';\nimport { HeatmapSeriesSpecTransformer } from './heatmap-transformer';\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\n\nexport class HeatmapSeries<T extends IHeatmapSeriesSpec = IHeatmapSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.heatmap;\n  type = SeriesTypeEnum.heatmap;\n\n  static readonly mark: SeriesMarkMap = heatmapSeriesMark;\n  static readonly transformerConstructor = HeatmapSeriesSpecTransformer as any;\n  readonly transformerConstructor = HeatmapSeriesSpecTransformer;\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: shouldMarkDoMorph(this._spec, HeatmapSeries.mark.cell.name),\n      defaultMorphElementKey: this.getDimensionField()[0],\n      isSeriesMark: true,\n      progressive,\n      customShape: this._spec.cell?.customShape,\n      stateSort: this._spec.cell?.stateSort\n    }) as ICellMark;\n\n    this._backgroundMark = this._createMark(HeatmapSeries.mark.cellBackground, {\n      progressive,\n      customShape: this._spec.cellBackground?.customShape,\n      stateSort: this._spec.cellBackground?.stateSort\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\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  initInteraction(): void {\n    this._parseInteractionConfig(this._cellMark ? [this._cellMark] : []);\n  }\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<HeatmapAppearPreset>)?.preset;\n    const animationParams = getGroupAnimationParams(this);\n\n    this._cellMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('heatmap')?.(appearPreset),\n        userAnimationConfig(SeriesMarkNameEnum.cell, this._spec, this._markAttributeContext),\n        animationParams\n      )\n    );\n  }\n\n  protected getCellSize(axisHelper: IAxisHelper) {\n    return axisHelper.getBandwidth?.(0) ?? DefaultBandWidth;\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new HeatmapSeriesTooltipHelper(this);\n    this._cellMark && this._tooltipHelper.activeTriggerSet.mark.add(this._cellMark);\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  getActiveMarks(): IMark[] {\n    return [this._cellMark];\n  }\n}\n\nexport const registerHeatmapSeries = () => {\n  registerTextMark();\n  registerCellMark();\n  registerHeatmapAnimation();\n  Factory.registerSeries(HeatmapSeries.type, HeatmapSeries);\n};\n"]}

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

@@ -67,6 +67,8 @@ export interface ISeriesMarkInitOption {
     progressive?: IMarkProgressiveConfig;
     support3d?: boolean;
     customShape?: (datum: any[], attrs: any, path: ICustomPath2D) => ICustomPath2D;
+    stateSort?: (stateA: string, stateB: string) => number;
+    componentType?: string;
 }
 export interface ISeriesMarkInfo extends IModelMarkInfo {
     name: SeriesMarkNameEnum | string;
@@ -76,5 +78,4 @@ export interface ISeriesSpecInfo<T extends ISeriesSpec = ISeriesSpec> extends IM
     type: string | SeriesTypeEnum;
     spec: T;
     markLabelSpec?: Partial<Record<SeriesMarkNameEnum, TransformedLabelSpec[]>>;
-    totalLabel?: IModelSpecInfo;
 }

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/interface/common.ts"],"names":[],"mappings":"","file":"common.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { IGrammarItem } from '../../compile/interface';\nimport type { IGroupMark } from '../../mark/group';\nimport type {\n  IBaseModelSpecTransformer,\n  IBaseModelSpecTransformerOption,\n  IModelConstructor,\n  IModelMarkInfo,\n  IModelOption,\n  IModelSpecInfo\n} from '../../model/interface';\nimport type { IRegion } from '../../region/interface';\nimport type { RenderMode } from '../../typings/spec/common';\nimport type { ISeries } from './series';\nimport type { IMarkProgressiveConfig } from '../../mark/interface';\nimport type { ISeriesSpec, StringOrNumber } from '../../typings';\nimport type { ILabelSpec, TransformedLabelSpec } from '../../component/label';\nimport type { SeriesMarkNameEnum, SeriesTypeEnum } from './type';\nimport type { ICustomPath2D } from '@visactor/vrender-core';\n\n// export type SeriesStyle = 'color' | 'size' | 'shape';\n\nexport interface ISeriesSeriesInfo {\n  key: string;\n  index?: number;\n  // 样式的值类型可能是 StringOrNumber | number[] | xxxx\n  style: (attribute: string) => any;\n  /** series 对应的缩略图类型 */\n  shapeType: string;\n}\n\nexport interface ISeriesOption extends IModelOption {\n  mode: RenderMode;\n  region: IRegion;\n  sourceDataList: DataView[];\n  getSeriesData: (id: StringOrNumber | undefined, index: number | undefined) => DataView | undefined;\n}\n\nexport interface ISeriesConstructor extends IModelConstructor {\n  readonly type: string;\n  mark?: SeriesMarkMap;\n  new (spec: any, options: ISeriesOption): ISeries;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface ISeriesInitOption {}\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface ISeriesUpdateDataOption {}\n\nexport interface ISeriesStackDataNode {\n  nodes: {\n    [key: string]: ISeriesStackDataMeta;\n  };\n}\nexport interface ISeriesStackDataLeaf {\n  values: any[];\n  total?: number;\n}\n\nexport type ISeriesStackDataMeta = ISeriesStackDataNode | ISeriesStackDataLeaf;\nexport type ISeriesStackData = ISeriesStackDataNode;\n\nexport type ISeriesStyle = ISeriesStyleItem[];\nexport type ISeriesStyleItem = {\n  name: string;\n} & {\n  [markName: string]: {\n    style?: any;\n  };\n};\n\nexport interface ISeriesMarkInitOption {\n  /** theme spec */\n  themeSpec?: any;\n\n  /** mark spec */\n  markSpec?: any;\n\n  /** 是否在编译时更新实际数据 */\n  skipBeforeLayouted?: boolean;\n\n  /** 父级 mark（如果是 undefined 则默认是系列的 root mark，如果是 false 则不配置父级 mark） */\n  parent?: IGroupMark | false;\n\n  /** 是否是 series field 所作用的 mark（用于 tooltip shape 取色等） */\n  isSeriesMark?: boolean;\n\n  /** 该 mark 依赖于哪些语法元素 */\n  depend?: IGrammarItem | IGrammarItem[];\n\n  /** 数据 key 值 */\n  key?: string;\n\n  /** 分组 key 值 */\n  groupKey?: string;\n\n  /** morph 配置开关 */\n  morph?: boolean;\n\n  /** morph元素的唯一key */\n  defaultMorphElementKey?: string;\n\n  /** 绑定系列数据（如果是 undefined 则默认是系列的 data，如果是 false 则不配置数据） */\n  dataView?: DataView | false;\n  /** 系列数据编译产物的名称 */\n  dataProductId?: string;\n  /** mark scale 如果需要使用统计信息设置domain的话，使用的series对应的统计数据 */\n  seriesId?: number;\n\n  /** 渐进渲染相关配置 */\n  progressive?: IMarkProgressiveConfig;\n\n  /** 是否支持 3d */\n  support3d?: boolean;\n  /* customized shape of mark  */\n  customShape?: (datum: any[], attrs: any, path: ICustomPath2D) => ICustomPath2D;\n}\n\nexport interface ISeriesMarkInfo extends IModelMarkInfo {\n  /** mark 名称 */\n  name: SeriesMarkNameEnum | string;\n}\n\nexport type SeriesMarkMap = Partial<Record<SeriesMarkNameEnum, ISeriesMarkInfo>>;\n\nexport interface ISeriesSpecInfo<T extends ISeriesSpec = ISeriesSpec> extends IModelSpecInfo {\n  /** model 具体类型 */\n  type: string | SeriesTypeEnum;\n  /** model spec */\n  spec: T;\n  /** 当前的 mark 标签 spec */\n  markLabelSpec?: Partial<Record<SeriesMarkNameEnum, TransformedLabelSpec[]>>;\n  /** 当前的总计标签 specInfo */\n  totalLabel?: IModelSpecInfo;\n}\n"]}
+{"version":3,"sources":["../src/series/interface/common.ts"],"names":[],"mappings":"","file":"common.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { IGrammarItem } from '../../compile/interface';\nimport type { IGroupMark } from '../../mark/group';\nimport type {\n  IBaseModelSpecTransformer,\n  IBaseModelSpecTransformerOption,\n  IModelConstructor,\n  IModelMarkInfo,\n  IModelOption,\n  IModelSpecInfo\n} from '../../model/interface';\nimport type { IRegion } from '../../region/interface';\nimport type { RenderMode } from '../../typings/spec/common';\nimport type { ISeries } from './series';\nimport type { IMarkProgressiveConfig } from '../../mark/interface';\nimport type { ISeriesSpec, StringOrNumber } from '../../typings';\nimport type { ILabelSpec, TransformedLabelSpec } from '../../component/label';\nimport type { SeriesMarkNameEnum, SeriesTypeEnum } from './type';\nimport type { ICustomPath2D } from '@visactor/vrender-core';\n\n// export type SeriesStyle = 'color' | 'size' | 'shape';\n\nexport interface ISeriesSeriesInfo {\n  key: string;\n  index?: number;\n  // 样式的值类型可能是 StringOrNumber | number[] | xxxx\n  style: (attribute: string) => any;\n  /** series 对应的缩略图类型 */\n  shapeType: string;\n}\n\nexport interface ISeriesOption extends IModelOption {\n  mode: RenderMode;\n  region: IRegion;\n  sourceDataList: DataView[];\n  getSeriesData: (id: StringOrNumber | undefined, index: number | undefined) => DataView | undefined;\n}\n\nexport interface ISeriesConstructor extends IModelConstructor {\n  readonly type: string;\n  mark?: SeriesMarkMap;\n  new (spec: any, options: ISeriesOption): ISeries;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface ISeriesInitOption {}\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface ISeriesUpdateDataOption {}\n\nexport interface ISeriesStackDataNode {\n  nodes: {\n    [key: string]: ISeriesStackDataMeta;\n  };\n}\nexport interface ISeriesStackDataLeaf {\n  values: any[];\n  total?: number;\n}\n\nexport type ISeriesStackDataMeta = ISeriesStackDataNode | ISeriesStackDataLeaf;\nexport type ISeriesStackData = ISeriesStackDataNode;\n\nexport type ISeriesStyle = ISeriesStyleItem[];\nexport type ISeriesStyleItem = {\n  name: string;\n} & {\n  [markName: string]: {\n    style?: any;\n  };\n};\n\nexport interface ISeriesMarkInitOption {\n  /** theme spec */\n  themeSpec?: any;\n\n  /** mark spec */\n  markSpec?: any;\n\n  /** 是否在编译时更新实际数据 */\n  skipBeforeLayouted?: boolean;\n\n  /** 父级 mark（如果是 undefined 则默认是系列的 root mark，如果是 false 则不配置父级 mark） */\n  parent?: IGroupMark | false;\n\n  /** 是否是 series field 所作用的 mark（用于 tooltip shape 取色等） */\n  isSeriesMark?: boolean;\n\n  /** 该 mark 依赖于哪些语法元素 */\n  depend?: IGrammarItem | IGrammarItem[];\n\n  /** 数据 key 值 */\n  key?: string;\n\n  /** 分组 key 值 */\n  groupKey?: string;\n\n  /** morph 配置开关 */\n  morph?: boolean;\n\n  /** morph元素的唯一key */\n  defaultMorphElementKey?: string;\n\n  /** 绑定系列数据（如果是 undefined 则默认是系列的 data，如果是 false 则不配置数据） */\n  dataView?: DataView | false;\n  /** 系列数据编译产物的名称 */\n  dataProductId?: string;\n  /** mark scale 如果需要使用统计信息设置domain的话，使用的series对应的统计数据 */\n  seriesId?: number;\n\n  /** 渐进渲染相关配置 */\n  progressive?: IMarkProgressiveConfig;\n\n  /** 是否支持 3d */\n  support3d?: boolean;\n  /* customized shape of mark  */\n  customShape?: (datum: any[], attrs: any, path: ICustomPath2D) => ICustomPath2D;\n  /**\n   * 状态排序方法，默认状态都是按照添加的顺序处理的，如果有特殊的需求，需要指定状态顺序，可以通过这个方法实现\n   * @since 1.9.0\n   */\n  stateSort?: (stateA: string, stateB: string) => number;\n  /**\n   * use component in extension mark\n   * @since 1.9.0\n   */\n  componentType?: string;\n}\n\nexport interface ISeriesMarkInfo extends IModelMarkInfo {\n  /** mark 名称 */\n  name: SeriesMarkNameEnum | string;\n}\n\nexport type SeriesMarkMap = Partial<Record<SeriesMarkNameEnum, ISeriesMarkInfo>>;\n\nexport interface ISeriesSpecInfo<T extends ISeriesSpec = ISeriesSpec> extends IModelSpecInfo {\n  /** model 具体类型 */\n  type: string | SeriesTypeEnum;\n  /** model spec */\n  spec: T;\n  /** 当前的 mark 标签 spec */\n  markLabelSpec?: Partial<Record<SeriesMarkNameEnum, TransformedLabelSpec[]>>;\n}\n"]}

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

@@ -1,4 +1,3 @@
-import type { ITrigger } from '../../interaction/interface';
 import type { PanEventParam, ZoomEventParam } from '../../event/interface';
 import type { IModel } from '../../model/interface';
 import type { DataSet, DataView, ITransformOptions } from '@visactor/vdataset';
@@ -11,7 +10,7 @@ import type { IPolarAxisHelper } from '../../component/axis/polar/interface';
 import type { ISeriesSeriesInfo, ISeriesSpecInfo, ISeriesStackData } from './common';
 import type { ISeriesTooltipHelper } from './tooltip-helper';
 import type { IInvalidType, Datum, DirectionType, IGroup, StringOrNumber } from '../../typings';
-import type { StateValueType } from '../../compile/mark';
+import type { ISeriesMarkAttributeContext, StateValueType } from '../../compile/mark';
 import type { StatisticOperations } from '../../data/transforms/dimension-statistics';
 import type { IGroupMark } from '../../mark/group';
 import type { IGeoCoordinateHelper } from '../../component/geo/interface';
@@ -90,11 +89,11 @@ export interface ISeries extends IModel {
     };
     getDefaultColorDomain: () => any[];
     getInvalidType: () => IInvalidType;
-    getTrigger: () => ITrigger;
     getDefaultShapeType: () => string;
     initLabelMarkStyle?: (labelMark: ILabelMark) => void;
     getGroupFields: () => string[];
     getSpecInfo: () => ISeriesSpecInfo;
+    getMarkAttributeContext: () => ISeriesMarkAttributeContext;
 }
 export interface ICartesianSeries extends ISeries {
     readonly coordinate: 'cartesian';

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/interface/series.ts"],"names":[],"mappings":"","file":"series.js","sourcesContent":["import type { ITrigger } from '../../interaction/interface';\nimport type { PanEventParam, ZoomEventParam } from '../../event/interface';\nimport type { IModel } from '../../model/interface';\nimport type { DataSet, DataView, ITransformOptions } from '@visactor/vdataset';\nimport type { IMark } from '../../mark/interface';\nimport type { CoordinateType, IPoint, IPolarPoint } from '../../typings/coordinate';\nimport type { IRegion } from '../../region/interface';\nimport type { IBaseScale } from '@visactor/vscale';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { IPolarAxisHelper } from '../../component/axis/polar/interface';\nimport type { ISeriesSeriesInfo, ISeriesSpecInfo, ISeriesStackData } from './common';\nimport type { ISeriesTooltipHelper } from './tooltip-helper';\nimport type { IInvalidType, Datum, DirectionType, IGroup, StringOrNumber } from '../../typings';\nimport type { StateValueType } from '../../compile/mark';\nimport type { StatisticOperations } from '../../data/transforms/dimension-statistics';\nimport type { IGroupMark } from '../../mark/group';\nimport type { IArcLabelSpec } from '../pie/interface';\nimport type { IGeoCoordinateHelper } from '../../component/geo/interface';\nimport type { ILabelMark } from '../../mark/label';\n\n// 使用类型约束系列支持的样式，但是感觉这样不合理 不使用这样的方式去做\n// export interface ISeries<A extends string> extends IModel\n\nexport interface ISeries extends IModel {\n  readonly type: string;\n  readonly name?: string;\n\n  // tooltip\n  tooltipHelper: ISeriesTooltipHelper;\n\n  // 配置\n  getSpec: () => any;\n\n  // 坐标系信息\n  readonly coordinate: CoordinateType;\n\n  // layout\n  onLayoutEnd: (ctx: any) => void;\n\n  // 数据\n  getRawData: () => DataView | undefined;\n  getViewDataFilter: () => DataView | undefined;\n  getViewData: () => DataView | undefined;\n  getViewDataProductId: () => string | undefined;\n  getRawDataStatisticsByField: (field: string, isNumeric?: boolean) => { values?: any[]; min?: number; max?: number };\n  getViewDataStatistics?: () => DataView | undefined;\n  getDataSet?: () => DataSet;\n  getFieldAlias: (field: string) => string;\n  // 更新原始数据\n  updateRawData: (d: any) => void;\n  setData?: (dv: DataView) => void;\n  rawDataUpdate: (d: DataView) => void;\n  viewDataUpdate: (d: DataView) => void;\n  viewDataStatisticsUpdate: (d: DataView) => void;\n  addViewDataFilter: (option: ITransformOptions) => void;\n  reFilterViewData: () => void;\n  reTransformViewData: () => void;\n  fillData: () => void;\n\n  /**\n   * 常见数据使用问题\n   *\n   * 一、使用图表最终展示数据\n   * 比如 markline，数值轴 这样的组件\n   * 需要操作展示数据，做 筛选 ｜ 变换 的\n   * 比如图例，datazoom\n      series.getViewData().transform({},false)\n   * 需要获取展示数据，生成自身数据做自身展示的 使用消息机制。比如 轴\n      series.event.on('viewDataStatisticsUpdate' ｜ 'viewDataUpdate', { filter: ({ model }) => model?.id === series.id }, () => {\n        this.updateData();\n      });\n   *\n   * 二、使用图表原始数据\n   * 比如图例，datazoom\n   * 需要使用原始数据信息，生成自身数据\n   * 比如图例，datazoom\n      series.getRawData().parserData  ｜   latestData    // parserData latestData 区别见下面说明\n      series.getRawDataStatistics().latestData\n\n      series.event.on('rawDataUpdate', { filter: ({ model }) => model?.id === series.id }, () => {\n        this.updateData();\n      });\n   * 或者使用系列自身的特殊api 特殊情况外不建议这样用\n      series.getSeriesInfoList()\n\n   * 建议：使用数据时需要注意数据更新，使用系列数据更新组件数据的场景，只建议使用消息监听\n      series.event.on(\n        'viewDataStatisticsUpdate' ｜\n        'viewDataUpdate' |\n        'rawDataUpdate',\n        { filter: ({ model }) => model?.id === series.id })\n   */\n\n  // 区域\n  getRegion: () => IRegion;\n\n  // mark\n  initMark: () => void;\n  getMarks: () => IMark[];\n  getMarksWithoutRoot: () => IMark[];\n  getMarkNameMap: () => Record<string, IMark>;\n  getMarksInType: (type: string | string[]) => IMark[];\n  getMarkInName: (name: string) => IMark | undefined;\n  getMarkInId: (id: number) => IMark | undefined;\n\n  getRootMark: () => IGroupMark;\n  getActiveMarks: () => IMark[];\n\n  // example\n  /**\n   *  [\n   *  {\n   *    fields: {\n   *       x: '周一',\n   *       __VChart_STACK: 'stack'\n   *    },\n   *    valueField: 'y',\n   *    values: [{x: '周一', y: 20}];\n   *  },\n   *  {\n   *    fields: {\n   *       x: '周一',\n   *       stack: 'stackA'\n   *    },\n   *    valueField: 'y',\n   *    values: [{x: '周一', y: 20, stack: 'stackA'}];\n   *  },\n   *  {\n   *    fields: {\n   *       x: '周一',\n   *       stack: 'stackB'\n   *    },\n   *    valueField: 'y',\n   *    values: [{x: '周一', y: 20, stack: 'stackB'}];\n   *  },\n   *  ]\n   */\n  getStackData: () => ISeriesStackData;\n\n  getStack: () => boolean;\n  getStackValue: () => StringOrNumber | undefined;\n  getPercent: () => boolean;\n  getStackOffsetSilhouette: () => boolean;\n\n  getStackValueField: () => string;\n  setValueFieldToStack: () => void;\n  setValueFieldToPercent: () => void;\n  setValueFieldToStackOffsetSilhouette: () => void;\n\n  getStackGroupFields: () => string[];\n  getSeriesField: () => string | undefined;\n  getSeriesKeys: () => string[];\n  getSeriesStyle: (datum: Datum) => ISeriesSeriesInfo['style'];\n  getSeriesInfoInField: (field: string) => ISeriesSeriesInfo[];\n  getSeriesInfoList: () => ISeriesSeriesInfo[];\n  getGroups: () => IGroup | undefined;\n  getDimensionField: () => string[];\n  getMeasureField: () => string[];\n  getStatisticFields: () => { key: string; operations: StatisticOperations }[];\n\n  setSeriesField: (field: string) => void;\n  handleZoom?: (e: ZoomEventParam) => void;\n  handlePan?: (e: PanEventParam) => void;\n\n  // 数据映射\n  dataToPosition: (datum: Datum) => IPoint | null;\n  dataToPositionX: (datum: Datum) => number | null;\n  dataToPositionY: (datum: Datum) => number | null;\n  dataToPositionZ?: (datum: Datum) => number | null;\n  valueToPosition: (value1: any, value2?: any) => IPoint;\n\n  getColorAttribute: () => { scale: IBaseScale; field: string };\n  getDefaultColorDomain: () => any[];\n\n  getInvalidType: () => IInvalidType;\n\n  // 交互\n  getTrigger: () => ITrigger;\n\n  /**\n   * 获取系列默认的缩略图形\n   * @returns 默认的缩略图形\n   */\n  getDefaultShapeType: () => string;\n  /** 获取系列标签配置 */\n  initLabelMarkStyle?: (labelMark: ILabelMark) => void;\n\n  getGroupFields: () => string[];\n\n  getSpecInfo: () => ISeriesSpecInfo;\n}\n\nexport interface ICartesianSeries extends ISeries {\n  readonly coordinate: 'cartesian';\n  readonly direction: DirectionType;\n\n  scaleX: IBaseScale;\n  setScaleX: (s: IBaseScale) => void;\n  scaleY: IBaseScale;\n  setScaleY: (s: IBaseScale) => void;\n  scaleZ?: IBaseScale;\n  setScaleZ: (s: IBaseScale) => void;\n  // 要考虑基于多个field的场景\n  fieldX: string[];\n  setFieldX: (field: string | string[], level?: number) => void;\n  fieldX2: string;\n  setFieldX2: (field: string) => void;\n  fieldY: string[];\n  setFieldY: (field: string | string[], level?: number) => void;\n  fieldY2: string;\n  setFieldY2: (field: string) => void;\n  fieldZ?: string[];\n  setFieldZ: (field: string | string[], level?: number) => void;\n\n  positionToData: (p: IPoint) => any | null;\n  positionToDataX: (xPos: number) => any | null;\n  positionToDataY: (yPos: number) => any | null;\n\n  // 轴API\n  getXAxisHelper: () => IAxisHelper;\n  setXAxisHelper: (h: IAxisHelper) => void;\n  getYAxisHelper: () => IAxisHelper;\n  setYAxisHelper: (h: IAxisHelper) => void;\n  getZAxisHelper: () => IAxisHelper | undefined;\n  setZAxisHelper: (h: IAxisHelper) => void;\n\n  dataToPositionX1: (datum: Datum) => number | null;\n  dataToPositionY1: (datum: Datum) => number | null;\n\n  valueToPosition: (value1: any, value2: any) => IPoint;\n  valueToPositionX: (value: StringOrNumber | StringOrNumber[], datum?: any) => any;\n  valueToPositionY: (value: StringOrNumber | StringOrNumber[], datum?: any) => any;\n}\n\nexport interface IPolarSeries extends ISeries {\n  readonly coordinate: 'polar';\n\n  outerRadius: number;\n  innerRadius: number;\n\n  getRadiusField: () => string[];\n  setRadiusField: (field: string | string[], level?: number) => void;\n  getAngleField: () => string[];\n  setAngleField: (field: string | string[], level?: number) => void;\n\n  // 轴将是一个实现了 scale 的组件。这里接收的可以是一个轴\n  radiusScale: IBaseScale;\n  setRadiusScale: (s: IBaseScale) => void;\n  angleScale: IBaseScale;\n  setAngleScale: (s: IBaseScale) => void;\n\n  // TODO:\n  positionToData: (point: IPolarPoint) => any;\n  radiusToData: (radius: number) => any;\n  angleToData: (angle: number) => any;\n\n  // 轴\n  radiusAxisHelper: IPolarAxisHelper;\n  angleAxisHelper: IPolarAxisHelper;\n\n  valueToPosition: (value1: any, value2: any) => IPoint;\n}\n\nexport interface IGeoSeries extends ISeries {\n  readonly coordinate: 'geo';\n\n  nameField?: string;\n  valueField?: string;\n\n  getMapViewData: () => DataView;\n  getNameProperty: () => string;\n\n  dataToPosition: (datum: any) => IPoint | null;\n  dataToLatitude: (latValue: any) => number | null;\n  dataToLongitude: (lonValue: any) => number | null;\n\n  positionToData: (p: IPoint) => any;\n  latitudeToData: (lat: number) => any;\n  longitudeToData: (lon: number) => any;\n\n  getCoordinateHelper: () => IGeoCoordinateHelper;\n  setCoordinateHelper: (helper: IGeoCoordinateHelper) => void;\n\n  valueToPosition: (value1: any, value2: any) => IPoint;\n  getDatumCenter: (datum: any) => [number, number];\n}\n\n// 收拢扇区标签形式依赖的 api\nexport interface IArcSeries extends IPolarSeries {\n  center: (() => IPoint) | IPoint;\n  getRadius: (state?: StateValueType) => number;\n  getInnerRadius: (state?: StateValueType) => number;\n\n  computeRadius: (r: number, k?: number) => number;\n  computeDatumRadius: (datum: any, state?: StateValueType) => number;\n}\n\nexport interface IFunnelSeries extends ISeries {\n  getPoints: (datum: any) => IPoint[];\n  getCategoryField: () => string;\n\n  valueToPosition: (value: any) => IPoint;\n}\n"]}
+{"version":3,"sources":["../src/series/interface/series.ts"],"names":[],"mappings":"","file":"series.js","sourcesContent":["import type { PanEventParam, ZoomEventParam } from '../../event/interface';\nimport type { IModel } from '../../model/interface';\nimport type { DataSet, DataView, ITransformOptions } from '@visactor/vdataset';\nimport type { IMark } from '../../mark/interface';\nimport type { CoordinateType, IPoint, IPolarPoint } from '../../typings/coordinate';\nimport type { IRegion } from '../../region/interface';\nimport type { IBaseScale } from '@visactor/vscale';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { IPolarAxisHelper } from '../../component/axis/polar/interface';\nimport type { ISeriesSeriesInfo, ISeriesSpecInfo, ISeriesStackData } from './common';\nimport type { ISeriesTooltipHelper } from './tooltip-helper';\nimport type { IInvalidType, Datum, DirectionType, IGroup, StringOrNumber } from '../../typings';\nimport type { ISeriesMarkAttributeContext, StateValueType } from '../../compile/mark';\nimport type { StatisticOperations } from '../../data/transforms/dimension-statistics';\nimport type { IGroupMark } from '../../mark/group';\nimport type { IArcLabelSpec } from '../pie/interface';\nimport type { IGeoCoordinateHelper } from '../../component/geo/interface';\nimport type { ILabelMark } from '../../mark/label';\n\n// 使用类型约束系列支持的样式，但是感觉这样不合理 不使用这样的方式去做\n// export interface ISeries<A extends string> extends IModel\n\nexport interface ISeries extends IModel {\n  readonly type: string;\n  readonly name?: string;\n\n  // tooltip\n  tooltipHelper: ISeriesTooltipHelper;\n\n  // 配置\n  getSpec: () => any;\n\n  // 坐标系信息\n  readonly coordinate: CoordinateType;\n\n  // layout\n  onLayoutEnd: (ctx: any) => void;\n\n  // 数据\n  getRawData: () => DataView | undefined;\n  getViewDataFilter: () => DataView | undefined;\n  getViewData: () => DataView | undefined;\n  getViewDataProductId: () => string | undefined;\n  getRawDataStatisticsByField: (field: string, isNumeric?: boolean) => { values?: any[]; min?: number; max?: number };\n  getViewDataStatistics?: () => DataView | undefined;\n  getDataSet?: () => DataSet;\n  getFieldAlias: (field: string) => string;\n  // 更新原始数据\n  updateRawData: (d: any) => void;\n  setData?: (dv: DataView) => void;\n  rawDataUpdate: (d: DataView) => void;\n  viewDataUpdate: (d: DataView) => void;\n  viewDataStatisticsUpdate: (d: DataView) => void;\n  addViewDataFilter: (option: ITransformOptions) => void;\n  reFilterViewData: () => void;\n  reTransformViewData: () => void;\n  fillData: () => void;\n\n  /**\n   * 常见数据使用问题\n   *\n   * 一、使用图表最终展示数据\n   * 比如 markline，数值轴 这样的组件\n   * 需要操作展示数据，做 筛选 ｜ 变换 的\n   * 比如图例，datazoom\n      series.getViewData().transform({},false)\n   * 需要获取展示数据，生成自身数据做自身展示的 使用消息机制。比如 轴\n      series.event.on('viewDataStatisticsUpdate' ｜ 'viewDataUpdate', { filter: ({ model }) => model?.id === series.id }, () => {\n        this.updateData();\n      });\n   *\n   * 二、使用图表原始数据\n   * 比如图例，datazoom\n   * 需要使用原始数据信息，生成自身数据\n   * 比如图例，datazoom\n      series.getRawData().parserData  ｜   latestData    // parserData latestData 区别见下面说明\n      series.getRawDataStatistics().latestData\n\n      series.event.on('rawDataUpdate', { filter: ({ model }) => model?.id === series.id }, () => {\n        this.updateData();\n      });\n   * 或者使用系列自身的特殊api 特殊情况外不建议这样用\n      series.getSeriesInfoList()\n\n   * 建议：使用数据时需要注意数据更新，使用系列数据更新组件数据的场景，只建议使用消息监听\n      series.event.on(\n        'viewDataStatisticsUpdate' ｜\n        'viewDataUpdate' |\n        'rawDataUpdate',\n        { filter: ({ model }) => model?.id === series.id })\n   */\n\n  // 区域\n  getRegion: () => IRegion;\n\n  // mark\n  initMark: () => void;\n  getMarks: () => IMark[];\n  getMarksWithoutRoot: () => IMark[];\n  getMarkNameMap: () => Record<string, IMark>;\n  getMarksInType: (type: string | string[]) => IMark[];\n  getMarkInName: (name: string) => IMark | undefined;\n  getMarkInId: (id: number) => IMark | undefined;\n\n  getRootMark: () => IGroupMark;\n  getActiveMarks: () => IMark[];\n\n  // example\n  /**\n   *  [\n   *  {\n   *    fields: {\n   *       x: '周一',\n   *       __VChart_STACK: 'stack'\n   *    },\n   *    valueField: 'y',\n   *    values: [{x: '周一', y: 20}];\n   *  },\n   *  {\n   *    fields: {\n   *       x: '周一',\n   *       stack: 'stackA'\n   *    },\n   *    valueField: 'y',\n   *    values: [{x: '周一', y: 20, stack: 'stackA'}];\n   *  },\n   *  {\n   *    fields: {\n   *       x: '周一',\n   *       stack: 'stackB'\n   *    },\n   *    valueField: 'y',\n   *    values: [{x: '周一', y: 20, stack: 'stackB'}];\n   *  },\n   *  ]\n   */\n  getStackData: () => ISeriesStackData;\n\n  getStack: () => boolean;\n  getStackValue: () => StringOrNumber | undefined;\n  getPercent: () => boolean;\n  getStackOffsetSilhouette: () => boolean;\n\n  getStackValueField: () => string;\n  setValueFieldToStack: () => void;\n  setValueFieldToPercent: () => void;\n  setValueFieldToStackOffsetSilhouette: () => void;\n\n  getStackGroupFields: () => string[];\n  getSeriesField: () => string | undefined;\n  getSeriesKeys: () => string[];\n  getSeriesStyle: (datum: Datum) => ISeriesSeriesInfo['style'];\n  getSeriesInfoInField: (field: string) => ISeriesSeriesInfo[];\n  getSeriesInfoList: () => ISeriesSeriesInfo[];\n  getGroups: () => IGroup | undefined;\n  getDimensionField: () => string[];\n  getMeasureField: () => string[];\n  getStatisticFields: () => { key: string; operations: StatisticOperations }[];\n\n  setSeriesField: (field: string) => void;\n  handleZoom?: (e: ZoomEventParam) => void;\n  handlePan?: (e: PanEventParam) => void;\n\n  // 数据映射\n  dataToPosition: (datum: Datum) => IPoint | null;\n  dataToPositionX: (datum: Datum) => number | null;\n  dataToPositionY: (datum: Datum) => number | null;\n  dataToPositionZ?: (datum: Datum) => number | null;\n  valueToPosition: (value1: any, value2?: any) => IPoint;\n\n  getColorAttribute: () => { scale: IBaseScale; field: string };\n  getDefaultColorDomain: () => any[];\n\n  getInvalidType: () => IInvalidType;\n\n  // 交互\n\n  /**\n   * 获取系列默认的缩略图形\n   * @returns 默认的缩略图形\n   */\n  getDefaultShapeType: () => string;\n  /** 获取系列标签配置 */\n  initLabelMarkStyle?: (labelMark: ILabelMark) => void;\n\n  getGroupFields: () => string[];\n\n  getSpecInfo: () => ISeriesSpecInfo;\n  getMarkAttributeContext: () => ISeriesMarkAttributeContext;\n}\n\nexport interface ICartesianSeries extends ISeries {\n  readonly coordinate: 'cartesian';\n  readonly direction: DirectionType;\n\n  scaleX: IBaseScale;\n  setScaleX: (s: IBaseScale) => void;\n  scaleY: IBaseScale;\n  setScaleY: (s: IBaseScale) => void;\n  scaleZ?: IBaseScale;\n  setScaleZ: (s: IBaseScale) => void;\n  // 要考虑基于多个field的场景\n  fieldX: string[];\n  setFieldX: (field: string | string[], level?: number) => void;\n  fieldX2: string;\n  setFieldX2: (field: string) => void;\n  fieldY: string[];\n  setFieldY: (field: string | string[], level?: number) => void;\n  fieldY2: string;\n  setFieldY2: (field: string) => void;\n  fieldZ?: string[];\n  setFieldZ: (field: string | string[], level?: number) => void;\n\n  positionToData: (p: IPoint) => any | null;\n  positionToDataX: (xPos: number) => any | null;\n  positionToDataY: (yPos: number) => any | null;\n\n  // 轴API\n  getXAxisHelper: () => IAxisHelper;\n  setXAxisHelper: (h: IAxisHelper) => void;\n  getYAxisHelper: () => IAxisHelper;\n  setYAxisHelper: (h: IAxisHelper) => void;\n  getZAxisHelper: () => IAxisHelper | undefined;\n  setZAxisHelper: (h: IAxisHelper) => void;\n\n  dataToPositionX1: (datum: Datum) => number | null;\n  dataToPositionY1: (datum: Datum) => number | null;\n\n  valueToPosition: (value1: any, value2: any) => IPoint;\n  valueToPositionX: (value: StringOrNumber | StringOrNumber[], datum?: any) => any;\n  valueToPositionY: (value: StringOrNumber | StringOrNumber[], datum?: any) => any;\n}\n\nexport interface IPolarSeries extends ISeries {\n  readonly coordinate: 'polar';\n\n  outerRadius: number;\n  innerRadius: number;\n\n  getRadiusField: () => string[];\n  setRadiusField: (field: string | string[], level?: number) => void;\n  getAngleField: () => string[];\n  setAngleField: (field: string | string[], level?: number) => void;\n\n  // 轴将是一个实现了 scale 的组件。这里接收的可以是一个轴\n  radiusScale: IBaseScale;\n  setRadiusScale: (s: IBaseScale) => void;\n  angleScale: IBaseScale;\n  setAngleScale: (s: IBaseScale) => void;\n\n  // TODO:\n  positionToData: (point: IPolarPoint) => any;\n  radiusToData: (radius: number) => any;\n  angleToData: (angle: number) => any;\n\n  // 轴\n  radiusAxisHelper: IPolarAxisHelper;\n  angleAxisHelper: IPolarAxisHelper;\n\n  valueToPosition: (value1: any, value2: any) => IPoint;\n}\n\nexport interface IGeoSeries extends ISeries {\n  readonly coordinate: 'geo';\n\n  nameField?: string;\n  valueField?: string;\n\n  getMapViewData: () => DataView;\n  getNameProperty: () => string;\n\n  dataToPosition: (datum: any) => IPoint | null;\n  dataToLatitude: (latValue: any) => number | null;\n  dataToLongitude: (lonValue: any) => number | null;\n\n  positionToData: (p: IPoint) => any;\n  latitudeToData: (lat: number) => any;\n  longitudeToData: (lon: number) => any;\n\n  getCoordinateHelper: () => IGeoCoordinateHelper;\n  setCoordinateHelper: (helper: IGeoCoordinateHelper) => void;\n\n  valueToPosition: (value1: any, value2: any) => IPoint;\n  getDatumCenter: (datum: any) => [number, number];\n}\n\n// 收拢扇区标签形式依赖的 api\nexport interface IArcSeries extends IPolarSeries {\n  center: (() => IPoint) | IPoint;\n  getRadius: (state?: StateValueType) => number;\n  getInnerRadius: (state?: StateValueType) => number;\n\n  computeRadius: (r: number, k?: number) => number;\n  computeDatumRadius: (datum: any, state?: StateValueType) => number;\n}\n\nexport interface IFunnelSeries extends ISeries {\n  getPoints: (datum: any) => IPoint[];\n  getCategoryField: () => string;\n\n  valueToPosition: (value: any) => IPoint;\n}\n"]}

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

@@ -25,6 +25,7 @@ import type { ICorrelationSeriesTheme } from '../correlation/interface';
 import { SeriesTypeEnum } from './type';
 import type { SeriesMarkMap } from './common';
 import type { IRangeAreaSeriesTheme } from '../range-area/interface';
+import type { ILiquidSeriesTheme } from '../liquid/interface';
 export interface ISeriesTheme {
     [SeriesTypeEnum.bar]?: IBarSeriesTheme;
     [SeriesTypeForThemeEnum.bar_vertical]?: IBarSeriesTheme;
@@ -76,6 +77,7 @@ export interface ISeriesTheme {
     [SeriesTypeEnum.circlePacking]?: ICirclePackingSeriesTheme;
     [SeriesTypeEnum.heatmap]?: IHeatmapSeriesTheme;
     [SeriesTypeEnum.correlation]?: ICorrelationSeriesTheme;
+    [SeriesTypeEnum.liquid]?: ILiquidSeriesTheme;
 }
 export declare enum SeriesTypeForThemeEnum {
     area_horizontal = "area_horizontal",

package/cjs/series/interface/theme.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.seriesMarkInfoMap = exports.SeriesTypeForThemeEnum = void 0;
 
-const type_1 = require("./type"), constant_1 = require("../bar/constant"), constant_2 = require("../line/constant"), constant_3 = require("../scatter/constant"), constant_4 = require("../area/constant"), constant_5 = require("../radar/constant"), constant_6 = require("../pie/constant"), constant_7 = require("../rose/constant"), constant_8 = require("../map/constant"), constant_9 = require("../progress/circular/constant"), constant_10 = require("../link/constant"), constant_11 = require("../dot/constant"), constant_12 = require("../word-cloud/constant"), constant_13 = require("../funnel/constant"), constant_14 = require("../progress/linear/constant"), constant_15 = require("../waterfall/constant"), constant_16 = require("../box-plot/constant"), constant_17 = require("../treemap/constant"), constant_18 = require("../sankey/constant"), constant_19 = require("../gauge/constant"), constant_20 = require("../sunburst/constant"), constant_21 = require("../range-column/constant"), constant_22 = require("../circle-packing/constant"), constant_23 = require("../heatmap/constant"), constant_24 = require("../correlation/constant"), constant_25 = require("../range-area/constant"), constant_26 = require("../base/constant");
+const type_1 = require("./type"), constant_1 = require("../bar/constant"), constant_2 = require("../line/constant"), constant_3 = require("../scatter/constant"), constant_4 = require("../area/constant"), constant_5 = require("../radar/constant"), constant_6 = require("../pie/constant"), constant_7 = require("../rose/constant"), constant_8 = require("../map/constant"), constant_9 = require("../progress/circular/constant"), constant_10 = require("../link/constant"), constant_11 = require("../dot/constant"), constant_12 = require("../word-cloud/constant"), constant_13 = require("../funnel/constant"), constant_14 = require("../progress/linear/constant"), constant_15 = require("../waterfall/constant"), constant_16 = require("../box-plot/constant"), constant_17 = require("../treemap/constant"), constant_18 = require("../sankey/constant"), constant_19 = require("../gauge/constant"), constant_20 = require("../sunburst/constant"), constant_21 = require("../range-column/constant"), constant_22 = require("../circle-packing/constant"), constant_23 = require("../heatmap/constant"), constant_24 = require("../correlation/constant"), constant_25 = require("../range-area/constant"), constant_26 = require("../base/constant"), constant_27 = require("../liquid/constant");
 
 var SeriesTypeForThemeEnum;
 
@@ -54,6 +54,7 @@ exports.seriesMarkInfoMap = {
     [type_1.SeriesTypeEnum.circlePacking]: constant_22.circlePackingSeriesMark,
     [type_1.SeriesTypeEnum.heatmap]: constant_23.heatmapSeriesMark,
     [type_1.SeriesTypeEnum.correlation]: constant_24.correlationSeriesMark,
-    [type_1.SeriesTypeEnum.rangeArea]: constant_25.rangeAreaSeriesMark
+    [type_1.SeriesTypeEnum.rangeArea]: constant_25.rangeAreaSeriesMark,
+    [type_1.SeriesTypeEnum.liquid]: constant_27.LiquidSeriesMark
 };
 //# sourceMappingURL=theme.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/interface/theme.ts"],"names":[],"mappings":"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","file":"theme.js","sourcesContent":["import type { IWaterfallSeriesTheme } from '../waterfall/interface';\nimport type { IBoxPlotSeriesTheme } from '../box-plot/interface';\nimport type { IBar3dSeriesTheme, IBarSeriesTheme } from '../bar/interface';\nimport type { ILineSeriesTheme } from '../line/interface';\nimport type { IScatterSeriesTheme } from '../scatter/interface';\nimport type { IAreaSeriesTheme } from '../area/interface';\nimport type { IRadarSeriesTheme } from '../radar/interface';\nimport type { IPie3dSeriesTheme, IPieSeriesTheme } from '../pie/interface';\nimport type { IRoseSeriesTheme } from '../rose/interface';\nimport type { IMapSeriesTheme } from '../map/interface';\nimport type { ICircularProgressSeriesTheme } from '../progress/circular/interface';\nimport type { ILinkSeriesTheme } from '../link/interface';\nimport type { IDotSeriesTheme } from '../dot/interface';\nimport type { IWordCloud3dSeriesTheme, IWordCloudSeriesTheme } from '../word-cloud/interface';\nimport type { IFunnel3dSeriesTheme, IFunnelSeriesTheme } from '../funnel/interface';\nimport type { ILinearProgressSeriesTheme } from '../progress/linear/interface';\nimport type { IGaugePointerSeriesTheme, IGaugeSeriesTheme } from '../gauge';\nimport type { ISankeySeriesTheme } from '../sankey/interface';\nimport type { ITreemapSeriesTheme } from '../treemap/interface';\nimport type { ISunburstSeriesTheme } from '../sunburst/interface';\nimport type { IRangeColumnSeriesTheme } from '../range-column/interface';\nimport type { ICirclePackingSeriesTheme } from '../circle-packing/interface';\nimport type { IHeatmapSeriesTheme } from '../heatmap/interface';\nimport type { ICorrelationSeriesTheme } from '../correlation/interface';\nimport { SeriesTypeEnum } from './type';\nimport type { SeriesMarkMap } from './common';\nimport { bar3dSeriesMark, barSeriesMark } from '../bar/constant';\nimport { lineSeriesMark } from '../line/constant';\nimport { scatterSeriesMark } from '../scatter/constant';\nimport { areaSeriesMark } from '../area/constant';\nimport { radarSeriesMark } from '../radar/constant';\nimport { pie3dSeriesMark, pieSeriesMark } from '../pie/constant';\nimport { roseSeriesMark } from '../rose/constant';\nimport { mapSeriesMark } from '../map/constant';\nimport { circularProgressSeriesMark } from '../progress/circular/constant';\nimport { linkSeriesMark } from '../link/constant';\nimport { dotSeriesMark } from '../dot/constant';\nimport { wordCloudSeriesMark } from '../word-cloud/constant';\nimport { funnel3dSeriesMark, funnelSeriesMark } from '../funnel/constant';\nimport { linearProgressSeriesMark } from '../progress/linear/constant';\nimport { waterfallSeriesMark } from '../waterfall/constant';\nimport { boxPlotSeriesMark } from '../box-plot/constant';\nimport { treemapSeriesMark } from '../treemap/constant';\nimport { sankeySeriesMark } from '../sankey/constant';\nimport { gaugePointerSeriesMark, gaugeSeriesMark } from '../gauge/constant';\nimport { sunburstSeriesMark } from '../sunburst/constant';\nimport { rangeColumn3dSeriesMark, rangeColumnSeriesMark } from '../range-column/constant';\nimport { circlePackingSeriesMark } from '../circle-packing/constant';\nimport { heatmapSeriesMark } from '../heatmap/constant';\nimport { correlationSeriesMark } from '../correlation/constant';\nimport { rangeAreaSeriesMark } from '../range-area/constant';\nimport type { IRangeAreaSeriesTheme } from '../range-area/interface';\nimport { baseSeriesMark } from '../base/constant';\n\nexport interface ISeriesTheme {\n  [SeriesTypeEnum.bar]?: IBarSeriesTheme;\n  [SeriesTypeForThemeEnum.bar_vertical]?: IBarSeriesTheme;\n  [SeriesTypeForThemeEnum.bar_horizontal]?: IBarSeriesTheme;\n\n  [SeriesTypeEnum.bar3d]?: IBar3dSeriesTheme;\n  [SeriesTypeForThemeEnum.bar3d_vertical]?: IBar3dSeriesTheme;\n  [SeriesTypeForThemeEnum.bar3d_horizontal]?: IBar3dSeriesTheme;\n\n  [SeriesTypeEnum.line]?: ILineSeriesTheme;\n  [SeriesTypeForThemeEnum.line_vertical]?: ILineSeriesTheme;\n  [SeriesTypeForThemeEnum.line_horizontal]?: ILineSeriesTheme;\n\n  [SeriesTypeEnum.area]?: IAreaSeriesTheme;\n  [SeriesTypeForThemeEnum.area_vertical]?: IAreaSeriesTheme;\n  [SeriesTypeForThemeEnum.area_horizontal]?: IAreaSeriesTheme;\n\n  [SeriesTypeEnum.rangeColumn]?: IRangeColumnSeriesTheme;\n  [SeriesTypeForThemeEnum.rangeColumn_vertical]?: IRangeColumnSeriesTheme;\n  [SeriesTypeForThemeEnum.rangeColumn_horizontal]?: IRangeColumnSeriesTheme;\n\n  [SeriesTypeEnum.rangeArea]?: IRangeAreaSeriesTheme;\n  [SeriesTypeForThemeEnum.rangeArea_vertical]?: IRangeAreaSeriesTheme;\n  [SeriesTypeForThemeEnum.rangeArea_horizontal]?: IRangeAreaSeriesTheme;\n\n  [SeriesTypeEnum.linearProgress]?: ILinearProgressSeriesTheme;\n  [SeriesTypeForThemeEnum.linearProgress_vertical]?: ILinearProgressSeriesTheme;\n  [SeriesTypeForThemeEnum.linearProgress_horizontal]?: ILinearProgressSeriesTheme;\n\n  [SeriesTypeEnum.boxPlot]?: IBoxPlotSeriesTheme;\n  [SeriesTypeForThemeEnum.boxPlot_vertical]?: IBoxPlotSeriesTheme;\n  [SeriesTypeForThemeEnum.boxPlot_horizontal]?: IBoxPlotSeriesTheme;\n\n  [SeriesTypeEnum.sankey]?: ISankeySeriesTheme;\n  [SeriesTypeForThemeEnum.sankey_vertical]?: ISankeySeriesTheme;\n  [SeriesTypeForThemeEnum.sankey_horizontal]?: ISankeySeriesTheme;\n\n  [SeriesTypeEnum.waterfall]?: IWaterfallSeriesTheme;\n  [SeriesTypeForThemeEnum.waterfall_vertical]?: IWaterfallSeriesTheme;\n  [SeriesTypeForThemeEnum.waterfall_horizontal]?: IWaterfallSeriesTheme;\n\n  [SeriesTypeEnum.scatter]?: IScatterSeriesTheme;\n  [SeriesTypeEnum.radar]?: IRadarSeriesTheme;\n  [SeriesTypeEnum.pie]?: IPieSeriesTheme;\n  [SeriesTypeEnum.pie3d]?: IPie3dSeriesTheme;\n  [SeriesTypeEnum.rose]?: IRoseSeriesTheme;\n  [SeriesTypeEnum.map]?: IMapSeriesTheme;\n  [SeriesTypeEnum.circularProgress]?: ICircularProgressSeriesTheme;\n  [SeriesTypeEnum.link]?: ILinkSeriesTheme;\n  [SeriesTypeEnum.dot]?: IDotSeriesTheme;\n  [SeriesTypeEnum.wordCloud]?: IWordCloudSeriesTheme;\n  [SeriesTypeEnum.wordCloud3d]?: IWordCloud3dSeriesTheme;\n  [SeriesTypeEnum.funnel]?: IFunnelSeriesTheme;\n  [SeriesTypeEnum.funnel3d]?: IFunnel3dSeriesTheme;\n  [SeriesTypeEnum.treemap]?: ITreemapSeriesTheme;\n  [SeriesTypeEnum.gauge]?: IGaugeSeriesTheme;\n  [SeriesTypeEnum.gaugePointer]?: IGaugePointerSeriesTheme;\n  [SeriesTypeEnum.sunburst]?: ISunburstSeriesTheme;\n  [SeriesTypeEnum.circlePacking]?: ICirclePackingSeriesTheme;\n  [SeriesTypeEnum.heatmap]?: IHeatmapSeriesTheme;\n  [SeriesTypeEnum.correlation]?: ICorrelationSeriesTheme;\n}\n\n/** 带有方向信息的系列类型，作为主题相关的补充类型 */\nexport enum SeriesTypeForThemeEnum {\n  area_horizontal = 'area_horizontal',\n  area_vertical = 'area_vertical',\n\n  line_horizontal = 'line_horizontal',\n  line_vertical = 'line_vertical',\n\n  bar_horizontal = 'bar_horizontal',\n  bar_vertical = 'bar_vertical',\n\n  bar3d_horizontal = 'bar3d_horizontal',\n  bar3d_vertical = 'bar3d_vertical',\n\n  rangeColumn_horizontal = 'rangeColumn_horizontal',\n  rangeColumn_vertical = 'rangeColumn_vertical',\n\n  rangeColumn3d_horizontal = 'rangeColumn3d_horizontal',\n  rangeColumn3d_vertical = 'rangeColumn3d_vertical',\n\n  rangeArea_horizontal = 'rangeArea_horizontal',\n  rangeArea_vertical = 'rangeArea_vertical',\n\n  linearProgress_horizontal = 'linearProgress_horizontal',\n  linearProgress_vertical = 'linearProgress_vertical',\n\n  boxPlot_horizontal = 'boxPlot_horizontal',\n  boxPlot_vertical = 'boxPlot_vertical',\n\n  sankey_horizontal = 'sankey_horizontal',\n  sankey_vertical = 'sankey_vertical',\n\n  waterfall_horizontal = 'waterfall_horizontal',\n  waterfall_vertical = 'waterfall_vertical'\n}\n\nexport const seriesMarkInfoMap: Record<SeriesTypeEnum, SeriesMarkMap> = {\n  [SeriesTypeEnum.bar]: barSeriesMark,\n  [SeriesTypeEnum.bar3d]: bar3dSeriesMark,\n  [SeriesTypeEnum.line]: lineSeriesMark,\n  [SeriesTypeEnum.scatter]: scatterSeriesMark,\n  [SeriesTypeEnum.area]: areaSeriesMark,\n  [SeriesTypeEnum.radar]: radarSeriesMark,\n  [SeriesTypeEnum.pie]: pieSeriesMark,\n  [SeriesTypeEnum.pie3d]: pie3dSeriesMark,\n  [SeriesTypeEnum.rose]: roseSeriesMark,\n  [SeriesTypeEnum.geo]: baseSeriesMark,\n  [SeriesTypeEnum.map]: mapSeriesMark,\n  [SeriesTypeEnum.circularProgress]: circularProgressSeriesMark,\n  [SeriesTypeEnum.link]: linkSeriesMark,\n  [SeriesTypeEnum.dot]: dotSeriesMark,\n  [SeriesTypeEnum.wordCloud]: wordCloudSeriesMark,\n  [SeriesTypeEnum.wordCloud3d]: wordCloudSeriesMark,\n  [SeriesTypeEnum.funnel]: funnelSeriesMark,\n  [SeriesTypeEnum.funnel3d]: funnel3dSeriesMark,\n  [SeriesTypeEnum.linearProgress]: linearProgressSeriesMark,\n  [SeriesTypeEnum.waterfall]: waterfallSeriesMark,\n  [SeriesTypeEnum.boxPlot]: boxPlotSeriesMark,\n  [SeriesTypeEnum.treemap]: treemapSeriesMark,\n  [SeriesTypeEnum.sankey]: sankeySeriesMark,\n  [SeriesTypeEnum.gauge]: gaugeSeriesMark,\n  [SeriesTypeEnum.gaugePointer]: gaugePointerSeriesMark,\n  [SeriesTypeEnum.sunburst]: sunburstSeriesMark,\n  [SeriesTypeEnum.rangeColumn]: rangeColumnSeriesMark,\n  [SeriesTypeEnum.rangeColumn3d]: rangeColumn3dSeriesMark,\n  [SeriesTypeEnum.circlePacking]: circlePackingSeriesMark,\n  [SeriesTypeEnum.heatmap]: heatmapSeriesMark,\n  [SeriesTypeEnum.correlation]: correlationSeriesMark,\n  [SeriesTypeEnum.rangeArea]: rangeAreaSeriesMark\n};\n"]}
+{"version":3,"sources":["../src/series/interface/theme.ts"],"names":[],"mappings":"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","file":"theme.js","sourcesContent":["import type { IWaterfallSeriesTheme } from '../waterfall/interface';\nimport type { IBoxPlotSeriesTheme } from '../box-plot/interface';\nimport type { IBar3dSeriesTheme, IBarSeriesTheme } from '../bar/interface';\nimport type { ILineSeriesTheme } from '../line/interface';\nimport type { IScatterSeriesTheme } from '../scatter/interface';\nimport type { IAreaSeriesTheme } from '../area/interface';\nimport type { IRadarSeriesTheme } from '../radar/interface';\nimport type { IPie3dSeriesTheme, IPieSeriesTheme } from '../pie/interface';\nimport type { IRoseSeriesTheme } from '../rose/interface';\nimport type { IMapSeriesTheme } from '../map/interface';\nimport type { ICircularProgressSeriesTheme } from '../progress/circular/interface';\nimport type { ILinkSeriesTheme } from '../link/interface';\nimport type { IDotSeriesTheme } from '../dot/interface';\nimport type { IWordCloud3dSeriesTheme, IWordCloudSeriesTheme } from '../word-cloud/interface';\nimport type { IFunnel3dSeriesTheme, IFunnelSeriesTheme } from '../funnel/interface';\nimport type { ILinearProgressSeriesTheme } from '../progress/linear/interface';\nimport type { IGaugePointerSeriesTheme, IGaugeSeriesTheme } from '../gauge';\nimport type { ISankeySeriesTheme } from '../sankey/interface';\nimport type { ITreemapSeriesTheme } from '../treemap/interface';\nimport type { ISunburstSeriesTheme } from '../sunburst/interface';\nimport type { IRangeColumnSeriesTheme } from '../range-column/interface';\nimport type { ICirclePackingSeriesTheme } from '../circle-packing/interface';\nimport type { IHeatmapSeriesTheme } from '../heatmap/interface';\nimport type { ICorrelationSeriesTheme } from '../correlation/interface';\nimport { SeriesTypeEnum } from './type';\nimport type { SeriesMarkMap } from './common';\nimport { bar3dSeriesMark, barSeriesMark } from '../bar/constant';\nimport { lineSeriesMark } from '../line/constant';\nimport { scatterSeriesMark } from '../scatter/constant';\nimport { areaSeriesMark } from '../area/constant';\nimport { radarSeriesMark } from '../radar/constant';\nimport { pie3dSeriesMark, pieSeriesMark } from '../pie/constant';\nimport { roseSeriesMark } from '../rose/constant';\nimport { mapSeriesMark } from '../map/constant';\nimport { circularProgressSeriesMark } from '../progress/circular/constant';\nimport { linkSeriesMark } from '../link/constant';\nimport { dotSeriesMark } from '../dot/constant';\nimport { wordCloudSeriesMark } from '../word-cloud/constant';\nimport { funnel3dSeriesMark, funnelSeriesMark } from '../funnel/constant';\nimport { linearProgressSeriesMark } from '../progress/linear/constant';\nimport { waterfallSeriesMark } from '../waterfall/constant';\nimport { boxPlotSeriesMark } from '../box-plot/constant';\nimport { treemapSeriesMark } from '../treemap/constant';\nimport { sankeySeriesMark } from '../sankey/constant';\nimport { gaugePointerSeriesMark, gaugeSeriesMark } from '../gauge/constant';\nimport { sunburstSeriesMark } from '../sunburst/constant';\nimport { rangeColumn3dSeriesMark, rangeColumnSeriesMark } from '../range-column/constant';\nimport { circlePackingSeriesMark } from '../circle-packing/constant';\nimport { heatmapSeriesMark } from '../heatmap/constant';\nimport { correlationSeriesMark } from '../correlation/constant';\nimport { rangeAreaSeriesMark } from '../range-area/constant';\nimport type { IRangeAreaSeriesTheme } from '../range-area/interface';\nimport { baseSeriesMark } from '../base/constant';\nimport type { ILiquidSeriesTheme } from '../liquid/interface';\nimport { LiquidSeriesMark } from '../liquid/constant';\n\nexport interface ISeriesTheme {\n  [SeriesTypeEnum.bar]?: IBarSeriesTheme;\n  [SeriesTypeForThemeEnum.bar_vertical]?: IBarSeriesTheme;\n  [SeriesTypeForThemeEnum.bar_horizontal]?: IBarSeriesTheme;\n\n  [SeriesTypeEnum.bar3d]?: IBar3dSeriesTheme;\n  [SeriesTypeForThemeEnum.bar3d_vertical]?: IBar3dSeriesTheme;\n  [SeriesTypeForThemeEnum.bar3d_horizontal]?: IBar3dSeriesTheme;\n\n  [SeriesTypeEnum.line]?: ILineSeriesTheme;\n  [SeriesTypeForThemeEnum.line_vertical]?: ILineSeriesTheme;\n  [SeriesTypeForThemeEnum.line_horizontal]?: ILineSeriesTheme;\n\n  [SeriesTypeEnum.area]?: IAreaSeriesTheme;\n  [SeriesTypeForThemeEnum.area_vertical]?: IAreaSeriesTheme;\n  [SeriesTypeForThemeEnum.area_horizontal]?: IAreaSeriesTheme;\n\n  [SeriesTypeEnum.rangeColumn]?: IRangeColumnSeriesTheme;\n  [SeriesTypeForThemeEnum.rangeColumn_vertical]?: IRangeColumnSeriesTheme;\n  [SeriesTypeForThemeEnum.rangeColumn_horizontal]?: IRangeColumnSeriesTheme;\n\n  [SeriesTypeEnum.rangeArea]?: IRangeAreaSeriesTheme;\n  [SeriesTypeForThemeEnum.rangeArea_vertical]?: IRangeAreaSeriesTheme;\n  [SeriesTypeForThemeEnum.rangeArea_horizontal]?: IRangeAreaSeriesTheme;\n\n  [SeriesTypeEnum.linearProgress]?: ILinearProgressSeriesTheme;\n  [SeriesTypeForThemeEnum.linearProgress_vertical]?: ILinearProgressSeriesTheme;\n  [SeriesTypeForThemeEnum.linearProgress_horizontal]?: ILinearProgressSeriesTheme;\n\n  [SeriesTypeEnum.boxPlot]?: IBoxPlotSeriesTheme;\n  [SeriesTypeForThemeEnum.boxPlot_vertical]?: IBoxPlotSeriesTheme;\n  [SeriesTypeForThemeEnum.boxPlot_horizontal]?: IBoxPlotSeriesTheme;\n\n  [SeriesTypeEnum.sankey]?: ISankeySeriesTheme;\n  [SeriesTypeForThemeEnum.sankey_vertical]?: ISankeySeriesTheme;\n  [SeriesTypeForThemeEnum.sankey_horizontal]?: ISankeySeriesTheme;\n\n  [SeriesTypeEnum.waterfall]?: IWaterfallSeriesTheme;\n  [SeriesTypeForThemeEnum.waterfall_vertical]?: IWaterfallSeriesTheme;\n  [SeriesTypeForThemeEnum.waterfall_horizontal]?: IWaterfallSeriesTheme;\n\n  [SeriesTypeEnum.scatter]?: IScatterSeriesTheme;\n  [SeriesTypeEnum.radar]?: IRadarSeriesTheme;\n  [SeriesTypeEnum.pie]?: IPieSeriesTheme;\n  [SeriesTypeEnum.pie3d]?: IPie3dSeriesTheme;\n  [SeriesTypeEnum.rose]?: IRoseSeriesTheme;\n  [SeriesTypeEnum.map]?: IMapSeriesTheme;\n  [SeriesTypeEnum.circularProgress]?: ICircularProgressSeriesTheme;\n  [SeriesTypeEnum.link]?: ILinkSeriesTheme;\n  [SeriesTypeEnum.dot]?: IDotSeriesTheme;\n  [SeriesTypeEnum.wordCloud]?: IWordCloudSeriesTheme;\n  [SeriesTypeEnum.wordCloud3d]?: IWordCloud3dSeriesTheme;\n  [SeriesTypeEnum.funnel]?: IFunnelSeriesTheme;\n  [SeriesTypeEnum.funnel3d]?: IFunnel3dSeriesTheme;\n  [SeriesTypeEnum.treemap]?: ITreemapSeriesTheme;\n  [SeriesTypeEnum.gauge]?: IGaugeSeriesTheme;\n  [SeriesTypeEnum.gaugePointer]?: IGaugePointerSeriesTheme;\n  [SeriesTypeEnum.sunburst]?: ISunburstSeriesTheme;\n  [SeriesTypeEnum.circlePacking]?: ICirclePackingSeriesTheme;\n  [SeriesTypeEnum.heatmap]?: IHeatmapSeriesTheme;\n  [SeriesTypeEnum.correlation]?: ICorrelationSeriesTheme;\n  [SeriesTypeEnum.liquid]?: ILiquidSeriesTheme;\n}\n\n/** 带有方向信息的系列类型，作为主题相关的补充类型 */\nexport enum SeriesTypeForThemeEnum {\n  area_horizontal = 'area_horizontal',\n  area_vertical = 'area_vertical',\n\n  line_horizontal = 'line_horizontal',\n  line_vertical = 'line_vertical',\n\n  bar_horizontal = 'bar_horizontal',\n  bar_vertical = 'bar_vertical',\n\n  bar3d_horizontal = 'bar3d_horizontal',\n  bar3d_vertical = 'bar3d_vertical',\n\n  rangeColumn_horizontal = 'rangeColumn_horizontal',\n  rangeColumn_vertical = 'rangeColumn_vertical',\n\n  rangeColumn3d_horizontal = 'rangeColumn3d_horizontal',\n  rangeColumn3d_vertical = 'rangeColumn3d_vertical',\n\n  rangeArea_horizontal = 'rangeArea_horizontal',\n  rangeArea_vertical = 'rangeArea_vertical',\n\n  linearProgress_horizontal = 'linearProgress_horizontal',\n  linearProgress_vertical = 'linearProgress_vertical',\n\n  boxPlot_horizontal = 'boxPlot_horizontal',\n  boxPlot_vertical = 'boxPlot_vertical',\n\n  sankey_horizontal = 'sankey_horizontal',\n  sankey_vertical = 'sankey_vertical',\n\n  waterfall_horizontal = 'waterfall_horizontal',\n  waterfall_vertical = 'waterfall_vertical'\n}\n\nexport const seriesMarkInfoMap: Record<SeriesTypeEnum, SeriesMarkMap> = {\n  [SeriesTypeEnum.bar]: barSeriesMark,\n  [SeriesTypeEnum.bar3d]: bar3dSeriesMark,\n  [SeriesTypeEnum.line]: lineSeriesMark,\n  [SeriesTypeEnum.scatter]: scatterSeriesMark,\n  [SeriesTypeEnum.area]: areaSeriesMark,\n  [SeriesTypeEnum.radar]: radarSeriesMark,\n  [SeriesTypeEnum.pie]: pieSeriesMark,\n  [SeriesTypeEnum.pie3d]: pie3dSeriesMark,\n  [SeriesTypeEnum.rose]: roseSeriesMark,\n  [SeriesTypeEnum.geo]: baseSeriesMark,\n  [SeriesTypeEnum.map]: mapSeriesMark,\n  [SeriesTypeEnum.circularProgress]: circularProgressSeriesMark,\n  [SeriesTypeEnum.link]: linkSeriesMark,\n  [SeriesTypeEnum.dot]: dotSeriesMark,\n  [SeriesTypeEnum.wordCloud]: wordCloudSeriesMark,\n  [SeriesTypeEnum.wordCloud3d]: wordCloudSeriesMark,\n  [SeriesTypeEnum.funnel]: funnelSeriesMark,\n  [SeriesTypeEnum.funnel3d]: funnel3dSeriesMark,\n  [SeriesTypeEnum.linearProgress]: linearProgressSeriesMark,\n  [SeriesTypeEnum.waterfall]: waterfallSeriesMark,\n  [SeriesTypeEnum.boxPlot]: boxPlotSeriesMark,\n  [SeriesTypeEnum.treemap]: treemapSeriesMark,\n  [SeriesTypeEnum.sankey]: sankeySeriesMark,\n  [SeriesTypeEnum.gauge]: gaugeSeriesMark,\n  [SeriesTypeEnum.gaugePointer]: gaugePointerSeriesMark,\n  [SeriesTypeEnum.sunburst]: sunburstSeriesMark,\n  [SeriesTypeEnum.rangeColumn]: rangeColumnSeriesMark,\n  [SeriesTypeEnum.rangeColumn3d]: rangeColumn3dSeriesMark,\n  [SeriesTypeEnum.circlePacking]: circlePackingSeriesMark,\n  [SeriesTypeEnum.heatmap]: heatmapSeriesMark,\n  [SeriesTypeEnum.correlation]: correlationSeriesMark,\n  [SeriesTypeEnum.rangeArea]: rangeAreaSeriesMark,\n  [SeriesTypeEnum.liquid]: LiquidSeriesMark\n};\n"]}

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

@@ -31,9 +31,10 @@ export declare enum SeriesTypeEnum {
     circlePacking = "circlePacking",
     waterfall = "waterfall",
     heatmap = "heatmap",
-    correlation = "correlation"
+    correlation = "correlation",
+    liquid = "liquid"
 }
-export declare enum SeriesMarkNameEnum {
+export declare const enum SeriesMarkNameEnum {
     label = "label",
     point = "point",
     line = "line",
@@ -88,6 +89,8 @@ export declare enum SeriesMarkNameEnum {
     centerLabel = "centerLabel",
     barBackground = "barBackground",
     lineLabel = "lineLabel",
-    areaLabel = "areaLabel"
+    areaLabel = "areaLabel",
+    liquid = "liquid",
+    liquidBackground = "liquidBackground",
+    liquidOutline = "liquidOutline"
 }
-export declare const seriesMarkNameSet: Set<string>;

package/cjs/series/interface/type.js

@@ -4,8 +4,7 @@ var SeriesTypeEnum, SeriesMarkNameEnum;
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.seriesMarkNameSet = exports.SeriesMarkNameEnum = exports.SeriesTypeEnum = void 0, 
-function(SeriesTypeEnum) {
+}), exports.SeriesMarkNameEnum = exports.SeriesTypeEnum = void 0, function(SeriesTypeEnum) {
     SeriesTypeEnum.area = "area", SeriesTypeEnum.line = "line", SeriesTypeEnum.bar = "bar", 
     SeriesTypeEnum.bar3d = "bar3d", SeriesTypeEnum.rangeColumn = "rangeColumn", SeriesTypeEnum.rangeColumn3d = "rangeColumn3d", 
     SeriesTypeEnum.rangeArea = "rangeArea", SeriesTypeEnum.dot = "dot", SeriesTypeEnum.geo = "geo", 
@@ -17,7 +16,8 @@ function(SeriesTypeEnum) {
     SeriesTypeEnum.boxPlot = "boxPlot", SeriesTypeEnum.sankey = "sankey", SeriesTypeEnum.gaugePointer = "gaugePointer", 
     SeriesTypeEnum.gauge = "gauge", SeriesTypeEnum.treemap = "treemap", SeriesTypeEnum.sunburst = "sunburst", 
     SeriesTypeEnum.circlePacking = "circlePacking", SeriesTypeEnum.waterfall = "waterfall", 
-    SeriesTypeEnum.heatmap = "heatmap", SeriesTypeEnum.correlation = "correlation";
+    SeriesTypeEnum.heatmap = "heatmap", SeriesTypeEnum.correlation = "correlation", 
+    SeriesTypeEnum.liquid = "liquid";
 }(SeriesTypeEnum = exports.SeriesTypeEnum || (exports.SeriesTypeEnum = {})), function(SeriesMarkNameEnum) {
     SeriesMarkNameEnum.label = "label", SeriesMarkNameEnum.point = "point", SeriesMarkNameEnum.line = "line", 
     SeriesMarkNameEnum.area = "area", SeriesMarkNameEnum.bar = "bar", SeriesMarkNameEnum.bar3d = "bar3d", 
@@ -42,7 +42,7 @@ function(SeriesTypeEnum) {
     SeriesMarkNameEnum.nodePoint = "nodePoint", SeriesMarkNameEnum.ripplePoint = "ripplePoint", 
     SeriesMarkNameEnum.centerPoint = "centerPoint", SeriesMarkNameEnum.centerLabel = "centerLabel", 
     SeriesMarkNameEnum.barBackground = "barBackground", SeriesMarkNameEnum.lineLabel = "lineLabel", 
-    SeriesMarkNameEnum.areaLabel = "areaLabel";
-}(SeriesMarkNameEnum = exports.SeriesMarkNameEnum || (exports.SeriesMarkNameEnum = {})), 
-exports.seriesMarkNameSet = new Set(Object.values(SeriesMarkNameEnum));
+    SeriesMarkNameEnum.areaLabel = "areaLabel", SeriesMarkNameEnum.liquid = "liquid", 
+    SeriesMarkNameEnum.liquidBackground = "liquidBackground", SeriesMarkNameEnum.liquidOutline = "liquidOutline";
+}(SeriesMarkNameEnum = exports.SeriesMarkNameEnum || (exports.SeriesMarkNameEnum = {}));
 //# sourceMappingURL=type.js.map