@visactor/vchart 1.8.0-beta.0 → 1.8.0

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 { registerCircularProgressAnimation } 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  registerCircularProgressAnimation();\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];\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"]}

package/cjs/series/polar/progress-like/animation.d.ts

@@ -4,4 +4,4 @@ export interface IProgressLikeAnimationParams {
     startAngle?: number;
 }
 export declare function progressLikePresetAnimation(params: IProgressLikeAnimationParams, preset: ProgressLikeAppearPreset): IAnimationTypeConfig;
-export declare const registerCircularProgressAnimation: () => void;
+export declare const registerProgressLikeAnimation: () => void;

package/cjs/series/polar/progress-like/animation.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.registerCircularProgressAnimation = exports.progressLikePresetAnimation = void 0;
+}), exports.registerProgressLikeAnimation = exports.progressLikePresetAnimation = void 0;
 
 const factory_1 = require("../../../core/factory"), Appear_Grow = params => ({
     type: "growAngleIn",
@@ -19,7 +19,7 @@ function progressLikePresetAnimation(params, preset) {
 
 exports.progressLikePresetAnimation = progressLikePresetAnimation;
 
-const registerCircularProgressAnimation = () => {
+const registerProgressLikeAnimation = () => {
     factory_1.Factory.registerAnimation("circularProgress", ((params, preset) => ({
         appear: progressLikePresetAnimation(params, preset),
         enter: {
@@ -31,5 +31,5 @@ const registerCircularProgressAnimation = () => {
     })));
 };
 
-exports.registerCircularProgressAnimation = registerCircularProgressAnimation;
+exports.registerProgressLikeAnimation = registerProgressLikeAnimation;
 //# sourceMappingURL=animation.js.map

package/cjs/series/polar/progress-like/animation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/polar/progress-like/animation.ts"],"names":[],"mappings":";;;AACA,mDAAgD;AAQhD,MAAM,WAAW,GAAG,CAAC,MAAoC,EAAwB,EAAE,CAAC,CAAC;IACnF,IAAI,EAAE,aAAa;IACnB,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC,UAAU;KAC3B;CACF,CAAC,CAAC;AAEH,MAAM,aAAa,GAAyB;IAC1C,IAAI,EAAE,QAAQ;CACf,CAAC;AAEF,SAAgB,2BAA2B,CAAC,MAAoC,EAAE,MAAgC;IAChH,QAAQ,MAAM,EAAE;QACd,KAAK,QAAQ;YACX,OAAO,aAAa,CAAC;QACvB;YACE,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;KAC9B;AACH,CAAC;AAPD,kEAOC;AAEM,MAAM,iCAAiC,GAAG,GAAG,EAAE;IACpD,iBAAO,CAAC,iBAAiB,CACvB,kBAAkB,EAClB,CAAC,MAAoC,EAAE,MAAgC,EAAE,EAAE,CAAC,CAAC;QAC3E,MAAM,EAAE,2BAA2B,CAAC,MAAM,EAAE,MAAM,CAAC;QACnD,KAAK,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE;QAC9B,SAAS,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE;KACpC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,iCAAiC,qCAS5C","file":"animation.js","sourcesContent":["import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';\nimport { Factory } from '../../../core/factory';\n\nexport type ProgressLikeAppearPreset = 'grow' | 'fadeIn';\n\nexport interface IProgressLikeAnimationParams {\n  startAngle?: number;\n}\n\nconst Appear_Grow = (params: IProgressLikeAnimationParams): IAnimationTypeConfig => ({\n  type: 'growAngleIn',\n  options: {\n    overall: params.startAngle\n  }\n});\n\nconst Appear_FadeIn: IAnimationTypeConfig = {\n  type: 'fadeIn'\n};\n\nexport function progressLikePresetAnimation(params: IProgressLikeAnimationParams, preset: ProgressLikeAppearPreset) {\n  switch (preset) {\n    case 'fadeIn':\n      return Appear_FadeIn;\n    default:\n      return Appear_Grow(params);\n  }\n}\n\nexport const registerCircularProgressAnimation = () => {\n  Factory.registerAnimation(\n    'circularProgress',\n    (params: IProgressLikeAnimationParams, preset: ProgressLikeAppearPreset) => ({\n      appear: progressLikePresetAnimation(params, preset),\n      enter: { type: 'growAngleIn' },\n      disappear: { type: 'growAngleOut' }\n    })\n  );\n};\n"]}
+{"version":3,"sources":["../src/series/polar/progress-like/animation.ts"],"names":[],"mappings":";;;AACA,mDAAgD;AAQhD,MAAM,WAAW,GAAG,CAAC,MAAoC,EAAwB,EAAE,CAAC,CAAC;IACnF,IAAI,EAAE,aAAa;IACnB,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC,UAAU;KAC3B;CACF,CAAC,CAAC;AAEH,MAAM,aAAa,GAAyB;IAC1C,IAAI,EAAE,QAAQ;CACf,CAAC;AAEF,SAAgB,2BAA2B,CAAC,MAAoC,EAAE,MAAgC;IAChH,QAAQ,MAAM,EAAE;QACd,KAAK,QAAQ;YACX,OAAO,aAAa,CAAC;QACvB;YACE,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;KAC9B;AACH,CAAC;AAPD,kEAOC;AAEM,MAAM,6BAA6B,GAAG,GAAG,EAAE;IAChD,iBAAO,CAAC,iBAAiB,CACvB,kBAAkB,EAClB,CAAC,MAAoC,EAAE,MAAgC,EAAE,EAAE,CAAC,CAAC;QAC3E,MAAM,EAAE,2BAA2B,CAAC,MAAM,EAAE,MAAM,CAAC;QACnD,KAAK,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE;QAC9B,SAAS,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE;KACpC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,6BAA6B,iCASxC","file":"animation.js","sourcesContent":["import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';\nimport { Factory } from '../../../core/factory';\n\nexport type ProgressLikeAppearPreset = 'grow' | 'fadeIn';\n\nexport interface IProgressLikeAnimationParams {\n  startAngle?: number;\n}\n\nconst Appear_Grow = (params: IProgressLikeAnimationParams): IAnimationTypeConfig => ({\n  type: 'growAngleIn',\n  options: {\n    overall: params.startAngle\n  }\n});\n\nconst Appear_FadeIn: IAnimationTypeConfig = {\n  type: 'fadeIn'\n};\n\nexport function progressLikePresetAnimation(params: IProgressLikeAnimationParams, preset: ProgressLikeAppearPreset) {\n  switch (preset) {\n    case 'fadeIn':\n      return Appear_FadeIn;\n    default:\n      return Appear_Grow(params);\n  }\n}\n\nexport const registerProgressLikeAnimation = () => {\n  Factory.registerAnimation(\n    'circularProgress',\n    (params: IProgressLikeAnimationParams, preset: ProgressLikeAppearPreset) => ({\n      appear: progressLikePresetAnimation(params, preset),\n      enter: { type: 'growAngleIn' },\n      disappear: { type: 'growAngleOut' }\n    })\n  );\n};\n"]}

package/cjs/series/progress/circular/circular.js

@@ -119,7 +119,7 @@ CircularProgressSeries.mark = constant_1.circularProgressSeriesMark;
 
 const registerCircularProgressSeries = () => {
     (0, progress_arc_1.registerProgressArcMark)(), (0, arc_1.registerArcMark)(), (0, 
-    progress_like_2.registerCircularProgressAnimation)(), (0, config_1.registerFadeInOutAnimation)(), 
+    progress_like_2.registerProgressLikeAnimation)(), (0, config_1.registerFadeInOutAnimation)(), 
     factory_1.Factory.registerSeries(CircularProgressSeries.type, CircularProgressSeries);
 };
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/progress/circular/circular.ts"],"names":[],"mappings":"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","file":"circular.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport type { BandScale } from '@visactor/vscale';\nimport type { IArcMark } from '../../../mark/arc';\nimport type { Maybe, Datum } from '../../../typings';\nimport { isValidNumber } from '@visactor/vutils';\nimport type { SeriesMarkMap } from '../../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../../interface/type';\nimport { animationConfig, userAnimationConfig } from '../../../animation/utils';\nimport type { ICircularProgressSeriesSpec, ICircularProgressSeriesTheme } from './interface';\nimport { ProgressLikeSeries } from '../../polar/progress-like/progress-like';\nimport type { IStateAnimateSpec } from '../../../animation/spec';\nimport type { IProgressArcMark } from '../../../mark/progress-arc';\nimport { ArcMark, registerArcMark } from '../../../mark/arc';\nimport { ProgressArcMark, registerProgressArcMark } from '../../../mark/progress-arc';\nimport { circularProgressSeriesMark } from './constant';\nimport { STACK_FIELD_END, STACK_FIELD_START, AttributeLevel } from '../../../constant';\nimport { Factory } from '../../../core/factory';\nimport { registerCircularProgressAnimation } from '../../polar/progress-like';\nimport { registerFadeInOutAnimation } from '../../../animation/config';\nimport type { IMark } from '../../../mark/interface';\n\nexport class CircularProgressSeries<\n  T extends ICircularProgressSeriesSpec = ICircularProgressSeriesSpec\n> extends ProgressLikeSeries<T> {\n  static readonly type: string = SeriesTypeEnum.circularProgress;\n  type = SeriesTypeEnum.circularProgress;\n\n  static readonly mark: SeriesMarkMap = circularProgressSeriesMark;\n\n  private _progressMark: IProgressArcMark | null = null;\n  private _trackMark: IProgressArcMark | null = null;\n\n  getStackGroupFields(): string[] {\n    return this.getGroupFields();\n  }\n\n  getGroupFields() {\n    return this._radiusField;\n  }\n\n  initMark(): void {\n    super.initMark();\n    this._initTrackMark();\n    this._initProgressMark();\n  }\n\n  initMarkStyle(): void {\n    super.initMarkStyle();\n    this._initTrackMarkStyle();\n    this._initProgressMarkStyle();\n  }\n\n  private _initProgressMark() {\n    this._progressMark = this._createMark(CircularProgressSeries.mark.progress, {\n      parent: this._arcGroupMark,\n      isSeriesMark: true,\n      customShape: this._spec.progress?.customShape\n    }) as IArcMark;\n    return this._progressMark;\n  }\n\n  private _initProgressMarkStyle() {\n    const progressMark = this._progressMark;\n    if (progressMark) {\n      this.setMarkStyle(\n        progressMark,\n        {\n          x: () => this.angleAxisHelper.center().x,\n          y: () => this.angleAxisHelper.center().y,\n          startAngle: this._getAngleValueStart,\n          endAngle: this._getAngleValueEnd,\n          innerRadius: this._getRadiusValueStart,\n          outerRadius: this._getRadiusValueEnd,\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        'normal',\n        AttributeLevel.Series\n      );\n      this._trigger.registerMark(progressMark);\n    }\n  }\n\n  protected initTooltip() {\n    super.initTooltip();\n\n    this._progressMark && this._tooltipHelper.activeTriggerSet.mark.add(this._progressMark);\n  }\n\n  private _initTrackMark() {\n    this._trackMark = this._createMark(CircularProgressSeries.mark.track, {\n      parent: this._arcGroupMark,\n      customShape: this._spec.track?.customShape\n    }) as IArcMark;\n    return this._trackMark;\n  }\n\n  private _initTrackMarkStyle() {\n    const trackMark = this._trackMark;\n    if (trackMark) {\n      this.setMarkStyle(\n        trackMark,\n        {\n          visible: (datum: Datum) => {\n            const scale = this.angleAxisHelper.getScale(0);\n            const range = scale.range();\n            const min = Math.min(range[0], range[range.length - 1]);\n            const startValue = this._getAngleValueStartWithoutMask(datum);\n            // 堆叠情况只显示第一组的背景\n            return Math.abs(startValue - min) <= 1e-14;\n          },\n          x: () => this.angleAxisHelper.center().x,\n          y: () => this.angleAxisHelper.center().y,\n          startAngle: () => {\n            const fieldName = this._stack ? STACK_FIELD_START : this._angleField[0];\n            const scale = this.angleAxisHelper.getScale(0);\n            const domain = scale.domain();\n            return this._getAngleValueStart({ [fieldName]: domain[0] });\n          },\n          endAngle: () => {\n            const fieldName = this._stack ? STACK_FIELD_END : this._angleField[0];\n            const scale = this.angleAxisHelper.getScale(0);\n            const domain = scale.domain();\n            return this._getAngleValueEnd({ [fieldName]: domain[domain.length - 1] });\n          },\n          innerRadius: this._getRadiusValueStart,\n          outerRadius: this._getRadiusValueEnd,\n          cornerRadius: this._spec.cornerRadius,\n          fill: this.getColorAttribute(),\n          zIndex: 100\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      this._trigger.registerMark(trackMark);\n    }\n  }\n\n  protected _getRadiusValueStart = (datum: Datum) => {\n    if (this.getGroupFields().length > 1) {\n      const value = this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields()));\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]);\n  };\n\n  protected _getRadiusValueEnd = (datum: Datum) => {\n    if (this.getGroupFields().length > 1) {\n      const value =\n        this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields())) +\n        this.radiusAxisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0);\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return (\n      this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]) +\n      (this.radiusAxisHelper.getScale(0) as BandScale).step()\n    );\n  };\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<any>)?.preset;\n\n    this._progressMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('circularProgress')?.({ startAngle: this._startAngle }, appearPreset),\n        userAnimationConfig(SeriesMarkNameEnum.progress, this._spec, this._markAttributeContext)\n      )\n    );\n\n    this._trackMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('fadeInOut')?.(),\n        userAnimationConfig(SeriesMarkNameEnum.track, this._spec, this._markAttributeContext)\n      )\n    );\n  }\n\n  getActiveMarks(): IMark[] {\n    return [this._progressMark];\n  }\n}\n\nexport const registerCircularProgressSeries = () => {\n  registerProgressArcMark();\n  registerArcMark();\n  registerCircularProgressAnimation();\n  registerFadeInOutAnimation();\n  Factory.registerSeries(CircularProgressSeries.type, CircularProgressSeries);\n};\n"]}
+{"version":3,"sources":["../src/series/progress/circular/circular.ts"],"names":[],"mappings":"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","file":"circular.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport type { BandScale } from '@visactor/vscale';\nimport type { IArcMark } from '../../../mark/arc';\nimport type { Maybe, Datum } from '../../../typings';\nimport { isValidNumber } from '@visactor/vutils';\nimport type { SeriesMarkMap } from '../../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../../interface/type';\nimport { animationConfig, userAnimationConfig } from '../../../animation/utils';\nimport type { ICircularProgressSeriesSpec, ICircularProgressSeriesTheme } from './interface';\nimport { ProgressLikeSeries } from '../../polar/progress-like/progress-like';\nimport type { IStateAnimateSpec } from '../../../animation/spec';\nimport type { IProgressArcMark } from '../../../mark/progress-arc';\nimport { ArcMark, registerArcMark } from '../../../mark/arc';\nimport { ProgressArcMark, registerProgressArcMark } from '../../../mark/progress-arc';\nimport { circularProgressSeriesMark } from './constant';\nimport { STACK_FIELD_END, STACK_FIELD_START, AttributeLevel } from '../../../constant';\nimport { Factory } from '../../../core/factory';\nimport { registerProgressLikeAnimation } from '../../polar/progress-like';\nimport { registerFadeInOutAnimation } from '../../../animation/config';\nimport type { IMark } from '../../../mark/interface';\n\nexport class CircularProgressSeries<\n  T extends ICircularProgressSeriesSpec = ICircularProgressSeriesSpec\n> extends ProgressLikeSeries<T> {\n  static readonly type: string = SeriesTypeEnum.circularProgress;\n  type = SeriesTypeEnum.circularProgress;\n\n  static readonly mark: SeriesMarkMap = circularProgressSeriesMark;\n\n  private _progressMark: IProgressArcMark | null = null;\n  private _trackMark: IProgressArcMark | null = null;\n\n  getStackGroupFields(): string[] {\n    return this.getGroupFields();\n  }\n\n  getGroupFields() {\n    return this._radiusField;\n  }\n\n  initMark(): void {\n    super.initMark();\n    this._initTrackMark();\n    this._initProgressMark();\n  }\n\n  initMarkStyle(): void {\n    super.initMarkStyle();\n    this._initTrackMarkStyle();\n    this._initProgressMarkStyle();\n  }\n\n  private _initProgressMark() {\n    this._progressMark = this._createMark(CircularProgressSeries.mark.progress, {\n      parent: this._arcGroupMark,\n      isSeriesMark: true,\n      customShape: this._spec.progress?.customShape\n    }) as IArcMark;\n    return this._progressMark;\n  }\n\n  private _initProgressMarkStyle() {\n    const progressMark = this._progressMark;\n    if (progressMark) {\n      this.setMarkStyle(\n        progressMark,\n        {\n          x: () => this.angleAxisHelper.center().x,\n          y: () => this.angleAxisHelper.center().y,\n          startAngle: this._getAngleValueStart,\n          endAngle: this._getAngleValueEnd,\n          innerRadius: this._getRadiusValueStart,\n          outerRadius: this._getRadiusValueEnd,\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        'normal',\n        AttributeLevel.Series\n      );\n      this._trigger.registerMark(progressMark);\n    }\n  }\n\n  protected initTooltip() {\n    super.initTooltip();\n\n    this._progressMark && this._tooltipHelper.activeTriggerSet.mark.add(this._progressMark);\n  }\n\n  private _initTrackMark() {\n    this._trackMark = this._createMark(CircularProgressSeries.mark.track, {\n      parent: this._arcGroupMark,\n      customShape: this._spec.track?.customShape\n    }) as IArcMark;\n    return this._trackMark;\n  }\n\n  private _initTrackMarkStyle() {\n    const trackMark = this._trackMark;\n    if (trackMark) {\n      this.setMarkStyle(\n        trackMark,\n        {\n          visible: (datum: Datum) => {\n            const scale = this.angleAxisHelper.getScale(0);\n            const range = scale.range();\n            const min = Math.min(range[0], range[range.length - 1]);\n            const startValue = this._getAngleValueStartWithoutMask(datum);\n            // 堆叠情况只显示第一组的背景\n            return Math.abs(startValue - min) <= 1e-14;\n          },\n          x: () => this.angleAxisHelper.center().x,\n          y: () => this.angleAxisHelper.center().y,\n          startAngle: () => {\n            const fieldName = this._stack ? STACK_FIELD_START : this._angleField[0];\n            const scale = this.angleAxisHelper.getScale(0);\n            const domain = scale.domain();\n            return this._getAngleValueStart({ [fieldName]: domain[0] });\n          },\n          endAngle: () => {\n            const fieldName = this._stack ? STACK_FIELD_END : this._angleField[0];\n            const scale = this.angleAxisHelper.getScale(0);\n            const domain = scale.domain();\n            return this._getAngleValueEnd({ [fieldName]: domain[domain.length - 1] });\n          },\n          innerRadius: this._getRadiusValueStart,\n          outerRadius: this._getRadiusValueEnd,\n          cornerRadius: this._spec.cornerRadius,\n          fill: this.getColorAttribute(),\n          zIndex: 100\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      this._trigger.registerMark(trackMark);\n    }\n  }\n\n  protected _getRadiusValueStart = (datum: Datum) => {\n    if (this.getGroupFields().length > 1) {\n      const value = this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields()));\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]);\n  };\n\n  protected _getRadiusValueEnd = (datum: Datum) => {\n    if (this.getGroupFields().length > 1) {\n      const value =\n        this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields())) +\n        this.radiusAxisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0);\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return (\n      this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]) +\n      (this.radiusAxisHelper.getScale(0) as BandScale).step()\n    );\n  };\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<any>)?.preset;\n\n    this._progressMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('circularProgress')?.({ startAngle: this._startAngle }, appearPreset),\n        userAnimationConfig(SeriesMarkNameEnum.progress, this._spec, this._markAttributeContext)\n      )\n    );\n\n    this._trackMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('fadeInOut')?.(),\n        userAnimationConfig(SeriesMarkNameEnum.track, this._spec, this._markAttributeContext)\n      )\n    );\n  }\n\n  getActiveMarks(): IMark[] {\n    return [this._progressMark];\n  }\n}\n\nexport const registerCircularProgressSeries = () => {\n  registerProgressArcMark();\n  registerArcMark();\n  registerProgressLikeAnimation();\n  registerFadeInOutAnimation();\n  Factory.registerSeries(CircularProgressSeries.type, CircularProgressSeries);\n};\n"]}

package/esm/core/index.d.ts

@@ -1,7 +1,7 @@
 import { VChart } from './vchart';
 import { Factory } from './factory';
 export { VChart, Factory };
-export declare const version = "1.8.0-beta.0";
+export declare const version = "1.8.0";
 export type { IVChart } from './interface';
 export type { IStateSpec, StateValueType } from '../compile/mark';
 export * from '../typings/spec/common';

package/esm/core/index.js

@@ -4,7 +4,7 @@ import { Factory } from "./factory";
 
 export { VChart, Factory };
 
-export const version = "1.8.0-beta.0";
+export const version = "1.8.0";
 
 export * from "../typings/spec/common";
 

package/esm/core/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAG3B,MAAM,CAAC,MAAM,OAAO,GAAG,cAAc,CAAC;AAMtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAK5B,cAAc,uBAAuB,CAAC;AAGtC,cAAc,gBAAgB,CAAC;AAG/B,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD,cAAc,WAAW,CAAC","file":"index.js","sourcesContent":["/**\n * @description The core module of VChart, containing the necessary interfaces for using VChart.\n */\n\nimport { VChart } from './vchart';\nimport { Factory } from './factory';\n\nexport { VChart, Factory };\n\n// export the version\nexport const version = \"1.8.0-beta.0\";\n\n// export necessary types\nexport type { IVChart } from './interface';\nexport type { IStateSpec, StateValueType } from '../compile/mark';\n\nexport * from '../typings/spec/common';\nexport * from '../event/interface';\nexport * from '../theme/interface';\nexport * from '../constant';\n\n/**\n * spec\n */\nexport * from '../typings/spec/index';\n\n// theme\nexport * from '../theme/index';\n\n// vrender\nexport { vglobal } from '@visactor/vrender-core';\n\n// plugin\nexport * from '../plugin';\n"]}
+{"version":3,"sources":["../src/core/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAG3B,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC;AAM/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAK5B,cAAc,uBAAuB,CAAC;AAGtC,cAAc,gBAAgB,CAAC;AAG/B,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD,cAAc,WAAW,CAAC","file":"index.js","sourcesContent":["/**\n * @description The core module of VChart, containing the necessary interfaces for using VChart.\n */\n\nimport { VChart } from './vchart';\nimport { Factory } from './factory';\n\nexport { VChart, Factory };\n\n// export the version\nexport const version = \"1.8.0\";\n\n// export necessary types\nexport type { IVChart } from './interface';\nexport type { IStateSpec, StateValueType } from '../compile/mark';\n\nexport * from '../typings/spec/common';\nexport * from '../event/interface';\nexport * from '../theme/interface';\nexport * from '../constant';\n\n/**\n * spec\n */\nexport * from '../typings/spec/index';\n\n// theme\nexport * from '../theme/index';\n\n// vrender\nexport { vglobal } from '@visactor/vrender-core';\n\n// plugin\nexport * from '../plugin';\n"]}

package/esm/interaction/config.js

@@ -25,4 +25,4 @@ export function getDefaultInteractionConfigByMode(mode) {
         }
     } : null;
 }
-//# sourceMappingURL=config.js.map
+//# sourceMappingURL=config.js.map

package/esm/interaction/dimension-trigger.js

@@ -91,4 +91,4 @@ export class DimensionTrigger {
         return !0;
     }
 }
-//# sourceMappingURL=dimension-trigger.js.map
+//# sourceMappingURL=dimension-trigger.js.map

package/esm/interaction/interaction.js

@@ -76,4 +76,4 @@ export class Interaction {
         })));
     }
 }
-//# sourceMappingURL=interaction.js.map
+//# sourceMappingURL=interaction.js.map

package/esm/interaction/interface.js

@@ -1,2 +1,2 @@
 export { };
-//# sourceMappingURL=interface.js.map
+//# sourceMappingURL=interface.js.map

package/esm/layout/base-layout.js

@@ -153,4 +153,4 @@ export class Layout {
 }
 
 Layout.type = "base";
-//# sourceMappingURL=base-layout.js.map
+//# sourceMappingURL=base-layout.js.map

package/esm/layout/index.js

@@ -5,4 +5,4 @@ import { GridLayout, registerGridLayout } from "./grid-layout/grid-layout";
 import { Layout3d, registerLayout3d } from "./layout3d";
 
 export { Layout, GridLayout, Layout3d, registerGridLayout, registerLayout3d };
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/esm/layout/interface.js

@@ -1,2 +1,2 @@
 export { };
-//# sourceMappingURL=interface.js.map
+//# sourceMappingURL=interface.js.map

package/esm/layout/layout-item.js

@@ -211,4 +211,4 @@ export class LayoutItem {
         return this._model.getVisible();
     }
 }
-//# sourceMappingURL=layout-item.js.map
+//# sourceMappingURL=layout-item.js.map

package/esm/mark/text.js

@@ -4,7 +4,7 @@ import { BaseMark } from "./base/base-mark";
 
 import { MarkTypeEnum } from "./interface";
 
-import { GrammarMarkType, registerTextGraphic } from "@visactor/vgrammar-core";
+import { GrammarMarkType, registerRichTextGraphic, registerTextGraphic } from "@visactor/vgrammar-core";
 
 export class TextMark extends BaseMark {
     constructor() {
@@ -28,6 +28,6 @@ export class TextMark extends BaseMark {
 TextMark.type = MarkTypeEnum.text;
 
 export const registerTextMark = () => {
-    Factory.registerMark(TextMark.type, TextMark), registerTextGraphic();
+    Factory.registerMark(TextMark.type, TextMark), registerTextGraphic(), registerRichTextGraphic();
 };
 //# sourceMappingURL=text.js.map

package/esm/mark/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAK/E,MAAM,OAAO,QAAS,SAAQ,QAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IA4BhC,CAAC;IA1BW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAE3B,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,QAAQ,EACnB,SAAS,EAAE,CAAC,EACZ,UAAU,EAAE,EAAE,GACf,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,YAAY,CAAC,KAA2B;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAGpC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAE/B,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,MAAM,EAAE;YACxC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,QAA2B,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACvG;aAAM;YACL,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAuB,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACnG;QAED,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AA5Be,aAAI,GAAG,YAAY,CAAC,IAAI,CAAC;AA+B3C,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,mBAAmB,EAAE,CAAC;AACxB,CAAC,CAAC","file":"text.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { ITextMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\nimport { GrammarMarkType, registerTextGraphic } from '@visactor/vgrammar-core';\nimport type { IGroupMark } from '@visactor/vgrammar-core';\n\nexport type ITextMark = IMarkRaw<ITextMarkSpec>;\n\nexport class TextMark extends BaseMark<ITextMarkSpec> implements ITextMark {\n  static readonly type = MarkTypeEnum.text;\n  readonly type = TextMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ITextMarkSpec> = {\n      ...super._getDefaultStyle(),\n      // TODO: 删除后会有显示问题，待排查\n      angle: 0,\n      textAlign: 'center',\n      lineWidth: 0,\n      textConfig: []\n    };\n    return defaultStyle;\n  }\n\n  protected _initProduct(group?: string | IGroupMark) {\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n\n    if (this.getStyle('textType') === 'rich') {\n      this._product = view.mark(GrammarMarkType.richtext as GrammarMarkType, group ?? view.rootMark).id(id);\n    } else {\n      this._product = view.mark(GrammarMarkType.text as GrammarMarkType, group ?? view.rootMark).id(id);\n    }\n\n    this._compiledProductId = id;\n  }\n}\n\nexport const registerTextMark = () => {\n  Factory.registerMark(TextMark.type, TextMark);\n  registerTextGraphic();\n};\n"]}
+{"version":3,"sources":["../src/mark/text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAKxG,MAAM,OAAO,QAAS,SAAQ,QAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IA4BhC,CAAC;IA1BW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAE3B,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,QAAQ,EACnB,SAAS,EAAE,CAAC,EACZ,UAAU,EAAE,EAAE,GACf,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,YAAY,CAAC,KAA2B;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAGpC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAE/B,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,MAAM,EAAE;YACxC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,QAA2B,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACvG;aAAM;YACL,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAuB,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACnG;QAED,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AA5Be,aAAI,GAAG,YAAY,CAAC,IAAI,CAAC;AA+B3C,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,mBAAmB,EAAE,CAAC;IACtB,uBAAuB,EAAE,CAAC;AAC5B,CAAC,CAAC","file":"text.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { ITextMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\nimport { GrammarMarkType, registerRichTextGraphic, registerTextGraphic } from '@visactor/vgrammar-core';\nimport type { IGroupMark } from '@visactor/vgrammar-core';\n\nexport type ITextMark = IMarkRaw<ITextMarkSpec>;\n\nexport class TextMark extends BaseMark<ITextMarkSpec> implements ITextMark {\n  static readonly type = MarkTypeEnum.text;\n  readonly type = TextMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ITextMarkSpec> = {\n      ...super._getDefaultStyle(),\n      // TODO: 删除后会有显示问题，待排查\n      angle: 0,\n      textAlign: 'center',\n      lineWidth: 0,\n      textConfig: []\n    };\n    return defaultStyle;\n  }\n\n  protected _initProduct(group?: string | IGroupMark) {\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n\n    if (this.getStyle('textType') === 'rich') {\n      this._product = view.mark(GrammarMarkType.richtext as GrammarMarkType, group ?? view.rootMark).id(id);\n    } else {\n      this._product = view.mark(GrammarMarkType.text as GrammarMarkType, group ?? view.rootMark).id(id);\n    }\n\n    this._compiledProductId = id;\n  }\n}\n\nexport const registerTextMark = () => {\n  Factory.registerMark(TextMark.type, TextMark);\n  registerTextGraphic();\n  registerRichTextGraphic();\n};\n"]}

package/esm/series/funnel/funnel.js

@@ -260,7 +260,8 @@ export class FunnelSeries extends BaseSeries {
         return !!(null == datum ? void 0 : datum[FUNNEL_TRANSFORM_LEVEL]);
     }
     _buildMarkAttributeContext() {
-        super._buildMarkAttributeContext(), this._markAttributeContext.valueToPosition = this.valueToPosition.bind(this);
+        super._buildMarkAttributeContext(), this._markAttributeContext.valueToPosition = this.valueToPosition.bind(this), 
+        this._markAttributeContext.getPoints = this.getPoints.bind(this), this._markAttributeContext.isTransformLevel = this.isTransformLevel.bind(this);
     }
     valueToPosition(category) {
         var _a, _b, _c;