@visactor/vchart 1.5.4 → 1.6.0

package/cjs/component/axis/polar/band-axis.js

@@ -4,21 +4,15 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerPolarBandAxis = exports.PolarBandAxis = void 0;
 
-const vscale_1 = require("@visactor/vscale"), interface_1 = require("../../interface"), axis_1 = require("./axis"), config_1 = require("./config"), vutils_1 = require("@visactor/vutils"), band_axis_mixin_1 = require("../mixin/band-axis-mixin"), factory_1 = require("../../../core/factory"), base_axis_1 = require("../base-axis");
+const vscale_1 = require("@visactor/vscale"), type_1 = require("../../interface/type"), axis_1 = require("./axis"), vutils_1 = require("@visactor/vutils"), band_axis_mixin_1 = require("../mixin/band-axis-mixin"), factory_1 = require("../../../core/factory"), base_axis_1 = require("../base-axis");
 
 class PolarBandAxis extends axis_1.PolarAxis {
     constructor() {
-        super(...arguments), this.type = interface_1.ComponentTypeEnum.polarBandAxis, this._scale = new vscale_1.BandScale;
+        super(...arguments), this.type = type_1.ComponentTypeEnum.polarBandAxis, this._scale = new vscale_1.BandScale;
     }
     computeDomain(data) {
         return this.computeBandDomain(data);
     }
-    dataToPosition(values, cfg = {}) {
-        var _a, _b;
-        if (0 === values.length || 0 === this._scales.length) return 0;
-        const {position: position, bandScale: bandScale} = this.getPosition(values);
-        return position + bandScale.bandwidth() * (null !== (_b = null !== (_a = cfg.bandPosition) && void 0 !== _a ? _a : this.getSpec().bandPosition) && void 0 !== _b ? _b : config_1.DEFAULT_BAND_POSITION);
-    }
     updateScaleRange() {
         super.updateScaleRange(), this.updateGroupScaleRange();
     }
@@ -29,12 +23,12 @@ class PolarBandAxis extends axis_1.PolarAxis {
         });
     }
     initScales() {
-        super.initScales(), this.calcScales(config_1.DEFAULT_BAND_INNER_PADDING, config_1.DEFAULT_BAND_OUTER_PADDING);
+        super.initScales(), this.calcScales(this._defaultBandInnerPadding, this._defaultBandOuterPadding);
     }
     transformScaleDomain() {}
 }
 
