@visactor/vchart 1.3.2 → 1.3.4

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

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

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

@@ -63,7 +63,7 @@ export class LinearProgressSeries extends CartesianSeries {
                     width: this._spec.bandWidth - leftPadding - rightPadding,
                     cornerRadius: this._spec.cornerRadius,
                     fill: this.getColorAttribute()
-                });
+                }, "normal", AttributeLevel.Series);
             } else {
                 const topPadding = null !== (_f = null === (_e = this._spec.progress) || void 0 === _e ? void 0 : _e.topPadding) && void 0 !== _f ? _f : 0, bottomPadding = null !== (_h = null === (_g = this._spec.progress) || void 0 === _g ? void 0 : _g.bottomPadding) && void 0 !== _h ? _h : 0;
                 this.setMarkStyle(progressMark, {
@@ -86,7 +86,7 @@ export class LinearProgressSeries extends CartesianSeries {
                     },
                     cornerRadius: this._spec.cornerRadius,
                     fill: this.getColorAttribute()
-                });
+                }, "normal", AttributeLevel.Series);
             }
             this._trigger.registerMark(progressMark), null === (_j = this._tooltipHelper) || void 0 === _j || _j.activeTriggerSet.mark.add(progressMark);
         }
@@ -97,7 +97,7 @@ export class LinearProgressSeries extends CartesianSeries {
         }), this._trackMark;
     }
     initTrackMarkStyle() {
-        var _a, _b, _c, _d, _e;
+        var _a;
         const trackMark = this._trackMark;
         trackMark && ("vertical" === this._spec.direction ? this.setMarkStyle(trackMark, {
             x: datum => {
@@ -107,9 +107,8 @@ export class LinearProgressSeries extends CartesianSeries {
             y: 0,
             width: this._spec.bandWidth,
             height: () => this._scaleY.range()[0],
-            cornerRadius: this._spec.cornerRadius,
-            fill: null === (_b = null === (_a = this._spec.track) || void 0 === _a ? void 0 : _a.style) || void 0 === _b ? void 0 : _b.fill
-        }) : this.setMarkStyle(trackMark, {
+            cornerRadius: this._spec.cornerRadius
+        }, "normal", AttributeLevel.Series) : this.setMarkStyle(trackMark, {
             x: 0,
             y: datum => {
                 var _a, _b;
@@ -117,9 +116,8 @@ export class LinearProgressSeries extends CartesianSeries {
             },
             height: this._spec.bandWidth,
             width: () => this._scaleX.range()[1],
-            cornerRadius: this._spec.cornerRadius,
-            fill: null === (_d = null === (_c = this._spec.track) || void 0 === _c ? void 0 : _c.style) || void 0 === _d ? void 0 : _d.fill
-        }), this._trigger.registerMark(trackMark), null === (_e = this._tooltipHelper) || void 0 === _e || _e.activeTriggerSet.mark.add(trackMark));
+            cornerRadius: this._spec.cornerRadius
+        }, "normal", AttributeLevel.Series), this._trigger.registerMark(trackMark), null === (_a = this._tooltipHelper) || void 0 === _a || _a.activeTriggerSet.mark.add(trackMark));
     }
     initProgressGroupMark() {
         return this._progressGroupMark = this._createMark(LinearProgressSeries.mark.group, {

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vchart",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "charts lib based @visactor/VGrammar",
   "main": "cjs/index.js",
   "module": "esm/index.js",