@visactor/vchart 1.4.0-alpha.4 → 1.4.0-alpha.6

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

@@ -1,4 +1,4 @@
-import type { IAnimationTypeConfig } from '@visactor/vgrammar';
+import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';
 export type ProgressLikeAppearPreset = 'grow' | 'fadeIn';
 export interface IProgressLikeAnimationParams {
     startAngle?: number;

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/polar/progress-like/animation.ts"],"names":[],"mappings":";;;AAQA,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","file":"animation.js","sourcesContent":["import type { IAnimationTypeConfig } from '@visactor/vgrammar';\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"]}
+{"version":3,"sources":["../src/series/polar/progress-like/animation.ts"],"names":[],"mappings":";;;AAQA,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","file":"animation.js","sourcesContent":["import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';\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"]}

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

@@ -0,0 +1,2 @@
+import type { SeriesMarkMap } from '../../interface/common';
+export declare const progressLikeSeriesMark: SeriesMarkMap;

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

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.progressLikeSeriesMark = void 0;
+
+const interface_1 = require("../../../mark/interface"), constant_1 = require("../../base/constant"), type_1 = require("../../interface/type");
+
+exports.progressLikeSeriesMark = Object.assign(Object.assign({}, constant_1.baseSeriesMark), {
+    [type_1.SeriesMarkNameEnum.group]: {
+        name: type_1.SeriesMarkNameEnum.group,
+        type: interface_1.MarkTypeEnum.group
+    }
+});
+//# sourceMappingURL=constant.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/series/polar/progress-like/constant.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AACvD,kDAAqD;AAErD,+CAA0D;AAE7C,QAAA,sBAAsB,mCAC9B,yBAAc,KACjB,CAAC,yBAAkB,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,yBAAkB,CAAC,KAAK,EAAE,IAAI,EAAE,wBAAY,CAAC,KAAK,EAAE,IACxF","file":"constant.js","sourcesContent":["import { MarkTypeEnum } from '../../../mark/interface';\nimport { baseSeriesMark } from '../../base/constant';\nimport type { SeriesMarkMap } from '../../interface/common';\nimport { SeriesMarkNameEnum } from '../../interface/type';\n\nexport const progressLikeSeriesMark: SeriesMarkMap = {\n  ...baseSeriesMark,\n  [SeriesMarkNameEnum.group]: { name: SeriesMarkNameEnum.group, type: MarkTypeEnum.group }\n};\n"]}

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

@@ -1,9 +1,21 @@
+import type { IArcMarkSpec, IMarkSpec, IMarkTheme } from '../../../typings';
 import type { IPolarSeriesSpec, IPolarSeriesTheme } from '../interface';
+export interface IContinuousTickData {
+    index?: number;
+    value: number;
+}
+export interface ITickMaskSpec {
+    angle?: number;
+    offsetAngle?: number;
+    forceAlign?: boolean;
+}
 export interface IProgressLikeSeriesSpec extends IPolarSeriesSpec {
     roundCap?: boolean | [boolean, boolean];
     cornerRadius?: number;
+    tickMask?: Omit<IMarkSpec<IArcMarkSpec>, 'state'> & ITickMaskSpec;
 }
 export interface IProgressLikeSeriesTheme extends IPolarSeriesTheme {
     roundCap?: boolean | [boolean, boolean];
     cornerRadius?: number;
+    tickMask?: Omit<IMarkTheme<IArcMarkSpec>, 'state'> & ITickMaskSpec;
 }

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/polar/progress-like/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IPolarSeriesSpec, IPolarSeriesTheme } from '../interface';\n\nexport interface IProgressLikeSeriesSpec extends IPolarSeriesSpec {\n  /** 圆角部分是否突出（可分别设置左侧和右侧） */\n  roundCap?: boolean | [boolean, boolean];\n\n  /** 圆角半径 */\n  cornerRadius?: number;\n}\n\nexport interface IProgressLikeSeriesTheme extends IPolarSeriesTheme {\n  /** 圆角部分是否突出 */\n  roundCap?: boolean | [boolean, boolean];\n\n  /** 圆角半径 */\n  cornerRadius?: number;\n}\n"]}
+{"version":3,"sources":["../src/series/polar/progress-like/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IArcMarkSpec, IMarkSpec, IMarkTheme } from '../../../typings';\nimport type { IPolarSeriesSpec, IPolarSeriesTheme } from '../interface';\n\nexport interface IContinuousTickData {\n  index?: number;\n  value: number;\n}\n\nexport interface ITickMaskSpec {\n  /** 单个 tick 的默认宽度，角度值 */\n  angle?: number;\n  /** 单个 tick 的偏移角度，角度值 */\n  offsetAngle?: number;\n  /** tick mask 下的图元是否强制和 tick 的边线对齐 */\n  forceAlign?: boolean;\n}\n\nexport interface IProgressLikeSeriesSpec extends IPolarSeriesSpec {\n  /** 圆角部分是否突出（可分别设置左侧和右侧） */\n  roundCap?: boolean | [boolean, boolean];\n\n  /** 圆角半径 */\n  cornerRadius?: number;\n\n  /**\n   * tick 模式显示\n   * @since 1.4.0\n   */\n  tickMask?: Omit<IMarkSpec<IArcMarkSpec>, 'state'> & ITickMaskSpec;\n}\n\nexport interface IProgressLikeSeriesTheme extends IPolarSeriesTheme {\n  /** 圆角部分是否突出 */\n  roundCap?: boolean | [boolean, boolean];\n\n  /** 圆角半径 */\n  cornerRadius?: number;\n\n  /**\n   * tick 模式显示\n   * @since 1.4.0\n   */\n  tickMask?: Omit<IMarkTheme<IArcMarkSpec>, 'state'> & ITickMaskSpec;\n}\n"]}

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

@@ -1,12 +1,17 @@
-import type { Datum } from '@visactor/vgrammar';
+import type { Datum } from '@visactor/vgrammar-core';
 import type { IMarkStyle } from '../../../mark/interface';
 import type { ConvertToMarkStyleSpec, ICommonSpec } from '../../../typings';
 import { PolarSeries } from '../polar';
-import type { IProgressLikeSeriesSpec } from './interface';
+import type { IContinuousTickData, IProgressLikeSeriesSpec } from './interface';
+import type { IPolarAxis } from '../../../component/axis';
+import type { IGroupMark } from '../../../mark/group';
+import type { SeriesMarkMap } from '../../interface';
 export declare abstract class ProgressLikeSeries<T extends IProgressLikeSeriesSpec> extends PolarSeries<T> {
+    static readonly mark: SeriesMarkMap;
     protected _stack: boolean;
     protected _startAngle: number;
     protected _endAngle: number;
+    protected _arcGroupMark: IGroupMark | null;
     setAttrFromSpec(): void;
     getStackGroupFields(): string[];
     getStackValueField(): string;
@@ -15,8 +20,18 @@ export declare abstract class ProgressLikeSeries<T extends IProgressLikeSeriesSp
     setValueFieldToStackOffsetSilhouette(): void;
     getGroupFields(): string[];
     protected _convertMarkStyle<T extends ICommonSpec = ICommonSpec>(style: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>): Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>;
-    protected _getAngleValueStart(datum: Datum): number;
-    protected _getAngleValueEnd(datum: Datum): number;
+    protected _getAngleValueStart: (datum: Datum) => number;
+    protected _getAngleValueEnd: (datum: Datum) => number;
+    protected _getAngleValueStartWithoutMask(datum: Datum): number;
+    protected _getAngleValueEndWithoutMask(datum: Datum): number;
     getDimensionField(): string[];
     getMeasureField(): string[];
+    initMark(): void;
+    initMarkStyle(): void;
+    protected _initArcGroupMark(): IGroupMark;
+    protected _initArcGroupMarkStyle(): void;
+    protected _getAngleAxis(): IPolarAxis;
+    protected _getAngleAxisTickData(angleAxis?: IPolarAxis): IContinuousTickData[];
+    protected _isTickMaskVisible(angleAxis?: IPolarAxis): boolean;
+    protected _getAngleAxisSubTickData(angleAxis: IPolarAxis): IContinuousTickData[];
 }

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

