@visactor/vchart 1.11.0-alpha.2 → 1.11.0-alpha.3

package/cjs/series/polar/polar.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.PolarSeries = void 0;
 
-const vutils_1 = require("@visactor/vutils"), type_1 = require("../../util/type"), vscale_1 = require("@visactor/vscale"), polar_1 = require("../../constant/polar"), base_series_1 = require("../base/base-series"), utils_1 = require("../util/utils");
+const vutils_1 = require("@visactor/vutils"), vscale_1 = require("@visactor/vscale"), polar_1 = require("../../constant/polar"), base_series_1 = require("../base/base-series"), utils_1 = require("../util/utils"), constant_1 = require("../../constant");
 
 class PolarSeries extends base_series_1.BaseSeries {
     constructor() {
@@ -135,17 +135,28 @@ class PolarSeries extends base_series_1.BaseSeries {
         const {width: width, height: height} = this._region.getLayoutRect();
         return Math.min(width / 2, height / 2);
     }
-    fillData() {
-        super.fillData(), this.sortDataByAxis && this._sortDataInAxisDomain();
+    initEvent() {
+        super.initEvent(), this.sortDataByAxis && this.event.on(constant_1.ChartEvent.scaleDomainUpdate, {
+            filter: param => {
+                var _a;
+                return param.model.id === (null === (_a = this._angleAxisHelper) || void 0 === _a ? void 0 : _a.getAxisId());
+            }
+        }, (() => {
+            this._sortDataInAxisDomain();
+        }));
     }
     _sortDataInAxisDomain() {
         var _a, _b;
         (null === (_b = null === (_a = this.getViewData()) || void 0 === _a ? void 0 : _a.latestData) || void 0 === _b ? void 0 : _b.length) && (0, 
         utils_1.sortDataInAxisHelper)(this.angleAxisHelper, this._angleField[0], this.getViewData().latestData);
     }
-    _getInvalidDefined(datum) {
-        return !(this.angleAxisHelper.isContinuous && !(0, type_1.couldBeValidNumber)(datum[this._angleField[0]])) && !(this.radiusAxisHelper.isContinuous && !(0, 
-        type_1.couldBeValidNumber)(datum[this._radiusField[0]]));
+    getInvalidCheckFields() {
+        const fields = [];
+        return this.angleAxisHelper.isContinuous && this._angleField.forEach((f => {
+            fields.push(f);
+        })), this.radiusAxisHelper.isContinuous && this._radiusField.forEach((f => {
+            fields.push(f);
+        })), fields;
     }
 }
 

package/cjs/series/polar/polar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/polar/polar.ts"],"names":[],"mappings":"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","file":"polar.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\nimport type { IPoint, IPolarPoint } from '../../typings/coordinate';\nimport type { IPolarSeries } from '../interface';\nimport { array, isValid, isNil } from '@visactor/vutils';\nimport { couldBeValidNumber } from '../../util/type';\nimport type { IPolarAxisHelper } from '../../component/axis/polar/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport { POLAR_DEFAULT_RADIUS } from '../../constant/polar';\nimport { BaseSeries } from '../base/base-series';\nimport type { IPolarSeriesSpec } from './interface';\nimport type { Datum, StringOrNumber } from '../../typings';\nimport { sortDataInAxisHelper } from '../util/utils';\n\nexport abstract class PolarSeries<T extends IPolarSeriesSpec = IPolarSeriesSpec>\n  extends BaseSeries<T>\n  implements IPolarSeries\n{\n  readonly coordinate: 'polar' = 'polar';\n\n  protected _outerRadius: number = POLAR_DEFAULT_RADIUS;\n  public get outerRadius() {\n    return this._outerRadius;\n  }\n\n  protected _innerRadius: number = 0;\n  public get innerRadius() {\n    return this._innerRadius;\n  }\n\n  protected _angleField: string[] = [];\n  getAngleField() {\n    return this._angleField;\n  }\n  setAngleField(f: string | string[]): string[] {\n    this._angleField = isValid(f) ? array(f) : [];\n    return this._angleField;\n  }\n\n  protected _radiusField: string[] = [];\n  getRadiusField() {\n    return this._radiusField;\n  }\n  setRadiusField(f: string | string[]): string[] {\n    this._radiusField = isValid(f) ? array(f) : [];\n    return this._radiusField;\n  }\n\n  protected _specAngleField: string[];\n  protected _specRadiusField: string[];\n\n  protected _innerRadiusField!: string[];\n  public get innerRadiusField() {\n    return this._innerRadiusField;\n  }\n  setInnerRadiusField(f: string | string[]): string[] {\n    this._innerRadiusField = array(f);\n    return this._innerRadiusField;\n  }\n\n  protected _radiusScale!: IBaseScale;\n  public get radiusScale() {\n    return this._radiusScale;\n  }\n  setRadiusScale(s: IBaseScale) {\n    this._radiusScale = s;\n    return s;\n  }\n\n  protected _angleScale!: IBaseScale;\n  public get angleScale() {\n    return this._angleScale;\n  }\n  setAngleScale(s: IBaseScale) {\n    this._angleScale = s;\n    return s;\n  }\n\n  private _angleAxisHelper!: IPolarAxisHelper;\n  public get angleAxisHelper() {\n    return this._angleAxisHelper;\n  }\n  public set angleAxisHelper(h: IPolarAxisHelper) {\n    this._angleAxisHelper = h;\n    this.onAngleAxisHelperUpdate();\n  }\n\n  private _radiusAxisHelper!: IPolarAxisHelper;\n  public get radiusAxisHelper() {\n    return this._radiusAxisHelper;\n  }\n  public set radiusAxisHelper(h: IPolarAxisHelper) {\n    this._radiusAxisHelper = h;\n    this.onRadiusAxisHelperUpdate();\n  }\n\n  protected _sortDataByAxis: boolean = false;\n  get sortDataByAxis() {\n    return this._sortDataByAxis;\n  }\n\n  protected _buildMarkAttributeContext() {\n    super._buildMarkAttributeContext();\n    // position\n    this._markAttributeContext.valueToPosition = this.valueToPosition.bind(this);\n    this._markAttributeContext.getCenter = () => this.angleAxisHelper.center();\n    this._markAttributeContext.getLayoutRadius = () => this._computeLayoutRadius();\n  }\n\n  valueToPosition(angleValue: StringOrNumber | StringOrNumber[], radiusValue: StringOrNumber | StringOrNumber[]) {\n    if (isNil(angleValue) || isNil(radiusValue) || !this.angleAxisHelper || !this.radiusAxisHelper) {\n      return { x: Number.NaN, y: Number.NaN };\n    }\n    const angle = this.angleAxisHelper.dataToPosition(array(angleValue));\n    const radius = this.radiusAxisHelper.dataToPosition(array(radiusValue));\n    // FIXME: 由于存在两个轴，这里的 坐标系转换逻辑会有点尬\n    return this.angleAxisHelper.coordToPoint({ angle, radius });\n  }\n\n  dataToPosition(datum: Datum, checkInViewData?: boolean): IPoint {\n    if (!datum || !this.angleAxisHelper || !this.radiusAxisHelper) {\n      return null;\n    }\n    if (checkInViewData && !this.isDatumInViewData(datum)) {\n      return null;\n    }\n    // FIXME: 由于存在两个轴，这里的 坐标系转换逻辑会有点尬\n    return this.valueToPosition(\n      this.getDatumPositionValues(datum, this._angleField),\n      this.getDatumPositionValues(datum, this._radiusField)\n    );\n  }\n\n  dataToPositionX(datum: Datum): number {\n    return this.dataToPosition(datum)?.x;\n  }\n\n  dataToPositionY(datum: Datum): number {\n    return this.dataToPosition(datum)?.y;\n  }\n\n  dataToPositionZ(datum: Datum): number {\n    return 0;\n  }\n\n  // todo: 待实现\n  positionToData(p: IPolarPoint): any {\n    /* do nothing */\n  }\n  radiusToData(r: number): any {\n    /* do nothing */\n  }\n  angleToData(a: number): any {\n    /* do nothing */\n  }\n\n  getStatisticFields() {\n    const fields: { key: string; operations: Array<'max' | 'min' | 'values'> }[] = [];\n    if (this.radiusAxisHelper?.getScale) {\n      this._radiusField.forEach(f => {\n        const result: { key: string; operations: Array<'max' | 'min' | 'values'> } = { key: f, operations: [] };\n        if (isContinuous(this.radiusAxisHelper.getScale(0).type)) {\n          result.operations = ['max', 'min'];\n        } else {\n          result.operations = ['values'];\n        }\n        fields.push(result);\n      });\n    }\n    if (this.angleAxisHelper?.getScale) {\n      this._angleField.forEach(f => {\n        const result: { key: string; operations: Array<'max' | 'min' | 'values'> } = { key: f, operations: [] };\n        if (isContinuous(this.angleAxisHelper.getScale(0).type)) {\n          result.operations = ['max', 'min'];\n        } else {\n          result.operations = ['values'];\n        }\n        fields.push(result);\n      });\n    }\n    return fields;\n  }\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec();\n    if (isValid(this._spec.outerRadius)) {\n      this._outerRadius = this._spec.outerRadius;\n    }\n    if (isValid(this._spec.radius)) {\n      // 优先使用outerRadius, 但要兼容spec.radius\n      this._outerRadius = this._spec.radius;\n    }\n    if (isValid(this._spec.innerRadius)) {\n      this._innerRadius = this._spec.innerRadius;\n    }\n\n    if (isValid(this._spec.sortDataByAxis)) {\n      this._sortDataByAxis = this._spec.sortDataByAxis === true;\n    }\n  }\n\n  onRadiusAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n  onAngleAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n\n  afterInitMark(): void {\n    super.afterInitMark();\n  }\n\n  protected _computeLayoutRadius() {\n    const { width, height } = this._region.getLayoutRect();\n    return Math.min(width / 2, height / 2);\n  }\n\n  fillData(): void {\n    super.fillData();\n    if (this.sortDataByAxis) {\n      this._sortDataInAxisDomain();\n    }\n  }\n\n  _sortDataInAxisDomain() {\n    if (this.getViewData()?.latestData?.length) {\n      sortDataInAxisHelper(this.angleAxisHelper, this._angleField[0], this.getViewData().latestData);\n    }\n  }\n\n  protected _getInvalidDefined(datum: Datum) {\n    if (this.angleAxisHelper.isContinuous) {\n      if (!couldBeValidNumber(datum[this._angleField[0]])) {\n        return false;\n      }\n    }\n    if (this.radiusAxisHelper.isContinuous) {\n      if (!couldBeValidNumber(datum[this._radiusField[0]])) {\n        return false;\n      }\n    }\n    return true;\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/polar/polar.ts"],"names":[],"mappings":";;;AAGA,6CAAyD;AAIzD,6CAAgD;AAChD,gDAA4D;AAC5D,qDAAiD;AAGjD,yCAAqD;AACrD,6CAA4C;AAI5C,MAAsB,WACpB,SAAQ,wBAAa;IADvB;;QAIW,eAAU,GAAY,OAAO,CAAC;QAE7B,iBAAY,GAAW,4BAAoB,CAAC;QAK5C,iBAAY,GAAW,CAAC,CAAC;QAKzB,gBAAW,GAAa,EAAE,CAAC;QAS3B,iBAAY,GAAa,EAAE,CAAC;QAyD5B,oBAAe,GAAY,KAAK,CAAC;IAgK7C,CAAC;IA3OC,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAGD,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAGD,aAAa;QACX,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IACD,aAAa,CAAC,CAAoB;QAChC,IAAI,CAAC,WAAW,GAAG,IAAA,gBAAO,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAGD,cAAc;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACD,cAAc,CAAC,CAAoB;QACjC,IAAI,CAAC,YAAY,GAAG,IAAA,gBAAO,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAMD,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IACD,mBAAmB,CAAC,CAAoB;QACtC,IAAI,CAAC,iBAAiB,GAAG,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAGD,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACD,cAAc,CAAC,CAAa;QAC1B,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;QACtB,OAAO,CAAC,CAAC;IACX,CAAC;IAGD,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IACD,aAAa,CAAC,CAAa;QACzB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACrB,OAAO,CAAC,CAAC;IACX,CAAC;IAGD,IAAW,eAAe;QACxB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IACD,IAAW,eAAe,CAAC,CAAmB;QAC5C,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,uBAAuB,EAAE,CAAC;IACjC,CAAC;IAGD,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IACD,IAAW,gBAAgB,CAAC,CAAmB;QAC7C,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,wBAAwB,EAAE,CAAC;IAClC,CAAC;IAGD,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAES,0BAA0B;QAClC,KAAK,CAAC,0BAA0B,EAAE,CAAC;QAEnC,IAAI,CAAC,qBAAqB,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7E,IAAI,CAAC,qBAAqB,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;QAC3E,IAAI,CAAC,qBAAqB,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;IACjF,CAAC;IAED,eAAe,CAAC,UAA6C,EAAE,WAA8C;QAC3G,IAAI,IAAA,cAAK,EAAC,UAAU,CAAC,IAAI,IAAA,cAAK,EAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC9F,OAAO,EAAE,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC;SACzC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,IAAA,cAAK,EAAC,UAAU,CAAC,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,IAAA,cAAK,EAAC,WAAW,CAAC,CAAC,CAAC;QAExE,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,cAAc,CAAC,KAAY,EAAE,eAAyB;QACpD,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC7D,OAAO,IAAI,CAAC;SACb;QACD,IAAI,eAAe,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE;YACrD,OAAO,IAAI,CAAC;SACb;QAED,OAAO,IAAI,CAAC,eAAe,CACzB,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,EACpD,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,CACtD,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,KAAY;;QAC1B,OAAO,MAAA,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,0CAAE,CAAC,CAAC;IACvC,CAAC;IAED,eAAe,CAAC,KAAY;;QAC1B,OAAO,MAAA,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,0CAAE,CAAC,CAAC;IACvC,CAAC;IAED,eAAe,CAAC,KAAY;QAC1B,OAAO,CAAC,CAAC;IACX,CAAC;IAGD,cAAc,CAAC,CAAc;IAE7B,CAAC;IACD,YAAY,CAAC,CAAS;IAEtB,CAAC;IACD,WAAW,CAAC,CAAS;IAErB,CAAC;IAED,kBAAkB;;QAChB,MAAM,MAAM,GAAmE,EAAE,CAAC;QAClF,IAAI,MAAA,IAAI,CAAC,gBAAgB,0CAAE,QAAQ,EAAE;YACnC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC5B,MAAM,MAAM,GAAiE,EAAE,GAAG,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;gBACxG,IAAI,IAAA,qBAAY,EAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;oBACxD,MAAM,CAAC,UAAU,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;iBACpC;qBAAM;oBACL,MAAM,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,CAAC;iBAChC;gBACD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,MAAA,IAAI,CAAC,eAAe,0CAAE,QAAQ,EAAE;YAClC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC3B,MAAM,MAAM,GAAiE,EAAE,GAAG,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;gBACxG,IAAI,IAAA,qBAAY,EAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;oBACvD,MAAM,CAAC,UAAU,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;iBACpC;qBAAM;oBACL,MAAM,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,CAAC;iBAChC;gBACD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtB,CAAC,CAAC,CAAC;SACJ;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,eAAe;QACb,KAAK,CAAC,eAAe,EAAE,CAAC;QACxB,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YACnC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;SAC5C;QACD,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YAE9B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;SACvC;QACD,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YACnC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;SAC5C;QAED,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE;YACtC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,KAAK,IAAI,CAAC;SAC3D;IACH,CAAC;IAED,wBAAwB;QACtB,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IACD,uBAAuB;QACrB,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IAED,aAAa;QACX,KAAK,CAAC,aAAa,EAAE,CAAC;IACxB,CAAC;IAES,oBAAoB;QAC5B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QACvD,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC;IACzC,CAAC;IAES,SAAS;QACjB,KAAK,CAAC,SAAS,EAAE,CAAC;QAElB,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,IAAI,CAAC,KAAK,CAAC,EAAE,CACX,qBAAU,CAAC,iBAAiB,EAC5B;gBACE,MAAM,EAAE,KAAK,CAAC,EAAE,WAAC,OAAA,KAAK,CAAC,KAAK,CAAC,EAAE,MAAK,MAAA,IAAI,CAAC,gBAAgB,0CAAE,SAAS,EAAE,CAAA,CAAA,EAAA;aACvE,EACD,GAAG,EAAE;gBAEH,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC/B,CAAC,CACF,CAAC;SACH;IACH,CAAC;IAED,qBAAqB;;QACnB,IAAI,MAAA,MAAA,IAAI,CAAC,WAAW,EAAE,0CAAE,UAAU,0CAAE,MAAM,EAAE;YAC1C,IAAA,4BAAoB,EAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,CAAC;SAChG;IACH,CAAC;IAES,qBAAqB;QAC7B,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,IAAI,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE;YACrC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC3B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjB,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE;YACtC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC5B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjB,CAAC,CAAC,CAAC;SACJ;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAlPD,kCAkPC","file":"polar.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\nimport type { IPoint, IPolarPoint } from '../../typings/coordinate';\nimport type { IPolarSeries } from '../interface';\nimport { array, isValid, isNil } from '@visactor/vutils';\nimport { couldBeValidNumber } from '../../util/type';\nimport type { IPolarAxisHelper } from '../../component/axis/polar/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport { POLAR_DEFAULT_RADIUS } from '../../constant/polar';\nimport { BaseSeries } from '../base/base-series';\nimport type { IPolarSeriesSpec } from './interface';\nimport type { Datum, StringOrNumber } from '../../typings';\nimport { sortDataInAxisHelper } from '../util/utils';\nimport { ChartEvent } from '../../constant';\nimport { registerDataSetInstanceTransform } from '../../data/register';\nimport { invalidTravel } from '../../data/transforms/invalid-travel';\n\nexport abstract class PolarSeries<T extends IPolarSeriesSpec = IPolarSeriesSpec>\n  extends BaseSeries<T>\n  implements IPolarSeries\n{\n  readonly coordinate: 'polar' = 'polar';\n\n  protected _outerRadius: number = POLAR_DEFAULT_RADIUS;\n  public get outerRadius() {\n    return this._outerRadius;\n  }\n\n  protected _innerRadius: number = 0;\n  public get innerRadius() {\n    return this._innerRadius;\n  }\n\n  protected _angleField: string[] = [];\n  getAngleField() {\n    return this._angleField;\n  }\n  setAngleField(f: string | string[]): string[] {\n    this._angleField = isValid(f) ? array(f) : [];\n    return this._angleField;\n  }\n\n  protected _radiusField: string[] = [];\n  getRadiusField() {\n    return this._radiusField;\n  }\n  setRadiusField(f: string | string[]): string[] {\n    this._radiusField = isValid(f) ? array(f) : [];\n    return this._radiusField;\n  }\n\n  protected _specAngleField: string[];\n  protected _specRadiusField: string[];\n\n  protected _innerRadiusField!: string[];\n  public get innerRadiusField() {\n    return this._innerRadiusField;\n  }\n  setInnerRadiusField(f: string | string[]): string[] {\n    this._innerRadiusField = array(f);\n    return this._innerRadiusField;\n  }\n\n  protected _radiusScale!: IBaseScale;\n  public get radiusScale() {\n    return this._radiusScale;\n  }\n  setRadiusScale(s: IBaseScale) {\n    this._radiusScale = s;\n    return s;\n  }\n\n  protected _angleScale!: IBaseScale;\n  public get angleScale() {\n    return this._angleScale;\n  }\n  setAngleScale(s: IBaseScale) {\n    this._angleScale = s;\n    return s;\n  }\n\n  private _angleAxisHelper!: IPolarAxisHelper;\n  public get angleAxisHelper() {\n    return this._angleAxisHelper;\n  }\n  public set angleAxisHelper(h: IPolarAxisHelper) {\n    this._angleAxisHelper = h;\n    this.onAngleAxisHelperUpdate();\n  }\n\n  private _radiusAxisHelper!: IPolarAxisHelper;\n  public get radiusAxisHelper() {\n    return this._radiusAxisHelper;\n  }\n  public set radiusAxisHelper(h: IPolarAxisHelper) {\n    this._radiusAxisHelper = h;\n    this.onRadiusAxisHelperUpdate();\n  }\n\n  protected _sortDataByAxis: boolean = false;\n  get sortDataByAxis() {\n    return this._sortDataByAxis;\n  }\n\n  protected _buildMarkAttributeContext() {\n    super._buildMarkAttributeContext();\n    // position\n    this._markAttributeContext.valueToPosition = this.valueToPosition.bind(this);\n    this._markAttributeContext.getCenter = () => this.angleAxisHelper.center();\n    this._markAttributeContext.getLayoutRadius = () => this._computeLayoutRadius();\n  }\n\n  valueToPosition(angleValue: StringOrNumber | StringOrNumber[], radiusValue: StringOrNumber | StringOrNumber[]) {\n    if (isNil(angleValue) || isNil(radiusValue) || !this.angleAxisHelper || !this.radiusAxisHelper) {\n      return { x: Number.NaN, y: Number.NaN };\n    }\n    const angle = this.angleAxisHelper.dataToPosition(array(angleValue));\n    const radius = this.radiusAxisHelper.dataToPosition(array(radiusValue));\n    // FIXME: 由于存在两个轴，这里的 坐标系转换逻辑会有点尬\n    return this.angleAxisHelper.coordToPoint({ angle, radius });\n  }\n\n  dataToPosition(datum: Datum, checkInViewData?: boolean): IPoint {\n    if (!datum || !this.angleAxisHelper || !this.radiusAxisHelper) {\n      return null;\n    }\n    if (checkInViewData && !this.isDatumInViewData(datum)) {\n      return null;\n    }\n    // FIXME: 由于存在两个轴，这里的 坐标系转换逻辑会有点尬\n    return this.valueToPosition(\n      this.getDatumPositionValues(datum, this._angleField),\n      this.getDatumPositionValues(datum, this._radiusField)\n    );\n  }\n\n  dataToPositionX(datum: Datum): number {\n    return this.dataToPosition(datum)?.x;\n  }\n\n  dataToPositionY(datum: Datum): number {\n    return this.dataToPosition(datum)?.y;\n  }\n\n  dataToPositionZ(datum: Datum): number {\n    return 0;\n  }\n\n  // todo: 待实现\n  positionToData(p: IPolarPoint): any {\n    /* do nothing */\n  }\n  radiusToData(r: number): any {\n    /* do nothing */\n  }\n  angleToData(a: number): any {\n    /* do nothing */\n  }\n\n  getStatisticFields() {\n    const fields: { key: string; operations: Array<'max' | 'min' | 'values'> }[] = [];\n    if (this.radiusAxisHelper?.getScale) {\n      this._radiusField.forEach(f => {\n        const result: { key: string; operations: Array<'max' | 'min' | 'values'> } = { key: f, operations: [] };\n        if (isContinuous(this.radiusAxisHelper.getScale(0).type)) {\n          result.operations = ['max', 'min'];\n        } else {\n          result.operations = ['values'];\n        }\n        fields.push(result);\n      });\n    }\n    if (this.angleAxisHelper?.getScale) {\n      this._angleField.forEach(f => {\n        const result: { key: string; operations: Array<'max' | 'min' | 'values'> } = { key: f, operations: [] };\n        if (isContinuous(this.angleAxisHelper.getScale(0).type)) {\n          result.operations = ['max', 'min'];\n        } else {\n          result.operations = ['values'];\n        }\n        fields.push(result);\n      });\n    }\n    return fields;\n  }\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec();\n    if (isValid(this._spec.outerRadius)) {\n      this._outerRadius = this._spec.outerRadius;\n    }\n    if (isValid(this._spec.radius)) {\n      // 优先使用outerRadius, 但要兼容spec.radius\n      this._outerRadius = this._spec.radius;\n    }\n    if (isValid(this._spec.innerRadius)) {\n      this._innerRadius = this._spec.innerRadius;\n    }\n\n    if (isValid(this._spec.sortDataByAxis)) {\n      this._sortDataByAxis = this._spec.sortDataByAxis === true;\n    }\n  }\n\n  onRadiusAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n  onAngleAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n\n  afterInitMark(): void {\n    super.afterInitMark();\n  }\n\n  protected _computeLayoutRadius() {\n    const { width, height } = this._region.getLayoutRect();\n    return Math.min(width / 2, height / 2);\n  }\n\n  protected initEvent() {\n    super.initEvent();\n    // 通过轴事件来进行排序。轴的domain数据变化在系列的统计数据完成后\n    if (this.sortDataByAxis) {\n      this.event.on(\n        ChartEvent.scaleDomainUpdate,\n        {\n          filter: param => param.model.id === this._angleAxisHelper?.getAxisId()\n        },\n        () => {\n          // 只能排序，不能修改数据，此时已经在数据流的统计流程之后\n          this._sortDataInAxisDomain();\n        }\n      );\n    }\n  }\n\n  _sortDataInAxisDomain() {\n    if (this.getViewData()?.latestData?.length) {\n      sortDataInAxisHelper(this.angleAxisHelper, this._angleField[0], this.getViewData().latestData);\n    }\n  }\n\n  protected getInvalidCheckFields() {\n    const fields: string[] = [];\n\n    if (this.angleAxisHelper.isContinuous) {\n      this._angleField.forEach(f => {\n        fields.push(f);\n      });\n    }\n\n    if (this.radiusAxisHelper.isContinuous) {\n      this._radiusField.forEach(f => {\n        fields.push(f);\n      });\n    }\n    return fields;\n  }\n}\n"]}

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerCircularProgressSeries = exports.CircularProgressSeries = void 0;
 
-const vutils_1 = require("@visactor/vutils"), type_1 = require("../../interface/type"), utils_1 = require("../../../animation/utils"), progress_like_1 = require("../../polar/progress-like/progress-like"), arc_1 = require("../../../mark/arc"), constant_1 = require("./constant"), constant_2 = require("../../../constant"), factory_1 = require("../../../core/factory"), progress_like_2 = require("../../polar/progress-like"), config_1 = require("../../../animation/config"), circular_transformer_1 = require("./circular-transformer");
+const vutils_1 = require("@visactor/vutils"), type_1 = require("../../interface/type"), utils_1 = require("../../../animation/utils"), progress_like_1 = require("../../polar/progress-like/progress-like"), arc_1 = require("../../../mark/arc"), constant_1 = require("./constant"), constant_2 = require("../../../constant"), factory_1 = require("../../../core/factory"), progress_like_2 = require("../../polar/progress-like"), config_1 = require("../../../animation/config"), circular_transformer_1 = require("./circular-transformer"), polar_1 = require("../../../component/axis/polar");
 
 class CircularProgressSeries extends progress_like_1.ProgressLikeSeries {
     constructor() {
@@ -125,8 +125,10 @@ exports.CircularProgressSeries = CircularProgressSeries, CircularProgressSeries.
 CircularProgressSeries.mark = constant_1.circularProgressSeriesMark, CircularProgressSeries.transformerConstructor = circular_transformer_1.CircularProgressSeriesSpecTransformer;
 
 const registerCircularProgressSeries = () => {
+    factory_1.Factory.registerSeries(CircularProgressSeries.type, CircularProgressSeries), 
     (0, arc_1.registerArcMark)(), (0, progress_like_2.registerProgressLikeAnimation)(), 
-    (0, config_1.registerFadeInOutAnimation)(), factory_1.Factory.registerSeries(CircularProgressSeries.type, CircularProgressSeries);
+    (0, config_1.registerFadeInOutAnimation)(), (0, polar_1.registerPolarBandAxis)(), 
+    (0, polar_1.registerPolarLinearAxis)();
 };
 
 exports.registerCircularProgressSeries = registerCircularProgressSeries;

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/progress/circular/circular.ts"],"names":[],"mappings":"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","file":"circular.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport type { BandScale } from '@visactor/vscale';\nimport type { IArcMark } from '../../../mark/arc';\nimport type { Datum } from '../../../typings';\nimport { isValidNumber } from '@visactor/vutils';\nimport type { SeriesMarkMap } from '../../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../../interface/type';\nimport { animationConfig, userAnimationConfig } from '../../../animation/utils';\nimport type { ICircularProgressSeriesSpec } from './interface';\nimport { ProgressLikeSeries } from '../../polar/progress-like/progress-like';\nimport type { IStateAnimateSpec } from '../../../animation/spec';\nimport { registerArcMark } from '../../../mark/arc';\nimport { circularProgressSeriesMark } from './constant';\nimport { STACK_FIELD_END, STACK_FIELD_START, AttributeLevel } from '../../../constant';\nimport { Factory } from '../../../core/factory';\nimport { registerProgressLikeAnimation } from '../../polar/progress-like';\nimport { registerFadeInOutAnimation } from '../../../animation/config';\nimport type { IMark } from '../../../mark/interface';\nimport { CircularProgressSeriesSpecTransformer } from './circular-transformer';\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  static readonly transformerConstructor = CircularProgressSeriesSpecTransformer as any;\n  readonly transformerConstructor = CircularProgressSeriesSpecTransformer;\n\n  private _progressMark: IArcMark | null = null;\n  private _trackMark: IArcMark | null = null;\n\n  getStackGroupFields(): string[] {\n    return this.getGroupFields();\n  }\n\n  getGroupFields() {\n    return this._radiusField;\n  }\n\n  initMark(): void {\n    super.initMark();\n    this._initTrackMark();\n    this._initProgressMark();\n  }\n\n  initMarkStyle(): void {\n    super.initMarkStyle();\n    this._initTrackMarkStyle();\n    this._initProgressMarkStyle();\n  }\n\n  private _initProgressMark() {\n    this._progressMark = this._createMark(CircularProgressSeries.mark.progress, {\n      parent: this._arcGroupMark,\n      isSeriesMark: true,\n      customShape: this._spec.progress?.customShape,\n      stateSort: this._spec.progress?.stateSort\n    }) as IArcMark;\n    return this._progressMark;\n  }\n\n  private _initProgressMarkStyle() {\n    const progressMark = this._progressMark;\n    if (progressMark) {\n      this.setMarkStyle(\n        progressMark,\n        {\n          x: () => this.angleAxisHelper.center().x,\n          y: () => this.angleAxisHelper.center().y,\n          startAngle: this._getAngleValueStart,\n          endAngle: this._getAngleValueEnd,\n          innerRadius: this._getRadiusValueStart,\n          outerRadius: this._getRadiusValueEnd,\n          cap: this._spec.roundCap ?? false,\n          boundsMode: 'imprecise',\n          cornerRadius: this._spec.cornerRadius,\n          fill: this.getColorAttribute(),\n          zIndex: 200,\n          // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n          // @ts-ignore\n          // forceShowCap 是内部属性，不在接口中暴露\n          forceShowCap: true\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  initInteraction(): void {\n    const marks: IMark[] = [];\n\n    if (this._trackMark) {\n      marks.push(this._trackMark);\n    }\n\n    if (this._progressMark) {\n      marks.push(this._progressMark);\n    }\n    this._parseInteractionConfig(marks);\n  }\n\n  protected initTooltip() {\n    super.initTooltip();\n\n    this._progressMark && this._tooltipHelper.activeTriggerSet.mark.add(this._progressMark);\n  }\n\n  private _initTrackMark() {\n    this._trackMark = this._createMark(CircularProgressSeries.mark.track, {\n      parent: this._arcGroupMark,\n      customShape: this._spec.track?.customShape,\n      stateSort: this._spec.track?.stateSort\n    }) as IArcMark;\n    return this._trackMark;\n  }\n\n  private _initTrackMarkStyle() {\n    const trackMark = this._trackMark;\n    if (trackMark) {\n      this.setMarkStyle(\n        trackMark,\n        {\n          visible: (datum: Datum) => {\n            const scale = this.angleAxisHelper.getScale(0);\n            const range = scale.range();\n            const min = Math.min(range[0], range[range.length - 1]);\n            const startValue = this._getAngleValueStartWithoutMask(datum);\n            // 堆叠情况只显示第一组的背景\n            return Math.abs(startValue - min) <= 1e-14;\n          },\n          x: () => this.angleAxisHelper.center().x,\n          y: () => this.angleAxisHelper.center().y,\n          startAngle: () => {\n            const fieldName = this.getStack() ? STACK_FIELD_START : this._angleField[0];\n            const scale = this.angleAxisHelper.getScale(0);\n            const domain = scale.domain();\n            return this._getAngleValueStart({ [fieldName]: domain[0] });\n          },\n          endAngle: () => {\n            const fieldName = this.getStack() ? STACK_FIELD_END : this._angleField[0];\n            const scale = this.angleAxisHelper.getScale(0);\n            const domain = scale.domain();\n            return this._getAngleValueEnd({ [fieldName]: domain[domain.length - 1] });\n          },\n          innerRadius: this._getRadiusValueStart,\n          outerRadius: this._getRadiusValueEnd,\n          cornerRadius: this._spec.cornerRadius,\n          fill: this.getColorAttribute(),\n          zIndex: 100\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  protected _getRadiusValueStart = (datum: Datum) => {\n    if (this.getGroupFields().length > 1) {\n      const value = this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields()));\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]);\n  };\n\n  protected _getRadiusValueEnd = (datum: Datum) => {\n    if (this.getGroupFields().length > 1) {\n      const value =\n        this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields())) +\n        this.radiusAxisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0);\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return (\n      this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]) +\n      (this.radiusAxisHelper.getScale(0) as BandScale).step()\n    );\n  };\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<any>)?.preset;\n\n    this._progressMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('circularProgress')?.({ startAngle: this._startAngle }, appearPreset),\n        userAnimationConfig(SeriesMarkNameEnum.progress, this._spec, this._markAttributeContext)\n      )\n    );\n\n    this._trackMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('fadeInOut')?.(),\n        userAnimationConfig(SeriesMarkNameEnum.track, this._spec, this._markAttributeContext)\n      )\n    );\n  }\n\n  getActiveMarks(): IMark[] {\n    return [this._progressMark];\n  }\n}\n\nexport const registerCircularProgressSeries = () => {\n  registerArcMark();\n  registerProgressLikeAnimation();\n  registerFadeInOutAnimation();\n  Factory.registerSeries(CircularProgressSeries.type, CircularProgressSeries);\n};\n"]}
+{"version":3,"sources":["../src/series/progress/circular/circular.ts"],"names":[],"mappings":";;;AAIA,6CAAiD;AAEjD,+CAA0E;AAC1E,oDAAgF;AAEhF,2EAA6E;AAE7E,2CAAoD;AACpD,yCAAwD;AACxD,gDAAuF;AACvF,mDAAgD;AAChD,6DAA0E;AAC1E,sDAAuE;AAEvE,iEAA+E;AAC/E,yDAA+F;AAE/F,MAAa,sBAEX,SAAQ,kCAAqB;IAF/B;;QAIE,SAAI,GAAG,qBAAc,CAAC,gBAAgB,CAAC;QAI9B,2BAAsB,GAAG,4DAAqC,CAAC;QAEhE,kBAAa,GAAoB,IAAI,CAAC;QACtC,eAAU,GAAoB,IAAI,CAAC;QAgIjC,yBAAoB,GAAG,CAAC,KAAY,EAAE,EAAE;YAChD,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;gBACpC,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;gBAC9G,IAAI,IAAA,sBAAa,EAAC,KAAK,CAAC,EAAE;oBACxB,OAAO,KAAK,CAAC;iBACd;aACF;YACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7E,CAAC,CAAC;QAEQ,uBAAkB,GAAG,CAAC,KAAY,EAAE,EAAE;;YAC9C,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;gBACpC,MAAM,KAAK,GACT,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;qBAC/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;gBAC1F,IAAI,IAAA,sBAAa,EAAC,KAAK,CAAC,EAAE;oBACxB,OAAO,KAAK,CAAC;iBACd;aACF;YACD,OAAO,CACL,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAClE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAe,CAAC,IAAI,EAAE,CACxD,CAAC;QACJ,CAAC,CAAC;IAuBJ,CAAC;IA5KC,mBAAmB;QACjB,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;IAC/B,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,QAAQ;QACN,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAED,aAAa;QACX,KAAK,CAAC,aAAa,EAAE,CAAC;QACtB,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAChC,CAAC;IAEO,iBAAiB;;QACvB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC1E,MAAM,EAAE,IAAI,CAAC,aAAa;YAC1B,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,MAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,0CAAE,WAAW;YAC7C,SAAS,EAAE,MAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,0CAAE,SAAS;SAC1C,CAAa,CAAC;QACf,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAEO,sBAAsB;;QAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,YAAY,EAAE;YAChB,IAAI,CAAC,YAAY,CACf,YAAY,EACZ;gBACE,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;gBACpC,QAAQ,EAAE,IAAI,CAAC,iBAAiB;gBAChC,WAAW,EAAE,IAAI,CAAC,oBAAoB;gBACtC,WAAW,EAAE,IAAI,CAAC,kBAAkB;gBACpC,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,EACD,QAAQ,EACR,yBAAc,CAAC,MAAM,CACtB,CAAC;SACH;IACH,CAAC;IAED,eAAe;QACb,MAAM,KAAK,GAAY,EAAE,CAAC;QAE1B,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC7B;QAED,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SAChC;QACD,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IAES,WAAW;QACnB,KAAK,CAAC,WAAW,EAAE,CAAC;QAEpB,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC1F,CAAC;IAEO,cAAc;;QACpB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,EAAE;YACpE,MAAM,EAAE,IAAI,CAAC,aAAa;YAC1B,WAAW,EAAE,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,0CAAE,WAAW;YAC1C,SAAS,EAAE,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,0CAAE,SAAS;SACvC,CAAa,CAAC;QACf,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAEO,mBAAmB;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,SAAS,EAAE;YACb,IAAI,CAAC,YAAY,CACf,SAAS,EACT;gBACE,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,8BAA8B,CAAC,KAAK,CAAC,CAAC;oBAE9D,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,GAAG,EAAE;oBACf,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,4BAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;oBAC5E,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;oBAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;oBAC9B,OAAO,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC9D,CAAC;gBACD,QAAQ,EAAE,GAAG,EAAE;oBACb,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,0BAAe,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;oBAC1E,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;oBAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;oBAC9B,OAAO,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC5E,CAAC;gBACD,WAAW,EAAE,IAAI,CAAC,oBAAoB;gBACtC,WAAW,EAAE,IAAI,CAAC,kBAAkB;gBACpC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;gBACrC,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE;gBAC9B,MAAM,EAAE,GAAG;aACZ,EACD,QAAQ,EACR,yBAAc,CAAC,MAAM,CACtB,CAAC;SACH;IACH,CAAC;IA2BD,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,MAAA,iBAAO,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,0CAAG,EAAE,UAAU,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,YAAY,CAAC,EAC/F,IAAA,2BAAmB,cAA8B,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,qBAAqB,CAAC,CACzF,CACF,CAAC;QAEF,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAChC,IAAA,uBAAe,EACb,MAAA,iBAAO,CAAC,iBAAiB,CAAC,WAAW,CAAC,2CAAI,EAC1C,IAAA,2BAAmB,WAA2B,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,qBAAqB,CAAC,CACtF,CACF,CAAC;IACJ,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9B,CAAC;;AAxLH,wDAyLC;AAtLiB,2BAAI,GAAW,qBAAc,CAAC,gBAAgB,CAAC;AAG/C,2BAAI,GAAkB,qCAA0B,CAAC;AACjD,6CAAsB,GAAG,4DAA4C,CAAC;AAoLjF,MAAM,8BAA8B,GAAG,GAAG,EAAE;IACjD,iBAAO,CAAC,cAAc,CAAC,sBAAsB,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAC5E,IAAA,qBAAe,GAAE,CAAC;IAClB,IAAA,6CAA6B,GAAE,CAAC;IAChC,IAAA,mCAA0B,GAAE,CAAC;IAC7B,IAAA,6BAAqB,GAAE,CAAC;IACxB,IAAA,+BAAuB,GAAE,CAAC;AAC5B,CAAC,CAAC;AAPW,QAAA,8BAA8B,kCAOzC","file":"circular.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport type { BandScale } from '@visactor/vscale';\nimport type { IArcMark } from '../../../mark/arc';\nimport type { Datum } from '../../../typings';\nimport { isValidNumber } from '@visactor/vutils';\nimport type { SeriesMarkMap } from '../../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../../interface/type';\nimport { animationConfig, userAnimationConfig } from '../../../animation/utils';\nimport type { ICircularProgressSeriesSpec } from './interface';\nimport { ProgressLikeSeries } from '../../polar/progress-like/progress-like';\nimport type { IStateAnimateSpec } from '../../../animation/spec';\nimport { registerArcMark } from '../../../mark/arc';\nimport { circularProgressSeriesMark } from './constant';\nimport { STACK_FIELD_END, STACK_FIELD_START, AttributeLevel } from '../../../constant';\nimport { Factory } from '../../../core/factory';\nimport { registerProgressLikeAnimation } from '../../polar/progress-like';\nimport { registerFadeInOutAnimation } from '../../../animation/config';\nimport type { IMark } from '../../../mark/interface';\nimport { CircularProgressSeriesSpecTransformer } from './circular-transformer';\nimport { registerPolarLinearAxis, registerPolarBandAxis } from '../../../component/axis/polar';\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  static readonly transformerConstructor = CircularProgressSeriesSpecTransformer as any;\n  readonly transformerConstructor = CircularProgressSeriesSpecTransformer;\n\n  private _progressMark: IArcMark | null = null;\n  private _trackMark: IArcMark | null = null;\n\n  getStackGroupFields(): string[] {\n    return this.getGroupFields();\n  }\n\n  getGroupFields() {\n    return this._radiusField;\n  }\n\n  initMark(): void {\n    super.initMark();\n    this._initTrackMark();\n    this._initProgressMark();\n  }\n\n  initMarkStyle(): void {\n    super.initMarkStyle();\n    this._initTrackMarkStyle();\n    this._initProgressMarkStyle();\n  }\n\n  private _initProgressMark() {\n    this._progressMark = this._createMark(CircularProgressSeries.mark.progress, {\n      parent: this._arcGroupMark,\n      isSeriesMark: true,\n      customShape: this._spec.progress?.customShape,\n      stateSort: this._spec.progress?.stateSort\n    }) as IArcMark;\n    return this._progressMark;\n  }\n\n  private _initProgressMarkStyle() {\n    const progressMark = this._progressMark;\n    if (progressMark) {\n      this.setMarkStyle(\n        progressMark,\n        {\n          x: () => this.angleAxisHelper.center().x,\n          y: () => this.angleAxisHelper.center().y,\n          startAngle: this._getAngleValueStart,\n          endAngle: this._getAngleValueEnd,\n          innerRadius: this._getRadiusValueStart,\n          outerRadius: this._getRadiusValueEnd,\n          cap: this._spec.roundCap ?? false,\n          boundsMode: 'imprecise',\n          cornerRadius: this._spec.cornerRadius,\n          fill: this.getColorAttribute(),\n          zIndex: 200,\n          // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n          // @ts-ignore\n          // forceShowCap 是内部属性，不在接口中暴露\n          forceShowCap: true\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  initInteraction(): void {\n    const marks: IMark[] = [];\n\n    if (this._trackMark) {\n      marks.push(this._trackMark);\n    }\n\n    if (this._progressMark) {\n      marks.push(this._progressMark);\n    }\n    this._parseInteractionConfig(marks);\n  }\n\n  protected initTooltip() {\n    super.initTooltip();\n\n    this._progressMark && this._tooltipHelper.activeTriggerSet.mark.add(this._progressMark);\n  }\n\n  private _initTrackMark() {\n    this._trackMark = this._createMark(CircularProgressSeries.mark.track, {\n      parent: this._arcGroupMark,\n      customShape: this._spec.track?.customShape,\n      stateSort: this._spec.track?.stateSort\n    }) as IArcMark;\n    return this._trackMark;\n  }\n\n  private _initTrackMarkStyle() {\n    const trackMark = this._trackMark;\n    if (trackMark) {\n      this.setMarkStyle(\n        trackMark,\n        {\n          visible: (datum: Datum) => {\n            const scale = this.angleAxisHelper.getScale(0);\n            const range = scale.range();\n            const min = Math.min(range[0], range[range.length - 1]);\n            const startValue = this._getAngleValueStartWithoutMask(datum);\n            // 堆叠情况只显示第一组的背景\n            return Math.abs(startValue - min) <= 1e-14;\n          },\n          x: () => this.angleAxisHelper.center().x,\n          y: () => this.angleAxisHelper.center().y,\n          startAngle: () => {\n            const fieldName = this.getStack() ? STACK_FIELD_START : this._angleField[0];\n            const scale = this.angleAxisHelper.getScale(0);\n            const domain = scale.domain();\n            return this._getAngleValueStart({ [fieldName]: domain[0] });\n          },\n          endAngle: () => {\n            const fieldName = this.getStack() ? STACK_FIELD_END : this._angleField[0];\n            const scale = this.angleAxisHelper.getScale(0);\n            const domain = scale.domain();\n            return this._getAngleValueEnd({ [fieldName]: domain[domain.length - 1] });\n          },\n          innerRadius: this._getRadiusValueStart,\n          outerRadius: this._getRadiusValueEnd,\n          cornerRadius: this._spec.cornerRadius,\n          fill: this.getColorAttribute(),\n          zIndex: 100\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  protected _getRadiusValueStart = (datum: Datum) => {\n    if (this.getGroupFields().length > 1) {\n      const value = this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields()));\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]);\n  };\n\n  protected _getRadiusValueEnd = (datum: Datum) => {\n    if (this.getGroupFields().length > 1) {\n      const value =\n        this.radiusAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields())) +\n        this.radiusAxisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0);\n      if (isValidNumber(value)) {\n        return value;\n      }\n    }\n    return (\n      this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]) +\n      (this.radiusAxisHelper.getScale(0) as BandScale).step()\n    );\n  };\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<any>)?.preset;\n\n    this._progressMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('circularProgress')?.({ startAngle: this._startAngle }, appearPreset),\n        userAnimationConfig(SeriesMarkNameEnum.progress, this._spec, this._markAttributeContext)\n      )\n    );\n\n    this._trackMark.setAnimationConfig(\n      animationConfig(\n        Factory.getAnimationInKey('fadeInOut')?.(),\n        userAnimationConfig(SeriesMarkNameEnum.track, this._spec, this._markAttributeContext)\n      )\n    );\n  }\n\n  getActiveMarks(): IMark[] {\n    return [this._progressMark];\n  }\n}\n\nexport const registerCircularProgressSeries = () => {\n  Factory.registerSeries(CircularProgressSeries.type, CircularProgressSeries);\n  registerArcMark();\n  registerProgressLikeAnimation();\n  registerFadeInOutAnimation();\n  registerPolarBandAxis();\n  registerPolarLinearAxis();\n};\n"]}

package/cjs/series/radar/radar.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerRadarSeries = exports.RadarSeries = void 0;
 
-const line_mixin_1 = require("../mixin/line-mixin"), constant_1 = require("../../constant"), interpolate_1 = require("../../typings/interpolate"), type_1 = require("../interface/type"), vutils_1 = require("@visactor/vutils"), utils_1 = require("../../animation/utils"), animation_1 = require("./animation"), rose_like_1 = require("../polar/rose-like"), area_1 = require("../../mark/area"), line_1 = require("../../mark/line"), symbol_1 = require("../../mark/symbol"), constant_2 = require("./constant"), factory_1 = require("../../core/factory"), vgrammar_core_1 = require("@visactor/vgrammar-core"), line_mixin_transformer_1 = require("../mixin/line-mixin-transformer");
+const line_mixin_1 = require("../mixin/line-mixin"), constant_1 = require("../../constant"), interpolate_1 = require("../../typings/interpolate"), type_1 = require("../interface/type"), vutils_1 = require("@visactor/vutils"), utils_1 = require("../../animation/utils"), animation_1 = require("./animation"), rose_like_1 = require("../polar/rose-like"), area_1 = require("../../mark/area"), line_1 = require("../../mark/line"), symbol_1 = require("../../mark/symbol"), constant_2 = require("./constant"), factory_1 = require("../../core/factory"), vgrammar_core_1 = require("@visactor/vgrammar-core"), line_mixin_transformer_1 = require("../mixin/line-mixin-transformer"), polar_1 = require("../../component/axis/polar");
 
 class RadarSeries extends rose_like_1.RoseLikeSeries {
     constructor() {
@@ -116,9 +116,10 @@ RadarSeries.mark = constant_2.radarSeriesMark, RadarSeries.transformerConstructo
 (0, vutils_1.mixin)(RadarSeries, line_mixin_1.LineLikeSeriesMixin);
 
 const registerRadarSeries = () => {
-    (0, vgrammar_core_1.registerMarkOverlapTransform)(), (0, area_1.registerAreaMark)(), 
-    (0, line_1.registerLineMark)(), (0, symbol_1.registerSymbolMark)(), (0, animation_1.registerRadarAnimation)(), 
-    factory_1.Factory.registerSeries(RadarSeries.type, RadarSeries);
+    factory_1.Factory.registerSeries(RadarSeries.type, RadarSeries), (0, vgrammar_core_1.registerMarkOverlapTransform)(), 
+    (0, area_1.registerAreaMark)(), (0, line_1.registerLineMark)(), (0, symbol_1.registerSymbolMark)(), 
+    (0, animation_1.registerRadarAnimation)(), (0, polar_1.registerPolarBandAxis)(), 
+    (0, polar_1.registerPolarLinearAxis)();
 };
 
 exports.registerRadarSeries = registerRadarSeries;

package/cjs/series/radar/radar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/radar/radar.ts"],"names":[],"mappings":";;;AACA,oDAA0D;AAG1D,6CAAgF;AAChF,2DAAuE;AAGvE,4CAAuE;AACvE,6CAA2E;AAE3E,iDAA6E;AAE7E,2CAAqD;AACrD,kDAAoD;AAGpD,0CAAmD;AACnD,0CAAmD;AACnD,8CAAuD;AACvD,yCAA6C;AAC7C,gDAA6C;AAC7C,2DAAuE;AACvE,4EAAgF;AAiBhF,MAAa,WAA2D,SAAQ,0BAAiB;IAAjG;;QAEE,SAAI,GAAG,qBAAc,CAAC,KAAK,CAAC;QAInB,2BAAsB,GAAG,sDAA6B,CAAC;QAGtD,oBAAe,GAAY,KAAK,CAAC;IAsL7C,CAAC;IApLC,UAAU;IAEV,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAED,QAAQ;;QACN,MAAM,WAAW,GAAG;YAClB,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe;YAC3C,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB;YACrD,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;YACvB,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc;SAC1C,CAAC;QAEF,MAAM,aAAa,GAAG,CAAA,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,0CAAE,OAAO,MAAK,KAAK,IAAI,CAAA,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,0CAAE,KAAK,0CAAE,OAAO,MAAK,KAAK,CAAC;QACtG,MAAM,UAAU,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,UAAU,mCAAI,MAAM,CAAC;QACnD,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,aAAa,IAAI,UAAU,KAAK,MAAM,CAAC,CAAC;QACvE,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,UAAU,KAAK,MAAM,IAAI,CAAC,UAAU,KAAK,MAAM,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;QACnG,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,UAAU,KAAK,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,aAAa;QACX,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC7B,CAAC;IAED,YAAY,CAAC,WAAmC,EAAE,YAAqB;;QACrE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE;YACvD,WAAW;YACX,YAAY;YACZ,WAAW,EAAE,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,0CAAE,WAAW;YACzC,SAAS,EAAE,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,0CAAE,SAAS;SACtC,CAAc,CAAC;IAClB,CAAC;IAED,iBAAiB;QACf,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,YAAY,CACf,QAAQ,EACR;gBACE,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;gBAClC,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;gBAClC,EAAE,EAAE,CAAC,KAAY,EAAE,EAAE;oBACnB,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;wBAC7D,OAAO,MAAM,CAAC,GAAG,CAAC;qBACnB;oBACD,OAAO,IAAI,CAAC,eAAe,CACzB,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,EACpD,IAAI,CAAC,QAAQ,EAAE;wBACb,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC;wBAC5D,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CACjC,CAAC,CAAC,CAAC;gBACN,CAAC;gBACD,EAAE,EAAE,CAAC,KAAY,EAAE,EAAE;oBACnB,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;wBAC7D,OAAO,MAAM,CAAC,GAAG,CAAC;qBACnB;oBAED,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAChC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,EACpD,IAAI,CAAC,QAAQ,EAAE;wBACb,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC;wBAC5D,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CACjC,CAAC,CAAC,CAAC;oBACJ,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE;gBAC9B,SAAS,EAAE,wCAA0B;gBACrC,SAAS,EAAE,IAAI;aAChB,EACD,QAAQ,EACR,yBAAc,CAAC,MAAM,CACtB,CAAC;YAEF,IAAI,IAAI,CAAC,YAAY,KAAK,MAAM,EAAE;gBAChC,IAAI,CAAC,YAAY,CACf,QAAQ,EACR;oBACE,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;oBAC3C,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE;iBAC7C,EACD,QAAQ,EACR,yBAAc,CAAC,MAAM,CACtB,CAAC;aACH;YACD,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,qBAAU,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,EAAE,EAAE,GAAG,EAAE;gBACjG,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAES,WAAW;QACnB,KAAK,CAAC,WAAW,EAAE,CAAC;QACpB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC;QACxE,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC9B,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC3B;QACD,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC9B,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC3B;QACD,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC3B,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAC7B;IACH,CAAC;IAED,aAAa;;QACX,MAAM,eAAe,GAA0B;YAC7C,MAAM,EAAE,GAAG,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,MAAM,EAAE,CAAA,EAAA;YAC5C,MAAM,EAAE,GAAG,EAAE;gBACX,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;gBAClC,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAC3C,CAAC;YACD,UAAU,EAAE,IAAA,gBAAO,EAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAA,uBAAc,EAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,6BAAkB;YACvG,YAAY,EAAE,CAAC,KAAa,EAAE,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,YAAY,CAAC,KAAK,CAAC,CAAA,EAAA;YAC1E,YAAY,EAAE,CAAC,KAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,KAAK,CAAC;SAC/E,CAAC;QACF,MAAM,YAAY,GAAG,CAAC,MAAA,MAAC,MAAA,IAAI,CAAC,KAAK,0CAAE,eAAwD,0CAAE,MAAM,mCACjG,QAAQ,CAAsB,CAAC;QAEjC,IAAI,YAAY,KAAK,QAAQ,EAAE;YAC7B,IAAI,IAAI,CAAC,SAAS,EAAE;gBAClB,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAC/B,IAAA,uBAAe,EACb,MAAA,iBAAO,CAAC,iBAAiB,CAAC,YAAY,CAAC,0CAAG,eAAe,EAAE,YAAY,CAAC,EACxE,IAAA,2BAAmB,WAA2B,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,qBAAqB,CAAC,CACtF,CACF,CAAC;aACH;SACF;QAGD,MAAM,gBAAgB,GAAsB;YAC1C,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC;YACzB,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC;YACzB,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC;SAClC,CAAC;QAGF,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE;YAC7C,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,EAAE;gBACjB,MAAM,YAAY,GAAG,iBAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;gBAC1D,IAAI,CAAC,kBAAkB,CACrB,IAAA,uBAAe,EACb,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,eAAe,EAAE,YAAY,CAAC,EAC7C,IAAA,2BAAmB,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,qBAAqB,CAAC,CACvE,CACF,CAAC;aACH;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,mBAAmB;QACjB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5D,CAAC;IAED,cAAc,CAAC,KAAY;QACzB,OAAO,CAAC,SAAiB,EAAE,EAAE;;YAC3B,IAAI,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,YAAY,CAAC,SAAgB,EAAE,KAAK,CAAC,mCAAI,SAAS,CAAC;YAClF,IAAI,SAAS,KAAK,MAAM,IAAI,CAAC,MAAM,EAAE;gBACnC,SAAS,GAAG,QAAQ,CAAC;gBACrB,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,mCAAI,SAAS,CAAC;aACxE;YACD,IAAI,SAAS,KAAK,QAAQ,IAAI,IAAA,gBAAO,EAAC,MAAM,CAAC,EAAE;gBAC7C,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;aAClB;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;;AA9LH,kCA+LC;AA9LiB,gBAAI,GAAW,qBAAc,CAAC,KAAK,CAAC;AAGpC,gBAAI,GAAkB,0BAAe,CAAC;AACtC,kCAAsB,GAAG,sDAAoC,CAAC;AA4LhF,IAAA,cAAK,EAAC,WAAW,EAAE,gCAAmB,CAAC,CAAC;AAEjC,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,IAAA,4CAA4B,GAAE,CAAC;IAC/B,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,uBAAgB,GAAE,CAAC;IACnB,IAAA,2BAAkB,GAAE,CAAC;IACrB,IAAA,kCAAsB,GAAE,CAAC;IACzB,iBAAO,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;AACxD,CAAC,CAAC;AAPW,QAAA,mBAAmB,uBAO9B","file":"radar.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { LineLikeSeriesMixin } from '../mixin/line-mixin';\nimport type { ILineMark } from '../../mark/line';\nimport type { IMark, IMarkProgressiveConfig } from '../../mark/interface';\nimport { AttributeLevel, ChartEvent, POLAR_START_RADIAN } from '../../constant';\nimport { DEFAULT_LINEAR_INTERPOLATE } from '../../typings/interpolate';\nimport type { Datum, IPoint, IPolarPoint } from '../../typings';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport { degreeToRadian, isArray, mixin, isValid } from '@visactor/vutils';\nimport type { IRadarSeriesSpec } from './interface';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport type { IRadarAnimationParams, RadarAppearPreset } from './animation';\nimport { registerRadarAnimation } from './animation';\nimport { RoseLikeSeries } from '../polar/rose-like';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport type { IAreaMark } from '../../mark/area';\nimport { registerAreaMark } from '../../mark/area';\nimport { registerLineMark } from '../../mark/line';\nimport { registerSymbolMark } from '../../mark/symbol';\nimport { radarSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport { registerMarkOverlapTransform } from '@visactor/vgrammar-core';\nimport { LineLikeSeriesSpecTransformer } from '../mixin/line-mixin-transformer';\n\nexport interface RadarSeries<T extends IRadarSeriesSpec>\n  extends Pick<\n      LineLikeSeriesMixin,\n      | 'initLineMark'\n      | 'initSymbolMark'\n      | 'initLabelMarkStyle'\n      | 'initLineMarkStyle'\n      | 'initSymbolMarkStyle'\n      | 'encodeDefined'\n      | '_lineMark'\n      | '_symbolMark'\n      | 'addOverlapCompile'\n    >,\n    RoseLikeSeries<T> {}\n\nexport class RadarSeries<T extends IRadarSeriesSpec = IRadarSeriesSpec> extends RoseLikeSeries<T> {\n  static readonly type: string = SeriesTypeEnum.radar;\n  type = SeriesTypeEnum.radar;\n\n  static readonly mark: SeriesMarkMap = radarSeriesMark;\n  static readonly transformerConstructor = LineLikeSeriesSpecTransformer as any;\n  readonly transformerConstructor = LineLikeSeriesSpecTransformer;\n\n  private _areaMark: ILineMark;\n  protected _sortDataByAxis: boolean = false;\n\n  initGroups() {\n    // do nothing\n  }\n\n  compile(): void {\n    super.compile();\n    this.addOverlapCompile();\n  }\n\n  initMark(): void {\n    const progressive = {\n      progressiveStep: this._spec.progressiveStep,\n      progressiveThreshold: this._spec.progressiveThreshold,\n      large: this._spec.large,\n      largeThreshold: this._spec.largeThreshold\n    };\n\n    const isAreaVisible = this._spec.area?.visible !== false && this._spec.area?.style?.visible !== false;\n    const seriesMark = this._spec.seriesMark ?? 'area';\n    this.initAreaMark(progressive, isAreaVisible && seriesMark === 'area');\n    this.initLineMark(progressive, seriesMark === 'line' || (seriesMark === 'area' && !isAreaVisible));\n    this.initSymbolMark(progressive, seriesMark === 'point');\n  }\n\n  initMarkStyle(): void {\n    this.initAreaMarkStyle();\n    this.initLineMarkStyle();\n    this.initSymbolMarkStyle();\n  }\n\n  initAreaMark(progressive: IMarkProgressiveConfig, isSeriesMark: boolean) {\n    this._areaMark = this._createMark(RadarSeries.mark.area, {\n      progressive,\n      isSeriesMark,\n      customShape: this._spec.area?.customShape,\n      stateSort: this._spec.area?.stateSort\n    }) as IAreaMark;\n  }\n\n  initAreaMarkStyle() {\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      this.setMarkStyle(\n        areaMark,\n        {\n          x: this.dataToPositionX.bind(this),\n          y: this.dataToPositionY.bind(this),\n          x1: (datum: Datum) => {\n            if (!datum || !this.angleAxisHelper || !this.radiusAxisHelper) {\n              return Number.NaN;\n            }\n            return this.valueToPosition(\n              this.getDatumPositionValues(datum, this._angleField),\n              this.getStack()\n                ? this.getDatumPositionValues(datum, this._innerRadiusField)\n                : this.radiusScale.domain()[0]\n            ).x;\n          },\n          y1: (datum: Datum) => {\n            if (!datum || !this.angleAxisHelper || !this.radiusAxisHelper) {\n              return Number.NaN;\n            }\n\n            const value = this.valueToPosition(\n              this.getDatumPositionValues(datum, this._angleField),\n              this.getStack()\n                ? this.getDatumPositionValues(datum, this._innerRadiusField)\n                : this.radiusScale.domain()[0]\n            ).y;\n            return value;\n          },\n          fill: this.getColorAttribute(),\n          curveType: DEFAULT_LINEAR_INTERPOLATE,\n          closePath: true\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n\n      if (this._invalidType !== 'zero') {\n        this.setMarkStyle(\n          areaMark,\n          {\n            defined: this._getInvalidDefined.bind(this),\n            connectedType: this._getInvalidConnectType()\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.event.on(ChartEvent.viewDataStatisticsUpdate, { filter: param => param.model === this }, () => {\n        this.encodeDefined(areaMark, 'defined');\n      });\n    }\n  }\n\n  protected initTooltip() {\n    super.initTooltip();\n    const { dimension, group, mark } = this._tooltipHelper.activeTriggerSet;\n    if (this._lineMark) {\n      dimension.add(this._lineMark);\n      group.add(this._lineMark);\n    }\n    if (this._areaMark) {\n      dimension.add(this._areaMark);\n      group.add(this._areaMark);\n    }\n    if (this._symbolMark) {\n      mark.add(this._symbolMark);\n      group.add(this._symbolMark);\n    }\n  }\n\n  initAnimation() {\n    const animationParams: IRadarAnimationParams = {\n      center: () => this.angleAxisHelper?.center(),\n      radius: () => {\n        const rect = this.getLayoutRect();\n        return Math.min(rect.width, rect.height);\n      },\n      startAngle: isValid(this._spec.startAngle) ? degreeToRadian(this._spec.startAngle) : POLAR_START_RADIAN,\n      pointToCoord: (point: IPoint) => this.angleAxisHelper?.pointToCoord(point),\n      coordToPoint: (coord: IPolarPoint) => this.angleAxisHelper.coordToPoint(coord)\n    };\n    const appearPreset = ((this._spec?.animationAppear as IStateAnimateSpec<RadarAppearPreset>)?.preset ??\n      'clipIn') as RadarAppearPreset;\n\n    if (appearPreset === 'clipIn') {\n      if (this._rootMark) {\n        this._rootMark.setAnimationConfig(\n          animationConfig(\n            Factory.getAnimationInKey('radarGroup')?.(animationParams, appearPreset),\n            userAnimationConfig(SeriesMarkNameEnum.group, this._spec, this._markAttributeContext)\n          )\n        );\n      }\n    }\n\n    // TODO: animationType\n    const markAnimationMap: [IMark, string][] = [\n      [this._areaMark, 'radar'],\n      [this._lineMark, 'radar'],\n      [this._symbolMark, 'radarSymbol']\n    ];\n\n    // 为 mark 添加动画\n    markAnimationMap.forEach(([mark, animation]) => {\n      if (isValid(mark)) {\n        const getAnimation = Factory.getAnimationInKey(animation);\n        mark.setAnimationConfig(\n          animationConfig(\n            getAnimation?.(animationParams, appearPreset),\n            userAnimationConfig(mark.name, this._spec, this._markAttributeContext)\n          )\n        );\n      }\n    });\n  }\n\n  getDefaultShapeType() {\n    return 'square';\n  }\n\n  getActiveMarks(): IMark[] {\n    return [this._areaMark, this._symbolMark, this._lineMark];\n  }\n\n  getSeriesStyle(datum: Datum) {\n    return (attribute: string) => {\n      let result = this._seriesMark?.getAttribute(attribute as any, datum) ?? undefined;\n      if (attribute === 'fill' && !result) {\n        attribute = 'stroke';\n        result = this._seriesMark?.getAttribute(attribute, datum) ?? undefined;\n      }\n      if (attribute === 'stroke' && isArray(result)) {\n        return result[0];\n      }\n      return result;\n    };\n  }\n}\n\nmixin(RadarSeries, LineLikeSeriesMixin);\n\nexport const registerRadarSeries = () => {\n  registerMarkOverlapTransform();\n  registerAreaMark();\n  registerLineMark();\n  registerSymbolMark();\n  registerRadarAnimation();\n  Factory.registerSeries(RadarSeries.type, RadarSeries);\n};\n"]}
+{"version":3,"sources":["../src/series/radar/radar.ts"],"names":[],"mappings":"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","file":"radar.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { LineLikeSeriesMixin } from '../mixin/line-mixin';\nimport type { ILineMark } from '../../mark/line';\nimport type { IMark, IMarkProgressiveConfig } from '../../mark/interface';\nimport { AttributeLevel, ChartEvent, POLAR_START_RADIAN } from '../../constant';\nimport { DEFAULT_LINEAR_INTERPOLATE } from '../../typings/interpolate';\nimport type { Datum, IPoint, IPolarPoint } from '../../typings';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport { degreeToRadian, isArray, mixin, isValid } from '@visactor/vutils';\nimport type { IRadarSeriesSpec } from './interface';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport type { IRadarAnimationParams, RadarAppearPreset } from './animation';\nimport { registerRadarAnimation } from './animation';\nimport { RoseLikeSeries } from '../polar/rose-like';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport type { IAreaMark } from '../../mark/area';\nimport { registerAreaMark } from '../../mark/area';\nimport { registerLineMark } from '../../mark/line';\nimport { registerSymbolMark } from '../../mark/symbol';\nimport { radarSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport { registerMarkOverlapTransform } from '@visactor/vgrammar-core';\nimport { LineLikeSeriesSpecTransformer } from '../mixin/line-mixin-transformer';\nimport { registerPolarBandAxis, registerPolarLinearAxis } from '../../component/axis/polar';\n\nexport interface RadarSeries<T extends IRadarSeriesSpec>\n  extends Pick<\n      LineLikeSeriesMixin,\n      | 'initLineMark'\n      | 'initSymbolMark'\n      | 'initLabelMarkStyle'\n      | 'initLineMarkStyle'\n      | 'initSymbolMarkStyle'\n      | 'encodeDefined'\n      | '_lineMark'\n      | '_symbolMark'\n      | 'addOverlapCompile'\n    >,\n    RoseLikeSeries<T> {}\n\nexport class RadarSeries<T extends IRadarSeriesSpec = IRadarSeriesSpec> extends RoseLikeSeries<T> {\n  static readonly type: string = SeriesTypeEnum.radar;\n  type = SeriesTypeEnum.radar;\n\n  static readonly mark: SeriesMarkMap = radarSeriesMark;\n  static readonly transformerConstructor = LineLikeSeriesSpecTransformer as any;\n  readonly transformerConstructor = LineLikeSeriesSpecTransformer;\n\n  private _areaMark: ILineMark;\n  protected _sortDataByAxis: boolean = false;\n\n  initGroups() {\n    // do nothing\n  }\n\n  compile(): void {\n    super.compile();\n    this.addOverlapCompile();\n  }\n\n  initMark(): void {\n    const progressive = {\n      progressiveStep: this._spec.progressiveStep,\n      progressiveThreshold: this._spec.progressiveThreshold,\n      large: this._spec.large,\n      largeThreshold: this._spec.largeThreshold\n    };\n\n    const isAreaVisible = this._spec.area?.visible !== false && this._spec.area?.style?.visible !== false;\n    const seriesMark = this._spec.seriesMark ?? 'area';\n    this.initAreaMark(progressive, isAreaVisible && seriesMark === 'area');\n    this.initLineMark(progressive, seriesMark === 'line' || (seriesMark === 'area' && !isAreaVisible));\n    this.initSymbolMark(progressive, seriesMark === 'point');\n  }\n\n  initMarkStyle(): void {\n    this.initAreaMarkStyle();\n    this.initLineMarkStyle();\n    this.initSymbolMarkStyle();\n  }\n\n  initAreaMark(progressive: IMarkProgressiveConfig, isSeriesMark: boolean) {\n    this._areaMark = this._createMark(RadarSeries.mark.area, {\n      progressive,\n      isSeriesMark,\n      customShape: this._spec.area?.customShape,\n      stateSort: this._spec.area?.stateSort\n    }) as IAreaMark;\n  }\n\n  initAreaMarkStyle() {\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      this.setMarkStyle(\n        areaMark,\n        {\n          x: this.dataToPositionX.bind(this),\n          y: this.dataToPositionY.bind(this),\n          x1: (datum: Datum) => {\n            if (!datum || !this.angleAxisHelper || !this.radiusAxisHelper) {\n              return Number.NaN;\n            }\n            return this.valueToPosition(\n              this.getDatumPositionValues(datum, this._angleField),\n              this.getStack()\n                ? this.getDatumPositionValues(datum, this._innerRadiusField)\n                : this.radiusScale.domain()[0]\n            ).x;\n          },\n          y1: (datum: Datum) => {\n            if (!datum || !this.angleAxisHelper || !this.radiusAxisHelper) {\n              return Number.NaN;\n            }\n\n            const value = this.valueToPosition(\n              this.getDatumPositionValues(datum, this._angleField),\n              this.getStack()\n                ? this.getDatumPositionValues(datum, this._innerRadiusField)\n                : this.radiusScale.domain()[0]\n            ).y;\n            return value;\n          },\n          fill: this.getColorAttribute(),\n          curveType: DEFAULT_LINEAR_INTERPOLATE,\n          closePath: true\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n\n      if (this._invalidType !== 'zero') {\n        this.setMarkStyle(\n          areaMark,\n          {\n            defined: this._getInvalidDefined.bind(this),\n            connectedType: this._getInvalidConnectType()\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.event.on(ChartEvent.viewDataStatisticsUpdate, { filter: param => param.model === this }, () => {\n        this.encodeDefined(areaMark, 'defined');\n      });\n    }\n  }\n\n  protected initTooltip() {\n    super.initTooltip();\n    const { dimension, group, mark } = this._tooltipHelper.activeTriggerSet;\n    if (this._lineMark) {\n      dimension.add(this._lineMark);\n      group.add(this._lineMark);\n    }\n    if (this._areaMark) {\n      dimension.add(this._areaMark);\n      group.add(this._areaMark);\n    }\n    if (this._symbolMark) {\n      mark.add(this._symbolMark);\n      group.add(this._symbolMark);\n    }\n  }\n\n  initAnimation() {\n    const animationParams: IRadarAnimationParams = {\n      center: () => this.angleAxisHelper?.center(),\n      radius: () => {\n        const rect = this.getLayoutRect();\n        return Math.min(rect.width, rect.height);\n      },\n      startAngle: isValid(this._spec.startAngle) ? degreeToRadian(this._spec.startAngle) : POLAR_START_RADIAN,\n      pointToCoord: (point: IPoint) => this.angleAxisHelper?.pointToCoord(point),\n      coordToPoint: (coord: IPolarPoint) => this.angleAxisHelper.coordToPoint(coord)\n    };\n    const appearPreset = ((this._spec?.animationAppear as IStateAnimateSpec<RadarAppearPreset>)?.preset ??\n      'clipIn') as RadarAppearPreset;\n\n    if (appearPreset === 'clipIn') {\n      if (this._rootMark) {\n        this._rootMark.setAnimationConfig(\n          animationConfig(\n            Factory.getAnimationInKey('radarGroup')?.(animationParams, appearPreset),\n            userAnimationConfig(SeriesMarkNameEnum.group, this._spec, this._markAttributeContext)\n          )\n        );\n      }\n    }\n\n    // TODO: animationType\n    const markAnimationMap: [IMark, string][] = [\n      [this._areaMark, 'radar'],\n      [this._lineMark, 'radar'],\n      [this._symbolMark, 'radarSymbol']\n    ];\n\n    // 为 mark 添加动画\n    markAnimationMap.forEach(([mark, animation]) => {\n      if (isValid(mark)) {\n        const getAnimation = Factory.getAnimationInKey(animation);\n        mark.setAnimationConfig(\n          animationConfig(\n            getAnimation?.(animationParams, appearPreset),\n            userAnimationConfig(mark.name, this._spec, this._markAttributeContext)\n          )\n        );\n      }\n    });\n  }\n\n  getDefaultShapeType() {\n    return 'square';\n  }\n\n  getActiveMarks(): IMark[] {\n    return [this._areaMark, this._symbolMark, this._lineMark];\n  }\n\n  getSeriesStyle(datum: Datum) {\n    return (attribute: string) => {\n      let result = this._seriesMark?.getAttribute(attribute as any, datum) ?? undefined;\n      if (attribute === 'fill' && !result) {\n        attribute = 'stroke';\n        result = this._seriesMark?.getAttribute(attribute, datum) ?? undefined;\n      }\n      if (attribute === 'stroke' && isArray(result)) {\n        return result[0];\n      }\n      return result;\n    };\n  }\n}\n\nmixin(RadarSeries, LineLikeSeriesMixin);\n\nexport const registerRadarSeries = () => {\n  Factory.registerSeries(RadarSeries.type, RadarSeries);\n  registerMarkOverlapTransform();\n  registerAreaMark();\n  registerLineMark();\n  registerSymbolMark();\n  registerRadarAnimation();\n  registerPolarBandAxis();\n  registerPolarLinearAxis();\n};\n"]}

package/cjs/series/range-area/range-area.d.ts

@@ -1,7 +1,6 @@
 import { AreaSeries } from '../area/area';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface/type';
-import type { Datum } from '../../typings';
 import type { IAreaSeriesSpec } from '../area/interface';
 export declare class RangeAreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends AreaSeries<T> {
     static readonly type: string;
@@ -12,6 +11,5 @@ export declare class RangeAreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec
     initAreaMarkStyle(): void;
     protected initTooltip(): void;
     protected _isFieldAllValid(): boolean;
-    protected _getInvalidDefined(datum: Datum): boolean;
 }
 export declare const registerRangeAreaSeries: () => void;

package/cjs/series/range-area/range-area.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerRangeAreaSeries = exports.RangeAreaSeries = void 0;
 
-const area_1 = require("../area/area"), type_1 = require("../interface/type"), area_2 = require("../../mark/area"), constant_1 = require("../../constant"), tooltip_helper_1 = require("./tooltip-helper"), constant_2 = require("./constant"), factory_1 = require("../../core/factory"), util_1 = require("../../util");
+const area_1 = require("../area/area"), type_1 = require("../interface/type"), area_2 = require("../../mark/area"), constant_1 = require("../../constant"), tooltip_helper_1 = require("./tooltip-helper"), constant_2 = require("./constant"), factory_1 = require("../../core/factory"), cartesian_1 = require("../../component/axis/cartesian");
 
 class RangeAreaSeries extends area_1.AreaSeries {
     constructor() {
@@ -53,17 +53,14 @@ class RangeAreaSeries extends area_1.AreaSeries {
         const viewStatistics = this.getViewDataStatistics(), fields = this.fieldY;
         return !!(viewStatistics && viewStatistics.latestData && fields.length) && fields.every((field => viewStatistics.latestData[field] && viewStatistics.latestData[field].allValid));
     }
-    _getInvalidDefined(datum) {
-        return !!super._getInvalidDefined(datum) && !(this._yAxisHelper && this._yAxisHelper.isContinuous && !(0, 
-        util_1.couldBeValidNumber)(datum[this._specYField[1]]));
-    }
 }
 
 exports.RangeAreaSeries = RangeAreaSeries, RangeAreaSeries.type = type_1.SeriesTypeEnum.rangeArea, 
 RangeAreaSeries.mark = constant_2.rangeAreaSeriesMark;
 
 const registerRangeAreaSeries = () => {
-    (0, area_2.registerAreaMark)(), factory_1.Factory.registerSeries(RangeAreaSeries.type, RangeAreaSeries);
+    (0, area_2.registerAreaMark)(), (0, cartesian_1.registerCartesianBandAxis)(), (0, 
+    cartesian_1.registerCartesianLinearAxis)(), factory_1.Factory.registerSeries(RangeAreaSeries.type, RangeAreaSeries);
 };
 
 exports.registerRangeAreaSeries = registerRangeAreaSeries;

package/cjs/series/range-area/range-area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/range-area/range-area.ts"],"names":[],"mappings":"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","file":"range-area.js","sourcesContent":["import { AreaSeries } from '../area/area';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesTypeEnum } from '../interface/type';\nimport type { IAreaMark } from '../../mark/area';\nimport { registerAreaMark } from '../../mark/area';\nimport { Direction } from '../../typings/space';\nimport type { Datum } from '../../typings';\nimport { AttributeLevel } from '../../constant';\nimport { RangeAreaSeriesTooltipHelper } from './tooltip-helper';\nimport type { IAreaSeriesSpec } from '../area/interface';\nimport { rangeAreaSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport { couldBeValidNumber } from '../../util';\n\nexport class RangeAreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends AreaSeries<T> {\n  static readonly type: string = SeriesTypeEnum.rangeArea;\n  type = SeriesTypeEnum.rangeArea;\n\n  static readonly mark: SeriesMarkMap = rangeAreaSeriesMark;\n\n  initMark(): void {\n    const { customShape, stateSort } = this._spec.area ?? {};\n    this._areaMark = this._createMark(RangeAreaSeries.mark.area, {\n      defaultMorphElementKey: this.getDimensionField()[0],\n      groupKey: this._seriesField,\n      isSeriesMark: true,\n      customShape,\n      stateSort\n    }) as IAreaMark;\n  }\n\n  initMarkStyle(): void {\n    this.initAreaMarkStyle();\n  }\n\n  initAreaMarkStyle(): void {\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      super.initAreaMarkStyle();\n      if (this._direction === Direction.horizontal) {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x1: (datum: Datum) => {\n              if (!this._xAxisHelper) {\n                return Number.NaN;\n              }\n              const { dataToPosition } = this._xAxisHelper;\n              return dataToPosition(this.getDatumPositionValues(datum, this._spec.xField[1]), {\n                bandPosition: this._bandPosition\n              });\n            }\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      } else {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            y1: (datum: Datum) => {\n              if (!this._yAxisHelper) {\n                return Number.NaN;\n              }\n              const { dataToPosition } = this._yAxisHelper;\n              return dataToPosition(this.getDatumPositionValues(datum, this._spec.yField[1]), {\n                bandPosition: this._bandPosition\n              });\n            }\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n\n      this.setMarkStyle(areaMark, { stroke: false }, 'normal', AttributeLevel.Series);\n    }\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new RangeAreaSeriesTooltipHelper(this);\n    this._areaMark && this._tooltipHelper.activeTriggerSet.dimension.add(this._areaMark);\n  }\n\n  protected _isFieldAllValid() {\n    const viewStatistics = this.getViewDataStatistics();\n    const fields = this.fieldY;\n    if (viewStatistics && viewStatistics.latestData && fields.length) {\n      return fields.every(field => viewStatistics.latestData[field] && viewStatistics.latestData[field].allValid);\n    }\n    return false;\n  }\n\n  protected _getInvalidDefined(datum: Datum) {\n    if (!super._getInvalidDefined(datum)) {\n      return false;\n    }\n\n    if (this._yAxisHelper && this._yAxisHelper.isContinuous) {\n      if (!couldBeValidNumber(datum[this._specYField[1]])) {\n        return false;\n      }\n    }\n    return true;\n  }\n}\n\nexport const registerRangeAreaSeries = () => {\n  registerAreaMark();\n  Factory.registerSeries(RangeAreaSeries.type, RangeAreaSeries);\n};\n"]}
+{"version":3,"sources":["../src/series/range-area/range-area.ts"],"names":[],"mappings":"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","file":"range-area.js","sourcesContent":["import { AreaSeries } from '../area/area';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesTypeEnum } from '../interface/type';\nimport type { IAreaMark } from '../../mark/area';\nimport { registerAreaMark } from '../../mark/area';\nimport { Direction } from '../../typings/space';\nimport type { Datum } from '../../typings';\nimport { AttributeLevel } from '../../constant';\nimport { RangeAreaSeriesTooltipHelper } from './tooltip-helper';\nimport type { IAreaSeriesSpec } from '../area/interface';\nimport { rangeAreaSeriesMark } from './constant';\nimport { Factory } from '../../core/factory';\nimport { couldBeValidNumber } from '../../util';\nimport { registerCartesianLinearAxis, registerCartesianBandAxis } from '../../component/axis/cartesian';\n\nexport class RangeAreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends AreaSeries<T> {\n  static readonly type: string = SeriesTypeEnum.rangeArea;\n  type = SeriesTypeEnum.rangeArea;\n\n  static readonly mark: SeriesMarkMap = rangeAreaSeriesMark;\n\n  initMark(): void {\n    const { customShape, stateSort } = this._spec.area ?? {};\n    this._areaMark = this._createMark(RangeAreaSeries.mark.area, {\n      defaultMorphElementKey: this.getDimensionField()[0],\n      groupKey: this._seriesField,\n      isSeriesMark: true,\n      customShape,\n      stateSort\n    }) as IAreaMark;\n  }\n\n  initMarkStyle(): void {\n    this.initAreaMarkStyle();\n  }\n\n  initAreaMarkStyle(): void {\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      super.initAreaMarkStyle();\n      if (this._direction === Direction.horizontal) {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x1: (datum: Datum) => {\n              if (!this._xAxisHelper) {\n                return Number.NaN;\n              }\n              const { dataToPosition } = this._xAxisHelper;\n              return dataToPosition(this.getDatumPositionValues(datum, this._spec.xField[1]), {\n                bandPosition: this._bandPosition\n              });\n            }\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      } else {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            y1: (datum: Datum) => {\n              if (!this._yAxisHelper) {\n                return Number.NaN;\n              }\n              const { dataToPosition } = this._yAxisHelper;\n              return dataToPosition(this.getDatumPositionValues(datum, this._spec.yField[1]), {\n                bandPosition: this._bandPosition\n              });\n            }\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n\n      this.setMarkStyle(areaMark, { stroke: false }, 'normal', AttributeLevel.Series);\n    }\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new RangeAreaSeriesTooltipHelper(this);\n    this._areaMark && this._tooltipHelper.activeTriggerSet.dimension.add(this._areaMark);\n  }\n\n  protected _isFieldAllValid() {\n    const viewStatistics = this.getViewDataStatistics();\n    const fields = this.fieldY;\n    if (viewStatistics && viewStatistics.latestData && fields.length) {\n      return fields.every(field => viewStatistics.latestData[field] && viewStatistics.latestData[field].allValid);\n    }\n    return false;\n  }\n}\n\nexport const registerRangeAreaSeries = () => {\n  registerAreaMark();\n  registerCartesianBandAxis();\n  registerCartesianLinearAxis();\n  Factory.registerSeries(RangeAreaSeries.type, RangeAreaSeries);\n};\n"]}

package/cjs/series/range-area/tooltip-helper.js

@@ -16,16 +16,16 @@ class RangeAreaSeriesTooltipHelper extends tooltip_helper_1.BaseSeriesTooltipHel
                 activeType: activeType,
                 title: {
                     key: void 0,
-                    value: this.titleValueCallback,
+                    value: this.dimensionTooltipTitleCallback,
                     hasShape: !1
                 },
                 content: [ {
-                    key: this.contentKeyCallback,
-                    value: this.contentValueCallback,
+                    key: this.markTooltipKeyCallback,
+                    value: this.markTooltipValueCallback,
                     hasShape: !0,
-                    shapeType: this.contentShapeTypeCallback,
-                    shapeColor: this.contentShapeColorCallback,
-                    shapeStroke: this.contentShapeColorCallback,
+                    shapeType: this.shapeTypeCallback,
+                    shapeColor: this.shapeColorCallback,
+                    shapeStroke: this.shapeStrokeCallback,
                     shapeHollow: !1
                 } ]
             };
@@ -40,12 +40,12 @@ class RangeAreaSeriesTooltipHelper extends tooltip_helper_1.BaseSeriesTooltipHel
                 return dimensionInfo.forEach((({data: data}) => data.forEach((({series: series}) => {
                     "rangeArea" === series.type && content.push({
                         seriesId: series.id,
-                        key: this.contentKeyCallback,
+                        key: this.markTooltipKeyCallback,
                         value: datum => "horizontal" === this.series.getSpec().direction ? datum[this.series.getSpec().xField[0]] + "-" + datum[this.series.getSpec().xField[1]] : datum[this.series.getSpec().yField[0]] + "-" + datum[this.series.getSpec().yField[1]],
                         hasShape: !0,
-                        shapeType: this.contentShapeTypeCallback,
-                        shapeColor: this.contentShapeColorCallback,
-                        shapeStroke: this.contentShapeColorCallback,
+                        shapeType: this.shapeTypeCallback,
+                        shapeColor: this.shapeColorCallback,
+                        shapeStroke: this.shapeStrokeCallback,
                         shapeHollow: !1
                     });
                 })))), {

package/cjs/series/range-area/tooltip-helper.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/range-area/tooltip-helper.ts"],"names":[],"mappings":";;;AACA,2DAAiE;AAMjE,MAAa,4BAA6B,SAAQ,wCAAuB;IAEvE,wBAAwB,CAAC,UAA6B,EAAE,aAAgC;QACtF,QAAQ,UAAU,EAAE;YAClB,KAAK,MAAM,CAAC;YACZ,KAAK,OAAO;gBACV,OAAO;oBACL,OAAO,EAAE,IAAI;oBACb,UAAU;oBACV,KAAK,EAAE;wBACL,GAAG,EAAE,SAAS;wBACd,KAAK,EAAE,IAAI,CAAC,kBAAkB;wBAC9B,QAAQ,EAAE,KAAK;qBAChB;oBACD,OAAO,EAAE;wBACP;4BACE,GAAG,EAAE,IAAI,CAAC,kBAAkB;4BAC5B,KAAK,EAAE,IAAI,CAAC,oBAAoB;4BAChC,QAAQ,EAAE,IAAI;4BACd,SAAS,EAAE,IAAI,CAAC,wBAAwB;4BACxC,UAAU,EAAE,IAAI,CAAC,yBAAyB;4BAC1C,WAAW,EAAE,IAAI,CAAC,yBAAyB;4BAC3C,WAAW,EAAE,KAAK;yBACnB;qBACF;iBACF,CAAC;YACJ,KAAK,WAAW;gBACd,IAAI,aAAa,EAAE;oBACjB,MAAM,KAAK,GAAwB;wBACjC,GAAG,EAAE,SAAS;wBACd,KAAK,EAAE,IAAI,CAAC,iBAAiB;wBAC7B,QAAQ,EAAE,KAAK;qBAChB,CAAC;oBACF,MAAM,OAAO,GAA0B,EAAE,CAAC;oBAC1C,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CACjC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAO,EAAE,EAAE;wBAC/B,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE;4BAC/B,OAAO,CAAC,IAAI,CAAC;gCACX,QAAQ,EAAE,MAAM,CAAC,EAAE;gCACnB,GAAG,EAAE,IAAI,CAAC,kBAAkB;gCAC5B,KAAK,EAAE,CAAC,KAAY,EAAE,EAAE;oCACtB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,SAAS,iBAAyB;wCAC7D,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;wCACvF,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;gCAC5F,CAAC;gCACD,QAAQ,EAAE,IAAI;gCACd,SAAS,EAAE,IAAI,CAAC,wBAAwB;gCACxC,UAAU,EAAE,IAAI,CAAC,yBAAyB;gCAC1C,WAAW,EAAE,IAAI,CAAC,yBAAyB;gCAC3C,WAAW,EAAE,KAAK;6BACnB,CAAC,CAAC;yBACJ;oBACH,CAAC,CAAC,CACH,CAAC;oBACF,OAAO;wBACL,OAAO,EAAE,IAAI;wBACb,UAAU;wBACV,KAAK;wBACL,OAAO;qBACR,CAAC;iBACH;gBACD,MAAM;SACT;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAjED,oEAiEC","file":"tooltip-helper.js","sourcesContent":["import type { ISeriesTooltipHelper } from '../interface';\nimport { BaseSeriesTooltipHelper } from '../base/tooltip-helper';\nimport type { Datum, ITooltipPattern, TooltipActiveType, ITooltipLinePattern } from '../../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport { Direction } from '../../typings/space';\nimport type { IDimensionInfo } from '../../event/events/dimension/interface';\n\nexport class RangeAreaSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {\n  /** 获取默认的tooltip pattern */\n  getDefaultTooltipPattern(activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]): ITooltipPattern | null {\n    switch (activeType) {\n      case 'mark':\n      case 'group':\n        return {\n          visible: true,\n          activeType,\n          title: {\n            key: undefined,\n            value: this.titleValueCallback,\n            hasShape: false\n          },\n          content: [\n            {\n              key: this.contentKeyCallback,\n              value: this.contentValueCallback,\n              hasShape: true,\n              shapeType: this.contentShapeTypeCallback,\n              shapeColor: this.contentShapeColorCallback,\n              shapeStroke: this.contentShapeColorCallback,\n              shapeHollow: false\n            }\n          ]\n        };\n      case 'dimension':\n        if (dimensionInfo) {\n          const title: ITooltipLinePattern = {\n            key: undefined,\n            value: this._getDimensionData,\n            hasShape: false\n          };\n          const content: ITooltipLinePattern[] = [];\n          dimensionInfo.forEach(({ data }) =>\n            data.forEach(({ series }: any) => {\n              if (series.type === 'rangeArea') {\n                content.push({\n                  seriesId: series.id,\n                  key: this.contentKeyCallback,\n                  value: (datum: Datum) => {\n                    return this.series.getSpec().direction === Direction.horizontal\n                      ? datum[this.series.getSpec().xField[0]] + '-' + datum[this.series.getSpec().xField[1]]\n                      : datum[this.series.getSpec().yField[0]] + '-' + datum[this.series.getSpec().yField[1]];\n                  },\n                  hasShape: true,\n                  shapeType: this.contentShapeTypeCallback,\n                  shapeColor: this.contentShapeColorCallback,\n                  shapeStroke: this.contentShapeColorCallback,\n                  shapeHollow: false\n                });\n              }\n            })\n          );\n          return {\n            visible: true,\n            activeType,\n            title,\n            content\n          };\n        }\n        break;\n    }\n    return null;\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/range-area/tooltip-helper.ts"],"names":[],"mappings":";;;AACA,2DAAiE;AAMjE,MAAa,4BAA6B,SAAQ,wCAAuB;IAEvE,wBAAwB,CAAC,UAA6B,EAAE,aAAgC;QACtF,QAAQ,UAAU,EAAE;YAClB,KAAK,MAAM,CAAC;YACZ,KAAK,OAAO;gBACV,OAAO;oBACL,OAAO,EAAE,IAAI;oBACb,UAAU;oBACV,KAAK,EAAE;wBACL,GAAG,EAAE,SAAS;wBACd,KAAK,EAAE,IAAI,CAAC,6BAA6B;wBACzC,QAAQ,EAAE,KAAK;qBAChB;oBACD,OAAO,EAAE;wBACP;4BACE,GAAG,EAAE,IAAI,CAAC,sBAAsB;4BAChC,KAAK,EAAE,IAAI,CAAC,wBAAwB;4BACpC,QAAQ,EAAE,IAAI;4BACd,SAAS,EAAE,IAAI,CAAC,iBAAiB;4BACjC,UAAU,EAAE,IAAI,CAAC,kBAAkB;4BACnC,WAAW,EAAE,IAAI,CAAC,mBAAmB;4BACrC,WAAW,EAAE,KAAK;yBACnB;qBACF;iBACF,CAAC;YACJ,KAAK,WAAW;gBACd,IAAI,aAAa,EAAE;oBACjB,MAAM,KAAK,GAAwB;wBACjC,GAAG,EAAE,SAAS;wBACd,KAAK,EAAE,IAAI,CAAC,iBAAiB;wBAC7B,QAAQ,EAAE,KAAK;qBAChB,CAAC;oBACF,MAAM,OAAO,GAA0B,EAAE,CAAC;oBAC1C,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CACjC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAO,EAAE,EAAE;wBAC/B,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE;4BAC/B,OAAO,CAAC,IAAI,CAAC;gCACX,QAAQ,EAAE,MAAM,CAAC,EAAE;gCACnB,GAAG,EAAE,IAAI,CAAC,sBAAsB;gCAChC,KAAK,EAAE,CAAC,KAAY,EAAE,EAAE;oCACtB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,SAAS,iBAAyB;wCAC7D,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;wCACvF,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;gCAC5F,CAAC;gCACD,QAAQ,EAAE,IAAI;gCACd,SAAS,EAAE,IAAI,CAAC,iBAAiB;gCACjC,UAAU,EAAE,IAAI,CAAC,kBAAkB;gCACnC,WAAW,EAAE,IAAI,CAAC,mBAAmB;gCACrC,WAAW,EAAE,KAAK;6BACnB,CAAC,CAAC;yBACJ;oBACH,CAAC,CAAC,CACH,CAAC;oBACF,OAAO;wBACL,OAAO,EAAE,IAAI;wBACb,UAAU;wBACV,KAAK;wBACL,OAAO;qBACR,CAAC;iBACH;gBACD,MAAM;SACT;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAjED,oEAiEC","file":"tooltip-helper.js","sourcesContent":["import type { ISeriesTooltipHelper } from '../interface';\nimport { BaseSeriesTooltipHelper } from '../base/tooltip-helper';\nimport type { Datum, ITooltipPattern, TooltipActiveType, ITooltipLinePattern } from '../../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport { Direction } from '../../typings/space';\nimport type { IDimensionInfo } from '../../event/events/dimension/interface';\n\nexport class RangeAreaSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {\n  /** 获取默认的tooltip pattern */\n  getDefaultTooltipPattern(activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]): ITooltipPattern | null {\n    switch (activeType) {\n      case 'mark':\n      case 'group':\n        return {\n          visible: true,\n          activeType,\n          title: {\n            key: undefined,\n            value: this.dimensionTooltipTitleCallback,\n            hasShape: false\n          },\n          content: [\n            {\n              key: this.markTooltipKeyCallback,\n              value: this.markTooltipValueCallback,\n              hasShape: true,\n              shapeType: this.shapeTypeCallback,\n              shapeColor: this.shapeColorCallback,\n              shapeStroke: this.shapeStrokeCallback,\n              shapeHollow: false\n            }\n          ]\n        };\n      case 'dimension':\n        if (dimensionInfo) {\n          const title: ITooltipLinePattern = {\n            key: undefined,\n            value: this._getDimensionData,\n            hasShape: false\n          };\n          const content: ITooltipLinePattern[] = [];\n          dimensionInfo.forEach(({ data }) =>\n            data.forEach(({ series }: any) => {\n              if (series.type === 'rangeArea') {\n                content.push({\n                  seriesId: series.id,\n                  key: this.markTooltipKeyCallback,\n                  value: (datum: Datum) => {\n                    return this.series.getSpec().direction === Direction.horizontal\n                      ? datum[this.series.getSpec().xField[0]] + '-' + datum[this.series.getSpec().xField[1]]\n                      : datum[this.series.getSpec().yField[0]] + '-' + datum[this.series.getSpec().yField[1]];\n                  },\n                  hasShape: true,\n                  shapeType: this.shapeTypeCallback,\n                  shapeColor: this.shapeColorCallback,\n                  shapeStroke: this.shapeStrokeCallback,\n                  shapeHollow: false\n                });\n              }\n            })\n          );\n          return {\n            visible: true,\n            activeType,\n            title,\n            content\n          };\n        }\n        break;\n    }\n    return null;\n  }\n}\n"]}

package/cjs/series/range-column/3d/range-column-3d.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerRangeColumn3dSeries = exports.RangeColumn3dSeries = exports.DefaultBandWidth = void 0;
 
-const type_1 = require("../../interface/type"), range_column_1 = require("../range-column"), rect_3d_1 = require("../../../mark/rect-3d"), constant_1 = require("../constant"), factory_1 = require("../../../core/factory");
+const type_1 = require("../../interface/type"), range_column_1 = require("../range-column"), rect_3d_1 = require("../../../mark/rect-3d"), constant_1 = require("../constant"), factory_1 = require("../../../core/factory"), cartesian_1 = require("../../../component/axis/cartesian");
 
 exports.DefaultBandWidth = 6;
 
@@ -19,7 +19,8 @@ exports.RangeColumn3dSeries = RangeColumn3dSeries, RangeColumn3dSeries.type = ty
 RangeColumn3dSeries.mark = constant_1.rangeColumn3dSeriesMark;
 
 const registerRangeColumn3dSeries = () => {
-    (0, rect_3d_1.registerRect3dMark)(), factory_1.Factory.registerSeries(RangeColumn3dSeries.type, RangeColumn3dSeries);
+    (0, rect_3d_1.registerRect3dMark)(), (0, cartesian_1.registerCartesianBandAxis)(), 
+    (0, cartesian_1.registerCartesianLinearAxis)(), factory_1.Factory.registerSeries(RangeColumn3dSeries.type, RangeColumn3dSeries);
 };
 
 exports.registerRangeColumn3dSeries = registerRangeColumn3dSeries;

package/cjs/series/range-column/3d/range-column-3d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/range-column/3d/range-column-3d.ts"],"names":[],"mappings":";;;AAEA,+CAAsD;AACtD,kDAAoD;AACpD,mDAA2D;AAG3D,0CAAsD;AACtD,mDAAgD;AAEnC,QAAA,gBAAgB,GAAG,CAAC,CAAC;AAElC,MAAa,mBAEX,SAAQ,gCAA0C;IAFpD;;QAIE,SAAI,GAAG,qBAAc,CAAC,aAAa,CAAC;QAC1B,iBAAY,YAAqC;QACjD,aAAQ,GAAW,qBAAc,CAAC,KAAK,CAAC;IAEpD,CAAC;;AARD,kDAQC;AALiB,wBAAI,GAAW,qBAAc,CAAC,aAAa,CAAC;AAI5C,wBAAI,GAAkB,kCAAuB,CAAC;AAGzD,MAAM,2BAA2B,GAAG,GAAG,EAAE;IAC9C,IAAA,4BAAkB,GAAE,CAAC;IACrB,iBAAO,CAAC,cAAc,CAAC,mBAAmB,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;AACxE,CAAC,CAAC;AAHW,QAAA,2BAA2B,+BAGtC","file":"range-column-3d.js","sourcesContent":["import { MarkTypeEnum } from '../../../mark/interface/type';\nimport type { SeriesMarkMap } from '../../interface';\nimport { SeriesTypeEnum } from '../../interface/type';\nimport { RangeColumnSeries } from '../range-column';\nimport { registerRect3dMark } from '../../../mark/rect-3d';\nimport type { AdaptiveSpec } from '../../../typings';\nimport type { IRangeColumn3dSeriesSpec } from '../interface';\nimport { rangeColumn3dSeriesMark } from '../constant';\nimport { Factory } from '../../../core/factory';\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\n\nexport class RangeColumn3dSeries<\n  T extends IRangeColumn3dSeriesSpec = IRangeColumn3dSeriesSpec\n> extends RangeColumnSeries<AdaptiveSpec<T, 'type'>> {\n  static readonly type: string = SeriesTypeEnum.rangeColumn3d;\n  type = SeriesTypeEnum.rangeColumn3d;\n  protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect3d;\n  protected _barName: string = SeriesTypeEnum.bar3d;\n  static readonly mark: SeriesMarkMap = rangeColumn3dSeriesMark;\n}\n\nexport const registerRangeColumn3dSeries = () => {\n  registerRect3dMark();\n  Factory.registerSeries(RangeColumn3dSeries.type, RangeColumn3dSeries);\n};\n"]}
+{"version":3,"sources":["../src/series/range-column/3d/range-column-3d.ts"],"names":[],"mappings":";;;AAEA,+CAAsD;AACtD,kDAAoD;AACpD,mDAA2D;AAG3D,0CAAsD;AACtD,mDAAgD;AAChD,iEAA2G;AAE9F,QAAA,gBAAgB,GAAG,CAAC,CAAC;AAElC,MAAa,mBAEX,SAAQ,gCAA0C;IAFpD;;QAIE,SAAI,GAAG,qBAAc,CAAC,aAAa,CAAC;QAC1B,iBAAY,YAAqC;QACjD,aAAQ,GAAW,qBAAc,CAAC,KAAK,CAAC;IAEpD,CAAC;;AARD,kDAQC;AALiB,wBAAI,GAAW,qBAAc,CAAC,aAAa,CAAC;AAI5C,wBAAI,GAAkB,kCAAuB,CAAC;AAGzD,MAAM,2BAA2B,GAAG,GAAG,EAAE;IAC9C,IAAA,4BAAkB,GAAE,CAAC;IACrB,IAAA,qCAAyB,GAAE,CAAC;IAC5B,IAAA,uCAA2B,GAAE,CAAC;IAC9B,iBAAO,CAAC,cAAc,CAAC,mBAAmB,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;AACxE,CAAC,CAAC;AALW,QAAA,2BAA2B,+BAKtC","file":"range-column-3d.js","sourcesContent":["import { MarkTypeEnum } from '../../../mark/interface/type';\nimport type { SeriesMarkMap } from '../../interface';\nimport { SeriesTypeEnum } from '../../interface/type';\nimport { RangeColumnSeries } from '../range-column';\nimport { registerRect3dMark } from '../../../mark/rect-3d';\nimport type { AdaptiveSpec } from '../../../typings';\nimport type { IRangeColumn3dSeriesSpec } from '../interface';\nimport { rangeColumn3dSeriesMark } from '../constant';\nimport { Factory } from '../../../core/factory';\nimport { registerCartesianLinearAxis, registerCartesianBandAxis } from '../../../component/axis/cartesian';\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\n\nexport class RangeColumn3dSeries<\n  T extends IRangeColumn3dSeriesSpec = IRangeColumn3dSeriesSpec\n> extends RangeColumnSeries<AdaptiveSpec<T, 'type'>> {\n  static readonly type: string = SeriesTypeEnum.rangeColumn3d;\n  type = SeriesTypeEnum.rangeColumn3d;\n  protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect3d;\n  protected _barName: string = SeriesTypeEnum.bar3d;\n  static readonly mark: SeriesMarkMap = rangeColumn3dSeriesMark;\n}\n\nexport const registerRangeColumn3dSeries = () => {\n  registerRect3dMark();\n  registerCartesianBandAxis();\n  registerCartesianLinearAxis();\n  Factory.registerSeries(RangeColumn3dSeries.type, RangeColumn3dSeries);\n};\n"]}

package/cjs/series/range-column/range-column.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerRangeColumnSeries = exports.RangeColumnSeries = exports.DefaultBandWidth = void 0;
 
-const bar_1 = require("../bar/bar"), type_1 = require("../interface/type"), rect_1 = require("../../mark/rect"), text_1 = require("../../mark/text"), label_mark_1 = require("../util/label-mark"), utils_1 = require("../../animation/utils"), tooltip_helper_1 = require("./tooltip-helper"), config_1 = require("../../animation/config"), animation_1 = require("./animation"), constant_1 = require("./constant"), factory_1 = require("../../core/factory"), utils_2 = require("../util/utils"), range_column_transformer_1 = require("./range-column-transformer");
+const bar_1 = require("../bar/bar"), type_1 = require("../interface/type"), rect_1 = require("../../mark/rect"), text_1 = require("../../mark/text"), label_mark_1 = require("../util/label-mark"), utils_1 = require("../../animation/utils"), tooltip_helper_1 = require("./tooltip-helper"), config_1 = require("../../animation/config"), animation_1 = require("./animation"), constant_1 = require("./constant"), factory_1 = require("../../core/factory"), utils_2 = require("../util/utils"), range_column_transformer_1 = require("./range-column-transformer"), cartesian_1 = require("../../component/axis/cartesian");
 
 exports.DefaultBandWidth = 6;
 
@@ -113,7 +113,8 @@ RangeColumnSeries.mark = constant_1.rangeColumnSeriesMark, RangeColumnSeries.tra
 
 const registerRangeColumnSeries = () => {
     (0, rect_1.registerRectMark)(), (0, text_1.registerTextMark)(), (0, animation_1.registerRangeColumnAnimation)(), 
-    (0, config_1.registerFadeInOutAnimation)(), factory_1.Factory.registerSeries(RangeColumnSeries.type, RangeColumnSeries);
+    (0, config_1.registerFadeInOutAnimation)(), (0, cartesian_1.registerCartesianBandAxis)(), 
+    (0, cartesian_1.registerCartesianLinearAxis)(), factory_1.Factory.registerSeries(RangeColumnSeries.type, RangeColumnSeries);
 };
 
 exports.registerRangeColumnSeries = registerRangeColumnSeries;