@visactor/vchart 1.3.0-beta.8 → 1.3.0

package/cjs/series/polar/polar.d.ts

@@ -32,6 +32,8 @@ export declare abstract class PolarSeries<T extends IPolarSeriesSpec = IPolarSer
     private _radiusAxisHelper;
     get radiusAxisHelper(): IPolarAxisHelper;
     set radiusAxisHelper(h: IPolarAxisHelper);
+    protected _sortDataByAxis: boolean;
+    get sortDataByAxis(): boolean;
     protected _buildMarkAttributeContext(): void;
     valueToPosition(angleValue: StringOrNumber | StringOrNumber[], radiusValue: StringOrNumber | StringOrNumber[]): IPoint;
     dataToPosition(datum: Datum): IPoint;
@@ -60,4 +62,6 @@ export declare abstract class PolarSeries<T extends IPolarSeriesSpec = IPolarSer
     afterInitMark(): void;
     protected _computeLayoutRadius(): number;
     setValueFieldToStackOffsetSilhouette(): void;
+    fillData(): void;
+    _sortDataInAxisDomain(): void;
 }

package/cjs/series/polar/polar.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.PolarSeries = void 0;
 
-const util_1 = require("../../util"), vscale_1 = require("@visactor/vscale"), polar_1 = require("../../constant/polar"), base_series_1 = require("../base/base-series");
+const util_1 = require("../../util"), vscale_1 = require("@visactor/vscale"), polar_1 = require("../../constant/polar"), base_series_1 = require("../base/base-series"), utils_1 = require("../util/utils");
 
 class PolarSeries extends base_series_1.BaseSeries {
     constructor() {
         super(...arguments), this.coordinate = "polar", this._outerRadius = polar_1.POLAR_DEFAULT_RADIUS, 
-        this._innerRadius = 0, this._angleField = [], this._radiusField = [];
+        this._innerRadius = 0, this._angleField = [], this._radiusField = [], this._sortDataByAxis = !1;
     }
     get outerRadius() {
         return this._outerRadius;
@@ -59,6 +59,9 @@ class PolarSeries extends base_series_1.BaseSeries {
     set radiusAxisHelper(h) {
         this._radiusAxisHelper = h, this.onRadiusAxisHelperUpdate();
     }
+    get sortDataByAxis() {
+        return this._sortDataByAxis;
+    }
     _buildMarkAttributeContext() {
         super._buildMarkAttributeContext(), this._markAttributeContext.valueToPosition = this.valueToPosition.bind(this), 
         this._markAttributeContext.getCenter = () => this.angleAxisHelper.center();
@@ -122,7 +125,8 @@ class PolarSeries extends base_series_1.BaseSeries {
     setAttrFromSpec() {
         super.setAttrFromSpec(), (0, util_1.isValid)(this._spec.outerRadius) && (this._outerRadius = this._spec.outerRadius), 
         (0, util_1.isValid)(this._spec.radius) && (this._outerRadius = this._spec.radius), 
-        (0, util_1.isValid)(this._spec.innerRadius) && (this._innerRadius = this._spec.innerRadius);
+        (0, util_1.isValid)(this._spec.innerRadius) && (this._innerRadius = this._spec.innerRadius), 
+        (0, util_1.isValid)(this._spec.sortDataByAxis) && (this._sortDataByAxis = !0 === this._spec.sortDataByAxis);
     }
     updateSpec(spec) {
         const originalSpec = this._originalSpec, {angleField: angleField, radiusField: radiusField} = originalSpec, result = super.updateSpec(spec);
@@ -143,6 +147,14 @@ class PolarSeries extends base_series_1.BaseSeries {
         return Math.min(width / 2, height / 2);
     }
     setValueFieldToStackOffsetSilhouette() {}
+    fillData() {
+        super.fillData(), this.sortDataByAxis && 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);
+    }
 }
 
 exports.PolarSeries = PolarSeries;

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/polar/polar.ts"],"names":[],"mappings":";;;AAGA,qCAAmE;AAGnE,6CAAgD;AAChD,gDAA4D;AAC5D,qDAAiD;AAIjD,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;IAyLxC,CAAC;IA3MC,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,cAAO,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,YAAK,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,cAAO,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,YAAK,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAGD,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IACD,mBAAmB,CAAC,CAAoB;QACtC,IAAI,CAAC,iBAAiB,GAAG,IAAA,YAAK,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;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;YAC1C,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;QACvC,CAAC,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,UAA6C,EAAE,WAA8C;QAC3G,IAAI,IAAA,YAAK,EAAC,UAAU,CAAC,IAAI,IAAA,YAAK,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,YAAK,EAAC,UAAU,CAAC,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,IAAA,YAAK,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;QACzB,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC7D,OAAO,EAAE,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC;SACzC;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,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,eAAe,CAAC,KAAY;QAC1B,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACtC,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;IAES,wBAAwB,CAAC,SAAc;QAC/C,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;QAC/C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAgB,CAAC;IACpD,CAAC;IAED,eAAe;QACb,KAAK,CAAC,eAAe,EAAE,CAAC;QACxB,IAAI,IAAA,cAAO,EAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YACnC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;SAC5C;QACD,IAAI,IAAA,cAAO,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YAE9B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;SACvC;QACD,IAAI,IAAA,cAAO,EAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YACnC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;SAC5C;IACH,CAAC;IAED,UAAU,CAAC,IAAS;QAClB,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC;QACjD,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,IAAA,qBAAc,EAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,IAAA,qBAAc,EAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE;YAClG,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;YACrB,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;YACvB,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;SACtB;QACD,OAAO,MAAM,CAAC;IAChB,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;QACtB,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;IAC1E,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;IAED,oCAAoC;IAEpC,CAAC;CACF;AAlND,kCAkNC","file":"polar.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\nimport type { IPoint, IPolarPoint } from '../../typings/coordinate';\nimport type { IPolarSeries } from '../interface';\nimport { array, shallowCompare, isValid, isNil } from '../../util';\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';\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 _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 _buildMarkAttributeContext() {\n    super._buildMarkAttributeContext();\n    // position\n    this._markAttributeContext.valueToPosition = this.valueToPosition.bind(this);\n    this._markAttributeContext.getCenter = () => {\n      return this.angleAxisHelper.center();\n    };\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): IPoint {\n    if (!datum || !this.angleAxisHelper || !this.radiusAxisHelper) {\n      return { x: Number.NaN, y: Number.NaN };\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  protected _getDefaultSpecFromChart(chartSpec: any) {\n    const { outerRadius, innerRadius } = chartSpec;\n    return { outerRadius, innerRadius } as Partial<T>;\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\n  updateSpec(spec: any) {\n    const originalSpec = this._originalSpec;\n    const { angleField, radiusField } = originalSpec;\n    const result = super.updateSpec(spec);\n    if (!shallowCompare(spec.angleField, angleField) || !shallowCompare(spec.radiusField, radiusField)) {\n      result.change = true;\n      result.reRender = true;\n      result.reMake = true;\n    }\n    return result;\n  }\n\n  onRadiusAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n  onAngleAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n\n  afterInitMark(): void {\n    super.afterInitMark();\n    this._trigger.setStateKeys([...this._angleField, ...this._radiusField]);\n  }\n\n  protected _computeLayoutRadius() {\n    const { width, height } = this._region.getLayoutRect();\n    return Math.min(width / 2, height / 2);\n  }\n\n  setValueFieldToStackOffsetSilhouette(): void {\n    // do nothing\n  }\n}\n"]}
+{"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, shallowCompare, isValid, isNil } from '../../util';\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 _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 = () => {\n      return this.angleAxisHelper.center();\n    };\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): IPoint {\n    if (!datum || !this.angleAxisHelper || !this.radiusAxisHelper) {\n      return { x: Number.NaN, y: Number.NaN };\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  protected _getDefaultSpecFromChart(chartSpec: any) {\n    const { outerRadius, innerRadius } = chartSpec;\n    return { outerRadius, innerRadius } as Partial<T>;\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  updateSpec(spec: any) {\n    const originalSpec = this._originalSpec;\n    const { angleField, radiusField } = originalSpec;\n    const result = super.updateSpec(spec);\n    if (!shallowCompare(spec.angleField, angleField) || !shallowCompare(spec.radiusField, radiusField)) {\n      result.change = true;\n      result.reRender = true;\n      result.reMake = true;\n    }\n    return result;\n  }\n\n  onRadiusAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n  onAngleAxisHelperUpdate(): void {\n    this.onMarkPositionUpdate();\n  }\n\n  afterInitMark(): void {\n    super.afterInitMark();\n    this._trigger.setStateKeys([...this._angleField, ...this._radiusField]);\n  }\n\n  protected _computeLayoutRadius() {\n    const { width, height } = this._region.getLayoutRect();\n    return Math.min(width / 2, height / 2);\n  }\n\n  setValueFieldToStackOffsetSilhouette(): void {\n    // do nothing\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"]}

package/cjs/series/radar/radar.d.ts

@@ -13,6 +13,7 @@ export declare class RadarSeries<T extends IRadarSeriesSpec = IRadarSeriesSpec>
     static readonly mark: SeriesMarkMap;
     protected _theme: Maybe<IRadarSeriesTheme>;
     private _areaMark;
+    protected _sortDataByAxis: boolean;
     initGroups(): void;
     initMark(): void;
     initMarkStyle(): void;

package/cjs/series/radar/radar.js

@@ -10,7 +10,7 @@ vchart_1.VChart.useMark([ area_1.AreaMark, line_1.LineMark, symbol_1.SymbolMark,
 
 class RadarSeries extends rose_like_1.RoseLikeSeries {
     constructor() {
-        super(...arguments), this.type = interface_1.SeriesTypeEnum.radar;
+        super(...arguments), this.type = interface_1.SeriesTypeEnum.radar, this._sortDataByAxis = !0;
     }
     initGroups() {}
     initMark() {

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

@@ -1 +1 @@
-{"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, POLAR_START_RADIAN } from '../../constant';\nimport { DEFAULT_LINEAR_CLOSED_INTERPOLATE } from '../../typings';\nimport type { Datum, IPoint, IPolarPoint, Maybe } from '../../typings';\nimport { isValid, radians } from '../../util';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface';\nimport { mixin } from '@visactor/vutils';\nimport type { IRadarSeriesSpec, IRadarSeriesTheme } from './interface';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { IRadarAnimationParams, RadarAppearPreset } from './animation';\nimport { RoseLikeSeries } from '../polar/rose-like';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport type { IAreaMark } from '../../mark/area';\nimport { VChart } from '../../core/vchart';\nimport { AreaMark } from '../../mark/area';\nimport { LineMark } from '../../mark/line';\nimport { SymbolMark } from '../../mark/symbol';\nimport { TextMark } from '../../mark/text';\nimport { radarSeriesMark } from './constant';\n\nVChart.useMark([AreaMark, LineMark, SymbolMark, TextMark]);\n\nexport interface RadarSeries<T extends IRadarSeriesSpec>\n  extends Pick<\n      LineLikeSeriesMixin,\n      | 'initLineMark'\n      | 'initSymbolMark'\n      | 'initLabelMarkStyle'\n      | 'initLineMarkStyle'\n      | 'initSymbolMarkStyle'\n      | '_lineMark'\n      | '_symbolMark'\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\n  protected declare _theme: Maybe<IRadarSeriesTheme>;\n\n  private _areaMark: ILineMark;\n\n  initGroups() {\n    // do nothing\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    }) 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._stack ? this.getDatumPositionValues(datum, this._innerRadiusField) : 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._stack ? this.getDatumPositionValues(datum, this._innerRadiusField) : this.radiusScale.domain()[0]\n            ).y;\n            return value;\n          },\n          fill: this.getColorAttribute(),\n          curveType: DEFAULT_LINEAR_CLOSED_INTERPOLATE\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      this._trigger.registerMark(areaMark);\n      this._tooltipHelper?.activeTriggerSet.dimension.add(areaMark);\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: radians(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            DEFAULT_MARK_ANIMATION.radarGroup(animationParams, appearPreset),\n            userAnimationConfig(SeriesMarkNameEnum.group, this._spec)\n          )\n        );\n      }\n    }\n\n    const markAnimationMap: [IMark, keyof typeof DEFAULT_MARK_ANIMATION][] = [\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 = DEFAULT_MARK_ANIMATION[animation];\n        mark.setAnimationConfig(\n          animationConfig(getAnimation(animationParams, appearPreset), userAnimationConfig(mark.name, this._spec))\n        );\n      }\n    });\n  }\n\n  getDefaultShapeType() {\n    return 'square';\n  }\n}\n\nmixin(RadarSeries, LineLikeSeriesMixin);\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, POLAR_START_RADIAN } from '../../constant';\nimport { DEFAULT_LINEAR_CLOSED_INTERPOLATE } from '../../typings';\nimport type { Datum, IPoint, IPolarPoint, Maybe } from '../../typings';\nimport { isValid, radians } from '../../util';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface';\nimport { mixin } from '@visactor/vutils';\nimport type { IRadarSeriesSpec, IRadarSeriesTheme } from './interface';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { IRadarAnimationParams, RadarAppearPreset } from './animation';\nimport { RoseLikeSeries } from '../polar/rose-like';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport type { IAreaMark } from '../../mark/area';\nimport { VChart } from '../../core/vchart';\nimport { AreaMark } from '../../mark/area';\nimport { LineMark } from '../../mark/line';\nimport { SymbolMark } from '../../mark/symbol';\nimport { TextMark } from '../../mark/text';\nimport { radarSeriesMark } from './constant';\n\nVChart.useMark([AreaMark, LineMark, SymbolMark, TextMark]);\n\nexport interface RadarSeries<T extends IRadarSeriesSpec>\n  extends Pick<\n      LineLikeSeriesMixin,\n      | 'initLineMark'\n      | 'initSymbolMark'\n      | 'initLabelMarkStyle'\n      | 'initLineMarkStyle'\n      | 'initSymbolMarkStyle'\n      | '_lineMark'\n      | '_symbolMark'\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\n  protected declare _theme: Maybe<IRadarSeriesTheme>;\n\n  private _areaMark: ILineMark;\n  protected _sortDataByAxis: boolean = true;\n\n  initGroups() {\n    // do nothing\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    }) 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._stack ? this.getDatumPositionValues(datum, this._innerRadiusField) : 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._stack ? this.getDatumPositionValues(datum, this._innerRadiusField) : this.radiusScale.domain()[0]\n            ).y;\n            return value;\n          },\n          fill: this.getColorAttribute(),\n          curveType: DEFAULT_LINEAR_CLOSED_INTERPOLATE\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      this._trigger.registerMark(areaMark);\n      this._tooltipHelper?.activeTriggerSet.dimension.add(areaMark);\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: radians(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            DEFAULT_MARK_ANIMATION.radarGroup(animationParams, appearPreset),\n            userAnimationConfig(SeriesMarkNameEnum.group, this._spec)\n          )\n        );\n      }\n    }\n\n    const markAnimationMap: [IMark, keyof typeof DEFAULT_MARK_ANIMATION][] = [\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 = DEFAULT_MARK_ANIMATION[animation];\n        mark.setAnimationConfig(\n          animationConfig(getAnimation(animationParams, appearPreset), userAnimationConfig(mark.name, this._spec))\n        );\n      }\n    });\n  }\n\n  getDefaultShapeType() {\n    return 'square';\n  }\n}\n\nmixin(RadarSeries, LineLikeSeriesMixin);\n"]}

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

@@ -1,3 +1,4 @@
+import type { DataView } from '@visactor/vdataset';
 import { AreaSeries } from '../area/area';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface';
@@ -9,4 +10,5 @@ export declare class RangeAreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec
     initMark(): void;
     initMarkStyle(): void;
     protected initTooltip(): void;
+    viewDataStatisticsUpdate(d: DataView): void;
 }

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

@@ -55,6 +55,9 @@ class RangeAreaSeries extends area_1.AreaSeries {
     initTooltip() {
         this._tooltipHelper = new tooltip_helper_1.RangeAreaSeriesTooltipHelper(this);
     }
+    viewDataStatisticsUpdate(d) {
+        super.viewDataStatisticsUpdate(d), this.encodeDefined(this._areaMark, "defined");
+    }
 }
 
 exports.RangeAreaSeries = RangeAreaSeries, RangeAreaSeries.type = interface_1.SeriesTypeEnum.rangeArea, 

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';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesTypeEnum } from '../interface';\nimport type { IAreaMark } from '../../mark/area';\nimport { DEFAULT_SMOOTH_INTERPOLATE } from '../../typings/interpolate';\nimport { Direction } from '../../typings/space';\nimport type { Datum } from '../../typings';\nimport { couldBeValidNumber } from '../../util';\nimport { AttributeLevel } from '../../constant';\nimport { RangeAreaSeriesTooltipHelper } from './tooltip-helper';\nimport type { IAreaSeriesSpec } from '../area/interface';\nimport { rangeAreaSeriesMark } from './constant';\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    // area\n    this._areaMark = this._createMark(RangeAreaSeries.mark.area, {\n      defaultMorphElementKey: this.getDimensionField()[0],\n      groupKey: this._seriesField,\n      isSeriesMark: true\n    }) as IAreaMark;\n  }\n\n  initMarkStyle(): void {\n    const userCurveType = this.getSpec().area?.style?.curveType ?? this.getSpec().line?.style?.curveType;\n    const curveType =\n      userCurveType === DEFAULT_SMOOTH_INTERPOLATE\n        ? this._direction === Direction.vertical\n          ? 'monotoneX'\n          : 'monotoneY'\n        : userCurveType;\n\n    // area\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      if (this._direction === Direction.vertical) {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            y1: (datum: Datum) => {\n              if (!this._yAxisHelper) {\n                return Number.NaN;\n              }\n              const { dataToPosition } = this._yAxisHelper;\n\n              return dataToPosition(this.getDatumPositionValues(datum, this._spec.yField[1]), {\n                bandPosition: this._bandPosition\n              });\n            },\n            y: this.dataToPositionY.bind(this)\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      } else {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            x1: (datum: Datum) => {\n              if (!this._xAxisHelper) {\n                return Number.NaN;\n              }\n              const { dataToPosition } = this._xAxisHelper;\n\n              return dataToPosition(this.getDatumPositionValues(datum, this._spec.xField[1]), {\n                bandPosition: this._bandPosition\n              });\n            },\n            y: this.dataToPositionY.bind(this),\n            orient: this._direction\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          fill: this.getColorAttribute(),\n          stroke: false\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      if (this._invalidType !== 'zero') {\n        this.setMarkStyle(\n          areaMark,\n          {\n            defined: this._getInvalidDefined,\n            connectedType: this._getInvalidConnectType()\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          curveType\n        },\n        'normal',\n        AttributeLevel.Built_In\n      );\n      this._trigger.registerMark(areaMark);\n      this._tooltipHelper.activeTriggerSet.dimension.add(areaMark);\n    }\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new RangeAreaSeriesTooltipHelper(this);\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/range-area/range-area.ts"],"names":[],"mappings":"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","file":"range-area.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport { AreaSeries } from '../area/area';\nimport type { SeriesMarkMap } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesTypeEnum } from '../interface';\nimport type { IAreaMark } from '../../mark/area';\nimport { DEFAULT_SMOOTH_INTERPOLATE } from '../../typings/interpolate';\nimport { Direction } from '../../typings/space';\nimport type { Datum } from '../../typings';\nimport { couldBeValidNumber } from '../../util';\nimport { AttributeLevel } from '../../constant';\nimport { RangeAreaSeriesTooltipHelper } from './tooltip-helper';\nimport type { IAreaSeriesSpec } from '../area/interface';\nimport { rangeAreaSeriesMark } from './constant';\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    // area\n    this._areaMark = this._createMark(RangeAreaSeries.mark.area, {\n      defaultMorphElementKey: this.getDimensionField()[0],\n      groupKey: this._seriesField,\n      isSeriesMark: true\n    }) as IAreaMark;\n  }\n\n  initMarkStyle(): void {\n    const userCurveType = this.getSpec().area?.style?.curveType ?? this.getSpec().line?.style?.curveType;\n    const curveType =\n      userCurveType === DEFAULT_SMOOTH_INTERPOLATE\n        ? this._direction === Direction.vertical\n          ? 'monotoneX'\n          : 'monotoneY'\n        : userCurveType;\n\n    // area\n    const areaMark = this._areaMark;\n    if (areaMark) {\n      if (this._direction === Direction.vertical) {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            y1: (datum: Datum) => {\n              if (!this._yAxisHelper) {\n                return Number.NaN;\n              }\n              const { dataToPosition } = this._yAxisHelper;\n\n              return dataToPosition(this.getDatumPositionValues(datum, this._spec.yField[1]), {\n                bandPosition: this._bandPosition\n              });\n            },\n            y: this.dataToPositionY.bind(this)\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      } else {\n        this.setMarkStyle(\n          this._areaMark,\n          {\n            x: this.dataToPositionX.bind(this),\n            x1: (datum: Datum) => {\n              if (!this._xAxisHelper) {\n                return Number.NaN;\n              }\n              const { dataToPosition } = this._xAxisHelper;\n\n              return dataToPosition(this.getDatumPositionValues(datum, this._spec.xField[1]), {\n                bandPosition: this._bandPosition\n              });\n            },\n            y: this.dataToPositionY.bind(this),\n            orient: this._direction\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          fill: this.getColorAttribute(),\n          stroke: false\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      if (this._invalidType !== 'zero') {\n        this.setMarkStyle(\n          areaMark,\n          {\n            defined: this._getInvalidDefined,\n            connectedType: this._getInvalidConnectType()\n          },\n          'normal',\n          AttributeLevel.Series\n        );\n      }\n      this.setMarkStyle(\n        areaMark,\n        {\n          curveType\n        },\n        'normal',\n        AttributeLevel.Built_In\n      );\n      this._trigger.registerMark(areaMark);\n      this._tooltipHelper.activeTriggerSet.dimension.add(areaMark);\n    }\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new RangeAreaSeriesTooltipHelper(this);\n  }\n\n  viewDataStatisticsUpdate(d: DataView) {\n    super.viewDataStatisticsUpdate(d);\n    this.encodeDefined(this._areaMark, 'defined');\n  }\n}\n"]}

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

@@ -20,7 +20,7 @@ class RangeColumnSeries extends bar_1.BarSeries {
             morph: (0, utils_1.shouldDoMorph)(this._spec.animation, this._spec.morph, (0, utils_1.userAnimationConfig)("bar", this._spec)),
             defaultMorphElementKey: this.getDimensionField()[0],
             groupKey: this._seriesField,
-            label: labelPosition === interface_3.PositionEnum.bothEnd ? void 0 : (0, util_1.merge)({}, this._spec.label),
+            label: labelPosition === interface_3.PositionEnum.bothEnd ? void 0 : (0, util_1.mergeSpec)({}, this._spec.label),
             isSeriesMark: !0
         }), !1 !== (null === (_b = this._spec.label) || void 0 === _b ? void 0 : _b.visible) && labelPosition === interface_3.PositionEnum.bothEnd && (!1 !== (null === (_d = null === (_c = this._spec.label) || void 0 === _c ? void 0 : _c.minLabel) || void 0 === _d ? void 0 : _d.visible) && (this._minLabelMark = this._createMark(RangeColumnSeries.mark.minLabel, {
             markSpec: null === (_e = this._spec.label) || void 0 === _e ? void 0 : _e.minLabel
@@ -67,7 +67,7 @@ class RangeColumnSeries extends bar_1.BarSeries {
                 max = datum[this._spec.xField[1]]) : (min = datum[this._spec.yField[0]], max = datum[this._spec.yField[1]]), 
                 min + "-" + max;
             },
-            z: this.dataToPositionZ.bind(this)
+            z: this._fieldZ ? this.dataToPositionZ.bind(this) : null
         }), null === (_a = this._tooltipHelper) || void 0 === _a || _a.ignoreTriggerSet.mark.add(labelMark));
     }
     initBandRectMarkStyle() {

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/range-column/range-column.ts"],"names":[],"mappings":"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","file":"range-column.js","sourcesContent":["import { BarSeries } from '../bar/bar';\nimport { MarkTypeEnum } from '../../mark/interface';\nimport type { SeriesMarkMap } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface';\nimport { Direction } from '../../typings/space';\nimport type { IRectMark } from '../../mark/rect';\nimport type { ITextMark } from '../../mark/text';\nimport { merge, valueInScaleRange } from '../../util';\nimport { setRectLabelPos } from '../util/label-mark';\nimport { AttributeLevel } from '../../constant';\nimport { animationConfig, shouldDoMorph, userAnimationConfig } from '../../animation/utils';\nimport { RangeColumnSeriesTooltipHelper } from './tooltip-helper';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { Datum } from '../../typings';\nimport type { IRangeColumnSeriesSpec } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { PositionEnum } from './interface';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport type { RangeColumnAppearPreset } from './animation';\nimport { rangeColumnSeriesMark } from './constant';\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\n\nexport class RangeColumnSeries<T extends IRangeColumnSeriesSpec = IRangeColumnSeriesSpec> extends BarSeries<any> {\n  static readonly type: string = SeriesTypeEnum.rangeColumn;\n  type = SeriesTypeEnum.rangeColumn;\n  protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect;\n  protected _barName: string = SeriesTypeEnum.bar;\n\n  protected declare _spec: T;\n\n  static readonly mark: SeriesMarkMap = rangeColumnSeriesMark;\n\n  protected _stack: boolean = false;\n  private _minLabelMark?: ITextMark;\n  private _maxLabelMark?: ITextMark;\n\n  initMark(): void {\n    const labelPosition = this._spec.label?.position;\n    this._rectMark = this._createMark(RangeColumnSeries.mark.bar, {\n      morph: shouldDoMorph(this._spec.animation, this._spec.morph, userAnimationConfig('bar', this._spec)),\n      defaultMorphElementKey: this.getDimensionField()[0],\n      groupKey: this._seriesField,\n      label: labelPosition === PositionEnum.bothEnd ? undefined : merge({}, this._spec.label),\n      isSeriesMark: true\n    }) as IRectMark;\n\n    if (this._spec.label?.visible !== false && labelPosition === PositionEnum.bothEnd) {\n      if (this._spec.label?.minLabel?.visible !== false) {\n        this._minLabelMark = this._createMark(RangeColumnSeries.mark.minLabel, {\n          markSpec: this._spec.label?.minLabel\n        }) as ITextMark;\n      }\n      if (this._spec.label?.maxLabel?.visible !== false) {\n        this._maxLabelMark = this._createMark(RangeColumnSeries.mark.maxLabel, {\n          markSpec: this._spec.label?.maxLabel\n        }) as ITextMark;\n      }\n    }\n  }\n\n  initMarkStyle(): void {\n    super.initMarkStyle();\n\n    const minLabelMark = this._minLabelMark;\n    const minLabelSpec = this._spec.label?.minLabel;\n    if (minLabelMark) {\n      this.setMarkStyle(minLabelMark, {\n        fill: minLabelSpec?.style?.fill ?? this.getColorAttribute(),\n        text: (datum: Datum) => {\n          const min =\n            this._spec.direction === Direction.horizontal ? datum[this._spec.xField[0]] : datum[this._spec.yField[0]];\n          if (minLabelSpec?.formatMethod) {\n            return minLabelSpec.formatMethod(min, datum);\n          }\n          return min;\n        }\n      });\n      const position = minLabelSpec?.position ?? 'end';\n      const offset = minLabelSpec?.offset ?? (this._direction === 'vertical' ? -20 : -25);\n      setRectLabelPos(\n        this,\n        minLabelMark,\n        position,\n        offset,\n        (datum: Datum) => this._rectMark.getAttribute('x', datum) as number,\n        (datum: Datum) => {\n          return this._direction === 'vertical'\n            ? (this._rectMark.getAttribute('x', datum) as number) +\n                (this._rectMark.getAttribute('width', datum) as number)\n            : (this._rectMark.getAttribute('x1', datum) as number);\n        },\n        (datum: Datum) => this._rectMark.getAttribute('y', datum) as number,\n        (datum: Datum) => {\n          return this._direction === 'vertical'\n            ? (this._rectMark.getAttribute('y1', datum) as number)\n            : (this._rectMark.getAttribute('y', datum) as number) +\n                (this._rectMark.getAttribute('height', datum) as number);\n        },\n        () => this._direction\n      );\n      this._tooltipHelper?.ignoreTriggerSet.mark.add(minLabelMark);\n    }\n\n    const maxLabelMark = this._maxLabelMark;\n    const maxLabelSpec = this._spec.label?.maxLabel;\n    if (maxLabelMark) {\n      this.setMarkStyle(maxLabelMark, {\n        fill: maxLabelSpec?.style?.fill ?? this.getColorAttribute(),\n        text: (datum: Datum) => {\n          const max =\n            this._spec.direction === Direction.horizontal ? datum[this._spec.xField[1]] : datum[this._spec.yField[1]];\n          if (maxLabelSpec?.formatMethod) {\n            return maxLabelSpec.formatMethod(max, datum);\n          }\n          return max;\n        }\n      });\n      const position = maxLabelSpec?.position ?? 'start';\n      const offset = maxLabelSpec?.offset ?? (this._direction === 'vertical' ? -20 : -25);\n      setRectLabelPos(\n        this,\n        maxLabelMark,\n        position,\n        offset,\n        (datum: Datum) => this._rectMark.getAttribute('x', datum) as number,\n        (datum: Datum) => {\n          return this._direction === 'vertical'\n            ? (this._rectMark.getAttribute('x', datum) as number) +\n                (this._rectMark.getAttribute('width', datum) as number)\n            : (this._rectMark.getAttribute('x1', datum) as number);\n        },\n        (datum: Datum) => this._rectMark.getAttribute('y', datum) as number,\n        (datum: Datum) => {\n          return this._direction === 'vertical'\n            ? (this._rectMark.getAttribute('y1', datum) as number)\n            : (this._rectMark.getAttribute('y', datum) as number) +\n                (this._rectMark.getAttribute('height', datum) as number);\n        },\n        () => this._direction\n      );\n      this._tooltipHelper?.ignoreTriggerSet.mark.add(maxLabelMark);\n    }\n  }\n\n  initLabelMarkStyle(labelMark: ITextMark): void {\n    if (!labelMark) {\n      return;\n    }\n    this.setMarkStyle(labelMark, {\n      text: (datum: Datum) => {\n        let min;\n        let max;\n        if (this._spec.direction === Direction.horizontal) {\n          min = datum[this._spec.xField[0]];\n          max = datum[this._spec.xField[1]];\n        } else {\n          min = datum[this._spec.yField[0]];\n          max = datum[this._spec.yField[1]];\n        }\n        return min + '-' + max;\n      },\n      z: this.dataToPositionZ.bind(this)\n    });\n    this._tooltipHelper?.ignoreTriggerSet.mark.add(labelMark);\n  }\n\n  initBandRectMarkStyle() {\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n    const { dataToPosition } = this.direction === Direction.horizontal ? this._xAxisHelper : this._yAxisHelper;\n    if (this.direction === Direction.horizontal) {\n      this.setMarkStyle(\n        this._rectMark,\n        {\n          x: (datum: Datum) =>\n            valueInScaleRange(\n              dataToPosition(this.getDatumPositionValues(datum, this._spec.xField[0]), {\n                bandPosition: this._bandPosition\n              }),\n              xScale\n            ),\n          x1: (datum: Datum) =>\n            valueInScaleRange(\n              dataToPosition(this.getDatumPositionValues(datum, this._spec.xField[1]), {\n                bandPosition: this._bandPosition\n              }),\n              xScale\n            ),\n          y: (datum: Datum) => this._getPosition(this.direction, datum),\n          height: () => this._getBarWidth(this._yAxisHelper)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    } else {\n      this.setMarkStyle(\n        this._rectMark,\n        {\n          x: (datum: Datum) => this._getPosition(this.direction, datum),\n          y: (datum: Datum) =>\n            valueInScaleRange(\n              dataToPosition(this.getDatumPositionValues(datum, this._spec.yField[0]), {\n                bandPosition: this._bandPosition\n              }),\n              yScale\n            ),\n          y1: (datum: Datum) =>\n            valueInScaleRange(\n              dataToPosition(this.getDatumPositionValues(datum, this._spec.yField[1]), {\n                bandPosition: this._bandPosition\n              }),\n              yScale\n            ),\n          width: () => {\n            return this._getBarWidth(this._xAxisHelper);\n          }\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  initAnimation() {\n    // 分组数据的dataIndex应该与x轴顺序一致，而非data[DEFAULT_DATA_INDEX]顺序\n    const dataIndex = (datum: Datum) => {\n      const xValue = datum?.[this._fieldX[0]];\n      const xIndex = this._viewDataStatistics?.latestData?.[this._fieldX[0]]?.values.indexOf(xValue);\n      // 不应该出现xIndex === -1 || undefined的情况\n      return xIndex || 0;\n    };\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<RangeColumnAppearPreset>)?.preset;\n    this._rectMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.rangeColumn({ direction: this.direction }, appearPreset),\n        userAnimationConfig(SeriesMarkNameEnum.bar, this._spec),\n        { dataIndex }\n      )\n    );\n\n    if (this._minLabelMark) {\n      this._minLabelMark.setAnimationConfig(\n        animationConfig(DEFAULT_MARK_ANIMATION.label(), userAnimationConfig(SeriesMarkNameEnum.label, this._spec), {\n          dataIndex\n        })\n      );\n    }\n\n    if (this._maxLabelMark) {\n      this._maxLabelMark.setAnimationConfig(\n        animationConfig(DEFAULT_MARK_ANIMATION.label(), userAnimationConfig(SeriesMarkNameEnum.label, this._spec), {\n          dataIndex\n        })\n      );\n    }\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new RangeColumnSeriesTooltipHelper(this);\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/range-column/range-column.ts"],"names":[],"mappings":"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","file":"range-column.js","sourcesContent":["import { BarSeries } from '../bar/bar';\nimport { MarkTypeEnum } from '../../mark/interface';\nimport type { SeriesMarkMap } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface';\nimport { Direction } from '../../typings/space';\nimport type { IRectMark } from '../../mark/rect';\nimport type { ITextMark } from '../../mark/text';\nimport { mergeSpec, valueInScaleRange } from '../../util';\nimport { setRectLabelPos } from '../util/label-mark';\nimport { AttributeLevel } from '../../constant';\nimport { animationConfig, shouldDoMorph, userAnimationConfig } from '../../animation/utils';\nimport { RangeColumnSeriesTooltipHelper } from './tooltip-helper';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { Datum } from '../../typings';\nimport type { IRangeColumnSeriesSpec } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { PositionEnum } from './interface';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport type { RangeColumnAppearPreset } from './animation';\nimport { rangeColumnSeriesMark } from './constant';\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\n\nexport class RangeColumnSeries<T extends IRangeColumnSeriesSpec = IRangeColumnSeriesSpec> extends BarSeries<any> {\n  static readonly type: string = SeriesTypeEnum.rangeColumn;\n  type = SeriesTypeEnum.rangeColumn;\n  protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect;\n  protected _barName: string = SeriesTypeEnum.bar;\n\n  protected declare _spec: T;\n\n  static readonly mark: SeriesMarkMap = rangeColumnSeriesMark;\n\n  protected _stack: boolean = false;\n  private _minLabelMark?: ITextMark;\n  private _maxLabelMark?: ITextMark;\n\n  initMark(): void {\n    const labelPosition = this._spec.label?.position;\n    this._rectMark = this._createMark(RangeColumnSeries.mark.bar, {\n      morph: shouldDoMorph(this._spec.animation, this._spec.morph, userAnimationConfig('bar', this._spec)),\n      defaultMorphElementKey: this.getDimensionField()[0],\n      groupKey: this._seriesField,\n      label: labelPosition === PositionEnum.bothEnd ? undefined : mergeSpec({}, this._spec.label),\n      isSeriesMark: true\n    }) as IRectMark;\n\n    if (this._spec.label?.visible !== false && labelPosition === PositionEnum.bothEnd) {\n      if (this._spec.label?.minLabel?.visible !== false) {\n        this._minLabelMark = this._createMark(RangeColumnSeries.mark.minLabel, {\n          markSpec: this._spec.label?.minLabel\n        }) as ITextMark;\n      }\n      if (this._spec.label?.maxLabel?.visible !== false) {\n        this._maxLabelMark = this._createMark(RangeColumnSeries.mark.maxLabel, {\n          markSpec: this._spec.label?.maxLabel\n        }) as ITextMark;\n      }\n    }\n  }\n\n  initMarkStyle(): void {\n    super.initMarkStyle();\n\n    const minLabelMark = this._minLabelMark;\n    const minLabelSpec = this._spec.label?.minLabel;\n    if (minLabelMark) {\n      this.setMarkStyle(minLabelMark, {\n        fill: minLabelSpec?.style?.fill ?? this.getColorAttribute(),\n        text: (datum: Datum) => {\n          const min =\n            this._spec.direction === Direction.horizontal ? datum[this._spec.xField[0]] : datum[this._spec.yField[0]];\n          if (minLabelSpec?.formatMethod) {\n            return minLabelSpec.formatMethod(min, datum);\n          }\n          return min;\n        }\n      });\n      const position = minLabelSpec?.position ?? 'end';\n      const offset = minLabelSpec?.offset ?? (this._direction === 'vertical' ? -20 : -25);\n      setRectLabelPos(\n        this,\n        minLabelMark,\n        position,\n        offset,\n        (datum: Datum) => this._rectMark.getAttribute('x', datum) as number,\n        (datum: Datum) => {\n          return this._direction === 'vertical'\n            ? (this._rectMark.getAttribute('x', datum) as number) +\n                (this._rectMark.getAttribute('width', datum) as number)\n            : (this._rectMark.getAttribute('x1', datum) as number);\n        },\n        (datum: Datum) => this._rectMark.getAttribute('y', datum) as number,\n        (datum: Datum) => {\n          return this._direction === 'vertical'\n            ? (this._rectMark.getAttribute('y1', datum) as number)\n            : (this._rectMark.getAttribute('y', datum) as number) +\n                (this._rectMark.getAttribute('height', datum) as number);\n        },\n        () => this._direction\n      );\n      this._tooltipHelper?.ignoreTriggerSet.mark.add(minLabelMark);\n    }\n\n    const maxLabelMark = this._maxLabelMark;\n    const maxLabelSpec = this._spec.label?.maxLabel;\n    if (maxLabelMark) {\n      this.setMarkStyle(maxLabelMark, {\n        fill: maxLabelSpec?.style?.fill ?? this.getColorAttribute(),\n        text: (datum: Datum) => {\n          const max =\n            this._spec.direction === Direction.horizontal ? datum[this._spec.xField[1]] : datum[this._spec.yField[1]];\n          if (maxLabelSpec?.formatMethod) {\n            return maxLabelSpec.formatMethod(max, datum);\n          }\n          return max;\n        }\n      });\n      const position = maxLabelSpec?.position ?? 'start';\n      const offset = maxLabelSpec?.offset ?? (this._direction === 'vertical' ? -20 : -25);\n      setRectLabelPos(\n        this,\n        maxLabelMark,\n        position,\n        offset,\n        (datum: Datum) => this._rectMark.getAttribute('x', datum) as number,\n        (datum: Datum) => {\n          return this._direction === 'vertical'\n            ? (this._rectMark.getAttribute('x', datum) as number) +\n                (this._rectMark.getAttribute('width', datum) as number)\n            : (this._rectMark.getAttribute('x1', datum) as number);\n        },\n        (datum: Datum) => this._rectMark.getAttribute('y', datum) as number,\n        (datum: Datum) => {\n          return this._direction === 'vertical'\n            ? (this._rectMark.getAttribute('y1', datum) as number)\n            : (this._rectMark.getAttribute('y', datum) as number) +\n                (this._rectMark.getAttribute('height', datum) as number);\n        },\n        () => this._direction\n      );\n      this._tooltipHelper?.ignoreTriggerSet.mark.add(maxLabelMark);\n    }\n  }\n\n  initLabelMarkStyle(labelMark: ITextMark): void {\n    if (!labelMark) {\n      return;\n    }\n    this.setMarkStyle(labelMark, {\n      text: (datum: Datum) => {\n        let min;\n        let max;\n        if (this._spec.direction === Direction.horizontal) {\n          min = datum[this._spec.xField[0]];\n          max = datum[this._spec.xField[1]];\n        } else {\n          min = datum[this._spec.yField[0]];\n          max = datum[this._spec.yField[1]];\n        }\n        return min + '-' + max;\n      },\n      z: this._fieldZ ? this.dataToPositionZ.bind(this) : null\n    });\n    this._tooltipHelper?.ignoreTriggerSet.mark.add(labelMark);\n  }\n\n  initBandRectMarkStyle() {\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n    const { dataToPosition } = this.direction === Direction.horizontal ? this._xAxisHelper : this._yAxisHelper;\n    if (this.direction === Direction.horizontal) {\n      this.setMarkStyle(\n        this._rectMark,\n        {\n          x: (datum: Datum) =>\n            valueInScaleRange(\n              dataToPosition(this.getDatumPositionValues(datum, this._spec.xField[0]), {\n                bandPosition: this._bandPosition\n              }),\n              xScale\n            ),\n          x1: (datum: Datum) =>\n            valueInScaleRange(\n              dataToPosition(this.getDatumPositionValues(datum, this._spec.xField[1]), {\n                bandPosition: this._bandPosition\n              }),\n              xScale\n            ),\n          y: (datum: Datum) => this._getPosition(this.direction, datum),\n          height: () => this._getBarWidth(this._yAxisHelper)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    } else {\n      this.setMarkStyle(\n        this._rectMark,\n        {\n          x: (datum: Datum) => this._getPosition(this.direction, datum),\n          y: (datum: Datum) =>\n            valueInScaleRange(\n              dataToPosition(this.getDatumPositionValues(datum, this._spec.yField[0]), {\n                bandPosition: this._bandPosition\n              }),\n              yScale\n            ),\n          y1: (datum: Datum) =>\n            valueInScaleRange(\n              dataToPosition(this.getDatumPositionValues(datum, this._spec.yField[1]), {\n                bandPosition: this._bandPosition\n              }),\n              yScale\n            ),\n          width: () => {\n            return this._getBarWidth(this._xAxisHelper);\n          }\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  initAnimation() {\n    // 分组数据的dataIndex应该与x轴顺序一致，而非data[DEFAULT_DATA_INDEX]顺序\n    const dataIndex = (datum: Datum) => {\n      const xValue = datum?.[this._fieldX[0]];\n      const xIndex = this._viewDataStatistics?.latestData?.[this._fieldX[0]]?.values.indexOf(xValue);\n      // 不应该出现xIndex === -1 || undefined的情况\n      return xIndex || 0;\n    };\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<RangeColumnAppearPreset>)?.preset;\n    this._rectMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.rangeColumn({ direction: this.direction }, appearPreset),\n        userAnimationConfig(SeriesMarkNameEnum.bar, this._spec),\n        { dataIndex }\n      )\n    );\n\n    if (this._minLabelMark) {\n      this._minLabelMark.setAnimationConfig(\n        animationConfig(DEFAULT_MARK_ANIMATION.label(), userAnimationConfig(SeriesMarkNameEnum.label, this._spec), {\n          dataIndex\n        })\n      );\n    }\n\n    if (this._maxLabelMark) {\n      this._maxLabelMark.setAnimationConfig(\n        animationConfig(DEFAULT_MARK_ANIMATION.label(), userAnimationConfig(SeriesMarkNameEnum.label, this._spec), {\n          dataIndex\n        })\n      );\n    }\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new RangeColumnSeriesTooltipHelper(this);\n  }\n}\n"]}

package/cjs/series/rose/rose.js

@@ -25,7 +25,7 @@ class RoseSeries extends rose_like_1.RoseLikeSeries {
             defaultMorphElementKey: this.getDimensionField()[0],
             groupKey: this._seriesField,
             isSeriesMark: !0,
-            label: (0, util_1.merge)({
+            label: (0, util_1.mergeSpec)({
                 animation: this._spec.animation
             }, this._spec.label)
         });

package/cjs/series/rose/rose.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/rose/rose.ts"],"names":[],"mappings":"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","file":"rose.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport type { IArcMark } from '../../mark/arc';\nimport type { Maybe, Datum } from '../../typings';\nimport { valueInScaleRange, degrees, merge } from '../../util';\nimport { animationConfig, shouldDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface';\nimport type { IRoseAnimationParams, RoseAppearPreset } from './animation';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { IRoseSeriesSpec, IRoseSeriesTheme } from './interface';\nimport { RoseLikeSeries } from '../polar/rose-like';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport type { ITextMark } from '../../mark/text';\nimport { AttributeLevel } from '../../constant';\nimport { VChart } from '../../core/vchart';\nimport { ArcMark } from '../../mark/arc';\nimport { TextMark } from '../../mark/text';\nimport { roseSeriesMark } from './constant';\n\nVChart.useMark([ArcMark, TextMark]);\n\nexport const DefaultBandWidth = 0.5;\n\nexport class RoseSeries<T extends IRoseSeriesSpec = IRoseSeriesSpec> extends RoseLikeSeries<T> {\n  static readonly type: string = SeriesTypeEnum.rose;\n  type = SeriesTypeEnum.rose;\n\n  static readonly mark: SeriesMarkMap = roseSeriesMark;\n\n  protected declare _theme: Maybe<IRoseSeriesTheme>;\n  protected _stack: boolean = true;\n\n  private _roseMark: IArcMark | null = null;\n  protected _labelMark: ITextMark | null = null;\n\n  initMark(): void {\n    this.initRoseMark();\n  }\n\n  initMarkStyle(): void {\n    this.initRoseMarkStyle();\n  }\n\n  private initRoseMark() {\n    this._roseMark = this._createMark(RoseSeries.mark.rose, {\n      morph: shouldDoMorph(this._spec.animation, this._spec.morph, userAnimationConfig('rose', this._spec)),\n      defaultMorphElementKey: this.getDimensionField()[0],\n      groupKey: this._seriesField,\n      isSeriesMark: true,\n      label: merge({ animation: this._spec.animation }, this._spec.label)\n    }) as IArcMark;\n  }\n\n  private getRoseAngle() {\n    const angleBandWidth =\n      this.angleAxisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n    return angleBandWidth;\n  }\n\n  private initRoseMarkStyle() {\n    const roseMark = this._roseMark;\n    if (roseMark) {\n      this.setMarkStyle(roseMark, {\n        x: () => this.angleAxisHelper.center().x,\n        y: () => this.angleAxisHelper.center().y,\n        startAngle: (datum: Datum) =>\n          this.angleAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields())) -\n          this.angleAxisHelper.getBandwidth(0) * 0.5,\n        endAngle: (datum: Datum) =>\n          this.angleAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields())) +\n          this.getRoseAngle() -\n          this.angleAxisHelper.getBandwidth(0) * 0.5,\n        fill: this.getColorAttribute(),\n        outerRadius: (datum: Datum) =>\n          valueInScaleRange(\n            this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]),\n            this.radiusAxisHelper.getScale(0)\n          ),\n        innerRadius: (datum: Datum) => {\n          if (!this._stack) {\n            return 0;\n          }\n          const stackStart = valueInScaleRange(\n            this.radiusAxisHelper.dataToPosition([datum[this._innerRadiusField[0]]]),\n            this.radiusAxisHelper.getScale(0)\n          );\n          return stackStart <= Number.MIN_VALUE\n            ? this._computeLayoutRadius() * (this._spec.innerRadius ?? 0)\n            : stackStart;\n        }\n      });\n      this._trigger.registerMark(roseMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(roseMark);\n    }\n  }\n\n  initLabelMarkStyle(textMark: ITextMark) {\n    if (!textMark) {\n      return;\n    }\n    this.setMarkStyle(textMark, {\n      visible: this._spec?.label?.visible,\n      text: (datum: Datum) => {\n        return datum[this.getDimensionField()[0]];\n      },\n      fill: this._spec.label?.style?.fill || this.getColorAttribute(),\n      angle: this._spec.label?.style?.angle,\n      limit: this._spec.label?.style?.limit,\n      z: 0\n    });\n  }\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<RoseAppearPreset>)?.preset;\n\n    if (this._roseMark) {\n      const animationParams: IRoseAnimationParams = {\n        innerRadius: () => this._computeLayoutRadius() * (this._spec.innerRadius ?? 0)\n      };\n      this._roseMark.setAnimationConfig(\n        animationConfig(\n          DEFAULT_MARK_ANIMATION.rose(animationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.rose, this._spec)\n        )\n      );\n    }\n  }\n\n  getDefaultShapeType() {\n    return 'circle';\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/rose/rose.ts"],"names":[],"mappings":"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","file":"rose.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport type { IArcMark } from '../../mark/arc';\nimport type { Maybe, Datum } from '../../typings';\nimport { valueInScaleRange, mergeSpec } from '../../util';\nimport { animationConfig, shouldDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface';\nimport type { IRoseAnimationParams, RoseAppearPreset } from './animation';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { IRoseSeriesSpec, IRoseSeriesTheme } from './interface';\nimport { RoseLikeSeries } from '../polar/rose-like';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport type { ITextMark } from '../../mark/text';\nimport { VChart } from '../../core/vchart';\nimport { ArcMark } from '../../mark/arc';\nimport { TextMark } from '../../mark/text';\nimport { roseSeriesMark } from './constant';\n\nVChart.useMark([ArcMark, TextMark]);\n\nexport const DefaultBandWidth = 0.5;\n\nexport class RoseSeries<T extends IRoseSeriesSpec = IRoseSeriesSpec> extends RoseLikeSeries<T> {\n  static readonly type: string = SeriesTypeEnum.rose;\n  type = SeriesTypeEnum.rose;\n\n  static readonly mark: SeriesMarkMap = roseSeriesMark;\n\n  protected declare _theme: Maybe<IRoseSeriesTheme>;\n  protected _stack: boolean = true;\n\n  private _roseMark: IArcMark | null = null;\n  protected _labelMark: ITextMark | null = null;\n\n  initMark(): void {\n    this.initRoseMark();\n  }\n\n  initMarkStyle(): void {\n    this.initRoseMarkStyle();\n  }\n\n  private initRoseMark() {\n    this._roseMark = this._createMark(RoseSeries.mark.rose, {\n      morph: shouldDoMorph(this._spec.animation, this._spec.morph, userAnimationConfig('rose', this._spec)),\n      defaultMorphElementKey: this.getDimensionField()[0],\n      groupKey: this._seriesField,\n      isSeriesMark: true,\n      label: mergeSpec({ animation: this._spec.animation }, this._spec.label)\n    }) as IArcMark;\n  }\n\n  private getRoseAngle() {\n    const angleBandWidth =\n      this.angleAxisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n    return angleBandWidth;\n  }\n\n  private initRoseMarkStyle() {\n    const roseMark = this._roseMark;\n    if (roseMark) {\n      this.setMarkStyle(roseMark, {\n        x: () => this.angleAxisHelper.center().x,\n        y: () => this.angleAxisHelper.center().y,\n        startAngle: (datum: Datum) =>\n          this.angleAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields())) -\n          this.angleAxisHelper.getBandwidth(0) * 0.5,\n        endAngle: (datum: Datum) =>\n          this.angleAxisHelper.dataToPosition(this.getDatumPositionValues(datum, this.getGroupFields())) +\n          this.getRoseAngle() -\n          this.angleAxisHelper.getBandwidth(0) * 0.5,\n        fill: this.getColorAttribute(),\n        outerRadius: (datum: Datum) =>\n          valueInScaleRange(\n            this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]),\n            this.radiusAxisHelper.getScale(0)\n          ),\n        innerRadius: (datum: Datum) => {\n          if (!this._stack) {\n            return 0;\n          }\n          const stackStart = valueInScaleRange(\n            this.radiusAxisHelper.dataToPosition([datum[this._innerRadiusField[0]]]),\n            this.radiusAxisHelper.getScale(0)\n          );\n          return stackStart <= Number.MIN_VALUE\n            ? this._computeLayoutRadius() * (this._spec.innerRadius ?? 0)\n            : stackStart;\n        }\n      });\n      this._trigger.registerMark(roseMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(roseMark);\n    }\n  }\n\n  initLabelMarkStyle(textMark: ITextMark) {\n    if (!textMark) {\n      return;\n    }\n    this.setMarkStyle(textMark, {\n      visible: this._spec?.label?.visible,\n      text: (datum: Datum) => {\n        return datum[this.getDimensionField()[0]];\n      },\n      fill: this._spec.label?.style?.fill || this.getColorAttribute(),\n      angle: this._spec.label?.style?.angle,\n      limit: this._spec.label?.style?.limit,\n      z: 0\n    });\n  }\n\n  initAnimation() {\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<RoseAppearPreset>)?.preset;\n\n    if (this._roseMark) {\n      const animationParams: IRoseAnimationParams = {\n        innerRadius: () => this._computeLayoutRadius() * (this._spec.innerRadius ?? 0)\n      };\n      this._roseMark.setAnimationConfig(\n        animationConfig(\n          DEFAULT_MARK_ANIMATION.rose(animationParams, appearPreset),\n          userAnimationConfig(SeriesMarkNameEnum.rose, this._spec)\n        )\n      );\n    }\n  }\n\n  getDefaultShapeType() {\n    return 'circle';\n  }\n}\n"]}

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

@@ -1,9 +1,10 @@
 import type { ISeriesSpec, DirectionType, IMarkTheme } from '../../typings';
 import type { IMarkSpec } from '../../typings/spec/common';
-import type { IRectMarkSpec, ITextMarkSpec, ILinkPathMarkSpec } from '../../typings/visual';
+import type { IRectMarkSpec, ILinkPathMarkSpec } from '../../typings/visual';
 import type { IAnimationSpec } from '../../animation/spec';
 import type { SankeyAppearPreset, SankeyMark } from './animation';
 import type { SeriesMarkNameEnum } from '../interface';
+import type { ILabelSpec } from '../../component/label';
 export interface ISankeySeriesSpec extends Omit<ISeriesSpec, 'data'>, IAnimationSpec<SankeyMark, SankeyAppearPreset> {
     type: 'sankey';
     categoryField: string;
@@ -30,7 +31,7 @@ export interface ISankeySeriesSpec extends Omit<ISeriesSpec, 'data'>, IAnimation
         trigger?: 'click' | 'hover';
         effect: 'self' | 'adjacency' | 'related';
     };
-    [SeriesMarkNameEnum.label]?: IMarkSpec<ITextMarkSpec> & {
+    [SeriesMarkNameEnum.label]?: ILabelSpec & {
         position: 'outside' | 'inside-start' | 'inside-middle' | 'inside-end' | 'left' | 'right';
         limit: number;
     };

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/sankey/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { ISeriesSpec, DirectionType, IMarkTheme } from '../../typings';\nimport type { IMarkSpec } from '../../typings/spec/common';\nimport type { IRectMarkSpec, ITextMarkSpec, ILinkPathMarkSpec } from '../../typings/visual';\nimport type { IAnimationSpec } from '../../animation/spec';\nimport type { SankeyAppearPreset, SankeyMark } from './animation';\nimport type { SeriesMarkNameEnum } from '../interface';\n\nexport interface ISankeySeriesSpec extends Omit<ISeriesSpec, 'data'>, IAnimationSpec<SankeyMark, SankeyAppearPreset> {\n  type: 'sankey';\n\n  /**\n   * 数据字段配置\n   */\n  /** 节点名称字段配置 */\n  categoryField: string;\n  /** 节点之间关系的权重字段 */\n  valueField: string;\n  /** 来源节点数据字段\n   *  层级数据不提供\n   */\n  sourceField?: string;\n  /** 目标节点数据字段\n   *  层级数据不提供\n   */\n  targetField?: string;\n\n  /**\n   * 图表布局方向\n   */\n  direction?: DirectionType;\n  /**\n   * 节点的对齐类型\n   */\n  nodeAlign?: 'left' | 'right' | 'center' | 'justify' | 'start' | 'end';\n  /**\n   * 同一层中两个节点之间的间隙大小\n   */\n  nodeGap?: number;\n  /**\n   * 每个节点的宽度，支持三种取值\n   * 1. 百分比字符串，例如：{ nodeWidth: '12%' }\n   * 2. 以'px'为单位的简单数字，eg: { nodeWidth: 20 }\n   * 3. function，通过自定义计算指定nodeWidth\n   */\n  nodeWidth?: string | number | ((node: SankeyNodeElement) => number);\n  /**\n   * link宽度，单位px\n   */\n  linkWidth?: number | ((link: SankeyLinkElement) => number);\n  /**\n   * link + node 的最小宽度\n   */\n  minStepWidth?: number;\n  /**\n   * 数据不为零或空时节点的最小大小\n   *  - 这个配置可以用来避免数据太小时看不到太细的节点\n   *  - 建议小于5px\n   */\n  minNodeHeight?: number;\n  /**\n   * 数据不为零或空时边的最小大小\n   *  - 这个配置可以用来避免数据太小的时候看不到太细的链接\n   *  - 建议小于5px\n   *  - 当同时指定 `minNodeHeight` 和 `minLinkHeight` 两个选项时，此选项应小于 `minNodeHeight`\n   */\n  minLinkHeight?: number;\n  /** 布局的迭代次数 */\n  iterations?: number;\n  /** 解析node的key，defaultValue */\n  nodeKey?: string | number | ((datum: SankeyNodeDatum) => string | number);\n  /** 按此funtion排序link */\n  linkSortBy?: (a: SankeyLinkElement, b: SankeyLinkElement) => number;\n  /** 按此funtion排序node */\n  nodeSortBy?: (a: SankeyNodeElement, b: SankeyNodeElement) => number;\n  /** 自定义指定节点层 */\n  setNodeLayer?: (datum: SankeyNodeDatum) => number;\n\n  /** 节点配置 */\n  [SeriesMarkNameEnum.node]?: IMarkSpec<IRectMarkSpec>;\n\n  /** 边配置 */\n  [SeriesMarkNameEnum.link]?: IMarkSpec<ILinkPathMarkSpec>;\n\n  /** 联动交互配置 */\n  emphasis?: {\n    /** 是否开启交互 */\n    enable: boolean;\n    /**\n     * 交互触发类型\n     * 默认为‘click'\n     */\n    trigger?: 'click' | 'hover';\n    /**桑基图提供3种在节点上的交互联动效果\n     * self: 仅高亮当前节点。\n     * adjacency: 高亮当前节点上下游节点和关联的边，淡化其它图形元素。\n     * related： 高亮与当前节点相关的整条路径上的节点和边，淡化其它图形元素。 */\n    effect: 'self' | 'adjacency' | 'related';\n  };\n\n  /** 标签配置 */\n  [SeriesMarkNameEnum.label]?: IMarkSpec<ITextMarkSpec> & {\n    /**\n     * 标签布局方式\n     * @default 'outside'\n     */\n    position: 'outside' | 'inside-start' | 'inside-middle' | 'inside-end' | 'left' | 'right';\n    /** 标签文字缩略 */\n    limit: number;\n  };\n\n  /** 进度条配置 */\n  // scroll?: IScrollSpec & {\n  //   /** 是否开启进度条 */\n  //   enable: boolean;\n  // };\n}\n\nexport interface SankeyLinkDatum {\n  source: string | number;\n  target: string | number;\n  value?: number;\n}\n\nexport interface SankeyNodeDatum {\n  value?: number;\n}\n\nexport interface HierarchyNodeDatum {\n  value?: number;\n  children?: HierarchyNodeDatum[];\n}\n\nexport type SankeyData =\n  | {\n      nodes?: SankeyNodeDatum[];\n      links: SankeyLinkDatum[];\n    }\n  | {\n      nodes: HierarchyNodeDatum[];\n    };\n\n/**\n * The node element after sankey layout\n */\nexport interface SankeyNodeElement {\n  key: string | number;\n  index: number;\n  /** the depth of node, from source to target */\n  depth: number;\n\n  /** the depth of node, from target to source */\n  endDepth?: number;\n  /** the final layer index after layout */\n  layer?: number;\n  isLastLayer?: boolean;\n  value: number;\n  datum: SankeyNodeDatum;\n  sourceLinks: SankeyLinkElement[];\n  targetLinks: SankeyLinkElement[];\n  x0?: number;\n  y0?: number;\n  x1?: number;\n  y1?: number;\n}\n/**\n * the link element after sankey layout\n */\nexport interface SankeyLinkElement {\n  vertical?: boolean;\n  index: number;\n  source: string | number;\n  target: string | number;\n  value: number;\n  datum: SankeyLinkDatum | SankeyLinkDatum[];\n  thickness?: number;\n  sourceRect?: { x0: number; x1: number; y0: number; y1: number };\n  targetRect?: { x0: number; x1: number; y0: number; y1: number };\n  /** this will only be generate in hierarchy node data*/\n  parents?: (string | number)[];\n  y0?: number;\n  y1?: number;\n  x0?: number;\n  x1?: number;\n}\n\nexport type SankeyLayoutResult = {\n  nodes: SankeyNodeElement[];\n  links: SankeyLinkElement[];\n  columns: SankeyNodeElement[][];\n}[];\n\nexport interface ISankeySeriesTheme {\n  [SeriesMarkNameEnum.node]?: IMarkTheme<IRectMarkSpec>;\n  [SeriesMarkNameEnum.link]?: IMarkTheme<ILinkPathMarkSpec>;\n}\n"]}
+{"version":3,"sources":["../src/series/sankey/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { ISeriesSpec, DirectionType, IMarkTheme } from '../../typings';\nimport type { IMarkSpec } from '../../typings/spec/common';\nimport type { IRectMarkSpec, ITextMarkSpec, ILinkPathMarkSpec } from '../../typings/visual';\nimport type { IAnimationSpec } from '../../animation/spec';\nimport type { SankeyAppearPreset, SankeyMark } from './animation';\nimport type { SeriesMarkNameEnum } from '../interface';\nimport type { ILabelSpec } from '../../component/label';\n\nexport interface ISankeySeriesSpec extends Omit<ISeriesSpec, 'data'>, IAnimationSpec<SankeyMark, SankeyAppearPreset> {\n  type: 'sankey';\n\n  /**\n   * 数据字段配置\n   */\n  /** 节点名称字段配置 */\n  categoryField: string;\n  /** 节点之间关系的权重字段 */\n  valueField: string;\n  /** 来源节点数据字段\n   *  层级数据不提供\n   */\n  sourceField?: string;\n  /** 目标节点数据字段\n   *  层级数据不提供\n   */\n  targetField?: string;\n\n  /**\n   * 图表布局方向\n   */\n  direction?: DirectionType;\n  /**\n   * 节点的对齐类型\n   */\n  nodeAlign?: 'left' | 'right' | 'center' | 'justify' | 'start' | 'end';\n  /**\n   * 同一层中两个节点之间的间隙大小\n   */\n  nodeGap?: number;\n  /**\n   * 每个节点的宽度，支持三种取值\n   * 1. 百分比字符串，例如：{ nodeWidth: '12%' }\n   * 2. 以'px'为单位的简单数字，eg: { nodeWidth: 20 }\n   * 3. function，通过自定义计算指定nodeWidth\n   */\n  nodeWidth?: string | number | ((node: SankeyNodeElement) => number);\n  /**\n   * link宽度，单位px\n   */\n  linkWidth?: number | ((link: SankeyLinkElement) => number);\n  /**\n   * link + node 的最小宽度\n   */\n  minStepWidth?: number;\n  /**\n   * 数据不为零或空时节点的最小大小\n   *  - 这个配置可以用来避免数据太小时看不到太细的节点\n   *  - 建议小于5px\n   */\n  minNodeHeight?: number;\n  /**\n   * 数据不为零或空时边的最小大小\n   *  - 这个配置可以用来避免数据太小的时候看不到太细的链接\n   *  - 建议小于5px\n   *  - 当同时指定 `minNodeHeight` 和 `minLinkHeight` 两个选项时，此选项应小于 `minNodeHeight`\n   */\n  minLinkHeight?: number;\n  /** 布局的迭代次数 */\n  iterations?: number;\n  /** 解析node的key，defaultValue */\n  nodeKey?: string | number | ((datum: SankeyNodeDatum) => string | number);\n  /** 按此funtion排序link */\n  linkSortBy?: (a: SankeyLinkElement, b: SankeyLinkElement) => number;\n  /** 按此funtion排序node */\n  nodeSortBy?: (a: SankeyNodeElement, b: SankeyNodeElement) => number;\n  /** 自定义指定节点层 */\n  setNodeLayer?: (datum: SankeyNodeDatum) => number;\n\n  /** 节点配置 */\n  [SeriesMarkNameEnum.node]?: IMarkSpec<IRectMarkSpec>;\n\n  /** 边配置 */\n  [SeriesMarkNameEnum.link]?: IMarkSpec<ILinkPathMarkSpec>;\n\n  /** 联动交互配置 */\n  emphasis?: {\n    /** 是否开启交互 */\n    enable: boolean;\n    /**\n     * 交互触发类型\n     * 默认为‘click'\n     */\n    trigger?: 'click' | 'hover';\n    /**桑基图提供3种在节点上的交互联动效果\n     * self: 仅高亮当前节点。\n     * adjacency: 高亮当前节点上下游节点和关联的边，淡化其它图形元素。\n     * related： 高亮与当前节点相关的整条路径上的节点和边，淡化其它图形元素。 */\n    effect: 'self' | 'adjacency' | 'related';\n  };\n\n  /** 标签配置 */\n  [SeriesMarkNameEnum.label]?: ILabelSpec & {\n    /**\n     * 标签布局方式\n     * @default 'outside'\n     */\n    position: 'outside' | 'inside-start' | 'inside-middle' | 'inside-end' | 'left' | 'right';\n    /** 标签文字缩略 */\n    limit: number;\n  };\n\n  /** 进度条配置 */\n  // scroll?: IScrollSpec & {\n  //   /** 是否开启进度条 */\n  //   enable: boolean;\n  // };\n}\n\nexport interface SankeyLinkDatum {\n  source: string | number;\n  target: string | number;\n  value?: number;\n}\n\nexport interface SankeyNodeDatum {\n  value?: number;\n}\n\nexport interface HierarchyNodeDatum {\n  value?: number;\n  children?: HierarchyNodeDatum[];\n}\n\nexport type SankeyData =\n  | {\n      nodes?: SankeyNodeDatum[];\n      links: SankeyLinkDatum[];\n    }\n  | {\n      nodes: HierarchyNodeDatum[];\n    };\n\n/**\n * The node element after sankey layout\n */\nexport interface SankeyNodeElement {\n  key: string | number;\n  index: number;\n  /** the depth of node, from source to target */\n  depth: number;\n\n  /** the depth of node, from target to source */\n  endDepth?: number;\n  /** the final layer index after layout */\n  layer?: number;\n  isLastLayer?: boolean;\n  value: number;\n  datum: SankeyNodeDatum;\n  sourceLinks: SankeyLinkElement[];\n  targetLinks: SankeyLinkElement[];\n  x0?: number;\n  y0?: number;\n  x1?: number;\n  y1?: number;\n}\n/**\n * the link element after sankey layout\n */\nexport interface SankeyLinkElement {\n  vertical?: boolean;\n  index: number;\n  source: string | number;\n  target: string | number;\n  value: number;\n  datum: SankeyLinkDatum | SankeyLinkDatum[];\n  thickness?: number;\n  sourceRect?: { x0: number; x1: number; y0: number; y1: number };\n  targetRect?: { x0: number; x1: number; y0: number; y1: number };\n  /** this will only be generate in hierarchy node data*/\n  parents?: (string | number)[];\n  y0?: number;\n  y1?: number;\n  x0?: number;\n  x1?: number;\n}\n\nexport type SankeyLayoutResult = {\n  nodes: SankeyNodeElement[];\n  links: SankeyLinkElement[];\n  columns: SankeyNodeElement[][];\n}[];\n\nexport interface ISankeySeriesTheme {\n  [SeriesMarkNameEnum.node]?: IMarkTheme<IRectMarkSpec>;\n  [SeriesMarkNameEnum.link]?: IMarkTheme<ILinkPathMarkSpec>;\n}\n"]}

package/cjs/series/sankey/sankey.d.ts

@@ -32,16 +32,21 @@ export declare class SankeySeries<T extends ISankeySeriesSpec = ISankeySeriesSpe
     protected _initNodeMarkStyle(): void;
     protected _initLinkMarkStyle(): void;
     protected _initLabelMarkStyle(): void;
+    private _createText;
     initAnimation(): void;
     protected initEvent(): void;
+    private nodesSeriesDataUpdate;
+    private linksSeriesDataUpdate;
     protected _handleAdjacencyClick: (params: ExtendEventParam) => void;
     protected _handleRelatedClick: (params: ExtendEventParam) => void;
+    protected _handleClearEmpty: () => void;
     protected _handleNodeAdjacencyClick: (element: IElement) => void;
     protected _handleLinkAdjacencyClick: (element: IGlyphElement) => void;
     protected _handleNodeRelatedClick: (element: IElement) => void;
     protected _handleLinkRelatedClick: (element: IGlyphElement) => void;
     protected initTooltip(): void;
     getNodeOrdinalColorScale(item: string): any;
+    extractNamesFromTree(tree: any): Set<unknown>;
     getDimensionField(): string[];
     getMeasureField(): string[];
     getSeriesKeys(): string[];