@@ -4,11 +4,38 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.ProgressLikeSeries = void 0;
 
-const vutils_1 = require("@visactor/vutils"), constant_1 = require("../../../constant"), util_1 = require("../../../util"), polar_1 = require("../polar");
+const vutils_1 = require("@visactor/vutils"), constant_1 = require("../../../constant"), util_1 = require("../../../util"), polar_1 = require("../polar"), vrender_1 = require("@visactor/vrender"), constant_2 = require("./constant"), vutils_extension_1 = require("@visactor/vutils-extension");
 
 class ProgressLikeSeries extends polar_1.PolarSeries {
     constructor() {
-        super(...arguments), this._stack = !0;
+        super(...arguments), this._stack = !0, this._arcGroupMark = null, this._getAngleValueStart = datum => {
+            const axis = this._getAngleAxis(), {tickMask: tickMask} = this._spec;
+            if ((null == tickMask ? void 0 : tickMask.forceAlign) && this._isTickMaskVisible(axis)) {
+                const originValue = datum[this._stack ? constant_1.STACK_FIELD_START : constant_1.SEGMENT_FIELD_START], scale = this.angleAxisHelper.getScale(0), subTickData = this._getAngleAxisSubTickData(axis), step = subTickData[1].value - subTickData[0].value, offsetAngle = (0, 
+                vutils_1.degreeToRadian)(tickMask.offsetAngle);
+                if ((0, vutils_1.isValid)(originValue)) {
+                    const index = (0, vutils_extension_1.binaryFuzzySearch)(subTickData, (tick => tick.value - originValue)), targetIndex = originValue > subTickData[index].value - step / 2 ? Math.min(index, subTickData.length - 1) : index > 0 ? 0 : void 0;
+                    if (void 0 !== targetIndex) {
+                        return this.angleAxisHelper.dataToPosition([ subTickData[targetIndex].value - step / 2 ]) + offsetAngle;
+                    }
+                }
+                const pos = this.angleAxisHelper.dataToPosition([ subTickData[0].value - step / 2 ]);
+                return this._stack ? (0, util_1.valueInScaleRange)(pos, scale) + offsetAngle : pos + offsetAngle;
+            }
+            return this._getAngleValueStartWithoutMask(datum);
+        }, this._getAngleValueEnd = datum => {
+            const axis = this._getAngleAxis(), {tickMask: tickMask} = this._spec;
+            if ((null == tickMask ? void 0 : tickMask.forceAlign) && this._isTickMaskVisible(axis)) {
+                const originValue = datum[this._stack ? constant_1.STACK_FIELD_END : this._angleField[0]], scale = this.angleAxisHelper.getScale(0), subTickData = this._getAngleAxisSubTickData(axis), step = subTickData[1].value - subTickData[0].value, offsetAngle = (0, 
+                vutils_1.degreeToRadian)(tickMask.offsetAngle), index = (0, vutils_extension_1.binaryFuzzySearch)(subTickData, (tick => tick.value - originValue)), targetIndex = originValue > subTickData[index].value - step / 2 ? Math.min(index, subTickData.length - 1) : index > 0 ? 0 : void 0;
+                if (void 0 !== targetIndex) {
+                    return this.angleAxisHelper.dataToPosition([ subTickData[targetIndex].value + step / 2 ]) + offsetAngle;
+                }
+                const pos = this.angleAxisHelper.dataToPosition([ subTickData[0].value - step / 2 ]);
+                return this._stack ? (0, util_1.valueInScaleRange)(pos, scale) + offsetAngle : pos + offsetAngle;
+            }
+            return this._getAngleValueEndWithoutMask(datum);
+        };
     }
     setAttrFromSpec() {
         var _a, _b, _c;
@@ -44,14 +71,14 @@ class ProgressLikeSeries extends polar_1.PolarSeries {
         }
         return newStyle;
     }
-    _getAngleValueStart(datum) {
+    _getAngleValueStartWithoutMask(datum) {
         if (this._stack) {
             const value = (0, util_1.valueInScaleRange)(this.angleAxisHelper.dataToPosition([ datum[constant_1.STACK_FIELD_START] ]), this.angleAxisHelper.getScale(0));
             if ((0, vutils_1.isValidNumber)(value)) return value;
         }
         return this._startAngle;
     }
-    _getAngleValueEnd(datum) {
+    _getAngleValueEndWithoutMask(datum) {
         if (this._stack) {
             const value = (0, util_1.valueInScaleRange)(this.angleAxisHelper.dataToPosition([ datum[constant_1.STACK_FIELD_END] ]), this.angleAxisHelper.getScale(0));
             if ((0, vutils_1.isValidNumber)(value)) return value;
@@ -64,7 +91,87 @@ class ProgressLikeSeries extends polar_1.PolarSeries {
     getMeasureField() {
         return this._angleField;
     }
+    initMark() {
+        this._initArcGroupMark();
+    }
+    initMarkStyle() {
+        this._initArcGroupMarkStyle();
+    }
+    _initArcGroupMark() {
+        return this._arcGroupMark = this._createMark(ProgressLikeSeries.mark.group, {
+            skipBeforeLayouted: !1
+        }), this._arcGroupMark;
+    }
+    _initArcGroupMarkStyle() {
+        const groupMark = this._arcGroupMark;
+        groupMark.setZIndex(this.layoutZIndex), groupMark.created(), this.setMarkStyle(groupMark, {
+            clip: !0,
+            x: 0,
+            y: 0,
+            path: () => {
+                var _a;
+                const axis = this._getAngleAxis();
+                if (this._isTickMaskVisible(axis)) {
+                    const {tickMask: tickMask} = this._spec, {angle: angle, offsetAngle: offsetAngle, style: style = {}} = tickMask, subTickData = this._getAngleAxisSubTickData(axis), {x: x, y: y} = this.angleAxisHelper.center(), radius = this._computeLayoutRadius(), markStyle = (0, 
+                    util_1.preprocessSpecOrTheme)("mark-spec", style, null === (_a = this._option.getTheme()) || void 0 === _a ? void 0 : _a.colorScheme, this.type);
+                    return subTickData.map((({value: value}) => {
+                        const pos = this._getAngleValueEndWithoutMask({
+                            [constant_1.STACK_FIELD_END]: value,
+                            [constant_1.SEGMENT_FIELD_END]: value,
+                            [this._angleField[0]]: value
+                        }) + (0, vutils_1.degreeToRadian)(offsetAngle), angleUnit = (0, vutils_1.degreeToRadian)(angle) / 2;
+                        return (0, vrender_1.createArc)(Object.assign(Object.assign({}, markStyle), {
+                            x: x,
+                            y: y,
+                            startAngle: pos - angleUnit,
+                            endAngle: pos + angleUnit,
+                            innerRadius: radius * this._innerRadius,
+                            outerRadius: radius * this._outerRadius,
+                            fill: !0
+                        }));
+                    }));
+                }
+                const {width: width, height: height} = this.getLayoutRect(), {x: x, y: y} = this.getLayoutStartPoint();
+                return [ (0, vrender_1.createRect)({
+                    x: x,
+                    y: y,
+                    width: width,
+                    height: height,
+                    fill: !0
+                }) ];
+            }
+        }, "normal", constant_1.AttributeLevel.Series), this._arcGroupMark.setInteractive(!1);
+    }
+    _getAngleAxis() {
+        const angleAxisId = this.angleAxisHelper.getAxisId();
+        return this._option.getChart().getAllComponents().find((component => component.id === angleAxisId));
+    }
+    _getAngleAxisTickData(angleAxis) {
+        return null == angleAxis ? void 0 : angleAxis.getTickData().getLatestData();
+    }
+    _isTickMaskVisible(angleAxis) {
+        const tickData = this._getAngleAxisTickData(angleAxis), {tickMask: tickMask} = this._spec;
+        return tickMask && !1 !== tickMask.visible && (null == tickData ? void 0 : tickData.length) > 1;
+    }
+    _getAngleAxisSubTickData(angleAxis) {
+        const tickData = this._getAngleAxisTickData(angleAxis), subTickData = [], {subTick: subTick = {}, tick: tick = {}} = null == angleAxis ? void 0 : angleAxis.getSpec(), {tickCount: subTickCount = 4} = subTick, {alignWithLabel: alignWithLabel} = tick;
+        if (tickData.length >= 2) {
+            const tickSegment = tickData[1].value - tickData[0].value;
+            for (let i = 0; i < tickData.length - 1; i++) {
+                const pre = tickData[i], next = tickData[i + 1];
+                subTickData.push(pre);
+                for (let j = 0; j < subTickCount; j++) {
+                    const percent = (j + 1) / (subTickCount + 1), value = (1 - percent) * pre.value + percent * (next ? next.value : alignWithLabel ? 1 : pre.value + tickSegment);
+                    subTickData.push({
+                        value: value
+                    });
+                }
+            }
+            return subTickData.push(tickData[tickData.length - 1]), subTickData;
+        }
+        return tickData;
+    }
 }
 
-exports.ProgressLikeSeries = ProgressLikeSeries;
+exports.ProgressLikeSeries = ProgressLikeSeries, ProgressLikeSeries.mark = constant_2.progressLikeSeriesMark;
 //# sourceMappingURL=progress-like.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/polar/progress-like/progress-like.ts"],"names":[],"mappings":"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","file":"progress-like.js","sourcesContent":["import type { Datum } from '@visactor/vgrammar';\nimport { degreeToRadian, isValid, isValidNumber } from '@visactor/vutils';\nimport { POLAR_END_RADIAN, POLAR_START_RADIAN, STACK_FIELD_END, STACK_FIELD_START } from '../../../constant';\nimport type { IMarkStyle } from '../../../mark/interface';\nimport type { ConvertToMarkStyleSpec, ICommonSpec } from '../../../typings';\nimport { valueInScaleRange } from '../../../util';\nimport { PolarSeries } from '../polar';\nimport type { IProgressLikeSeriesSpec } from './interface';\n\nexport abstract class ProgressLikeSeries<T extends IProgressLikeSeriesSpec> extends PolarSeries<T> {\n  protected _stack: boolean = true;\n\n  protected _startAngle: number;\n  protected _endAngle: number;\n\n  setAttrFromSpec(): void {\n    super.setAttrFromSpec();\n    const chartSpec = this._option.globalInstance.getChart()?.getSpec() as any;\n    const startAngle = this._spec.startAngle ?? chartSpec?.startAngle;\n    this._startAngle = isValid(startAngle) ? degreeToRadian(startAngle) : POLAR_START_RADIAN;\n    const endAngle = this._spec.endAngle ?? chartSpec?.endAngle;\n    this._endAngle = isValid(endAngle) ? degreeToRadian(endAngle) : POLAR_END_RADIAN;\n\n    // 值信息给角度\n    this.setAngleField(this._spec.valueField || this._spec.angleField);\n    // 分类信息给半径\n    this.setRadiusField(this._spec.categoryField || this._spec.radiusField);\n  }\n\n  getStackGroupFields(): string[] {\n    return this._radiusField;\n  }\n\n  getStackValueField() {\n    return this._angleField?.[0];\n  }\n\n  setValueFieldToStack(): void {\n    // this.setAngleField(STACK_FIELD_END);\n  }\n\n  setValueFieldToPercent(): void {\n    //do nothing\n  }\n\n  setValueFieldToStackOffsetSilhouette(): void {\n    // do nothing\n  }\n\n  getGroupFields() {\n    return this._angleField;\n  }\n\n  /** 重载 mark style 赋值前转换逻辑 */\n  protected _convertMarkStyle<T extends ICommonSpec = ICommonSpec>(\n    style: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>\n  ): Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>> {\n    const newStyle = super._convertMarkStyle(style) as unknown as any;\n\n    const fillKey = 'fill';\n    if (newStyle[fillKey]) {\n      const value = style[fillKey] as unknown as any;\n      // 为环形渐变色自动加 startAngle 和 endAngle\n      if (value?.gradient === 'conical' && !isValid(value?.startAngle) && !isValid(value?.endAngle)) {\n        newStyle[fillKey] = {\n          ...value,\n          startAngle: this._startAngle,\n          endAngle: this._endAngle\n        };\n      }\n    }\n\n    return newStyle;\n  }\n\n  protected _getAngleValueStart(datum: Datum) {\n    if (this._stack) {\n      const value = valueInScaleRange(\n        this.angleAxisHelper.dataToPosition([datum[STACK_FIELD_START]]),\n        this.angleAxisHelper.getScale(0)\n      );\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return this._startAngle;\n  }\n\n  protected _getAngleValueEnd(datum: Datum) {\n    if (this._stack) {\n      const value = valueInScaleRange(\n        this.angleAxisHelper.dataToPosition([datum[STACK_FIELD_END]]),\n        this.angleAxisHelper.getScale(0)\n      );\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return this.angleAxisHelper.dataToPosition([datum[this._angleField[0]]]);\n  }\n\n  getDimensionField(): string[] {\n    return this._radiusField;\n  }\n\n  getMeasureField(): string[] {\n    return this._angleField;\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/polar/progress-like/progress-like.ts"],"names":[],"mappings":"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","file":"progress-like.js","sourcesContent":["import type { Datum } from '@visactor/vgrammar-core';\nimport { degreeToRadian, isValid, isValidNumber } from '@visactor/vutils';\nimport {\n  AttributeLevel,\n  POLAR_END_RADIAN,\n  POLAR_START_RADIAN,\n  SEGMENT_FIELD_END,\n  SEGMENT_FIELD_START,\n  STACK_FIELD_END,\n  STACK_FIELD_START\n} from '../../../constant';\nimport type { IMarkStyle } from '../../../mark/interface';\nimport type { ConvertToMarkStyleSpec, ICommonSpec } from '../../../typings';\nimport { preprocessSpecOrTheme, valueInScaleRange } from '../../../util';\nimport { PolarSeries } from '../polar';\nimport type { IContinuousTickData, IProgressLikeSeriesSpec } from './interface';\nimport type { IPolarAxis, IPolarAxisSpec } from '../../../component/axis';\nimport type { IGroupMark } from '../../../mark/group';\nimport { createArc, createRect } from '@visactor/vrender';\nimport type { SeriesMarkMap } from '../../interface';\nimport { progressLikeSeriesMark } from './constant';\nimport { binaryFuzzySearch } from '@visactor/vutils-extension';\n\nexport abstract class ProgressLikeSeries<T extends IProgressLikeSeriesSpec> extends PolarSeries<T> {\n  static readonly mark: SeriesMarkMap = progressLikeSeriesMark;\n\n  protected _stack: boolean = true;\n\n  protected _startAngle: number;\n  protected _endAngle: number;\n\n  protected _arcGroupMark: IGroupMark | null = null;\n\n  setAttrFromSpec(): void {\n    super.setAttrFromSpec();\n    const chartSpec = this._option.globalInstance.getChart()?.getSpec() as any;\n    const startAngle = this._spec.startAngle ?? chartSpec?.startAngle;\n    this._startAngle = isValid(startAngle) ? degreeToRadian(startAngle) : POLAR_START_RADIAN;\n    const endAngle = this._spec.endAngle ?? chartSpec?.endAngle;\n    this._endAngle = isValid(endAngle) ? degreeToRadian(endAngle) : POLAR_END_RADIAN;\n\n    // 值信息给角度\n    this.setAngleField(this._spec.valueField || this._spec.angleField);\n    // 分类信息给半径\n    this.setRadiusField(this._spec.categoryField || this._spec.radiusField);\n  }\n\n  getStackGroupFields(): string[] {\n    return this._radiusField;\n  }\n\n  getStackValueField() {\n    return this._angleField?.[0];\n  }\n\n  setValueFieldToStack(): void {\n    // this.setAngleField(STACK_FIELD_END);\n  }\n\n  setValueFieldToPercent(): void {\n    //do nothing\n  }\n\n  setValueFieldToStackOffsetSilhouette(): void {\n    // do nothing\n  }\n\n  getGroupFields() {\n    return this._angleField;\n  }\n\n  /** 重载 mark style 赋值前转换逻辑 */\n  protected _convertMarkStyle<T extends ICommonSpec = ICommonSpec>(\n    style: Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>>\n  ): Partial<IMarkStyle<T> | ConvertToMarkStyleSpec<T>> {\n    const newStyle = super._convertMarkStyle(style) as unknown as any;\n\n    const fillKey = 'fill';\n    if (newStyle[fillKey]) {\n      const value = style[fillKey] as unknown as any;\n      // 为环形渐变色自动加 startAngle 和 endAngle\n      if (value?.gradient === 'conical' && !isValid(value?.startAngle) && !isValid(value?.endAngle)) {\n        newStyle[fillKey] = {\n          ...value,\n          startAngle: this._startAngle,\n          endAngle: this._endAngle\n        };\n      }\n    }\n\n    return newStyle;\n  }\n\n  protected _getAngleValueStart = (datum: Datum) => {\n    const axis = this._getAngleAxis();\n    const { tickMask } = this._spec;\n\n    if (tickMask?.forceAlign && this._isTickMaskVisible(axis)) {\n      const field = this._stack ? STACK_FIELD_START : SEGMENT_FIELD_START;\n      const originValue = datum[field];\n      const scale = this.angleAxisHelper.getScale(0);\n      const subTickData = this._getAngleAxisSubTickData(axis);\n      const step = subTickData[1].value - subTickData[0].value;\n      const offsetAngle = degreeToRadian(tickMask.offsetAngle);\n\n      if (isValid(originValue)) {\n        // 找到第一个大于等于数据值的 tick\n        const index = binaryFuzzySearch(subTickData, tick => tick.value - originValue);\n        // 对齐\n        const targetIndex =\n          originValue > subTickData[index].value - step / 2\n            ? Math.min(index, subTickData.length - 1)\n            : index > 0\n            ? 0\n            : undefined;\n        if (targetIndex !== undefined) {\n          const pos = this.angleAxisHelper.dataToPosition([subTickData[targetIndex].value - step / 2]);\n          return pos + offsetAngle;\n        }\n      }\n      const pos = this.angleAxisHelper.dataToPosition([subTickData[0].value - step / 2]);\n      if (this._stack) {\n        return valueInScaleRange(pos, scale) + offsetAngle;\n      }\n      return pos + offsetAngle;\n    }\n    return this._getAngleValueStartWithoutMask(datum);\n  };\n\n  protected _getAngleValueEnd = (datum: Datum) => {\n    const axis = this._getAngleAxis();\n    const { tickMask } = this._spec;\n\n    if (tickMask?.forceAlign && this._isTickMaskVisible(axis)) {\n      const field = this._stack ? STACK_FIELD_END : this._angleField[0];\n      const originValue = datum[field];\n      const scale = this.angleAxisHelper.getScale(0);\n      const subTickData = this._getAngleAxisSubTickData(axis);\n      const step = subTickData[1].value - subTickData[0].value;\n      const offsetAngle = degreeToRadian(tickMask.offsetAngle);\n\n      // 找到第一个大于等于数据值的 tick\n      const index = binaryFuzzySearch(subTickData, tick => tick.value - originValue);\n      // 对齐\n      const targetIndex =\n        originValue > subTickData[index].value - step / 2\n          ? Math.min(index, subTickData.length - 1)\n          : index > 0\n          ? 0\n          : undefined;\n      if (targetIndex !== undefined) {\n        const pos = this.angleAxisHelper.dataToPosition([subTickData[targetIndex].value + step / 2]);\n        return pos + offsetAngle;\n      }\n      const pos = this.angleAxisHelper.dataToPosition([subTickData[0].value - step / 2]);\n      if (this._stack) {\n        return valueInScaleRange(pos, scale) + offsetAngle;\n      }\n      return pos + offsetAngle;\n    }\n    return this._getAngleValueEndWithoutMask(datum);\n  };\n\n  protected _getAngleValueStartWithoutMask(datum: Datum) {\n    if (this._stack) {\n      const value = valueInScaleRange(\n        this.angleAxisHelper.dataToPosition([datum[STACK_FIELD_START]]),\n        this.angleAxisHelper.getScale(0)\n      );\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return this._startAngle;\n  }\n\n  protected _getAngleValueEndWithoutMask(datum: Datum) {\n    if (this._stack) {\n      const value = valueInScaleRange(\n        this.angleAxisHelper.dataToPosition([datum[STACK_FIELD_END]]),\n        this.angleAxisHelper.getScale(0)\n      );\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return this.angleAxisHelper.dataToPosition([datum[this._angleField[0]]]);\n  }\n\n  getDimensionField(): string[] {\n    return this._radiusField;\n  }\n\n  getMeasureField(): string[] {\n    return this._angleField;\n  }\n\n  initMark(): void {\n    this._initArcGroupMark();\n  }\n\n  initMarkStyle(): void {\n    this._initArcGroupMarkStyle();\n  }\n\n  protected _initArcGroupMark() {\n    // FIXME: disable group mark layout to prevent reevaluate after layout end\n    this._arcGroupMark = this._createMark(ProgressLikeSeries.mark.group, {\n      skipBeforeLayouted: false\n    }) as IGroupMark;\n    return this._arcGroupMark;\n  }\n\n  protected _initArcGroupMarkStyle() {\n    const groupMark = this._arcGroupMark;\n    groupMark.setZIndex(this.layoutZIndex);\n    groupMark.created();\n    this.setMarkStyle(\n      groupMark,\n      {\n        clip: true,\n        x: 0,\n        y: 0,\n        path: () => {\n          const axis = this._getAngleAxis();\n          if (this._isTickMaskVisible(axis)) {\n            const { tickMask } = this._spec;\n            const { angle, offsetAngle, style = {} } = tickMask;\n            const subTickData = this._getAngleAxisSubTickData(axis);\n            const { x, y } = this.angleAxisHelper.center();\n            const radius = this._computeLayoutRadius();\n            const markStyle = preprocessSpecOrTheme(\n              'mark-spec',\n              style,\n              this._option.getTheme()?.colorScheme,\n              this.type as any\n            );\n            return subTickData.map(({ value }) => {\n              const pos =\n                this._getAngleValueEndWithoutMask({\n                  [STACK_FIELD_END]: value,\n                  [SEGMENT_FIELD_END]: value,\n                  [this._angleField[0]]: value\n                }) + degreeToRadian(offsetAngle);\n              const angleUnit = degreeToRadian(angle) / 2;\n              return createArc({\n                ...markStyle,\n                x,\n                y,\n                startAngle: pos - angleUnit,\n                endAngle: pos + angleUnit,\n                innerRadius: radius * this._innerRadius,\n                outerRadius: radius * this._outerRadius,\n                fill: true\n              });\n            });\n          }\n          const { width, height } = this.getLayoutRect();\n          const { x, y } = this.getLayoutStartPoint();\n          return [\n            createRect({\n              x,\n              y,\n              width,\n              height,\n              fill: true\n            })\n          ];\n        }\n      },\n      'normal',\n      AttributeLevel.Series\n    );\n    this._arcGroupMark.setInteractive(false);\n  }\n\n  protected _getAngleAxis() {\n    const angleAxisId = this.angleAxisHelper.getAxisId();\n    const angleAxis = this._option\n      .getChart()\n      .getAllComponents()\n      .find(component => component.id === angleAxisId) as IPolarAxis;\n    return angleAxis;\n  }\n\n  protected _getAngleAxisTickData(angleAxis?: IPolarAxis): IContinuousTickData[] {\n    const tickData = angleAxis?.getTickData().getLatestData();\n    return tickData;\n  }\n\n  protected _isTickMaskVisible(angleAxis?: IPolarAxis) {\n    const tickData = this._getAngleAxisTickData(angleAxis);\n    const { tickMask } = this._spec;\n    return tickMask && tickMask.visible !== false && tickData?.length > 1;\n  }\n\n  protected _getAngleAxisSubTickData(angleAxis: IPolarAxis) {\n    const tickData = this._getAngleAxisTickData(angleAxis);\n    // TODO: 这块照搬了 vrender-components 的计算方法，需要抽出这块的公用逻辑\n    const subTickData: IContinuousTickData[] = [];\n    const { subTick = {}, tick = {} } = angleAxis?.getSpec() as IPolarAxisSpec;\n    const { tickCount: subTickCount = 4 } = subTick;\n    const { alignWithLabel } = tick;\n    // 刻度线的数量大于 2 时，才绘制子刻度\n    if (tickData.length >= 2) {\n      const tickSegment = tickData[1].value - tickData[0].value;\n      for (let i = 0; i < tickData.length - 1; i++) {\n        const pre = tickData[i];\n        const next = tickData[i + 1];\n        subTickData.push(pre);\n        for (let j = 0; j < subTickCount; j++) {\n          const percent = (j + 1) / (subTickCount + 1);\n          const value =\n            (1 - percent) * pre.value + percent * (next ? next.value : alignWithLabel ? 1 : pre.value + tickSegment);\n          subTickData.push({\n            value\n          });\n        }\n      }\n      subTickData.push(tickData[tickData.length - 1]);\n      return subTickData;\n    }\n    return tickData;\n  }\n}\n"]}

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

@@ -14,9 +14,11 @@ export declare class CircularProgressSeries<T extends ICircularProgressSeriesSpe
     getGroupFields(): string[];
     initMark(): void;
     initMarkStyle(): void;
-    private initProgressMarkStyle;
-    private initTrackMarkStyle;
-    protected _getRadiusValueStart(datum: Datum): number;
-    protected _getRadiusValueEnd(datum: Datum): number;
+    private _initProgressMark;
+    private _initProgressMarkStyle;
+    private _initTrackMark;
+    private _initTrackMarkStyle;
+    protected _getRadiusValueStart: (datum: Datum) => number;
+    protected _getRadiusValueEnd: (datum: Datum) => number;
     initAnimation(): void;
 }

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

@@ -4,14 +4,27 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.CircularProgressSeries = void 0;
 
-const util_1 = require("../../../util"), type_1 = require("../../interface/type"), utils_1 = require("../../../animation/utils"), config_1 = require("../../../animation/config"), progress_like_1 = require("../../polar/progress-like/progress-like"), vchart_1 = require("../../../core/vchart"), arc_1 = require("../../../mark/arc"), progress_arc_1 = require("../../../mark/progress-arc"), constant_1 = require("./constant");
+const util_1 = require("../../../util"), type_1 = require("../../interface/type"), utils_1 = require("../../../animation/utils"), config_1 = require("../../../animation/config"), progress_like_1 = require("../../polar/progress-like/progress-like"), vchart_1 = require("../../../core/vchart"), arc_1 = require("../../../mark/arc"), progress_arc_1 = require("../../../mark/progress-arc"), constant_1 = require("./constant"), constant_2 = require("../../../constant");
 
 vchart_1.VChart.useMark([ arc_1.ArcMark, progress_arc_1.ProgressArcMark ]);
 
 class CircularProgressSeries extends progress_like_1.ProgressLikeSeries {
     constructor() {
         super(...arguments), this.type = type_1.SeriesTypeEnum.circularProgress, this._progressMark = null, 
-        this._trackMark = null;
+        this._trackMark = null, this._getRadiusValueStart = datum => {
+            if (this.getGroupFields().length > 1) {
+                const value = this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields()));
+                if ((0, util_1.isValidNumber)(value)) return value;
+            }
+            return this.radiusAxisHelper.dataToPosition([ datum[this._radiusField[0]] ]);
+        }, this._getRadiusValueEnd = datum => {
+            var _a, _b;
+            if (this.getGroupFields().length > 1) {
+                const value = this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields())) + (null === (_b = (_a = this.radiusAxisHelper).getBandwidth) || void 0 === _b ? void 0 : _b.call(_a, this._groups ? this._groups.fields.length - 1 : 0));
+                if ((0, util_1.isValidNumber)(value)) return value;
+            }
+            return this.radiusAxisHelper.dataToPosition([ datum[this._radiusField[0]] ]) + this.radiusAxisHelper.getScale(0).step();
+        };
     }
     getStackGroupFields() {
         return this.getGroupFields();
@@ -20,23 +33,27 @@ class CircularProgressSeries extends progress_like_1.ProgressLikeSeries {
         return this._radiusField;
     }
     initMark() {
-        this._trackMark = this._createMark(CircularProgressSeries.mark.track), this._progressMark = this._createMark(CircularProgressSeries.mark.progress, {
-            isSeriesMark: !0
-        });
+        super.initMark(), this._initTrackMark(), this._initProgressMark();
     }
     initMarkStyle() {
-        this.initTrackMarkStyle(), this.initProgressMarkStyle();
+        super.initMarkStyle(), this._initTrackMarkStyle(), this._initProgressMarkStyle();
+    }
+    _initProgressMark() {
+        return this._progressMark = this._createMark(CircularProgressSeries.mark.progress, {
+            parent: this._arcGroupMark,
+            isSeriesMark: !0
+        }), this._progressMark;
     }
-    initProgressMarkStyle() {
+    _initProgressMarkStyle() {
         var _a, _b;
         const progressMark = this._progressMark;
         progressMark && (this.setMarkStyle(progressMark, {
             x: () => this.angleAxisHelper.center().x,
             y: () => this.angleAxisHelper.center().y,
-            startAngle: this._getAngleValueStart.bind(this),
-            endAngle: this._getAngleValueEnd.bind(this),
-            innerRadius: this._getRadiusValueStart.bind(this),
-            outerRadius: this._getRadiusValueEnd.bind(this),
+            startAngle: this._getAngleValueStart,
+            endAngle: this._getAngleValueEnd,
+            innerRadius: this._getRadiusValueStart,
+            outerRadius: this._getRadiusValueEnd,
             cap: null !== (_a = this._spec.roundCap) && void 0 !== _a && _a,
             boundsMode: "imprecise",
             cornerRadius: this._spec.cornerRadius,
@@ -45,39 +62,39 @@ class CircularProgressSeries extends progress_like_1.ProgressLikeSeries {
             forceShowCap: !0
         }), this._trigger.registerMark(progressMark), null === (_b = this._tooltipHelper) || void 0 === _b || _b.activeTriggerSet.mark.add(progressMark));
     }
-    initTrackMarkStyle() {
+    _initTrackMark() {
+        return this._trackMark = this._createMark(CircularProgressSeries.mark.track, {
+            parent: this._arcGroupMark
+        }), this._trackMark;
+    }
+    _initTrackMarkStyle() {
         const trackMark = this._trackMark;
         trackMark && (this.setMarkStyle(trackMark, {
             visible: datum => {
-                const range = this.angleAxisHelper.getScale(0).range(), min = Math.min(range[0], range[range.length - 1]), startValue = this._getAngleValueStart(datum);
+                const range = this.angleAxisHelper.getScale(0).range(), min = Math.min(range[0], range[range.length - 1]), startValue = this._getAngleValueStartWithoutMask(datum);
                 return Math.abs(startValue - min) <= 1e-14;
             },
             x: () => this.angleAxisHelper.center().x,
             y: () => this.angleAxisHelper.center().y,
-            startAngle: this._startAngle,
-            endAngle: this._endAngle,
-            innerRadius: this._getRadiusValueStart.bind(this),
-            outerRadius: this._getRadiusValueEnd.bind(this),
+            startAngle: () => {
+                const domain = this.angleAxisHelper.getScale(0).domain();
+                return this._getAngleValueStart({
+                    [constant_2.STACK_FIELD_START]: domain[0]
+                });
+            },
+            endAngle: () => {
+                const domain = this.angleAxisHelper.getScale(0).domain();
+                return this._getAngleValueEnd({
+                    [constant_2.STACK_FIELD_END]: domain[domain.length - 1]
+                });
+            },
+            innerRadius: this._getRadiusValueStart,
+            outerRadius: this._getRadiusValueEnd,
             cornerRadius: this._spec.cornerRadius,
             fill: this.getColorAttribute(),
             zIndex: 100
         }), this._trigger.registerMark(trackMark));
     }
-    _getRadiusValueStart(datum) {
-        if (this.getGroupFields().length > 1) {
-            const value = this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields()));
-            if ((0, util_1.isValidNumber)(value)) return value;
-        }
-        return this.radiusAxisHelper.dataToPosition([ datum[this._radiusField[0]] ]);
-    }
-    _getRadiusValueEnd(datum) {
-        var _a, _b;
-        if (this.getGroupFields().length > 1) {
-            const value = this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields())) + (null === (_b = (_a = this.radiusAxisHelper).getBandwidth) || void 0 === _b ? void 0 : _b.call(_a, this._groups ? this._groups.fields.length - 1 : 0));
-            if ((0, util_1.isValidNumber)(value)) return value;
-        }
-        return this.radiusAxisHelper.dataToPosition([ datum[this._radiusField[0]] ]) + this.radiusAxisHelper.getScale(0).step();
-    }
     initAnimation() {
         var _a, _b;
         const appearPreset = null === (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.animationAppear) || void 0 === _b ? void 0 : _b.preset;

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/progress/circular/circular.ts"],"names":[],"mappings":";;;AAIA,wCAA8C;AAE9C,+CAA0E;AAC1E,oDAAgF;AAChF,sDAAmE;AAEnE,2EAA6E;AAG7E,iDAA8C;AAC9C,2CAA4C;AAC5C,6DAA6D;AAC7D,yCAAwD;AAExD,eAAM,CAAC,OAAO,CAAC,CAAC,aAAO,EAAE,8BAAe,CAAC,CAAC,CAAC;AAE3C,MAAa,sBAEX,SAAQ,kCAAqB;IAF/B;;QAIE,SAAI,GAAG,qBAAc,CAAC,gBAAgB,CAAC;QAM/B,kBAAa,GAA4B,IAAI,CAAC;QAC9C,eAAU,GAA4B,IAAI,CAAC;IAwHrD,CAAC;IAtHC,mBAAmB;QACjB,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;IAC/B,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAa,CAAC;QAClF,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC1E,YAAY,EAAE,IAAI;SACnB,CAAa,CAAC;IACjB,CAAC;IAED,aAAa;QACX,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAEO,qBAAqB;;QAC3B,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,YAAY,EAAE;YAChB,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE;gBAC9B,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC;gBACxC,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC;gBACxC,UAAU,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC/C,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC3C,WAAW,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC;gBACjD,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC/C,GAAG,EAAE,MAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,mCAAI,KAAK;gBACjC,UAAU,EAAE,WAAW;gBACvB,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;gBACrC,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE;gBAC9B,MAAM,EAAE,GAAG;gBAIX,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;YACzC,MAAA,IAAI,CAAC,cAAc,0CAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;SAC9D;IACH,CAAC;IAEO,kBAAkB;QACxB,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,SAAS,EAAE;YACb,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE;gBAC3B,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;oBACxB,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;oBAC/C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;oBAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;oBACxD,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;oBAEnD,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,IAAI,KAAK,CAAC;gBAC7C,CAAC;gBACD,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC;gBACxC,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC;gBACxC,UAAU,EAAE,IAAI,CAAC,WAAW;gBAC5B,QAAQ,EAAE,IAAI,CAAC,SAAS;gBACxB,WAAW,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC;gBACjD,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC/C,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;gBACrC,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE;gBAC9B,MAAM,EAAE,GAAG;aACZ,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;SACvC;IACH,CAAC;IAES,oBAAoB,CAAC,KAAY;QACzC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;YAC9G,IAAI,IAAA,oBAAa,EAAC,KAAK,CAAC,EAAE;gBACxB,OAAO,KAAK,CAAC;aACd;SACF;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC;IAES,kBAAkB,CAAC,KAAY;;QACvC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,MAAM,KAAK,GACT,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;iBAC/F,MAAA,MAAA,IAAI,CAAC,gBAAgB,EAAC,YAAY,mDAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC;YAC1F,IAAI,IAAA,oBAAa,EAAC,KAAK,CAAC,EAAE;gBACxB,OAAO,KAAK,CAAC;aACd;SACF;QACD,OAAO,CACL,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAClE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAe,CAAC,IAAI,EAAE,CACxD,CAAC;IACJ,CAAC;IAED,aAAa;;QACX,MAAM,YAAY,GAAG,MAAC,MAAA,IAAI,CAAC,KAAK,0CAAE,eAA0C,0CAAE,MAAM,CAAC;QAErF,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACnC,IAAA,uBAAe,EACb,+BAAsB,CAAC,gBAAgB,CACrC;YACE,UAAU,EAAE,IAAI,CAAC,WAAW;SAC7B,EACD,YAAY,CACb,EACD,IAAA,2BAAmB,EAAC,yBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAC7D,CACF,CAAC;QAEF,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAChC,IAAA,uBAAe,EACb,+BAAsB,CAAC,kBAAkB,EAAE,EAC3C,IAAA,2BAAmB,EAAC,yBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAC1D,CACF,CAAC;IACJ,CAAC;;AAlIH,wDAmIC;AAhIiB,2BAAI,GAAW,qBAAc,CAAC,gBAAgB,CAAC;AAG/C,2BAAI,GAAkB,qCAA0B,CAAC","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 { STACK_FIELD_END, STACK_FIELD_START } 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    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    }) as IArcMark;\n    return this._progressMark;\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,\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      this._trigger.registerMark(progressMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(progressMark);\n    }\n  }\n\n  private _initTrackMark() {\n    this._trackMark = this._createMark(CircularProgressSeries.mark.track, {\n      parent: this._arcGroupMark\n    }) as IArcMark;\n    return this._trackMark;\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._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 scale = this.angleAxisHelper.getScale(0);\n          const domain = scale.domain();\n          return this._getAngleValueStart({ [STACK_FIELD_START]: domain[0] });\n        },\n        endAngle: () => {\n          const scale = this.angleAxisHelper.getScale(0);\n          const domain = scale.domain();\n          return this._getAngleValueEnd({ [STACK_FIELD_END]: 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      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/cjs/series/progress/circular/constant.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.circularProgressSeriesMark = void 0;
 
-const interface_1 = require("../../../mark/interface"), constant_1 = require("../../base/constant"), type_1 = require("../../interface/type");
+const interface_1 = require("../../../mark/interface"), type_1 = require("../../interface/type"), constant_1 = require("../../polar/progress-like/constant");
 
-exports.circularProgressSeriesMark = Object.assign(Object.assign({}, constant_1.baseSeriesMark), {
+exports.circularProgressSeriesMark = Object.assign(Object.assign({}, constant_1.progressLikeSeriesMark), {
     [type_1.SeriesMarkNameEnum.track]: {
         name: type_1.SeriesMarkNameEnum.track,
         type: interface_1.MarkTypeEnum.progressArc

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/progress/circular/constant.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AACvD,kDAAqD;AAErD,+CAA0D;AAE7C,QAAA,0BAA0B,mCAClC,yBAAc,KACjB,CAAC,yBAAkB,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,yBAAkB,CAAC,KAAK,EAAE,IAAI,EAAE,wBAAY,CAAC,WAAW,EAAE,EAC9F,CAAC,yBAAkB,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,yBAAkB,CAAC,QAAQ,EAAE,IAAI,EAAE,wBAAY,CAAC,WAAW,EAAE,IACpG","file":"constant.js","sourcesContent":["import { MarkTypeEnum } from '../../../mark/interface';\nimport { baseSeriesMark } from '../../base/constant';\nimport type { SeriesMarkMap } from '../../interface/common';\nimport { SeriesMarkNameEnum } from '../../interface/type';\n\nexport const circularProgressSeriesMark: SeriesMarkMap = {\n  ...baseSeriesMark,\n  [SeriesMarkNameEnum.track]: { name: SeriesMarkNameEnum.track, type: MarkTypeEnum.progressArc },\n  [SeriesMarkNameEnum.progress]: { name: SeriesMarkNameEnum.progress, type: MarkTypeEnum.progressArc }\n};\n"]}
+{"version":3,"sources":["../src/series/progress/circular/constant.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AAEvD,+CAA0D;AAC1D,iEAA4E;AAE/D,QAAA,0BAA0B,mCAClC,iCAAsB,KACzB,CAAC,yBAAkB,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,yBAAkB,CAAC,KAAK,EAAE,IAAI,EAAE,wBAAY,CAAC,WAAW,EAAE,EAC9F,CAAC,yBAAkB,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,yBAAkB,CAAC,QAAQ,EAAE,IAAI,EAAE,wBAAY,CAAC,WAAW,EAAE,IACpG","file":"constant.js","sourcesContent":["import { MarkTypeEnum } from '../../../mark/interface';\nimport type { SeriesMarkMap } from '../../interface/common';\nimport { SeriesMarkNameEnum } from '../../interface/type';\nimport { progressLikeSeriesMark } from '../../polar/progress-like/constant';\n\nexport const circularProgressSeriesMark: SeriesMarkMap = {\n  ...progressLikeSeriesMark,\n  [SeriesMarkNameEnum.track]: { name: SeriesMarkNameEnum.track, type: MarkTypeEnum.progressArc },\n  [SeriesMarkNameEnum.progress]: { name: SeriesMarkNameEnum.progress, type: MarkTypeEnum.progressArc }\n};\n"]}

package/cjs/series/progress/linear/animation.d.ts

@@ -1,4 +1,4 @@
-import type { IAnimationTypeConfig } from '@visactor/vgrammar';
+import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';
 import type { DirectionType } from '../../../typings';
 export interface ILinearProgressAnimationParams {
     direction: DirectionType;

package/cjs/series/progress/linear/animation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/progress/linear/animation.ts"],"names":[],"mappings":";;;AAGA,8CAA6C;AAQ7C,SAAS,wBAAwB,CAAC,MAAsC;IACtE,OAAO,GAAG,EAAE;QACV,IAAI,MAAM,CAAC,SAAS,KAAK,UAAU,EAAE;YACnC,OAAO;gBACL,MAAM,EAAE,UAAU;aACnB,CAAC;SACH;QACD,OAAO;YACL,MAAM,EAAE,UAAU;SACnB,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,WAAW,GAAG,CAAC,MAAsC,EAAwB,EAAE;IACnF,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,SAAS,KAAK,mBAAS,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,cAAc;QAChF,OAAO,EAAE,wBAAwB,CAAC,MAAM,CAAC;KAC1C,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,uBAAuB,GAAG,CAAC,MAAsC,EAAwB,EAAE;IACtG,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,SAAS,KAAK,mBAAS,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe;QAClF,OAAO,EAAE,wBAAwB,CAAC,MAAM,CAAC;KAC1C,CAAC;AACJ,CAAC,CAAC;AALW,QAAA,uBAAuB,2BAKlC;AAEW,QAAA,aAAa,GAAyB;IACjD,IAAI,EAAE,QAAQ;CACf,CAAC;AAEF,SAAgB,6BAA6B,CAC3C,MAAsC,EACtC,MAA4C;IAE5C,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,OAAO,EAAE,CAAC;KACX;IACD,QAAQ,MAAM,EAAE;QACd,KAAK,QAAQ;YACX,OAAO,qBAAa,CAAC;QACvB;YACE,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;KAC9B;AACH,CAAC;AAbD,sEAaC","file":"animation.js","sourcesContent":["import type { IAnimationTypeConfig } from '@visactor/vgrammar';\nimport type { DirectionType } from '../../../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport { Direction } from '../../../typings';\n\nexport interface ILinearProgressAnimationParams {\n  direction: DirectionType;\n}\n\nexport type LinearProgressAppearPreset = 'grow' | 'fadeIn';\n\nfunction LinearProgressGrowOption(params: ILinearProgressAnimationParams) {\n  return () => {\n    if (params.direction === 'vertical') {\n      return {\n        orient: 'negative'\n      };\n    }\n    return {\n      orient: 'positive'\n    };\n  };\n}\n\nconst Appear_Grow = (params: ILinearProgressAnimationParams): IAnimationTypeConfig => {\n  return {\n    type: params.direction === Direction.horizontal ? 'growWidthIn' : 'growHeightIn',\n    options: LinearProgressGrowOption(params)\n  };\n};\n\nexport const linearProgressDisappear = (params: ILinearProgressAnimationParams): IAnimationTypeConfig => {\n  return {\n    type: params.direction === Direction.horizontal ? 'growWidthOut' : 'growHeightOut',\n    options: LinearProgressGrowOption(params)\n  };\n};\n\nexport const Appear_FadeIn: IAnimationTypeConfig = {\n  type: 'fadeIn'\n};\n\nexport function linearProgressPresetAnimation(\n  params: ILinearProgressAnimationParams,\n  preset: LinearProgressAppearPreset | boolean\n) {\n  if (preset === false) {\n    return {};\n  }\n  switch (preset) {\n    case 'fadeIn':\n      return Appear_FadeIn;\n    default:\n      return Appear_Grow(params);\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/progress/linear/animation.ts"],"names":[],"mappings":";;;AAGA,8CAA6C;AAQ7C,SAAS,wBAAwB,CAAC,MAAsC;IACtE,OAAO,GAAG,EAAE;QACV,IAAI,MAAM,CAAC,SAAS,KAAK,UAAU,EAAE;YACnC,OAAO;gBACL,MAAM,EAAE,UAAU;aACnB,CAAC;SACH;QACD,OAAO;YACL,MAAM,EAAE,UAAU;SACnB,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,WAAW,GAAG,CAAC,MAAsC,EAAwB,EAAE;IACnF,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,SAAS,KAAK,mBAAS,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,cAAc;QAChF,OAAO,EAAE,wBAAwB,CAAC,MAAM,CAAC;KAC1C,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,uBAAuB,GAAG,CAAC,MAAsC,EAAwB,EAAE;IACtG,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,SAAS,KAAK,mBAAS,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe;QAClF,OAAO,EAAE,wBAAwB,CAAC,MAAM,CAAC;KAC1C,CAAC;AACJ,CAAC,CAAC;AALW,QAAA,uBAAuB,2BAKlC;AAEW,QAAA,aAAa,GAAyB;IACjD,IAAI,EAAE,QAAQ;CACf,CAAC;AAEF,SAAgB,6BAA6B,CAC3C,MAAsC,EACtC,MAA4C;IAE5C,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,OAAO,EAAE,CAAC;KACX;IACD,QAAQ,MAAM,EAAE;QACd,KAAK,QAAQ;YACX,OAAO,qBAAa,CAAC;QACvB;YACE,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;KAC9B;AACH,CAAC;AAbD,sEAaC","file":"animation.js","sourcesContent":["import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';\nimport type { DirectionType } from '../../../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport { Direction } from '../../../typings';\n\nexport interface ILinearProgressAnimationParams {\n  direction: DirectionType;\n}\n\nexport type LinearProgressAppearPreset = 'grow' | 'fadeIn';\n\nfunction LinearProgressGrowOption(params: ILinearProgressAnimationParams) {\n  return () => {\n    if (params.direction === 'vertical') {\n      return {\n        orient: 'negative'\n      };\n    }\n    return {\n      orient: 'positive'\n    };\n  };\n}\n\nconst Appear_Grow = (params: ILinearProgressAnimationParams): IAnimationTypeConfig => {\n  return {\n    type: params.direction === Direction.horizontal ? 'growWidthIn' : 'growHeightIn',\n    options: LinearProgressGrowOption(params)\n  };\n};\n\nexport const linearProgressDisappear = (params: ILinearProgressAnimationParams): IAnimationTypeConfig => {\n  return {\n    type: params.direction === Direction.horizontal ? 'growWidthOut' : 'growHeightOut',\n    options: LinearProgressGrowOption(params)\n  };\n};\n\nexport const Appear_FadeIn: IAnimationTypeConfig = {\n  type: 'fadeIn'\n};\n\nexport function linearProgressPresetAnimation(\n  params: ILinearProgressAnimationParams,\n  preset: LinearProgressAppearPreset | boolean\n) {\n  if (preset === false) {\n    return {};\n  }\n  switch (preset) {\n    case 'fadeIn':\n      return Appear_FadeIn;\n    default:\n      return Appear_Grow(params);\n  }\n}\n"]}

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

@@ -13,12 +13,12 @@ export declare class LinearProgressSeries<T extends ILinearProgressSeriesSpec =
     private _progressGroupMark;
     initMark(): void;
     initMarkStyle(): void;
-    private initProgressMark;
-    private initProgressMarkStyle;
-    private initTrackMark;
-    private initTrackMarkStyle;
-    private initProgressGroupMark;
-    private initProgressGroupMarkStyle;
+    private _initProgressMark;
+    private _initProgressMarkStyle;
+    private _initTrackMark;
+    private _initTrackMarkStyle;
+    private _initProgressGroupMark;
+    private _initProgressGroupMarkStyle;
     initAnimation(): void;
     protected initTooltip(): void;
 }