-exports.PolarBandAxis = PolarBandAxis, PolarBandAxis.type = interface_1.ComponentTypeEnum.polarBandAxis, 
+exports.PolarBandAxis = PolarBandAxis, PolarBandAxis.type = type_1.ComponentTypeEnum.polarBandAxis, 
 (0, vutils_1.mixin)(PolarBandAxis, band_axis_mixin_1.BandAxisMixin);
 
 const registerPolarBandAxis = () => {

package/cjs/component/axis/polar/band-axis.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/axis/polar/band-axis.ts"],"names":[],"mappings":";;;AAAA,6CAA6C;AAC7C,+CAAoD;AACpD,iCAAmC;AACnC,qCAAyG;AACzG,6CAAyC;AACzC,8DAAyD;AAGzD,mDAAgD;AAChD,4CAA4C;AAS5C,MAAa,aAAiE,SAAQ,gBAAY;IAAlG;;QAEE,SAAI,GAAG,6BAAiB,CAAC,aAAa,CAAC;QAE7B,WAAM,GAAc,IAAI,kBAAS,EAAE,CAAC;IAyChD,CAAC;IArCW,aAAa,CAAC,IAAmD;QACzE,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,cAAc,CAAC,MAAa,EAAE,MAAwB,EAAE;;QACtD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACpD,OAAO,CAAC,CAAC;SACV;QACD,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACzD,OAAO,CACL,QAAQ,GAAG,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAA,MAAA,GAAG,CAAC,YAAY,mCAAI,IAAI,CAAC,OAAO,EAAE,CAAC,YAAY,mCAAI,8BAAqB,CAAC,CAC9G,CAAC;IACJ,CAAC;IAES,gBAAgB;QACxB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAGS,UAAU;QAClB,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,EAAE;YACrC,OAAQ,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAe,CAAC,SAAS,EAAE,CAAC;QAC3D,CAAC,CAAC;QAEF,uCAAY,MAAM,KAAE,YAAY,IAAG;IACrC,CAAC;IAES,UAAU;QAClB,KAAK,CAAC,UAAU,EAAE,CAAC;QACnB,IAAI,CAAC,UAAU,CAAC,mCAA0B,EAAE,mCAA0B,CAAC,CAAC;IAC1E,CAAC;IAED,oBAAoB;IAEpB,CAAC;;AA5CH,sCA6CC;AA5CQ,kBAAI,GAAG,6BAAiB,CAAC,aAAa,CAAC;AA6ChD,IAAA,cAAK,EAAC,aAAa,EAAE,+BAAa,CAAC,CAAC;AAE7B,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACxC,IAAA,wBAAY,GAAE,CAAC;IACf,iBAAO,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AAC/D,CAAC,CAAC;AAHW,QAAA,qBAAqB,yBAGhC","file":"band-axis.js","sourcesContent":["import { BandScale } from '@visactor/vscale';\nimport { ComponentTypeEnum } from '../../interface';\nimport { PolarAxis } from './axis';\nimport { DEFAULT_BAND_INNER_PADDING, DEFAULT_BAND_OUTER_PADDING, DEFAULT_BAND_POSITION } from './config';\nimport { mixin } from '@visactor/vutils';\nimport { BandAxisMixin } from '../mixin/band-axis-mixin';\nimport type { StringOrNumber } from '../../../typings';\nimport type { IAxisLocationCfg, IPolarBandAxisSpec } from './interface';\nimport { Factory } from '../../../core/factory';\nimport { registerAxis } from '../base-axis';\n\nexport interface PolarBandAxis<T extends IPolarBandAxisSpec = IPolarBandAxisSpec>\n  extends Pick<\n      BandAxisMixin,\n      'valueToPosition' | 'updateGroupScaleRange' | 'getPosition' | 'calcScales' | 'computeBandDomain'\n    >,\n    PolarAxis<T> {}\n\nexport class PolarBandAxis<T extends IPolarBandAxisSpec = IPolarBandAxisSpec> extends PolarAxis<T> {\n  static type = ComponentTypeEnum.polarBandAxis;\n  type = ComponentTypeEnum.polarBandAxis;\n\n  protected _scale: BandScale = new BandScale();\n\n  protected declare _scales: BandScale[];\n\n  protected computeDomain(data: { min: number; max: number; values: any[] }[]): StringOrNumber[] {\n    return this.computeBandDomain(data);\n  }\n\n  dataToPosition(values: any[], cfg: IAxisLocationCfg = {}): number {\n    if (values.length === 0 || this._scales.length === 0) {\n      return 0;\n    }\n    const { position, bandScale } = this.getPosition(values);\n    return (\n      position + bandScale.bandwidth() * (cfg.bandPosition ?? this.getSpec().bandPosition ?? DEFAULT_BAND_POSITION)\n    );\n  }\n\n  protected updateScaleRange() {\n    super.updateScaleRange();\n    this.updateGroupScaleRange();\n  }\n\n  // axisHelper\n  protected axisHelper() {\n    const helper = super.axisHelper();\n    const getBandwidth = (depth: number) => {\n      return (helper.getScale(depth) as BandScale).bandwidth();\n    };\n\n    return { ...helper, getBandwidth };\n  }\n\n  protected initScales() {\n    super.initScales();\n    this.calcScales(DEFAULT_BAND_INNER_PADDING, DEFAULT_BAND_OUTER_PADDING);\n  }\n\n  transformScaleDomain() {\n    // do nothing\n  }\n}\nmixin(PolarBandAxis, BandAxisMixin);\n\nexport const registerPolarBandAxis = () => {\n  registerAxis();\n  Factory.registerComponent(PolarBandAxis.type, PolarBandAxis);\n};\n"]}
+{"version":3,"sources":["../src/component/axis/polar/band-axis.ts"],"names":[],"mappings":";;;AAAA,6CAA6C;AAC7C,+CAAyD;AACzD,iCAAmC;AACnC,6CAAyC;AACzC,8DAAyD;AAGzD,mDAAgD;AAChD,4CAA4C;AAS5C,MAAa,aAAiE,SAAQ,gBAAY;IAAlG;;QAEE,SAAI,GAAG,wBAAiB,CAAC,aAAa,CAAC;QAE7B,WAAM,GAAc,IAAI,kBAAS,EAAE,CAAC;IA+BhD,CAAC;IA3BW,aAAa,CAAC,IAAmD;QACzE,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAES,gBAAgB;QACxB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAGS,UAAU;QAClB,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,EAAE;YACrC,OAAQ,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAe,CAAC,SAAS,EAAE,CAAC;QAC3D,CAAC,CAAC;QAEF,uCAAY,MAAM,KAAE,YAAY,IAAG;IACrC,CAAC;IAES,UAAU;QAClB,KAAK,CAAC,UAAU,EAAE,CAAC;QACnB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAChF,CAAC;IAED,oBAAoB;IAEpB,CAAC;;AAlCH,sCAmCC;AAlCQ,kBAAI,GAAG,wBAAiB,CAAC,aAAa,CAAC;AAmChD,IAAA,cAAK,EAAC,aAAa,EAAE,+BAAa,CAAC,CAAC;AAE7B,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACxC,IAAA,wBAAY,GAAE,CAAC;IACf,iBAAO,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AAC/D,CAAC,CAAC;AAHW,QAAA,qBAAqB,yBAGhC","file":"band-axis.js","sourcesContent":["import { BandScale } from '@visactor/vscale';\nimport { ComponentTypeEnum } from '../../interface/type';\nimport { PolarAxis } from './axis';\nimport { mixin } from '@visactor/vutils';\nimport { BandAxisMixin } from '../mixin/band-axis-mixin';\nimport type { StringOrNumber } from '../../../typings';\nimport type { IPolarBandAxisSpec } from './interface';\nimport { Factory } from '../../../core/factory';\nimport { registerAxis } from '../base-axis';\n\nexport interface PolarBandAxis<T extends IPolarBandAxisSpec = IPolarBandAxisSpec>\n  extends Pick<\n      BandAxisMixin,\n      'valueToPosition' | 'updateGroupScaleRange' | 'getPosition' | 'calcScales' | 'computeBandDomain'\n    >,\n    PolarAxis<T> {}\n\nexport class PolarBandAxis<T extends IPolarBandAxisSpec = IPolarBandAxisSpec> extends PolarAxis<T> {\n  static type = ComponentTypeEnum.polarBandAxis;\n  type = ComponentTypeEnum.polarBandAxis;\n\n  protected _scale: BandScale = new BandScale();\n\n  protected declare _scales: BandScale[];\n\n  protected computeDomain(data: { min: number; max: number; values: any[] }[]): StringOrNumber[] {\n    return this.computeBandDomain(data);\n  }\n\n  protected updateScaleRange() {\n    super.updateScaleRange();\n    this.updateGroupScaleRange();\n  }\n\n  // axisHelper\n  protected axisHelper() {\n    const helper = super.axisHelper();\n    const getBandwidth = (depth: number) => {\n      return (helper.getScale(depth) as BandScale).bandwidth();\n    };\n\n    return { ...helper, getBandwidth };\n  }\n\n  protected initScales() {\n    super.initScales();\n    this.calcScales(this._defaultBandInnerPadding, this._defaultBandOuterPadding);\n  }\n\n  transformScaleDomain() {\n    // do nothing\n  }\n}\nmixin(PolarBandAxis, BandAxisMixin);\n\nexport const registerPolarBandAxis = () => {\n  registerAxis();\n  Factory.registerComponent(PolarBandAxis.type, PolarBandAxis);\n};\n"]}

package/cjs/component/axis/polar/interface/common.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/axis/polar/interface/common.ts"],"names":[],"mappings":"","file":"common.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\nimport type { IComponent } from '../../../interface';\nimport type { IPoint, IPolarOrientType, IPolarPoint } from '../../../../typings';\nimport type { IGrid } from '../../interface';\nimport type { ICompilableData } from '../../../../compile/data';\n\nexport type IPolarGrid = IGrid & {\n  /**\n   * smooth 为 true 时，为圆形 grid，为 false 则为多边形 grid\n   * @default false\n   */\n  smooth?: boolean;\n};\nexport interface IPolarAxisHelper {\n  // axis is continuous\n  isContinuous: boolean;\n\n  dataToPosition: (values: any, cfg?: any) => number;\n  coordToPoint: (point: IPolarPoint) => IPoint;\n  pointToCoord: (point: IPoint) => IPolarPoint;\n  center: () => IPoint;\n\n  getScale: (depth?: number) => IBaseScale;\n  getBandwidth?: (depth?: number) => number; // band轴特有\n  getAxisId: () => number;\n}\n\nexport interface IPolarAxis extends IComponent {\n  startAngle: number;\n  endAngle: number;\n\n  // 为了与直角坐标系轴对齐，这里也通过 orient 来区别 angle/redius 轴\n  getOrient: () => IPolarOrientType;\n  getScale: () => IBaseScale;\n  setRefAngleAxis: (axes: IPolarAxis) => this;\n  tickValues: () => number[];\n  getCenter: () => IPoint;\n  getOuterRadius: () => number;\n  getInnerRadius: () => number;\n  dataToPosition: (values: any[]) => number;\n  positionToData: (position: IPoint) => any;\n  getTickData: () => ICompilableData;\n  // 将半径和角度转换为笛卡尔坐标点\n  coordToPoint: (point: IPolarPoint) => IPoint;\n  pointToCoord: (point: IPoint) => IPolarPoint;\n}\n"]}
+{"version":3,"sources":["../src/component/axis/polar/interface/common.ts"],"names":[],"mappings":"","file":"common.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\nimport type { IComponent } from '../../../interface';\nimport type { IPoint, IPolarOrientType, IPolarPoint } from '../../../../typings';\nimport type { IGrid } from '../../interface';\nimport type { ICompilableData } from '../../../../compile/data';\n\nexport type IPolarGrid = IGrid & {\n  /**\n   * smooth 为 true 时，为圆形 grid，为 false 则为多边形 grid\n   * @default false\n   */\n  smooth?: boolean;\n};\nexport interface IPolarAxisHelper {\n  // axis is continuous\n  isContinuous: boolean;\n\n  dataToPosition: (values: any, cfg?: any) => number;\n  coordToPoint: (point: IPolarPoint) => IPoint;\n  pointToCoord: (point: IPoint) => IPolarPoint;\n  center: () => IPoint;\n\n  getScale: (depth?: number) => IBaseScale;\n  getBandwidth?: (depth?: number) => number; // band轴特有\n  getAxisId: () => number;\n}\n\nexport interface IPolarAxis extends IComponent {\n  startAngle: number;\n  endAngle: number;\n\n  // 为了与直角坐标系轴对齐，这里也通过 orient 来区别 angle/radius 轴\n  getOrient: () => IPolarOrientType;\n  getScale: () => IBaseScale;\n  setRefAngleAxis: (axes: IPolarAxis) => this;\n  tickValues: () => number[];\n  getCenter: () => IPoint;\n  getOuterRadius: () => number;\n  getInnerRadius: () => number;\n  dataToPosition: (values: any[]) => number;\n  positionToData: (position: IPoint) => any;\n  getTickData: () => ICompilableData;\n  // 将半径和角度转换为笛卡尔坐标点\n  coordToPoint: (point: IPolarPoint) => IPoint;\n  pointToCoord: (point: IPoint) => IPolarPoint;\n}\n"]}

package/cjs/component/axis/polar/linear-axis.d.ts

@@ -1,5 +1,5 @@
 import { LinearScale } from '@visactor/vscale';
-import { ComponentTypeEnum } from '../../interface';
+import { ComponentTypeEnum } from '../../interface/type';
 import { PolarAxis } from './axis';
 import type { IPolarLinearAxisSpec } from './interface/spec';
 import { LinearAxisMixin } from '../mixin/linear-axis-mixin';

package/cjs/component/axis/polar/linear-axis.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerPolarLinearAxis = exports.PolarLinearAxis = void 0;
 
-const vscale_1 = require("@visactor/vscale"), interface_1 = require("../../interface"), axis_1 = require("./axis"), linear_axis_mixin_1 = require("../mixin/linear-axis-mixin"), vutils_1 = require("@visactor/vutils"), factory_1 = require("../../../core/factory"), base_axis_1 = require("../base-axis");
+const vscale_1 = require("@visactor/vscale"), type_1 = require("../../interface/type"), axis_1 = require("./axis"), linear_axis_mixin_1 = require("../mixin/linear-axis-mixin"), vutils_1 = require("@visactor/vutils"), factory_1 = require("../../../core/factory"), base_axis_1 = require("../base-axis");
 
 class PolarLinearAxis extends axis_1.PolarAxis {
     constructor() {
-        super(...arguments), this.type = interface_1.ComponentTypeEnum.polarLinearAxis, 
-        this._zero = !0, this._nice = !0, this._scale = new vscale_1.LinearScale;
+        super(...arguments), this.type = type_1.ComponentTypeEnum.polarLinearAxis, this._zero = !0, 
+        this._nice = !0, this._scale = new vscale_1.LinearScale;
     }
     setAttrFromSpec() {
         super.setAttrFromSpec(), this.setExtraAttrFromSpec();
@@ -22,7 +22,7 @@ class PolarLinearAxis extends axis_1.PolarAxis {
     }
 }
 
-exports.PolarLinearAxis = PolarLinearAxis, PolarLinearAxis.type = interface_1.ComponentTypeEnum.polarLinearAxis, 
+exports.PolarLinearAxis = PolarLinearAxis, PolarLinearAxis.type = type_1.ComponentTypeEnum.polarLinearAxis, 
 (0, vutils_1.mixin)(PolarLinearAxis, linear_axis_mixin_1.LinearAxisMixin);
 
 const registerPolarLinearAxis = () => {

package/cjs/component/axis/polar/linear-axis.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/axis/polar/linear-axis.ts"],"names":[],"mappings":";;;AAAA,6CAA+C;AAC/C,+CAAoD;AACpD,iCAAmC;AAEnC,kEAA6D;AAC7D,6CAAyC;AACzC,mDAAgD;AAChD,4CAA4C;AAS5C,MAAa,eAAuE,SAAQ,gBAAY;IAAxG;;QAEE,SAAI,GAAG,6BAAiB,CAAC,eAAe,CAAC;QAE/B,UAAK,GAAY,IAAI,CAAC;QACtB,UAAK,GAAY,IAAI,CAAC;QAEtB,WAAM,GAAG,IAAI,oBAAW,EAAE,CAAC;IAgBvC,CAAC;IAbC,eAAe;QACb,KAAK,CAAC,eAAe,EAAE,CAAC;QACxB,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IAES,UAAU;QAClB,KAAK,CAAC,UAAU,EAAE,CAAC;QACnB,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAES,aAAa,CAAC,IAAmD;QACzE,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;;AAtBH,0CAuBC;AAtBQ,oBAAI,GAAG,6BAAiB,CAAC,eAAe,CAAC;AAwBlD,IAAA,cAAK,EAAC,eAAe,EAAE,mCAAe,CAAC,CAAC;AAEjC,MAAM,uBAAuB,GAAG,GAAG,EAAE;IAC1C,IAAA,wBAAY,GAAE,CAAC;IACf,iBAAO,CAAC,iBAAiB,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AACnE,CAAC,CAAC;AAHW,QAAA,uBAAuB,2BAGlC","file":"linear-axis.js","sourcesContent":["import { LinearScale } from '@visactor/vscale';\nimport { ComponentTypeEnum } from '../../interface';\nimport { PolarAxis } from './axis';\nimport type { IPolarLinearAxisSpec } from './interface/spec';\nimport { LinearAxisMixin } from '../mixin/linear-axis-mixin';\nimport { mixin } from '@visactor/vutils';\nimport { Factory } from '../../../core/factory';\nimport { registerAxis } from '../base-axis';\n\nexport interface PolarLinearAxis<T extends IPolarLinearAxisSpec = IPolarLinearAxisSpec>\n  extends Pick<\n      LinearAxisMixin,\n      'setExtraAttrFromSpec' | 'transformScaleDomain' | 'valueToPosition' | 'computeLinearDomain' | 'setScaleNice'\n    >,\n    PolarAxis<T> {}\n\nexport class PolarLinearAxis<T extends IPolarLinearAxisSpec = IPolarLinearAxisSpec> extends PolarAxis<T> {\n  static type = ComponentTypeEnum.polarLinearAxis;\n  type = ComponentTypeEnum.polarLinearAxis;\n\n  protected _zero: boolean = true;\n  protected _nice: boolean = true;\n\n  protected _scale = new LinearScale();\n  protected declare _groupScales: LinearScale[];\n\n  setAttrFromSpec(): void {\n    super.setAttrFromSpec();\n    this.setExtraAttrFromSpec();\n  }\n\n  protected initScales() {\n    super.initScales();\n    this.setScaleNice();\n  }\n\n  protected computeDomain(data: { min: number; max: number; values: any[] }[]): number[] {\n    return this.computeLinearDomain(data);\n  }\n}\n\nmixin(PolarLinearAxis, LinearAxisMixin);\n\nexport const registerPolarLinearAxis = () => {\n  registerAxis();\n  Factory.registerComponent(PolarLinearAxis.type, PolarLinearAxis);\n};\n"]}
+{"version":3,"sources":["../src/component/axis/polar/linear-axis.ts"],"names":[],"mappings":";;;AAAA,6CAA+C;AAC/C,+CAAyD;AACzD,iCAAmC;AAEnC,kEAA6D;AAC7D,6CAAyC;AACzC,mDAAgD;AAChD,4CAA4C;AAS5C,MAAa,eAAuE,SAAQ,gBAAY;IAAxG;;QAEE,SAAI,GAAG,wBAAiB,CAAC,eAAe,CAAC;QAE/B,UAAK,GAAY,IAAI,CAAC;QACtB,UAAK,GAAY,IAAI,CAAC;QAEtB,WAAM,GAAG,IAAI,oBAAW,EAAE,CAAC;IAgBvC,CAAC;IAbC,eAAe;QACb,KAAK,CAAC,eAAe,EAAE,CAAC;QACxB,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IAES,UAAU;QAClB,KAAK,CAAC,UAAU,EAAE,CAAC;QACnB,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAES,aAAa,CAAC,IAAmD;QACzE,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;;AAtBH,0CAuBC;AAtBQ,oBAAI,GAAG,wBAAiB,CAAC,eAAe,CAAC;AAwBlD,IAAA,cAAK,EAAC,eAAe,EAAE,mCAAe,CAAC,CAAC;AAEjC,MAAM,uBAAuB,GAAG,GAAG,EAAE;IAC1C,IAAA,wBAAY,GAAE,CAAC;IACf,iBAAO,CAAC,iBAAiB,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AACnE,CAAC,CAAC;AAHW,QAAA,uBAAuB,2BAGlC","file":"linear-axis.js","sourcesContent":["import { LinearScale } from '@visactor/vscale';\nimport { ComponentTypeEnum } from '../../interface/type';\nimport { PolarAxis } from './axis';\nimport type { IPolarLinearAxisSpec } from './interface/spec';\nimport { LinearAxisMixin } from '../mixin/linear-axis-mixin';\nimport { mixin } from '@visactor/vutils';\nimport { Factory } from '../../../core/factory';\nimport { registerAxis } from '../base-axis';\n\nexport interface PolarLinearAxis<T extends IPolarLinearAxisSpec = IPolarLinearAxisSpec>\n  extends Pick<\n      LinearAxisMixin,\n      'setExtraAttrFromSpec' | 'transformScaleDomain' | 'valueToPosition' | 'computeLinearDomain' | 'setScaleNice'\n    >,\n    PolarAxis<T> {}\n\nexport class PolarLinearAxis<T extends IPolarLinearAxisSpec = IPolarLinearAxisSpec> extends PolarAxis<T> {\n  static type = ComponentTypeEnum.polarLinearAxis;\n  type = ComponentTypeEnum.polarLinearAxis;\n\n  protected _zero: boolean = true;\n  protected _nice: boolean = true;\n\n  protected _scale = new LinearScale();\n  protected declare _groupScales: LinearScale[];\n\n  setAttrFromSpec(): void {\n    super.setAttrFromSpec();\n    this.setExtraAttrFromSpec();\n  }\n\n  protected initScales() {\n    super.initScales();\n    this.setScaleNice();\n  }\n\n  protected computeDomain(data: { min: number; max: number; values: any[] }[]): number[] {\n    return this.computeLinearDomain(data);\n  }\n}\n\nmixin(PolarLinearAxis, LinearAxisMixin);\n\nexport const registerPolarLinearAxis = () => {\n  registerAxis();\n  Factory.registerComponent(PolarLinearAxis.type, PolarLinearAxis);\n};\n"]}

package/cjs/component/axis/util.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.getPolarAxisTheme = exports.getCartesianAxisTheme = exports.isValidPolarAxis = exports.isValidCartesianAxis = exports.getLinearAxisSpecDomain = exports.getAxisLabelOffset = exports.transformAxisLineStyle = exports.DEFAULT_TITLE_STYLE = void 0;
 
-const vutils_1 = require("@visactor/vutils"), util_1 = require("../../util"), style_1 = require("../../util/style"), util_2 = require("./cartesian/util"), util_3 = require("../util");
+const vutils_1 = require("@visactor/vutils"), merge_spec_1 = require("../../util/spec/merge-spec"), style_1 = require("../../util/style"), common_1 = require("./cartesian/util/common"), util_1 = require("../util");
 
 function transformAxisLineStyle(lineCfg) {
     return (lineCfg = (0, style_1.transformComponentStyle)(lineCfg)).startSymbol = (0, 
@@ -54,21 +54,21 @@ exports.isValidPolarAxis = isValidPolarAxis;
 
 const getCartesianAxisTheme = (orient, type, option) => {
     var _a;
-    const axisTypeTheme = null !== (_a = "band" === type ? (0, util_3.getComponentThemeFromOption)("axisBand", option) : [ "linear", "log", "symlog" ].includes(type) ? (0, 
-    util_3.getComponentThemeFromOption)("axisLinear", option) : {}) && void 0 !== _a ? _a : {}, axisTheme = (0, 
-    util_2.isXAxis)(orient) ? (0, util_3.getComponentThemeFromOption)("axisX", option) : (0, 
-    util_3.getComponentThemeFromOption)("axisY", option);
-    return (0, util_1.mergeSpec)({}, (0, util_3.getComponentThemeFromOption)("axis", option), axisTypeTheme, axisTheme);
+    const axisTypeTheme = null !== (_a = "band" === type ? (0, util_1.getComponentThemeFromOption)("axisBand", option) : [ "linear", "log", "symlog" ].includes(type) ? (0, 
+    util_1.getComponentThemeFromOption)("axisLinear", option) : {}) && void 0 !== _a ? _a : {}, axisTheme = (0, 
+    common_1.isXAxis)(orient) ? (0, util_1.getComponentThemeFromOption)("axisX", option) : (0, 
+    util_1.getComponentThemeFromOption)("axisY", option);
+    return (0, merge_spec_1.mergeSpec)({}, (0, util_1.getComponentThemeFromOption)("axis", option), axisTypeTheme, axisTheme);
 };
 
 exports.getCartesianAxisTheme = getCartesianAxisTheme;
 
 const getPolarAxisTheme = (orient, type, option) => {
     var _a;
-    const axisTypeTheme = null !== (_a = "band" === type ? (0, util_3.getComponentThemeFromOption)("axisBand", option) : "linear" === type ? (0, 
-    util_3.getComponentThemeFromOption)("axisLinear", option) : {}) && void 0 !== _a ? _a : {}, axisTheme = "angle" === orient ? (0, 
-    util_3.getComponentThemeFromOption)("axisAngle", option) : (0, util_3.getComponentThemeFromOption)("axisRadius", option);
-    return (0, util_1.mergeSpec)({}, (0, util_3.getComponentThemeFromOption)("axis", option), axisTypeTheme, axisTheme);
+    const axisTypeTheme = null !== (_a = "band" === type ? (0, util_1.getComponentThemeFromOption)("axisBand", option) : "linear" === type ? (0, 
+    util_1.getComponentThemeFromOption)("axisLinear", option) : {}) && void 0 !== _a ? _a : {}, axisTheme = "angle" === orient ? (0, 
+    util_1.getComponentThemeFromOption)("axisAngle", option) : (0, util_1.getComponentThemeFromOption)("axisRadius", option);
+    return (0, merge_spec_1.mergeSpec)({}, (0, util_1.getComponentThemeFromOption)("axis", option), axisTypeTheme, axisTheme);
 };
 
 exports.getPolarAxisTheme = getPolarAxisTheme;

package/cjs/component/axis/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/axis/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { get } from '@visactor/vutils';\nimport { mergeSpec } from '../../util';\nimport type { IOrientType, IPolarOrientType } from '../../typings';\nimport type { AxisType, ICommonAxisSpec, ILinearAxisSpec } from './interface';\nimport { transformComponentStyle } from '../../util/style';\nimport { isXAxis } from './cartesian/util';\nimport type { IModelOption } from '../../model/interface';\nimport { getComponentThemeFromOption } from '../util';\n\nexport const DEFAULT_TITLE_STYLE = {\n  left: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  right: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  radius: {},\n  angle: {}\n};\n\nexport function transformAxisLineStyle(lineCfg: any) {\n  lineCfg = transformComponentStyle(lineCfg);\n  lineCfg.startSymbol = transformComponentStyle(lineCfg.startSymbol);\n  lineCfg.endSymbol = transformComponentStyle(lineCfg.endSymbol);\n\n  return lineCfg;\n}\n\nexport function getAxisLabelOffset(axisSpec: ICommonAxisSpec) {\n  let labelOffset = 0;\n  if (get(axisSpec, 'tick.visible')) {\n    labelOffset += get(axisSpec, 'tick.tickSize');\n  }\n\n  if (get(axisSpec, 'label.visible')) {\n    labelOffset += get(axisSpec, 'label.space');\n  }\n\n  return labelOffset;\n}\n\nexport function getLinearAxisSpecDomain(\n  axisSpec: ILinearAxisSpec,\n  defaultDomain?: {\n    min?: number;\n    max?: number;\n  }\n) {\n  // 兼容策略\n  return {\n    min: axisSpec.min ?? axisSpec.range?.min ?? defaultDomain?.min,\n    max: axisSpec.max ?? axisSpec.range?.max ?? defaultDomain?.max\n  };\n}\n\nexport function isValidCartesianAxis(spec: any) {\n  const orient = spec?.orient;\n  return orient === 'top' || orient === 'bottom' || orient === 'left' || orient === 'right' || orient === 'z';\n}\n\nexport function isValidPolarAxis(spec: any) {\n  const orient = spec?.orient;\n  return orient === 'angle' || orient === 'radius';\n}\n\nexport const getCartesianAxisTheme = (orient: IOrientType, type: AxisType, option: Partial<IModelOption>) => {\n  const axisTypeTheme =\n    (type === 'band'\n      ? getComponentThemeFromOption('axisBand', option)\n      : (['linear', 'log', 'symlog'] as AxisType[]).includes(type)\n      ? getComponentThemeFromOption('axisLinear', option)\n      : {}) ?? {};\n  const axisTheme = isXAxis(orient)\n    ? getComponentThemeFromOption('axisX', option)\n    : getComponentThemeFromOption('axisY', option);\n  return mergeSpec({}, getComponentThemeFromOption('axis', option), axisTypeTheme, axisTheme);\n};\n\nexport const getPolarAxisTheme = (orient: IPolarOrientType, type: AxisType, option: Partial<IModelOption>) => {\n  const axisTypeTheme =\n    (type === 'band'\n      ? getComponentThemeFromOption('axisBand', option)\n      : type === 'linear'\n      ? getComponentThemeFromOption('axisLinear', option)\n      : {}) ?? {};\n  const axisTheme =\n    orient === 'angle'\n      ? getComponentThemeFromOption('axisAngle', option)\n      : getComponentThemeFromOption('axisRadius', option);\n  return mergeSpec({}, getComponentThemeFromOption('axis', option), axisTypeTheme, axisTheme);\n};\n"]}
+{"version":3,"sources":["../src/component/axis/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { get } from '@visactor/vutils';\nimport { mergeSpec } from '../../util/spec/merge-spec';\nimport type { IOrientType, IPolarOrientType } from '../../typings';\nimport type { AxisType, ICommonAxisSpec, ILinearAxisSpec } from './interface';\nimport { transformComponentStyle } from '../../util/style';\nimport { isXAxis } from './cartesian/util/common';\nimport type { IModelOption } from '../../model/interface';\nimport { getComponentThemeFromOption } from '../util';\n\nexport const DEFAULT_TITLE_STYLE = {\n  left: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  right: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  radius: {},\n  angle: {}\n};\n\nexport function transformAxisLineStyle(lineCfg: any) {\n  lineCfg = transformComponentStyle(lineCfg);\n  lineCfg.startSymbol = transformComponentStyle(lineCfg.startSymbol);\n  lineCfg.endSymbol = transformComponentStyle(lineCfg.endSymbol);\n\n  return lineCfg;\n}\n\nexport function getAxisLabelOffset(axisSpec: ICommonAxisSpec) {\n  let labelOffset = 0;\n  if (get(axisSpec, 'tick.visible')) {\n    labelOffset += get(axisSpec, 'tick.tickSize');\n  }\n\n  if (get(axisSpec, 'label.visible')) {\n    labelOffset += get(axisSpec, 'label.space');\n  }\n\n  return labelOffset;\n}\n\nexport function getLinearAxisSpecDomain(\n  axisSpec: ILinearAxisSpec,\n  defaultDomain?: {\n    min?: number;\n    max?: number;\n  }\n) {\n  // 兼容策略\n  return {\n    min: axisSpec.min ?? axisSpec.range?.min ?? defaultDomain?.min,\n    max: axisSpec.max ?? axisSpec.range?.max ?? defaultDomain?.max\n  };\n}\n\nexport function isValidCartesianAxis(spec: any) {\n  const orient = spec?.orient;\n  return orient === 'top' || orient === 'bottom' || orient === 'left' || orient === 'right' || orient === 'z';\n}\n\nexport function isValidPolarAxis(spec: any) {\n  const orient = spec?.orient;\n  return orient === 'angle' || orient === 'radius';\n}\n\nexport const getCartesianAxisTheme = (orient: IOrientType, type: AxisType, option: Partial<IModelOption>) => {\n  const axisTypeTheme =\n    (type === 'band'\n      ? getComponentThemeFromOption('axisBand', option)\n      : (['linear', 'log', 'symlog'] as AxisType[]).includes(type)\n      ? getComponentThemeFromOption('axisLinear', option)\n      : {}) ?? {};\n  const axisTheme = isXAxis(orient)\n    ? getComponentThemeFromOption('axisX', option)\n    : getComponentThemeFromOption('axisY', option);\n  return mergeSpec({}, getComponentThemeFromOption('axis', option), axisTypeTheme, axisTheme);\n};\n\nexport const getPolarAxisTheme = (orient: IPolarOrientType, type: AxisType, option: Partial<IModelOption>) => {\n  const axisTypeTheme =\n    (type === 'band'\n      ? getComponentThemeFromOption('axisBand', option)\n      : type === 'linear'\n      ? getComponentThemeFromOption('axisLinear', option)\n      : {}) ?? {};\n  const axisTheme =\n    orient === 'angle'\n      ? getComponentThemeFromOption('axisAngle', option)\n      : getComponentThemeFromOption('axisRadius', option);\n  return mergeSpec({}, getComponentThemeFromOption('axis', option), axisTypeTheme, axisTheme);\n};\n"]}

package/cjs/component/base/base-component.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseComponent = void 0;
 
-const base_model_1 = require("../../model/base-model"), plugin_service_1 = require("../../plugin/components/plugin-service"), vutils_1 = require("@visactor/vutils"), util_1 = require("./util"), constant_1 = require("../../constant"), animate_manager_1 = require("../../animation/animate-manager"), util_2 = require("../../util");
+const base_model_1 = require("../../model/base-model"), plugin_service_1 = require("../../plugin/components/plugin-service"), vutils_1 = require("@visactor/vutils"), util_1 = require("./util"), constant_1 = require("../../constant"), animate_manager_1 = require("../../animation/animate-manager"), preprocess_1 = require("../../util/spec/preprocess"), space_1 = require("../../util/space");
 
 class BaseComponent extends base_model_1.BaseModel {
     getRegions() {
@@ -41,13 +41,13 @@ class BaseComponent extends base_model_1.BaseModel {
         };
     }
     _getTheme() {
-        return (0, util_2.preprocessSpecOrTheme)("theme", (0, util_1.getComponentThemeFromGlobalTheme)(this.type, this._option, this._originalSpec), this.getColorScheme());
+        return (0, preprocess_1.preprocessSpecOrTheme)("theme", (0, util_1.getComponentThemeFromGlobalTheme)(this.type, this._option, this._originalSpec), this.getColorScheme());
     }
     _mergeThemeToSpec() {
         super._mergeThemeToSpec();
         const {padding: padding, noOuterPadding: noOuterPadding = !0, orient: orient} = this.getSpec();
         noOuterPadding && padding && orient && (this._spec.padding = Object.assign(Object.assign({}, (0, 
-        util_2.normalizeLayoutPaddingSpec)(padding)), {
+        space_1.normalizeLayoutPaddingSpec)(padding)), {
             [orient]: 0
         }));
     }
@@ -79,7 +79,7 @@ class BaseComponent extends base_model_1.BaseModel {
         this.pluginService = null;
     }
     compile() {
-        this.compileSignal(), this.compileMarks();
+        this.compileMarks();
     }
     compileMarks(group) {
         this.getMarks().forEach((m => {

package/cjs/component/base/base-component.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/base/base-component.ts"],"names":[],"mappings":"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","file":"base-component.js","sourcesContent":["import type { IGraphic, IGroup, INode } from '@visactor/vrender-core';\nimport { BaseModel } from '../../model/base-model';\nimport type { IRegion } from '../../region/interface';\nimport type { ComponentTypeEnum, IComponent, IComponentOption } from '../interface';\nimport type { BaseEventParams } from '../../event/interface';\nimport { ComponentPluginService } from '../../plugin/components/plugin-service';\nimport type { IComponentPluginService, IComponentPlugin } from '../../plugin/components/interface';\nimport { isEqual } from '@visactor/vutils';\nimport { getComponentThemeFromGlobalTheme } from './util';\nimport type { IGroupMark } from '@visactor/vgrammar-core';\nimport { Event_Source_Type } from '../../constant';\nimport type { IAnimate } from '../../animation/interface';\nimport { AnimateManager } from '../../animation/animate-manager';\nimport type { Datum } from '../../typings';\nimport { normalizeLayoutPaddingSpec, preprocessSpecOrTheme } from '../../util';\nimport type { IComponentSpec } from './interface';\n\nexport abstract class BaseComponent<T extends IComponentSpec = IComponentSpec>\n  extends BaseModel<T>\n  implements IComponent\n{\n  name: string = 'component';\n  readonly modelType: string = 'component';\n  pluginService?: IComponentPluginService;\n  protected declare _option: IComponentOption;\n\n  protected _regions: IRegion[] = [];\n  getRegions() {\n    return this._regions;\n  }\n\n  protected _container: IGroup;\n\n  created() {\n    super.created();\n    this.pluginService = new ComponentPluginService(this);\n  }\n\n  animate?: IAnimate;\n\n  constructor(spec: T, options: IComponentOption) {\n    super(spec, options);\n    this._regions = options.getRegionsInIndex();\n    this.layoutBindRegionID = this._regions.map(x => x.id);\n    // 创建组件自己的动画管理器\n    if (this._option.animation) {\n      this.animate = new AnimateManager({\n        getCompiler: options.getCompiler\n      });\n    }\n  }\n\n  abstract changeRegions(regions: IRegion[]): void;\n  abstract getVRenderComponents(): IGraphic[];\n\n  protected callPlugin(cb: (plugin: IComponentPlugin) => void) {\n    if (this.pluginService) {\n      this.pluginService.getAll().forEach(plugin => cb(plugin));\n    }\n  }\n\n  protected eventPos(markEventParams: BaseEventParams) {\n    return {\n      x: (markEventParams.event as any).viewX - this.getLayoutStartPoint().x,\n      y: (markEventParams.event as any).viewY - this.getLayoutStartPoint().y\n    };\n  }\n\n  protected _getTheme() {\n    return preprocessSpecOrTheme(\n      'theme',\n      getComponentThemeFromGlobalTheme(this.type as ComponentTypeEnum, this._option, this._originalSpec),\n      this.getColorScheme()\n    );\n  }\n\n  protected _mergeThemeToSpec() {\n    super._mergeThemeToSpec();\n\n    // 默认忽略外侧 padding\n    const { padding, noOuterPadding = true, orient } = this.getSpec();\n    if (noOuterPadding && padding && orient) {\n      this._spec.padding = {\n        ...normalizeLayoutPaddingSpec(padding),\n        [orient]: 0\n      };\n    }\n  }\n\n  protected getContainer() {\n    if (!this._container) {\n      this._container = this._option?.globalInstance.getStage().find(node => node.name === 'root', true);\n    }\n\n    return this._container;\n  }\n\n  /**\n   * updateSpec\n   */\n  _compareSpec() {\n    const result = super._compareSpec();\n    if (!result.reMake) {\n      result.reMake = ['seriesId', 'seriesIndex', 'regionId', 'regionIndex'].some(k => {\n        return isEqual(this._originalSpec?.[k], this.getSpec()[k]);\n      });\n    }\n    if (this._originalSpec?.visible !== (<any>this.getSpec()).visible) {\n      result.reCompile = true;\n    }\n    return result;\n  }\n\n  release() {\n    super.release();\n    this.clear();\n  }\n\n  clear() {\n    const components = this.getVRenderComponents();\n    if (components && components.length) {\n      components.forEach(c => {\n        if (c) {\n          this.getContainer()?.removeChild(c as unknown as INode);\n          c = null;\n        }\n      });\n    }\n    this._container = null;\n    this.pluginService?.disposeAll();\n    this.pluginService = null;\n  }\n\n  compile(): void {\n    this.compileSignal();\n    this.compileMarks();\n  }\n\n  compileMarks(group?: string | IGroupMark) {\n    this.getMarks().forEach(m => {\n      m.compile({ group });\n      m.getProduct()?.configure({\n        context: {\n          model: this\n        }\n      });\n    });\n  }\n\n  // 代理组件事件\n  protected _delegateEvent = (component: IGraphic, event: any, type: string, item: any = null, datum: Datum = null) => {\n    this.event.emit(\n      type,\n      {\n        model: this,\n        node: component,\n        event,\n        item: item,\n        datum: datum,\n        source: Event_Source_Type.chart,\n        chart: this._option?.globalInstance?.getChart()\n      },\n      'model'\n    );\n  };\n\n  getGraphicBounds() {\n    return this.getVRenderComponents()?.[0]?.AABBBounds ?? super.getGraphicBounds();\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/base/base-component.ts"],"names":[],"mappings":"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","file":"base-component.js","sourcesContent":["import type { IGraphic, IGroup, INode } from '@visactor/vrender-core';\nimport { BaseModel } from '../../model/base-model';\nimport type { IRegion } from '../../region/interface';\nimport type { ComponentTypeEnum, IComponent, IComponentOption } from '../interface';\nimport type { BaseEventParams } from '../../event/interface';\nimport { ComponentPluginService } from '../../plugin/components/plugin-service';\nimport type { IComponentPluginService, IComponentPlugin } from '../../plugin/components/interface';\nimport { isEqual } from '@visactor/vutils';\nimport { getComponentThemeFromGlobalTheme } from './util';\nimport type { IGroupMark } from '@visactor/vgrammar-core';\nimport { Event_Source_Type } from '../../constant';\nimport type { IAnimate } from '../../animation/interface';\nimport { AnimateManager } from '../../animation/animate-manager';\nimport type { Datum } from '../../typings';\nimport { preprocessSpecOrTheme } from '../../util/spec/preprocess';\nimport { normalizeLayoutPaddingSpec } from '../../util/space';\nimport type { IComponentSpec } from './interface';\n\nexport abstract class BaseComponent<T extends IComponentSpec = IComponentSpec>\n  extends BaseModel<T>\n  implements IComponent\n{\n  name: string = 'component';\n  readonly modelType: string = 'component';\n  pluginService?: IComponentPluginService;\n  protected declare _option: IComponentOption;\n\n  protected _regions: IRegion[] = [];\n  getRegions() {\n    return this._regions;\n  }\n\n  protected _container: IGroup;\n\n  created() {\n    super.created();\n    this.pluginService = new ComponentPluginService(this);\n  }\n\n  animate?: IAnimate;\n\n  constructor(spec: T, options: IComponentOption) {\n    super(spec, options);\n    this._regions = options.getRegionsInIndex();\n    this.layoutBindRegionID = this._regions.map(x => x.id);\n    // 创建组件自己的动画管理器\n    if (this._option.animation) {\n      this.animate = new AnimateManager({\n        getCompiler: options.getCompiler\n      });\n    }\n  }\n\n  abstract changeRegions(regions: IRegion[]): void;\n  abstract getVRenderComponents(): IGraphic[];\n\n  protected callPlugin(cb: (plugin: IComponentPlugin) => void) {\n    if (this.pluginService) {\n      this.pluginService.getAll().forEach(plugin => cb(plugin));\n    }\n  }\n\n  protected eventPos(markEventParams: BaseEventParams) {\n    return {\n      x: (markEventParams.event as any).viewX - this.getLayoutStartPoint().x,\n      y: (markEventParams.event as any).viewY - this.getLayoutStartPoint().y\n    };\n  }\n\n  protected _getTheme() {\n    return preprocessSpecOrTheme(\n      'theme',\n      getComponentThemeFromGlobalTheme(this.type as ComponentTypeEnum, this._option, this._originalSpec),\n      this.getColorScheme()\n    );\n  }\n\n  protected _mergeThemeToSpec() {\n    super._mergeThemeToSpec();\n\n    // 默认忽略外侧 padding\n    const { padding, noOuterPadding = true, orient } = this.getSpec();\n    if (noOuterPadding && padding && orient) {\n      this._spec.padding = {\n        ...normalizeLayoutPaddingSpec(padding),\n        [orient]: 0\n      };\n    }\n  }\n\n  protected getContainer() {\n    if (!this._container) {\n      this._container = this._option?.globalInstance.getStage().find(node => node.name === 'root', true);\n    }\n\n    return this._container;\n  }\n\n  /**\n   * updateSpec\n   */\n  _compareSpec() {\n    const result = super._compareSpec();\n    if (!result.reMake) {\n      result.reMake = ['seriesId', 'seriesIndex', 'regionId', 'regionIndex'].some(k => {\n        return isEqual(this._originalSpec?.[k], this.getSpec()[k]);\n      });\n    }\n    if (this._originalSpec?.visible !== (<any>this.getSpec()).visible) {\n      result.reCompile = true;\n    }\n    return result;\n  }\n\n  release() {\n    super.release();\n    this.clear();\n  }\n\n  clear() {\n    const components = this.getVRenderComponents();\n    if (components && components.length) {\n      components.forEach(c => {\n        if (c) {\n          this.getContainer()?.removeChild(c as unknown as INode);\n          c = null;\n        }\n      });\n    }\n    this._container = null;\n    this.pluginService?.disposeAll();\n    this.pluginService = null;\n  }\n\n  compile(): void {\n    this.compileMarks();\n  }\n\n  compileMarks(group?: string | IGroupMark) {\n    this.getMarks().forEach(m => {\n      m.compile({ group });\n      m.getProduct()?.configure({\n        context: {\n          model: this\n        }\n      });\n    });\n  }\n\n  // 代理组件事件\n  protected _delegateEvent = (component: IGraphic, event: any, type: string, item: any = null, datum: Datum = null) => {\n    this.event.emit(\n      type,\n      {\n        model: this,\n        node: component,\n        event,\n        item: item,\n        datum: datum,\n        source: Event_Source_Type.chart,\n        chart: this._option?.globalInstance?.getChart()\n      },\n      'model'\n    );\n  };\n\n  getGraphicBounds() {\n    return this.getVRenderComponents()?.[0]?.AABBBounds ?? super.getGraphicBounds();\n  }\n}\n"]}

package/cjs/component/base/util.d.ts

@@ -1,3 +1,3 @@
 import type { IModelOption } from '../../model/interface';
-import { ComponentTypeEnum } from '../interface';
+import { ComponentTypeEnum } from '../interface/type';
 export declare function getComponentThemeFromGlobalTheme(type: ComponentTypeEnum, option: Partial<IModelOption>, componentSpec: any): any;

package/cjs/component/base/util.js

@@ -4,49 +4,49 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.getComponentThemeFromGlobalTheme = void 0;
 
-const util_1 = require("../../theme/util"), util_2 = require("../axis/cartesian/util"), util_3 = require("../axis/util"), util_4 = require("../crosshair/util"), interface_1 = require("../interface"), util_5 = require("../legend/util"), util_6 = require("../util");
+const util_1 = require("../../theme/util"), common_1 = require("../axis/cartesian/util/common"), util_2 = require("../axis/util"), util_3 = require("../crosshair/util"), type_1 = require("../interface/type"), util_4 = require("../legend/util"), util_5 = require("../util");
 
 function getComponentThemeFromGlobalTheme(type, option, componentSpec) {
     var _a;
     const chart = null === (_a = option.getChart) || void 0 === _a ? void 0 : _a.call(option);
     switch (type) {
-      case interface_1.ComponentTypeEnum.cartesianBandAxis:
-        return (0, util_3.getCartesianAxisTheme)((0, util_2.getOrient)(componentSpec), "band", option);
+      case type_1.ComponentTypeEnum.cartesianBandAxis:
+        return (0, util_2.getCartesianAxisTheme)((0, common_1.getOrient)(componentSpec), "band", option);
 
-      case interface_1.ComponentTypeEnum.cartesianLinearAxis:
-        return (0, util_3.getCartesianAxisTheme)((0, util_2.getOrient)(componentSpec), "linear", option);
+      case type_1.ComponentTypeEnum.cartesianLinearAxis:
+        return (0, util_2.getCartesianAxisTheme)((0, common_1.getOrient)(componentSpec), "linear", option);
 
-      case interface_1.ComponentTypeEnum.cartesianLogAxis:
-        return (0, util_3.getCartesianAxisTheme)((0, util_2.getOrient)(componentSpec), "log", option);
+      case type_1.ComponentTypeEnum.cartesianLogAxis:
+        return (0, util_2.getCartesianAxisTheme)((0, common_1.getOrient)(componentSpec), "log", option);
 
-      case interface_1.ComponentTypeEnum.cartesianSymlogAxis:
-        return (0, util_3.getCartesianAxisTheme)((0, util_2.getOrient)(componentSpec), "symlog", option);
+      case type_1.ComponentTypeEnum.cartesianSymlogAxis:
+        return (0, util_2.getCartesianAxisTheme)((0, common_1.getOrient)(componentSpec), "symlog", option);
 
-      case interface_1.ComponentTypeEnum.cartesianAxis:
-      case interface_1.ComponentTypeEnum.cartesianTimeAxis:
-        return (0, util_3.getCartesianAxisTheme)((0, util_2.getOrient)(componentSpec), void 0, option);
+      case type_1.ComponentTypeEnum.cartesianAxis:
+      case type_1.ComponentTypeEnum.cartesianTimeAxis:
+        return (0, util_2.getCartesianAxisTheme)((0, common_1.getOrient)(componentSpec), void 0, option);
 
-      case interface_1.ComponentTypeEnum.polarBandAxis:
-        return (0, util_3.getPolarAxisTheme)(componentSpec.orient, "band", option);
+      case type_1.ComponentTypeEnum.polarBandAxis:
+        return (0, util_2.getPolarAxisTheme)(componentSpec.orient, "band", option);
 
-      case interface_1.ComponentTypeEnum.polarLinearAxis:
-        return (0, util_3.getPolarAxisTheme)(componentSpec.orient, "linear", option);
+      case type_1.ComponentTypeEnum.polarLinearAxis:
+        return (0, util_2.getPolarAxisTheme)(componentSpec.orient, "linear", option);
 
-      case interface_1.ComponentTypeEnum.polarAxis:
-        return (0, util_3.getPolarAxisTheme)(componentSpec.orient, void 0, option);
+      case type_1.ComponentTypeEnum.polarAxis:
+        return (0, util_2.getPolarAxisTheme)(componentSpec.orient, void 0, option);
 
-      case interface_1.ComponentTypeEnum.cartesianCrosshair:
-        return (0, util_4.getCartesianCrosshairTheme)(option, chart);
+      case type_1.ComponentTypeEnum.cartesianCrosshair:
+        return (0, util_3.getCartesianCrosshairTheme)(option, chart);
 
-      case interface_1.ComponentTypeEnum.polarCrosshair:
-        return (0, util_4.getPolarCrosshairTheme)(option, chart);
+      case type_1.ComponentTypeEnum.polarCrosshair:
+        return (0, util_3.getPolarCrosshairTheme)(option, chart);
 
-      case interface_1.ComponentTypeEnum.colorLegend:
-      case interface_1.ComponentTypeEnum.sizeLegend:
-        return (0, util_1.getThemeFromOption)(`component.${type}.${(0, util_5.getLayout)(componentSpec)}`, option);
+      case type_1.ComponentTypeEnum.colorLegend:
+      case type_1.ComponentTypeEnum.sizeLegend:
+        return (0, util_1.getThemeFromOption)(`component.${type}.${(0, util_4.getLayout)(componentSpec)}`, option);
 
       default:
-        return (0, util_6.getComponentThemeFromOption)(type, option);
+        return (0, util_5.getComponentThemeFromOption)(type, option);
     }
 }
 

package/cjs/component/base/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/base/util.ts"],"names":[],"mappings":";;;AACA,2CAAsD;AACtD,iDAAmD;AACnD,uCAAwE;AACxE,4CAAuF;AACvF,4CAAiD;AACjD,yCAA2C;AAC3C,kCAAsD;AAEtD,SAAgB,gCAAgC,CAC9C,IAAuB,EACvB,MAA6B,EAC7B,aAAkB;;IAElB,MAAM,KAAK,GAAG,MAAA,MAAM,CAAC,QAAQ,sDAAI,CAAC;IAClC,QAAQ,IAAI,EAAE;QACZ,KAAK,6BAAiB,CAAC,iBAAiB;YACtC,OAAO,IAAA,4BAAqB,EAAC,IAAA,gBAAS,EAAC,aAAa,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACzE,KAAK,6BAAiB,CAAC,mBAAmB;YACxC,OAAO,IAAA,4BAAqB,EAAC,IAAA,gBAAS,EAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC3E,KAAK,6BAAiB,CAAC,gBAAgB;YACrC,OAAO,IAAA,4BAAqB,EAAC,IAAA,gBAAS,EAAC,aAAa,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACxE,KAAK,6BAAiB,CAAC,mBAAmB;YACxC,OAAO,IAAA,4BAAqB,EAAC,IAAA,gBAAS,EAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC3E,KAAK,6BAAiB,CAAC,aAAa,CAAC;QACrC,KAAK,6BAAiB,CAAC,iBAAiB;YACtC,OAAO,IAAA,4BAAqB,EAAC,IAAA,gBAAS,EAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC5E,KAAK,6BAAiB,CAAC,aAAa;YAClC,OAAO,IAAA,wBAAiB,EAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACjE,KAAK,6BAAiB,CAAC,eAAe;YACpC,OAAO,IAAA,wBAAiB,EAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACnE,KAAK,6BAAiB,CAAC,SAAS;YAC9B,OAAO,IAAA,wBAAiB,EAAC,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACpE,KAAK,6BAAiB,CAAC,kBAAkB;YACvC,OAAO,IAAA,iCAA0B,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACnD,KAAK,6BAAiB,CAAC,cAAc;YACnC,OAAO,IAAA,6BAAsB,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC/C,KAAK,6BAAiB,CAAC,WAAW,CAAC;QACnC,KAAK,6BAAiB,CAAC,UAAU;YAC/B,OAAO,IAAA,yBAAkB,EAAC,aAAa,IAAI,IAAI,IAAA,gBAAS,EAAC,aAAa,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACrF;YACE,OAAO,IAAA,kCAA2B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KACpD;AACH,CAAC;AAlCD,4EAkCC","file":"util.js","sourcesContent":["import type { IModelOption } from '../../model/interface';\nimport { getThemeFromOption } from '../../theme/util';\nimport { getOrient } from '../axis/cartesian/util';\nimport { getCartesianAxisTheme, getPolarAxisTheme } from '../axis/util';\nimport { getCartesianCrosshairTheme, getPolarCrosshairTheme } from '../crosshair/util';\nimport { ComponentTypeEnum } from '../interface';\nimport { getLayout } from '../legend/util';\nimport { getComponentThemeFromOption } from '../util';\n\nexport function getComponentThemeFromGlobalTheme(\n  type: ComponentTypeEnum,\n  option: Partial<IModelOption>,\n  componentSpec: any\n) {\n  const chart = option.getChart?.();\n  switch (type) {\n    case ComponentTypeEnum.cartesianBandAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'band', option);\n    case ComponentTypeEnum.cartesianLinearAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'linear', option);\n    case ComponentTypeEnum.cartesianLogAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'log', option);\n    case ComponentTypeEnum.cartesianSymlogAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'symlog', option);\n    case ComponentTypeEnum.cartesianAxis:\n    case ComponentTypeEnum.cartesianTimeAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), undefined, option);\n    case ComponentTypeEnum.polarBandAxis:\n      return getPolarAxisTheme(componentSpec.orient, 'band', option);\n    case ComponentTypeEnum.polarLinearAxis:\n      return getPolarAxisTheme(componentSpec.orient, 'linear', option);\n    case ComponentTypeEnum.polarAxis:\n      return getPolarAxisTheme(componentSpec.orient, undefined, option);\n    case ComponentTypeEnum.cartesianCrosshair:\n      return getCartesianCrosshairTheme(option, chart);\n    case ComponentTypeEnum.polarCrosshair:\n      return getPolarCrosshairTheme(option, chart);\n    case ComponentTypeEnum.colorLegend:\n    case ComponentTypeEnum.sizeLegend:\n      return getThemeFromOption(`component.${type}.${getLayout(componentSpec)}`, option);\n    default:\n      return getComponentThemeFromOption(type, option);\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/base/util.ts"],"names":[],"mappings":";;;AACA,2CAAsD;AACtD,0DAA0D;AAC1D,uCAAwE;AACxE,4CAAuF;AACvF,4CAAsD;AACtD,yCAA2C;AAC3C,kCAAsD;AAEtD,SAAgB,gCAAgC,CAC9C,IAAuB,EACvB,MAA6B,EAC7B,aAAkB;;IAElB,MAAM,KAAK,GAAG,MAAA,MAAM,CAAC,QAAQ,sDAAI,CAAC;IAClC,QAAQ,IAAI,EAAE;QACZ,KAAK,wBAAiB,CAAC,iBAAiB;YACtC,OAAO,IAAA,4BAAqB,EAAC,IAAA,kBAAS,EAAC,aAAa,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACzE,KAAK,wBAAiB,CAAC,mBAAmB;YACxC,OAAO,IAAA,4BAAqB,EAAC,IAAA,kBAAS,EAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC3E,KAAK,wBAAiB,CAAC,gBAAgB;YACrC,OAAO,IAAA,4BAAqB,EAAC,IAAA,kBAAS,EAAC,aAAa,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACxE,KAAK,wBAAiB,CAAC,mBAAmB;YACxC,OAAO,IAAA,4BAAqB,EAAC,IAAA,kBAAS,EAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC3E,KAAK,wBAAiB,CAAC,aAAa,CAAC;QACrC,KAAK,wBAAiB,CAAC,iBAAiB;YACtC,OAAO,IAAA,4BAAqB,EAAC,IAAA,kBAAS,EAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC5E,KAAK,wBAAiB,CAAC,aAAa;YAClC,OAAO,IAAA,wBAAiB,EAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACjE,KAAK,wBAAiB,CAAC,eAAe;YACpC,OAAO,IAAA,wBAAiB,EAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACnE,KAAK,wBAAiB,CAAC,SAAS;YAC9B,OAAO,IAAA,wBAAiB,EAAC,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACpE,KAAK,wBAAiB,CAAC,kBAAkB;YACvC,OAAO,IAAA,iCAA0B,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACnD,KAAK,wBAAiB,CAAC,cAAc;YACnC,OAAO,IAAA,6BAAsB,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC/C,KAAK,wBAAiB,CAAC,WAAW,CAAC;QACnC,KAAK,wBAAiB,CAAC,UAAU;YAC/B,OAAO,IAAA,yBAAkB,EAAC,aAAa,IAAI,IAAI,IAAA,gBAAS,EAAC,aAAa,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACrF;YACE,OAAO,IAAA,kCAA2B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KACpD;AACH,CAAC;AAlCD,4EAkCC","file":"util.js","sourcesContent":["import type { IModelOption } from '../../model/interface';\nimport { getThemeFromOption } from '../../theme/util';\nimport { getOrient } from '../axis/cartesian/util/common';\nimport { getCartesianAxisTheme, getPolarAxisTheme } from '../axis/util';\nimport { getCartesianCrosshairTheme, getPolarCrosshairTheme } from '../crosshair/util';\nimport { ComponentTypeEnum } from '../interface/type';\nimport { getLayout } from '../legend/util';\nimport { getComponentThemeFromOption } from '../util';\n\nexport function getComponentThemeFromGlobalTheme(\n  type: ComponentTypeEnum,\n  option: Partial<IModelOption>,\n  componentSpec: any\n) {\n  const chart = option.getChart?.();\n  switch (type) {\n    case ComponentTypeEnum.cartesianBandAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'band', option);\n    case ComponentTypeEnum.cartesianLinearAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'linear', option);\n    case ComponentTypeEnum.cartesianLogAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'log', option);\n    case ComponentTypeEnum.cartesianSymlogAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'symlog', option);\n    case ComponentTypeEnum.cartesianAxis:\n    case ComponentTypeEnum.cartesianTimeAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), undefined, option);\n    case ComponentTypeEnum.polarBandAxis:\n      return getPolarAxisTheme(componentSpec.orient, 'band', option);\n    case ComponentTypeEnum.polarLinearAxis:\n      return getPolarAxisTheme(componentSpec.orient, 'linear', option);\n    case ComponentTypeEnum.polarAxis:\n      return getPolarAxisTheme(componentSpec.orient, undefined, option);\n    case ComponentTypeEnum.cartesianCrosshair:\n      return getCartesianCrosshairTheme(option, chart);\n    case ComponentTypeEnum.polarCrosshair:\n      return getPolarCrosshairTheme(option, chart);\n    case ComponentTypeEnum.colorLegend:\n    case ComponentTypeEnum.sizeLegend:\n      return getThemeFromOption(`component.${type}.${getLayout(componentSpec)}`, option);\n    default:\n      return getComponentThemeFromOption(type, option);\n  }\n}\n"]}

package/cjs/component/brush/brush.d.ts

@@ -1,7 +1,7 @@
 import type { LayoutItem } from '../../model/layout-item';
-import { BaseComponent } from '../base';
+import { BaseComponent } from '../base/base-component';
 import type { IComponentOption } from '../interface';
-import { ComponentTypeEnum } from '../interface';
+import { ComponentTypeEnum } from '../interface/type';
 import { Brush as BrushComponent } from '@visactor/vrender-components';
 import type { IModelRenderOption } from '../../model/interface';
 import type { IRegion } from '../../region/interface';

package/cjs/component/brush/brush.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerBrush = exports.Brush = void 0;
 
-const constant_1 = require("../../constant"), base_1 = require("../base"), interface_1 = require("../interface"), vrender_components_1 = require("@visactor/vrender-components"), vutils_1 = require("@visactor/vutils"), style_1 = require("../../util/style"), vutils_2 = require("@visactor/vutils"), factory_1 = require("../../core/factory"), IN_BRUSH_STATE = "inBrush", OUT_BRUSH_STATE = "outOfBrush";
+const constant_1 = require("../../constant"), base_component_1 = require("../base/base-component"), type_1 = require("../interface/type"), vrender_components_1 = require("@visactor/vrender-components"), vutils_1 = require("@visactor/vutils"), style_1 = require("../../util/style"), vutils_2 = require("@visactor/vutils"), factory_1 = require("../../core/factory"), IN_BRUSH_STATE = "inBrush", OUT_BRUSH_STATE = "outOfBrush";
 
-class Brush extends base_1.BaseComponent {
+class Brush extends base_component_1.BaseComponent {
     constructor() {
-        super(...arguments), this.layoutType = "absolute", this.type = interface_1.ComponentTypeEnum.brush, 
-        this.name = interface_1.ComponentTypeEnum.brush, this.layoutZIndex = constant_1.LayoutZIndex.Brush, 
+        super(...arguments), this.layoutType = "absolute", this.type = type_1.ComponentTypeEnum.brush, 
+        this.name = type_1.ComponentTypeEnum.brush, this.layoutZIndex = constant_1.LayoutZIndex.Brush, 
         this._linkedSeries = [], this._itemMap = {}, this._linkedItemMap = {}, this._inBrushElementsMap = {}, 
         this._outOfBrushElementsMap = {}, this._linkedInBrushElementsMap = {}, this._linkedOutOfBrushElementsMap = {}, 
         this._needInitOutState = !0, this._cacheInteractiveRangeAttrs = [], this._needEnablePickable = !1;
@@ -266,7 +266,7 @@ class Brush extends base_1.BaseComponent {
     }
 }
 
-exports.Brush = Brush, Brush.type = interface_1.ComponentTypeEnum.brush, Brush.speckey = "brush";
+exports.Brush = Brush, Brush.type = type_1.ComponentTypeEnum.brush, Brush.speckey = "brush";
 
 const registerBrush = () => {
     factory_1.Factory.registerComponent(Brush.type, Brush);