@visactor/vchart 1.9.0-alpha.0 → 1.9.0-alpha.2

package/cjs/component/axis/cartesian/interface/spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/axis/cartesian/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { IOrientType, IRectMarkSpec, StringOrNumber } from '../../../../typings';\nimport type { IBandAxisSpec, ILinearAxisSpec, IGrid, ICommonAxisSpec } from '../../interface';\nimport type {\n  ICartesianDomainLine,\n  ICartesianLabel,\n  ITimeLayerType,\n  ICartesianTitle,\n  ICartesianAxisUnit\n} from './common';\nimport type { AxisItemStateStyle } from '@visactor/vrender-components';\n\n/** spec */\nexport type ICartesianAxisSpec =\n  | ICartesianLinearAxisSpec\n  | ICartesianBandAxisSpec\n  | ICartesianTimeAxisSpec\n  | ICartesianLogAxisSpec\n  | ICartesianSymlogAxisSpec;\n\nexport type ICartesianAxisCommonSpec = ICommonAxisSpec & {\n  /** 轴位置 */\n  orient: IOrientType;\n  /**\n   * 网格线配置\n   */\n  grid?: IGrid;\n  /**\n   * 子网格线配置\n   */\n  subGrid?: IGrid;\n  /**\n   * 轴线配置\n   */\n  domainLine?: ICartesianDomainLine;\n  /**\n   * 轴标签配置\n   */\n  label?: ICartesianLabel;\n  /**\n   * 轴标题配置\n   */\n  title?: ICartesianTitle;\n  /**\n   * 是否进行自动缩进\n   * 设置为 true 时，当轴元素超出绘图区会被裁剪时，会对图表增加额外的padding，使轴可以显示完整\n   */\n  autoIndent?: boolean;\n  /**\n   * 坐标轴背景配置\n   */\n  background?: {\n    /**\n     * 是否绘制坐标轴背景\n     * @default false\n     */\n    visible: boolean;\n    /**\n     * 背景样式\n     */\n    style?: Partial<IRectMarkSpec>;\n    /**\n     * 背景在交互状态下的样式配置\n     */\n    state?: AxisItemStateStyle<Partial<IRectMarkSpec>>;\n  };\n  /**\n   * 是否是3d模式的轴\n   */\n  mode?: '2d' | '3d';\n  /**\n   * 轴的z方向深度\n   */\n  depth?: number;\n  /**\n   * 轴单位配置，仅支持直角坐标系下的坐标轴\n   * @since 1.5.1\n   */\n  unit?: ICartesianAxisUnit;\n};\n\nexport interface ILinearAxisSync {\n  /**\n   * 配置参照的轴 id\n   */\n  axisId: StringOrNumber;\n  /**\n   * 是否保持 2 个轴的 0 值对齐\n   * @default false\n   */\n  zeroAlign?: boolean;\n  /**\n   * 是否使这个轴的 tick 与目标轴保持比例对齐\n   * @default false\n   */\n  tickAlign?: boolean;\n}\n\nexport type ICartesianLinearAxisSpec = ICartesianAxisCommonSpec &\n  ILinearAxisSpec & {\n    sync?: ILinearAxisSync;\n  };\n\nexport type ICartesianBandAxisSpec = ICartesianAxisCommonSpec &\n  IBandAxisSpec & {\n    /**\n     * 轴组宽设置\n     * @since 1.4.0\n     */\n    bandSize?: number;\n    /**\n     * 轴最大组宽设置\n     * @since 1.4.0\n     */\n    maxBandSize?: number;\n    /**\n     * 轴最小组宽设置\n     * @since 1.4.0\n     */\n    minBandSize?: number;\n    /**\n     * 是否根据组宽自动计算 region 宽度或高度，仅当 `bandSize` 或 `maxBandSize` 配置时生效\n     * @since 1.4.0\n     */\n    autoRegionSize?: boolean;\n  };\n\nexport type ICartesianTimeAxisSpec = Omit<ICartesianAxisCommonSpec, 'inverse'> & {\n  /**\n   * 轴的层级配置。\n   * layer[0] 为主轴，即离坐标轴线最近的轴\n   * @description 目前仅支持单层 / 双层，即layers.length <= 2\n   */\n  layers?: ITimeLayerType[];\n};\n\nexport type ICartesianLogAxisSpec = ICartesianLinearAxisSpec & {\n  /**\n   * 底数\n   * @default 10\n   */\n  base?: number;\n};\n\nexport type ICartesianSymlogAxisSpec = ICartesianLinearAxisSpec & {\n  /**\n   * 底数\n   * @default 10\n   */\n  constant?: number;\n};\n"]}
+{"version":3,"sources":["../src/component/axis/cartesian/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { ILayoutNumber, IOrientType, IRectMarkSpec, StringOrNumber } from '../../../../typings';\nimport type { IBandAxisSpec, ILinearAxisSpec, IGrid, ICommonAxisSpec } from '../../interface';\nimport type {\n  ICartesianDomainLine,\n  ICartesianLabel,\n  ITimeLayerType,\n  ICartesianTitle,\n  ICartesianAxisUnit\n} from './common';\nimport type { AxisItemStateStyle } from '@visactor/vrender-components';\n\n/** spec */\nexport type ICartesianAxisSpec =\n  | ICartesianLinearAxisSpec\n  | ICartesianBandAxisSpec\n  | ICartesianTimeAxisSpec\n  | ICartesianLogAxisSpec\n  | ICartesianSymlogAxisSpec;\n\nexport type ICartesianVertical = {\n  orient: 'left' | 'right';\n  /**\n   * 内padding/留白\n   * @since 1.8.10\n   */\n  innerOffset?: {\n    top?: ILayoutNumber;\n    bottom?: ILayoutNumber;\n  };\n};\nexport type ICartesianHorizontal = {\n  orient: 'top' | 'bottom';\n  /**\n   * 内padding/留白\n   * @since 1.8.10\n   */\n  innerOffset?: {\n    left?: ILayoutNumber;\n    right?: ILayoutNumber;\n  };\n};\nexport type ICartesianZ = {\n  orient: 'z';\n};\n\nexport type ICartesianAxisCommonSpec = ICommonAxisSpec & {\n  /**\n   * 网格线配置\n   */\n  grid?: IGrid;\n  /**\n   * 子网格线配置\n   */\n  subGrid?: IGrid;\n  /**\n   * 轴线配置\n   */\n  domainLine?: ICartesianDomainLine;\n  /**\n   * 轴标签配置\n   */\n  label?: ICartesianLabel;\n  /**\n   * 轴标题配置\n   */\n  title?: ICartesianTitle;\n  /**\n   * 是否进行自动缩进\n   * 设置为 true 时，当轴元素超出绘图区会被裁剪时，会对图表增加额外的padding，使轴可以显示完整\n   */\n  autoIndent?: boolean;\n  /**\n   * 坐标轴背景配置\n   */\n  background?: {\n    /**\n     * 是否绘制坐标轴背景\n     * @default false\n     */\n    visible: boolean;\n    /**\n     * 背景样式\n     */\n    style?: Partial<IRectMarkSpec>;\n    /**\n     * 背景在交互状态下的样式配置\n     */\n    state?: AxisItemStateStyle<Partial<IRectMarkSpec>>;\n  };\n  /**\n   * 是否是3d模式的轴\n   */\n  mode?: '2d' | '3d';\n  /**\n   * 轴的z方向深度\n   */\n  depth?: number;\n  /**\n   * 轴单位配置，仅支持直角坐标系下的坐标轴\n   * @since 1.5.1\n   */\n  unit?: ICartesianAxisUnit;\n  /**\n   * 是否在此轴上指定显示 dimension tooltip\n   * （离散轴默认不需要配置）\n   * @since 1.9.0\n   */\n  hasDimensionTooltip?: boolean;\n} & (ICartesianVertical | ICartesianHorizontal | ICartesianZ);\n\nexport interface ILinearAxisSync {\n  /**\n   * 配置参照的轴 id\n   */\n  axisId: StringOrNumber;\n  /**\n   * 是否保持 2 个轴的 0 值对齐\n   * @default false\n   */\n  zeroAlign?: boolean;\n  /**\n   * 是否使这个轴的 tick 与目标轴保持比例对齐\n   * @default false\n   */\n  tickAlign?: boolean;\n}\n\nexport type ICartesianLinearAxisSpec = ICartesianAxisCommonSpec &\n  ILinearAxisSpec & {\n    sync?: ILinearAxisSync;\n  };\n\nexport type ICartesianBandAxisSpec = ICartesianAxisCommonSpec &\n  IBandAxisSpec & {\n    /**\n     * 轴组宽设置\n     * @since 1.4.0\n     */\n    bandSize?: number;\n    /**\n     * 轴最大组宽设置\n     * @since 1.4.0\n     */\n    maxBandSize?: number;\n    /**\n     * 轴最小组宽设置\n     * @since 1.4.0\n     */\n    minBandSize?: number;\n    /**\n     * 是否根据组宽自动计算 region 宽度或高度，仅当 `bandSize` 或 `maxBandSize` 配置时生效\n     * @since 1.4.0\n     */\n    autoRegionSize?: boolean;\n  };\n\nexport type ICartesianTimeAxisSpec = Omit<ICartesianAxisCommonSpec, 'inverse'> & {\n  /**\n   * 轴的层级配置。\n   * layer[0] 为主轴，即离坐标轴线最近的轴\n   * @description 目前仅支持单层 / 双层，即layers.length <= 2\n   */\n  layers?: ITimeLayerType[];\n};\n\nexport type ICartesianLogAxisSpec = ICartesianLinearAxisSpec & {\n  /**\n   * 底数\n   * @default 10\n   */\n  base?: number;\n};\n\nexport type ICartesianSymlogAxisSpec = ICartesianLinearAxisSpec & {\n  /**\n   * 底数\n   * @default 10\n   */\n  constant?: number;\n};\n"]}

package/cjs/component/axis/cartesian/time-axis.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerCartesianTimeAxis = exports.CartesianTimeAxis = void 0;
 
-const vdataset_1 = require("@visactor/vdataset"), common_1 = require("./util/common"), time_1 = require("./util/time"), vutils_1 = require("@visactor/vutils"), model_1 = require("../../../util/model"), merge_spec_1 = require("../../../util/spec/merge-spec"), linear_axis_1 = require("./linear-axis"), type_1 = require("../../interface/type"), compilable_data_1 = require("../../../compile/data/compilable-data"), factory_1 = require("../../../core/factory"), base_axis_1 = require("../base-axis");
+const vdataset_1 = require("@visactor/vdataset"), common_1 = require("./util/common"), time_1 = require("./util/time"), model_1 = require("../../../util/model"), merge_spec_1 = require("../../../util/spec/merge-spec"), linear_axis_1 = require("./linear-axis"), type_1 = require("../../interface/type"), compilable_data_1 = require("../../../compile/data/compilable-data"), factory_1 = require("../../../core/factory"), base_axis_1 = require("../base-axis"), util_1 = require("../util");
 
 class CartesianTimeAxis extends linear_axis_1.CartesianLinearAxis {
     constructor() {
@@ -33,7 +33,7 @@ class CartesianTimeAxis extends linear_axis_1.CartesianLinearAxis {
                 type: "scale"
             }).transform({
                 type: "ticks",
-                options: Object.assign(Object.assign({}, this._tickTransformOption("cartesian")), {
+                options: Object.assign(Object.assign({}, this._tickTransformOption()), {
                     tickCount: this._spec.layers[1].tickCount,
                     forceTickCount: this._spec.layers[1].forceTickCount,
                     tickStep: this._spec.layers[1].tickStep
@@ -57,21 +57,14 @@ class CartesianTimeAxis extends linear_axis_1.CartesianLinearAxis {
         };
     }
     getLabelItems(length) {
-        const items = [];
-        return (0, vutils_1.isArray)(this._tickData.getLatestData()) && items.push(this._tickData.getLatestData().map((obj => ({
-            id: obj.value,
-            label: obj.value,
-            value: 0 === length ? 0 : this.dataToPosition([ obj.value ]) / length,
-            rawValue: obj.value
-        })))), this._layerTickData && (0, vutils_1.isArray)(this._layerTickData.getLatestData()) && items.push(this._layerTickData.getLatestData().map((obj => {
-            const value = this.dataToPosition([ obj.value ]);
-            return {
-                id: obj.value,
-                label: obj.value,
-                value: value / length,
-                rawValue: obj.value
-            };
-        }))), items;
+        var _a;
+        const items = [], tickLatestData = this.getTickData().getLatestData();
+        tickLatestData && tickLatestData.length && items.push(tickLatestData.map((obj => (0, 
+        util_1.getAxisItem)(obj.value, this._getNormalizedValue([ obj.value ], length)))));
+        const layerLatestData = null === (_a = this._layerTickData) || void 0 === _a ? void 0 : _a.getLatestData();
+        return layerLatestData && layerLatestData.length && items.push(layerLatestData.map((obj => (0, 
+        util_1.getAxisItem)(obj.value, this._getNormalizedValue([ obj.value ], length))))), 
+        items;
     }
     transformScaleDomain() {}
 }

package/cjs/component/axis/cartesian/time-axis.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/axis/cartesian/time-axis.ts"],"names":[],"mappings":"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","file":"time-axis.js","sourcesContent":["import type { IEffect } from '../../../model/interface';\nimport { DataView } from '@visactor/vdataset';\nimport { isXAxis } from './util/common';\nimport { TimeUtil } from './util/time';\nimport { isArray } from '@visactor/vutils';\nimport { eachSeries } from '../../../util/model';\nimport { mergeSpec } from '../../../util/spec/merge-spec';\nimport type { ICartesianSeries } from '../../../series/interface';\nimport { CartesianLinearAxis } from './linear-axis';\nimport type { ICartesianTickDataOpt } from '@visactor/vutils-extension';\nimport { ComponentTypeEnum } from '../../interface/type';\nimport type { Datum } from '../../../typings';\nimport { CompilableData } from '../../../compile/data/compilable-data';\nimport type { LinearAxisMixin } from '../mixin/linear-axis-mixin';\nimport type { ICartesianTimeAxisSpec } from './interface';\nimport { Factory } from '../../../core/factory';\nimport { registerAxis } from '../base-axis';\n\nexport interface CartesianTimeAxis<T extends ICartesianTimeAxisSpec = ICartesianTimeAxisSpec>\n  extends Pick<LinearAxisMixin, 'valueToPosition'>,\n    CartesianLinearAxis<T> {}\n\nexport class CartesianTimeAxis<\n  T extends ICartesianTimeAxisSpec = ICartesianTimeAxisSpec\n> extends CartesianLinearAxis<T> {\n  static type = ComponentTypeEnum.cartesianTimeAxis;\n  type = ComponentTypeEnum.cartesianTimeAxis;\n\n  static specKey = 'axes';\n\n  protected _layerTickData!: CompilableData;\n\n  protected _zero: boolean = false;\n\n  effect: IEffect = {\n    scaleUpdate: params => {\n      this.computeData(params?.value);\n      eachSeries(\n        this._regions,\n        s => {\n          if (isXAxis(this.getOrient())) {\n            (s as ICartesianSeries).setXAxisHelper(this.axisHelper());\n          } else {\n            (s as ICartesianSeries).setYAxisHelper(this.axisHelper());\n          }\n        },\n        {\n          userId: this._seriesUserId,\n          specIndex: this._seriesIndex\n        }\n      );\n    }\n  };\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec();\n    this._tick = mergeSpec({}, this._spec.tick, this._spec.layers?.[0]);\n  }\n\n  protected _initData() {\n    super._initData();\n\n    // 如果layer数组的第二项未配置，则不显示第二层\n    if (this._spec.layers?.[1]) {\n      const layerTickData = new DataView(this._option.dataSet, { name: `${this.type}_${this.id}_layer_1_ticks` })\n        .parse(this._scale, {\n          type: 'scale'\n        })\n        .transform(\n          {\n            type: 'ticks',\n            options: {\n              ...this._tickTransformOption('cartesian'),\n              tickCount: this._spec.layers[1].tickCount,\n              forceTickCount: this._spec.layers[1].forceTickCount,\n              tickStep: this._spec.layers[1].tickStep\n            } as ICartesianTickDataOpt\n          },\n          false\n        );\n      this._layerTickData = new CompilableData(this._option, layerTickData);\n    }\n  }\n\n  /**\n   * @override\n   */\n  protected computeData(updateType?: 'range' | 'domain' | 'force'): void {\n    super.computeData(updateType);\n    if (this._layerTickData) {\n      this._layerTickData.getDataView().reRunAllTransform();\n      this._layerTickData.updateData();\n    }\n  }\n\n  protected getLabelFormatMethod(): any {\n    const timeUtil = TimeUtil.getInstance();\n    const timeFormat1 = this._spec.layers?.[1]?.timeFormat || '%Y%m%d';\n    const timeFormatMode1 = this._spec.layers?.[1]?.timeFormatMode || 'local';\n    const timeFormatter1 = timeFormatMode1 === 'local' ? timeUtil.timeFormat : timeUtil.timeUTCFormat;\n\n    const timeFormat0 = this._spec.layers?.[0]?.timeFormat || '%Y%m%d';\n    const timeFormatMode0 = this._spec.layers?.[0]?.timeFormatMode || 'local';\n    const timeFormatter0 = timeFormatMode0 === 'local' ? timeUtil.timeFormat : timeUtil.timeUTCFormat;\n\n    return (value: any, datum: any, index: number, data: any[], layer: number) => {\n      let timeValue: string;\n      if (layer === 0) {\n        timeValue = timeFormatter0(timeFormat0, value);\n      } else {\n        timeValue = timeFormatter1(timeFormat1, value);\n      }\n\n      return this._spec.label?.formatMethod ? this._spec.label.formatMethod(timeValue, datum) : timeValue;\n    };\n  }\n\n  protected getLabelItems(length: number) {\n    const items = [];\n    if (isArray(this._tickData.getLatestData())) {\n      items.push(\n        this._tickData.getLatestData().map((obj: Datum) => {\n          return {\n            id: obj.value,\n            label: obj.value,\n            value: length === 0 ? 0 : this.dataToPosition([obj.value]) / length,\n            rawValue: obj.value\n          };\n        })\n      );\n    }\n\n    if (this._layerTickData && isArray(this._layerTickData.getLatestData())) {\n      items.push(\n        this._layerTickData.getLatestData().map((obj: Datum) => {\n          const value = this.dataToPosition([obj.value]);\n          return {\n            id: obj.value,\n            label: obj.value,\n            value: value / length,\n            rawValue: obj.value\n          };\n        })\n      );\n    }\n\n    return items;\n  }\n  transformScaleDomain() {\n    // do nothing\n  }\n}\n\nexport const registerCartesianTimeAxis = () => {\n  registerAxis();\n  Factory.registerComponent(CartesianTimeAxis.type, CartesianTimeAxis);\n};\n"]}
+{"version":3,"sources":["../src/component/axis/cartesian/time-axis.ts"],"names":[],"mappings":"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","file":"time-axis.js","sourcesContent":["import type { IEffect } from '../../../model/interface';\nimport { DataView } from '@visactor/vdataset';\nimport { isXAxis } from './util/common';\nimport { TimeUtil } from './util/time';\nimport { isArray } from '@visactor/vutils';\nimport { eachSeries } from '../../../util/model';\nimport { mergeSpec } from '../../../util/spec/merge-spec';\nimport type { ICartesianSeries } from '../../../series/interface';\nimport { CartesianLinearAxis } from './linear-axis';\nimport type { ICartesianTickDataOpt } from '@visactor/vutils-extension';\nimport { ComponentTypeEnum } from '../../interface/type';\nimport type { Datum } from '../../../typings';\nimport { CompilableData } from '../../../compile/data/compilable-data';\nimport type { LinearAxisMixin } from '../mixin/linear-axis-mixin';\nimport type { ICartesianTimeAxisSpec } from './interface';\nimport { Factory } from '../../../core/factory';\nimport { registerAxis } from '../base-axis';\nimport { getAxisItem } from '../util';\n\nexport interface CartesianTimeAxis<T extends ICartesianTimeAxisSpec = ICartesianTimeAxisSpec>\n  extends Pick<LinearAxisMixin, 'valueToPosition'>,\n    CartesianLinearAxis<T> {}\n\nexport class CartesianTimeAxis<\n  T extends ICartesianTimeAxisSpec = ICartesianTimeAxisSpec\n> extends CartesianLinearAxis<T> {\n  static type = ComponentTypeEnum.cartesianTimeAxis;\n  type = ComponentTypeEnum.cartesianTimeAxis;\n\n  static specKey = 'axes';\n\n  protected _layerTickData!: CompilableData;\n\n  protected _zero: boolean = false;\n\n  effect: IEffect = {\n    scaleUpdate: params => {\n      this.computeData(params?.value);\n      eachSeries(\n        this._regions,\n        s => {\n          if (isXAxis(this.getOrient())) {\n            (s as ICartesianSeries).setXAxisHelper(this.axisHelper());\n          } else {\n            (s as ICartesianSeries).setYAxisHelper(this.axisHelper());\n          }\n        },\n        {\n          userId: this._seriesUserId,\n          specIndex: this._seriesIndex\n        }\n      );\n    }\n  };\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec();\n    this._tick = mergeSpec({}, this._spec.tick, this._spec.layers?.[0]);\n  }\n\n  protected _initData() {\n    super._initData();\n\n    // 如果layer数组的第二项未配置，则不显示第二层\n    if (this._spec.layers?.[1]) {\n      const layerTickData = new DataView(this._option.dataSet, { name: `${this.type}_${this.id}_layer_1_ticks` })\n        .parse(this._scale, {\n          type: 'scale'\n        })\n        .transform(\n          {\n            type: 'ticks',\n            options: {\n              ...this._tickTransformOption(),\n              tickCount: this._spec.layers[1].tickCount,\n              forceTickCount: this._spec.layers[1].forceTickCount,\n              tickStep: this._spec.layers[1].tickStep\n            } as ICartesianTickDataOpt\n          },\n          false\n        );\n      this._layerTickData = new CompilableData(this._option, layerTickData);\n    }\n  }\n\n  /**\n   * @override\n   */\n  protected computeData(updateType?: 'range' | 'domain' | 'force'): void {\n    super.computeData(updateType);\n    if (this._layerTickData) {\n      this._layerTickData.getDataView().reRunAllTransform();\n      this._layerTickData.updateData();\n    }\n  }\n\n  protected getLabelFormatMethod(): any {\n    const timeUtil = TimeUtil.getInstance();\n    const timeFormat1 = this._spec.layers?.[1]?.timeFormat || '%Y%m%d';\n    const timeFormatMode1 = this._spec.layers?.[1]?.timeFormatMode || 'local';\n    const timeFormatter1 = timeFormatMode1 === 'local' ? timeUtil.timeFormat : timeUtil.timeUTCFormat;\n\n    const timeFormat0 = this._spec.layers?.[0]?.timeFormat || '%Y%m%d';\n    const timeFormatMode0 = this._spec.layers?.[0]?.timeFormatMode || 'local';\n    const timeFormatter0 = timeFormatMode0 === 'local' ? timeUtil.timeFormat : timeUtil.timeUTCFormat;\n\n    return (value: any, datum: any, index: number, data: any[], layer: number) => {\n      let timeValue: string;\n      if (layer === 0) {\n        timeValue = timeFormatter0(timeFormat0, value);\n      } else {\n        timeValue = timeFormatter1(timeFormat1, value);\n      }\n\n      return this._spec.label?.formatMethod ? this._spec.label.formatMethod(timeValue, datum) : timeValue;\n    };\n  }\n\n  protected getLabelItems(length: number) {\n    const items = [];\n\n    const tickData = this.getTickData();\n    const tickLatestData = tickData.getLatestData();\n    if (tickLatestData && tickLatestData.length) {\n      items.push(\n        tickLatestData.map((obj: Datum) => {\n          return getAxisItem(obj.value, this._getNormalizedValue([obj.value], length));\n        })\n      );\n    }\n\n    const layerLatestData = this._layerTickData?.getLatestData();\n    if (layerLatestData && layerLatestData.length) {\n      items.push(\n        layerLatestData.map((obj: Datum) => {\n          return getAxisItem(obj.value, this._getNormalizedValue([obj.value], length));\n        })\n      );\n    }\n\n    return items;\n  }\n  transformScaleDomain() {\n    // do nothing\n  }\n}\n\nexport const registerCartesianTimeAxis = () => {\n  registerAxis();\n  Factory.registerComponent(CartesianTimeAxis.type, CartesianTimeAxis);\n};\n"]}

package/cjs/component/axis/cartesian/util/common.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.getCartesianAxisInfo = exports.transformInverse = exports.isOrientInSameDirection = exports.getDirectionByOrient = exports.getOrient = exports.autoAxisType = exports.isZAxis = exports.isYAxis = exports.isXAxis = void 0;
 
-const space_1 = require("../../../../typings/space"), vutils_1 = require("@visactor/vutils"), space_2 = require("../../../../util/space"), interface_1 = require("../../../interface");
+const vutils_1 = require("@visactor/vutils"), space_1 = require("../../../../util/space"), interface_1 = require("../../../interface");
 
 function isXAxis(orient) {
     return "bottom" === orient || "top" === orient;
@@ -23,11 +23,11 @@ function autoAxisType(orient, isHorizontal) {
 }
 
 function getOrient(spec, whiteList) {
-    return (0, space_2.isValidOrient)(spec.orient) || whiteList && whiteList.includes(spec.orient) ? spec.orient : "left";
+    return (0, space_1.isValidOrient)(spec.orient) || whiteList && whiteList.includes(spec.orient) ? spec.orient : "left";
 }
 
 function getDirectionByOrient(orient) {
-    return "top" === orient || "bottom" === orient ? space_1.Direction.horizontal : space_1.Direction.vertical;
+    return "top" === orient || "bottom" === orient ? "horizontal" : "vertical";
 }
 
 function isOrientInSameDirection(orient1, orient2) {

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/axis/cartesian/util/common.ts"],"names":[],"mappings":";;;AAEA,qDAAsD;AACtD,6CAA2C;AAC3C,kDAAuD;AAEvD,kDAAuD;AAEvD,SAAgB,OAAO,CAAC,MAAmB;IACzC,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,KAAK,CAAC;AACjD,CAAC;AAFD,0BAEC;AAED,SAAgB,OAAO,CAAC,MAAmB;IACzC,OAAO,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC;AACjD,CAAC;AAFD,0BAEC;AAED,SAAgB,OAAO,CAAC,MAAmB;IACzC,OAAO,MAAM,KAAK,GAAG,CAAC;AACxB,CAAC;AAFD,0BAEC;AAID,SAAgB,YAAY,CAAC,MAAmB,EAAE,YAAqB;IACrE,IAAI,YAAY,EAAE;QAChB,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;KAC5C;IACD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC7C,CAAC;AALD,oCAKC;AAED,SAAgB,SAAS,CAAC,IAA8B,EAAE,SAAoB;IAC5E,OAAO,IAAA,qBAAa,EAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;AAC7G,CAAC;AAFD,8BAEC;AAED,SAAgB,oBAAoB,CAAC,MAAmB;IACtD,OAAO,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,iBAAS,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAS,CAAC,QAAQ,CAAC;AAC7F,CAAC;AAFD,oDAEC;AAED,SAAgB,uBAAuB,CAAC,OAAoB,EAAE,OAAoB;IAChF,OAAO,oBAAoB,CAAC,OAAO,CAAC,KAAK,oBAAoB,CAAC,OAAO,CAAC,CAAC;AACzE,CAAC;AAFD,0DAEC;AAED,SAAgB,gBAAgB,CAAC,IAA8B,EAAE,YAAqB;IAIpF,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC3B,IAAI,YAAY,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QACzC,OAAO,GAAG,IAAA,gBAAO,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;KACxD;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AATD,4CASC;AAED,SAAgB,oBAAoB,CAAC,IAA8B,EAAE,YAAsB;;IACzF,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,IAAI,mCAAI,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACtE,MAAM,aAAa,GAAG,GAAG,6BAAiB,CAAC,aAAa,IAAI,QAAQ,EAAE,CAAC;IACvE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC;AACrC,CAAC;AAJD,oDAIC","file":"common.js","sourcesContent":["import type { IOrientType } from '../../../../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport { Direction } from '../../../../typings/space';\nimport { isValid } from '@visactor/vutils';\nimport { isValidOrient } from '../../../../util/space';\nimport type { ICartesianAxisCommonSpec } from '../interface';\nimport { ComponentTypeEnum } from '../../../interface';\n\nexport function isXAxis(orient: IOrientType) {\n  return orient === 'bottom' || orient === 'top';\n}\n\nexport function isYAxis(orient: IOrientType) {\n  return orient === 'left' || orient === 'right';\n}\n\nexport function isZAxis(orient: IOrientType) {\n  return orient === 'z';\n}\n\n// 自动推断轴类型，现在根据orient来判断\n// TODO：后续可以根据数据特征推断\nexport function autoAxisType(orient: IOrientType, isHorizontal: boolean) {\n  if (isHorizontal) {\n    return isXAxis(orient) ? 'linear' : 'band';\n  }\n  return isXAxis(orient) ? 'band' : 'linear';\n}\n\nexport function getOrient(spec: ICartesianAxisCommonSpec, whiteList?: string[]): IOrientType {\n  return isValidOrient(spec.orient) || (whiteList && whiteList.includes(spec.orient)) ? spec.orient : 'left';\n}\n\nexport function getDirectionByOrient(orient: IOrientType) {\n  return orient === 'top' || orient === 'bottom' ? Direction.horizontal : Direction.vertical;\n}\n\nexport function isOrientInSameDirection(orient1: IOrientType, orient2: IOrientType) {\n  return getDirectionByOrient(orient1) === getDirectionByOrient(orient2);\n}\n\nexport function transformInverse(spec: ICartesianAxisCommonSpec, isHorizontal: boolean) {\n  // 这里处理下 direction === 'horizontal' 下的 Y 轴\n  // 因为 Y 轴绘制的时候默认是从下至上绘制的，但是在 direction === 'horizontal' 场景下，图表应该是按照从上至下阅读的\n  // 所以这里在这种场景下坐标轴会默认 inverse 已达到效果\n  let inverse = spec.inverse;\n  if (isHorizontal && !isXAxis(spec.orient)) {\n    inverse = isValid(spec.inverse) ? !spec.inverse : true;\n  }\n  return inverse;\n}\n\nexport function getCartesianAxisInfo(spec: ICartesianAxisCommonSpec, isHorizontal?: boolean) {\n  const axisType = spec.type ?? autoAxisType(spec.orient, isHorizontal);\n  const componentName = `${ComponentTypeEnum.cartesianAxis}-${axisType}`;\n  return { axisType, componentName };\n}\n"]}
+{"version":3,"sources":["../src/component/axis/cartesian/util/common.ts"],"names":[],"mappings":";;;AAGA,6CAA2C;AAC3C,kDAAuD;AAEvD,kDAAuD;AAEvD,SAAgB,OAAO,CAAC,MAAmB;IACzC,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,KAAK,CAAC;AACjD,CAAC;AAFD,0BAEC;AAED,SAAgB,OAAO,CAAC,MAAmB;IACzC,OAAO,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC;AACjD,CAAC;AAFD,0BAEC;AAED,SAAgB,OAAO,CAAC,MAAmB;IACzC,OAAO,MAAM,KAAK,GAAG,CAAC;AACxB,CAAC;AAFD,0BAEC;AAID,SAAgB,YAAY,CAAC,MAAmB,EAAE,YAAqB;IACrE,IAAI,YAAY,EAAE;QAChB,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;KAC5C;IACD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC7C,CAAC;AALD,oCAKC;AAED,SAAgB,SAAS,CAAC,IAA8B,EAAE,SAAoB;IAC5E,OAAO,IAAA,qBAAa,EAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;AAC7G,CAAC;AAFD,8BAEC;AAED,SAAgB,oBAAoB,CAAC,MAAmB;IACtD,OAAO,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,QAAQ,CAAC,CAAC,cAAsB,CAAC,WAAmB,CAAC;AAC7F,CAAC;AAFD,oDAEC;AAED,SAAgB,uBAAuB,CAAC,OAAoB,EAAE,OAAoB;IAChF,OAAO,oBAAoB,CAAC,OAAO,CAAC,KAAK,oBAAoB,CAAC,OAAO,CAAC,CAAC;AACzE,CAAC;AAFD,0DAEC;AAED,SAAgB,gBAAgB,CAAC,IAA8B,EAAE,YAAqB;IAIpF,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC3B,IAAI,YAAY,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QACzC,OAAO,GAAG,IAAA,gBAAO,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;KACxD;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AATD,4CASC;AAED,SAAgB,oBAAoB,CAAC,IAA8B,EAAE,YAAsB;;IACzF,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,IAAI,mCAAI,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACtE,MAAM,aAAa,GAAG,GAAG,6BAAiB,CAAC,aAAa,IAAI,QAAQ,EAAE,CAAC;IACvE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC;AACrC,CAAC;AAJD,oDAIC","file":"common.js","sourcesContent":["import type { IOrientType } from '../../../../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport { Direction } from '../../../../typings/space';\nimport { isValid } from '@visactor/vutils';\nimport { isValidOrient } from '../../../../util/space';\nimport type { ICartesianAxisCommonSpec } from '../interface';\nimport { ComponentTypeEnum } from '../../../interface';\n\nexport function isXAxis(orient: IOrientType) {\n  return orient === 'bottom' || orient === 'top';\n}\n\nexport function isYAxis(orient: IOrientType) {\n  return orient === 'left' || orient === 'right';\n}\n\nexport function isZAxis(orient: IOrientType) {\n  return orient === 'z';\n}\n\n// 自动推断轴类型，现在根据orient来判断\n// TODO：后续可以根据数据特征推断\nexport function autoAxisType(orient: IOrientType, isHorizontal: boolean) {\n  if (isHorizontal) {\n    return isXAxis(orient) ? 'linear' : 'band';\n  }\n  return isXAxis(orient) ? 'band' : 'linear';\n}\n\nexport function getOrient(spec: ICartesianAxisCommonSpec, whiteList?: string[]): IOrientType {\n  return isValidOrient(spec.orient) || (whiteList && whiteList.includes(spec.orient)) ? spec.orient : 'left';\n}\n\nexport function getDirectionByOrient(orient: IOrientType) {\n  return orient === 'top' || orient === 'bottom' ? Direction.horizontal : Direction.vertical;\n}\n\nexport function isOrientInSameDirection(orient1: IOrientType, orient2: IOrientType) {\n  return getDirectionByOrient(orient1) === getDirectionByOrient(orient2);\n}\n\nexport function transformInverse(spec: ICartesianAxisCommonSpec, isHorizontal: boolean) {\n  // 这里处理下 direction === 'horizontal' 下的 Y 轴\n  // 因为 Y 轴绘制的时候默认是从下至上绘制的，但是在 direction === 'horizontal' 场景下，图表应该是按照从上至下阅读的\n  // 所以这里在这种场景下坐标轴会默认 inverse 已达到效果\n  let inverse = spec.inverse;\n  if (isHorizontal && !isXAxis(spec.orient)) {\n    inverse = isValid(spec.inverse) ? !spec.inverse : true;\n  }\n  return inverse;\n}\n\nexport function getCartesianAxisInfo(spec: ICartesianAxisCommonSpec, isHorizontal?: boolean) {\n  const axisType = spec.type ?? autoAxisType(spec.orient, isHorizontal);\n  const componentName = `${ComponentTypeEnum.cartesianAxis}-${axisType}`;\n  return { axisType, componentName };\n}\n"]}

package/cjs/component/axis/interface/common.d.ts

@@ -37,3 +37,13 @@ export interface IAxisLocationCfg {
     bandPosition?: number;
     datum?: Datum;
 }
+export interface ITickCalculationCfg {
+    tickStep?: number;
+    tickCount?: number | ((option: ITickCallbackOption) => number);
+    forceTickCount?: number;
+    tickMode?: 'average' | 'd3';
+    noDecimals?: boolean;
+}
+export interface IBandAxisLayer extends Omit<ITickCalculationCfg, 'noDecimals' | 'tickMode'> {
+    visible?: boolean;
+}

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/axis/interface/common.ts"],"names":[],"mappings":"","file":"common.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\nimport type { Datum, IPolarOrientType, StringOrNumber } from '../../../typings';\nimport type { IComponent } from '../../interface/common';\nimport type { ICartesianAxisSpec } from '../cartesian/interface';\nimport type { ITextGraphicAttribute } from '@visactor/vrender-core';\n\nexport interface StatisticsDomain {\n  domain: any[];\n  index: { [key in StringOrNumber]: number };\n}\n\nexport interface IAxis extends IComponent {\n  valueToPosition: (value: any) => number;\n  getScale: () => IBaseScale;\n  getScales: () => IBaseScale[];\n  getOrient: () => ICartesianAxisSpec['orient'] | IPolarOrientType;\n  getInverse: () => boolean;\n  visible: boolean;\n  // 标记轴的方向，左到右，右到左，上到下，下到上\n  directionStr?: 'l2r' | 'r2l' | 't2b' | 'b2t';\n}\n\nexport interface IAxisItem<T> {\n  visible?: boolean;\n  style?: Omit<T, 'visible'>;\n}\n\nexport interface IAxisItemTheme<T> {\n  visible?: boolean;\n  style?: Omit<T, 'visible'>;\n}\nexport type AxisAnimationPreset = 'groupFadeIn' | 'fadeIn' | 'grow';\n\nexport type ITickCallbackOption = {\n  axisLength?: number;\n  labelStyle?: ITextGraphicAttribute;\n};\n\nexport type StyleCallback<T> = (value: any, index: number, datum: Datum, data: Datum[]) => T;\nexport type AxisType = 'linear' | 'ordinal' | 'band' | 'point' | 'time' | 'log' | 'symlog';\n\nexport interface IAxisLocationCfg {\n  bandPosition?: number;\n  datum?: Datum;\n}\n"]}
+{"version":3,"sources":["../src/component/axis/interface/common.ts"],"names":[],"mappings":"","file":"common.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\nimport type { Datum, IPolarOrientType, StringOrNumber } from '../../../typings';\nimport type { IComponent } from '../../interface/common';\nimport type { ICartesianAxisSpec } from '../cartesian/interface';\nimport type { ITextGraphicAttribute } from '@visactor/vrender-core';\n\nexport interface StatisticsDomain {\n  domain: any[];\n  index: { [key in StringOrNumber]: number };\n}\n\nexport interface IAxis extends IComponent {\n  valueToPosition: (value: any) => number;\n  getScale: () => IBaseScale;\n  getScales: () => IBaseScale[];\n  getOrient: () => ICartesianAxisSpec['orient'] | IPolarOrientType;\n  getInverse: () => boolean;\n  visible: boolean;\n  // 标记轴的方向，左到右，右到左，上到下，下到上\n  directionStr?: 'l2r' | 'r2l' | 't2b' | 'b2t';\n}\n\nexport interface IAxisItem<T> {\n  visible?: boolean;\n  style?: Omit<T, 'visible'>;\n}\n\nexport interface IAxisItemTheme<T> {\n  visible?: boolean;\n  style?: Omit<T, 'visible'>;\n}\nexport type AxisAnimationPreset = 'groupFadeIn' | 'fadeIn' | 'grow';\n\nexport type ITickCallbackOption = {\n  axisLength?: number;\n  labelStyle?: ITextGraphicAttribute;\n};\n\nexport type StyleCallback<T> = (value: any, index: number, datum: Datum, data: Datum[]) => T;\nexport type AxisType = 'linear' | 'ordinal' | 'band' | 'point' | 'time' | 'log' | 'symlog';\n\nexport interface IAxisLocationCfg {\n  bandPosition?: number;\n  datum?: Datum;\n}\n\nexport interface ITickCalculationCfg {\n  /** tick步长 */\n  tickStep?: number;\n  /**\n   * 期望的连续轴tick数量\n   * The desired number of ticks draw on linear axis.\n   * @default 5\n   * @description 建议的tick数量，并不保证结果一定是配置值\n   * @since 1.4.0 后支持函数回调。\n   */\n  tickCount?: number | ((option: ITickCallbackOption) => number);\n  /**\n   * 强制设置tick数量\n   * The exact number of ticks draw on linear axis. Might lead to decimal step.\n   * @default 5\n   * @description 强制设置的tick数量，可能由于数据范围导致tick值为小数\n   */\n  forceTickCount?: number;\n  /**\n   * 连续轴 tick 生成算法：\n   * 'average': 尽可能均分；\n   * 'd3'：与 d3 默认逻辑一致，以 [1, 2, 5] 为基数生成；\n   * @default 'average'\n   * @since 1.3.0\n   */\n  tickMode?: 'average' | 'd3';\n  /**\n   * 连续轴，是否避免小数 tick。\n   * @default false\n   * @description 当配置了 tickStep 或 forceTickCount 时不生效。\n   * @since 1.3.0\n   */\n  noDecimals?: boolean;\n}\n\nexport interface IBandAxisLayer extends Omit<ITickCalculationCfg, 'noDecimals' | 'tickMode'> {\n  /**\n   * 是否显示\n   * @default true\n   */\n  visible?: boolean;\n}\n"]}

package/cjs/component/axis/interface/spec.d.ts

@@ -2,7 +2,7 @@ import type { AxisItem, AxisItemStateStyle } from '@visactor/vrender-components'
 import type { IAnimationSpec } from '../../../animation/spec';
 import type { Datum, IPadding, IRectMarkSpec, IRuleMarkSpec, ISymbolMarkSpec, ITextMarkSpec, StringOrNumber } from '../../../typings';
 import type { IComponentSpec } from '../../base/interface';
-import type { AxisType, IAxisItem, ITickCallbackOption, StyleCallback } from './common';
+import type { AxisType, IAxisItem, IBandAxisLayer, ITickCalculationCfg, StyleCallback } from './common';
 import type { IRichTextCharacter } from '@visactor/vrender-core';
 export interface ICommonAxisSpec extends Omit<IComponentSpec, 'orient' | 'center'>, IAnimationSpec<string, string> {
     type?: AxisType;
@@ -38,6 +38,8 @@ export interface IBandAxisSpec {
     paddingOuter?: number | number[];
     domain?: StringOrNumber[];
     bandPosition?: number;
+    showAllGroupLayers?: boolean;
+    layers?: IBandAxisLayer[];
 }
 export interface IGrid extends IAxisItem<IRuleMarkSpec> {
     alternateColor?: string | string[];
@@ -45,15 +47,10 @@ export interface IGrid extends IAxisItem<IRuleMarkSpec> {
     style?: IRuleMarkSpec | StyleCallback<IRuleMarkSpec | undefined>;
     zIndex?: number;
 }
-export interface ITick extends IAxisItem<IRuleMarkSpec> {
+export interface ITick extends IAxisItem<IRuleMarkSpec>, ITickCalculationCfg {
     tickSize?: number;
     inside?: boolean;
     alignWithLabel?: boolean;
-    tickStep?: number;
-    tickCount?: number | ((option: ITickCallbackOption) => number);
-    forceTickCount?: number;
-    tickMode?: 'average' | 'd3';
-    noDecimals?: boolean;
     style?: IRuleMarkSpec | StyleCallback<IRuleMarkSpec | undefined>;
     state?: AxisItemStateStyle<IRuleMarkSpec>;
     dataFilter?: (data: AxisItem[]) => AxisItem[];

package/cjs/component/axis/interface/spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/axis/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { AxisItem, AxisItemStateStyle } from '@visactor/vrender-components';\nimport type { IAnimationSpec } from '../../../animation/spec';\nimport type {\n  Datum,\n  IPadding,\n  IRectMarkSpec,\n  IRuleMarkSpec,\n  ISymbolMarkSpec,\n  ITextMarkSpec,\n  StringOrNumber\n} from '../../../typings';\nimport type { IComponentSpec } from '../../base/interface';\nimport type { AxisType, IAxisItem, ITickCallbackOption, StyleCallback } from './common';\nimport type { IRichTextCharacter } from '@visactor/vrender-core';\n\nexport interface ICommonAxisSpec extends Omit<IComponentSpec, 'orient' | 'center'>, IAnimationSpec<string, string> {\n  /**\n   * 轴类型\n   */\n  type?: AxisType;\n  /**\n   * 是否显示坐标轴\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * 是否开启反向坐标轴。\n   * @default false\n   */\n  inverse?: boolean;\n  /**\n   * 轴刻度线配置\n   */\n  tick?: ITick;\n  /**\n   * 子刻度线配置\n   */\n  subTick?: ISubTick;\n\n  /**\n   * 是否开启动画，默认关闭\n   * @default false\n   */\n  animation?: boolean;\n\n  // 交互相关的配置\n  /**\n   * 是否开启 select 选中交互，默认关闭\n   * @default false\n   */\n  select?: boolean;\n  /**\n   * 是否开启 hover 悬浮交互，默认关闭\n   * @default false\n   */\n  hover?: boolean;\n\n  /**\n   * 是否开启轴数据采样，默认开启。\n   * 轴采样开启之后，会对轴数据进行采样显示，防止轴数据的重叠。\n   * 通过配置 `label.minGap` 可以控制轴标签之间的间距。\n   * @default true\n   * @since 1.1.0\n   */\n  sampling?: boolean;\n}\n\nexport interface ILinearAxisSpec {\n  // 线性轴数值范围配置\n  /** 最小值，**优先级高于 zero，nice** */\n  min?: number;\n  /** 最大值，**优先级高于 zero，nice** */\n  max?: number;\n\n  /** @deparated 线性轴数值范围配置（已弃用，请使用外层 min/max） */\n  range?: {\n    /** @deparated 最小值 */\n    min?: number;\n    /** @deparated 最大值 */\n    max?: number;\n  };\n\n  /**\n   * 是否根据数据将轴范围调整到相对规整的数值\n   * @default true\n   * @description 当配置了 min 和 max，该配置项失效\n   * @example 当配置了 max = 999, nice并不会将轴范围优化到1000\n   */\n  nice?: boolean;\n  /**\n   * nice效果的类型，是精度优先还是tickCount优先（比如tickCount为2那nice出来的精度就很低）\n   * @default undefined('tickCountFirst')\n   * @description 不配置就默认是tickCountFirst\n   * @example 数据范围是0~6000，如果tickCount为2，那么tickCountFirst出来的range就是[0, 10000], accurateFirst出来的range就是[0, 6000]但10000显示不了\n   */\n  niceType?: 'tickCountFirst' | 'accurateFirst';\n  /**\n   * 是否包含0值\n   * @default true\n   * @description 当配置了 min和 max，该配置项失效\n   */\n  zero?: boolean;\n  /**\n   * 轴范围按比例扩展\n   * @description 当配置了 min和 max，该配置项失效\n   */\n  expand?: {\n    min?: number;\n    max?: number;\n  };\n\n  /**\n   * 连续轴上的 dimension tooltip 数据筛选范围\n   * 如果配置为单个数字 d，则筛选区间为 [x0 - d, x0 + d]；如果配置为二元组 [d1, d2]，则筛选区间为 [x0 + d1, x0 + d2]\n   * @since 1.4.0\n   */\n  tooltipFilterRange?: number | [number, number];\n}\n\nexport interface IBandAxisSpec {\n  /**\n   * 是否去除 band 轴两端的留白，如果为 true，则两端的 padding 为 0，\n   * **并且 bandPadding、paddingInner 和 paddingOuter 的设置将被忽略**。\n   * @default false\n   * @since 1.7.0\n   */\n  trimPadding?: boolean;\n  /**\n   * 同时设置轴的 paddingInner 和 paddingOuter\n   * **因为有可能存在多层 scale( xField 设置成了数组，即分组场景），所以支持了数组类型，用于多层 scale 的 bandPadding 配置**\n   */\n  bandPadding?: number | number[];\n  /**\n   * band 轴的内边距\n   * ** 因为有可能存在多层 scale( xField 设置成了数组，即分组场景），所以支持了数组类型，用于多层 scale 的 paddingInner 配置**\n   * @default 0.1\n   */\n  paddingInner?: number | number[];\n  /**\n   * band 轴的外边距\n   * ** 因为有可能存在多层 scale( xField 设置成了数组，即分组场景），所以支持了数组类型，用于多层 scale 的 paddingOuter 配置**\n   * @default 0.3\n   */\n  paddingOuter?: number | number[];\n  /**\n   * 配置离散轴的数值范围\n   * @since 1.1.0\n   */\n  domain?: StringOrNumber[];\n  /**\n   * `bandPosition` 是一个可选参数，用于指定数据点在 band 轴上的位置。它的含义是确定数据点在 band 轴上的位置偏移量，相对于 band 轴的起始位置。\n   * `bandPosition` 的取值范围是从 0 到 1，其中 0 表示数据点位于 band 轴的起始位置，1 表示数据点位于 band 轴的结束位置。\n   * @default 0.5\n   */\n  bandPosition?: number;\n}\n// Grid 配置项\nexport interface IGrid extends IAxisItem<IRuleMarkSpec> {\n  /**\n   * 两个栅格线间的填充色\n   */\n  alternateColor?: string | string[];\n  /**\n   * grid 是否与 label 对齐，默认为 true，即对齐，配置为 false 则显示在前后两个刻度中间\n   * @default true\n   */\n  alignWithLabel?: boolean;\n  /**\n   * 网格线样式，支持回调\n   */\n  style?: IRuleMarkSpec | StyleCallback<IRuleMarkSpec | undefined>;\n  /**\n   * 快捷属性，也可以在 `style` 中配置，用于配置网格线的绘制顺序，默认为 50\n   * @default 50\n   * @since 1.4.0\n   */\n  zIndex?: number;\n}\n\n// 刻度线配置\nexport interface ITick extends IAxisItem<IRuleMarkSpec> {\n  /**\n   * Length of tick lines\n   * 坐标轴刻度线的长度\n   * @default 4\n   */\n  tickSize?: number;\n  /**\n   * 刻度线朝向，默认朝外(坐标线包围盒外部)\n   * @default false\n   */\n  inside?: boolean;\n  /**\n   * tick 是否与 label 对齐，默认为 true，即对齐，配置为 false 则显示在前后两个刻度中间\n   * @default true\n   */\n  alignWithLabel?: boolean;\n  /** tick步长 */\n  tickStep?: number;\n  /**\n   * 期望的连续轴tick数量\n   * The desired number of ticks draw on linear axis.\n   * @default 5\n   * @description 建议的tick数量，并不保证结果一定是配置值\n   * @since 1.4.0 后支持函数回调。\n   */\n  tickCount?: number | ((option: ITickCallbackOption) => number);\n  /**\n   * 强制设置tick数量\n   * The exact number of ticks draw on linear axis. Might lead to decimal step.\n   * @default 5\n   * @description 强制设置的tick数量，可能由于数据范围导致tick值为小数\n   */\n  forceTickCount?: number;\n  /**\n   * 连续轴 tick 生成算法：\n   * 'average': 尽可能均分；\n   * 'd3'：与 d3 默认逻辑一致，以 [1, 2, 5] 为基数生成；\n   * @default 'average'\n   * @since 1.3.0\n   */\n  tickMode?: 'average' | 'd3';\n  /**\n   * 连续轴，是否避免小数 tick。\n   * @default false\n   * @description 当配置了 tickStep 或 forceTickCount 时不生效。\n   * @since 1.3.0\n   */\n  noDecimals?: boolean;\n  /**\n   * 刻度线样式设置，支持回调\n   */\n  style?: IRuleMarkSpec | StyleCallback<IRuleMarkSpec | undefined>;\n  /**\n   * 刻度线不同交互状态下的样式配置，支持：\n   * 1. hover\n   * 2. hover_reverse\n   * 3. selected\n   * 4. selected_reverse\n   */\n  state?: AxisItemStateStyle<IRuleMarkSpec>;\n  /**\n   * 用于 tick 的数据过滤\n   * @since 1.1.0\n   */\n  dataFilter?: (data: AxisItem[]) => AxisItem[];\n}\n\n// 子刻度线配置\nexport interface ISubTick extends IAxisItem<IRuleMarkSpec> {\n  /**\n   * TODO: 考虑下 log 轴，自刻度线之间的间距是不均匀的问题\n   * 子刻度个数\n   */\n  tickCount?: number;\n  /**\n   * 子刻度线朝向，默认朝外(坐标线包围盒外部)\n   * @default false\n   */\n  inside?: boolean;\n  /** 子刻度线的长度 */\n  tickSize?: number;\n  /**\n   * 子刻度线不同交互状态下的样式配置，支持：\n   * 1. hover\n   * 2. hover_reverse\n   * 3. selected\n   * 4. selected_reverse\n   */\n  state?: AxisItemStateStyle<IRuleMarkSpec>;\n}\n\n// 轴标签配置\nexport interface ILabel extends IAxisItem<ITextMarkSpec> {\n  /** 文本类型：text, rich, html */\n  type?: 'text' | 'rich' | 'html';\n  /**\n   * 轴标签内容格式化函数\n   * @param text 原始标签文本值\n   * @param datum 图形数据\n   * @returns 格式化后的文本\n   */\n  formatMethod?: (text: string | string[], datum?: Datum) => string | string[] | IRichTextCharacter[];\n  /** 标签同 tick 之间的间距 */\n  space?: number;\n  /**\n   * 标签朝向，默认朝外(坐标线包围盒外部)\n   * @default false\n   */\n  inside?: boolean;\n  /**\n   * 标签之间的最小间距（单位为像素），仅当轴采样开始时生效（`sampling: true`）。\n   * 该配置会影响轴采样的结果。\n   */\n  minGap?: number;\n  /**\n   * 文本样式设置\n   */\n  style?: ITextMarkSpec | StyleCallback<ITextMarkSpec | undefined>;\n  /**\n   * label 不同交互状态下的样式配置，支持：\n   * 1. hover\n   * 2. hover_reverse\n   * 3. selected\n   * 4. selected_reverse\n   */\n  state?: AxisItemStateStyle<ITextMarkSpec>;\n  /**\n   * 用于 label 的数据过滤\n   * @since 1.1.0\n   */\n  dataFilter?: (data: AxisItem[], layer: number) => AxisItem[];\n}\n\n// 轴线配置\nexport interface IDomainLine extends IAxisItem<IRuleMarkSpec> {\n  /**\n   * domainLine 在不同交互状态下的样式配置，支持：\n   * 1. hover\n   * 2. hover_reverse\n   * 3. selected\n   * 4. selected_reverse\n   */\n  state?: AxisItemStateStyle<IRuleMarkSpec>;\n}\n\n// 轴标题配置\nexport interface ITitle extends IAxisItem<ITextMarkSpec> {\n  /**\n   * 标题的显示位置，直角坐标系默认 'middle'；\n   * 极坐标系的圆弧轴如果配置了内半径，则默认 'middle'，否则 'end'\n   */\n  position?: 'start' | 'middle' | 'end';\n  /**\n   * 标题距离坐标轴(轴线、刻度、标签共同构成的包围盒)的距离\n   */\n  space?: number;\n  /**\n   * 标题内边距配置\n   */\n  padding?: IPadding | number | number[];\n  /**\n   * 标题背景色设置\n   */\n  background?: IAxisItem<IRectMarkSpec> & {\n    /**\n     * 背景的交互状态样式配置\n     */\n    state?: AxisItemStateStyle<Partial<IRectMarkSpec>>;\n  };\n  /**\n   * TODO: 接入富文本\n   * 标题 shape 配置\n   */\n  shape?: IAxisItem<ISymbolMarkSpec> & {\n    /**\n     * shape 同标题文本之间的间距\n     */\n    space?: number;\n    /**\n     * shape 标记的交互状态样式配置\n     */\n    state?: AxisItemStateStyle<Partial<ISymbolMarkSpec>>;\n  };\n  /** 文本类型：text, rich, html */\n  type?: 'text' | 'rich' | 'html';\n  /**\n   * 文本内容\n   * 支持富文本内容, 如textConfig, html\n   */\n  text?: string | string[] | IRichTextCharacter[];\n  /**\n   * 标题整体的旋转角度（如果标题配置了 background、shape 等属性的话，需要使用该属性进行整体的配置旋转）。\n   */\n  angle?: number;\n  /**\n   * text 文本的交互状态样式配置\n   */\n  state?: AxisItemStateStyle<Partial<ITextMarkSpec>>;\n}\n"]}
+{"version":3,"sources":["../src/component/axis/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { AxisItem, AxisItemStateStyle } from '@visactor/vrender-components';\nimport type { IAnimationSpec } from '../../../animation/spec';\nimport type {\n  Datum,\n  IPadding,\n  IRectMarkSpec,\n  IRuleMarkSpec,\n  ISymbolMarkSpec,\n  ITextMarkSpec,\n  StringOrNumber\n} from '../../../typings';\nimport type { IComponentSpec } from '../../base/interface';\nimport type { AxisType, IAxisItem, IBandAxisLayer, ITickCalculationCfg, StyleCallback } from './common';\nimport type { IRichTextCharacter } from '@visactor/vrender-core';\n\nexport interface ICommonAxisSpec extends Omit<IComponentSpec, 'orient' | 'center'>, IAnimationSpec<string, string> {\n  /**\n   * 轴类型\n   */\n  type?: AxisType;\n  /**\n   * 是否显示坐标轴\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * 是否开启反向坐标轴。\n   * @default false\n   */\n  inverse?: boolean;\n  /**\n   * 轴刻度线配置\n   */\n  tick?: ITick;\n  /**\n   * 子刻度线配置\n   */\n  subTick?: ISubTick;\n\n  /**\n   * 是否开启动画，默认关闭\n   * @default false\n   */\n  animation?: boolean;\n\n  // 交互相关的配置\n  /**\n   * 是否开启 select 选中交互，默认关闭\n   * @default false\n   */\n  select?: boolean;\n  /**\n   * 是否开启 hover 悬浮交互，默认关闭\n   * @default false\n   */\n  hover?: boolean;\n\n  /**\n   * 是否开启轴数据采样，默认开启。\n   * 轴采样开启之后，会对轴数据进行采样显示，防止轴数据的重叠。\n   * 通过配置 `label.minGap` 可以控制轴标签之间的间距。\n   * @default true\n   * @since 1.1.0\n   */\n  sampling?: boolean;\n}\n\nexport interface ILinearAxisSpec {\n  // 线性轴数值范围配置\n  /** 最小值，**优先级高于 zero，nice** */\n  min?: number;\n  /** 最大值，**优先级高于 zero，nice** */\n  max?: number;\n\n  /** @deparated 线性轴数值范围配置（已弃用，请使用外层 min/max） */\n  range?: {\n    /** @deparated 最小值 */\n    min?: number;\n    /** @deparated 最大值 */\n    max?: number;\n  };\n\n  /**\n   * 是否根据数据将轴范围调整到相对规整的数值\n   * @default true\n   * @description 当配置了 min 和 max，该配置项失效\n   * @example 当配置了 max = 999, nice并不会将轴范围优化到1000\n   */\n  nice?: boolean;\n  /**\n   * nice效果的类型，是精度优先还是tickCount优先（比如tickCount为2那nice出来的精度就很低）\n   * @default undefined('tickCountFirst')\n   * @description 不配置就默认是tickCountFirst\n   * @example 数据范围是0~6000，如果tickCount为2，那么tickCountFirst出来的range就是[0, 10000], accurateFirst出来的range就是[0, 6000]但10000显示不了\n   */\n  niceType?: 'tickCountFirst' | 'accurateFirst';\n  /**\n   * 是否包含0值\n   * @default true\n   * @description 当配置了 min和 max，该配置项失效\n   */\n  zero?: boolean;\n  /**\n   * 轴范围按比例扩展\n   * @description 当配置了 min和 max，该配置项失效\n   */\n  expand?: {\n    min?: number;\n    max?: number;\n  };\n\n  /**\n   * 连续轴上的 dimension tooltip 数据筛选范围\n   * 如果配置为单个数字 d，则筛选区间为 [x0 - d, x0 + d]；如果配置为二元组 [d1, d2]，则筛选区间为 [x0 + d1, x0 + d2]\n   * @since 1.4.0\n   */\n  tooltipFilterRange?: number | [number, number];\n}\n\nexport interface IBandAxisSpec {\n  /**\n   * 是否去除 band 轴两端的留白，如果为 true，则两端的 padding 为 0，\n   * **并且 bandPadding、paddingInner 和 paddingOuter 的设置将被忽略**。\n   * @default false\n   * @since 1.7.0\n   */\n  trimPadding?: boolean;\n  /**\n   * 同时设置轴的 paddingInner 和 paddingOuter\n   * **因为有可能存在多层 scale( xField 设置成了数组，即分组场景），所以支持了数组类型，用于多层 scale 的 bandPadding 配置**\n   */\n  bandPadding?: number | number[];\n  /**\n   * band 轴的内边距\n   * ** 因为有可能存在多层 scale( xField 设置成了数组，即分组场景），所以支持了数组类型，用于多层 scale 的 paddingInner 配置**\n   * @default 0.1\n   */\n  paddingInner?: number | number[];\n  /**\n   * band 轴的外边距\n   * ** 因为有可能存在多层 scale( xField 设置成了数组，即分组场景），所以支持了数组类型，用于多层 scale 的 paddingOuter 配置**\n   * @default 0.3\n   */\n  paddingOuter?: number | number[];\n  /**\n   * 配置离散轴的数值范围\n   * @since 1.1.0\n   */\n  domain?: StringOrNumber[];\n  /**\n   * `bandPosition` 是一个可选参数，用于指定数据点在 band 轴上的位置。它的含义是确定数据点在 band 轴上的位置偏移量，相对于 band 轴的起始位置。\n   * `bandPosition` 的取值范围是从 0 到 1，其中 0 表示数据点位于 band 轴的起始位置，1 表示数据点位于 band 轴的结束位置。\n   * @default 0.5\n   */\n  bandPosition?: number;\n\n  /**\n   * 当存在多层分组场景时，是否展示所有的分组轴\n   * @default false\n   * @since 1.9.0\n   */\n  showAllGroupLayers?: boolean;\n  /**\n   * 每一层轴的配置\n   * layer[0] 为离坐标轴线最近的轴，当且仅当 `showAllGroupLayers` 配置开启生效。\n   * @since 1.9.0\n   */\n  layers?: IBandAxisLayer[];\n}\n// Grid 配置项\nexport interface IGrid extends IAxisItem<IRuleMarkSpec> {\n  /**\n   * 两个栅格线间的填充色\n   */\n  alternateColor?: string | string[];\n  /**\n   * grid 是否与 label 对齐，默认为 true，即对齐，配置为 false 则显示在前后两个刻度中间\n   * @default true\n   */\n  alignWithLabel?: boolean;\n  /**\n   * 网格线样式，支持回调\n   */\n  style?: IRuleMarkSpec | StyleCallback<IRuleMarkSpec | undefined>;\n  /**\n   * 快捷属性，也可以在 `style` 中配置，用于配置网格线的绘制顺序，默认为 50\n   * @default 50\n   * @since 1.4.0\n   */\n  zIndex?: number;\n}\n\n// 刻度线配置\nexport interface ITick extends IAxisItem<IRuleMarkSpec>, ITickCalculationCfg {\n  /**\n   * Length of tick lines\n   * 坐标轴刻度线的长度\n   * @default 4\n   */\n  tickSize?: number;\n  /**\n   * 刻度线朝向，默认朝外(坐标线包围盒外部)\n   * @default false\n   */\n  inside?: boolean;\n  /**\n   * tick 是否与 label 对齐，默认为 true，即对齐，配置为 false 则显示在前后两个刻度中间\n   * @default true\n   */\n  alignWithLabel?: boolean;\n  /**\n   * 刻度线样式设置，支持回调\n   */\n  style?: IRuleMarkSpec | StyleCallback<IRuleMarkSpec | undefined>;\n  /**\n   * 刻度线不同交互状态下的样式配置，支持：\n   * 1. hover\n   * 2. hover_reverse\n   * 3. selected\n   * 4. selected_reverse\n   */\n  state?: AxisItemStateStyle<IRuleMarkSpec>;\n  /**\n   * 用于 tick 的数据过滤\n   * @since 1.1.0\n   */\n  dataFilter?: (data: AxisItem[]) => AxisItem[];\n}\n\n// 子刻度线配置\nexport interface ISubTick extends IAxisItem<IRuleMarkSpec> {\n  /**\n   * TODO: 考虑下 log 轴，自刻度线之间的间距是不均匀的问题\n   * 子刻度个数\n   */\n  tickCount?: number;\n  /**\n   * 子刻度线朝向，默认朝外(坐标线包围盒外部)\n   * @default false\n   */\n  inside?: boolean;\n  /** 子刻度线的长度 */\n  tickSize?: number;\n  /**\n   * 子刻度线不同交互状态下的样式配置，支持：\n   * 1. hover\n   * 2. hover_reverse\n   * 3. selected\n   * 4. selected_reverse\n   */\n  state?: AxisItemStateStyle<IRuleMarkSpec>;\n}\n\n// 轴标签配置\nexport interface ILabel extends IAxisItem<ITextMarkSpec> {\n  /** 文本类型：text, rich, html */\n  type?: 'text' | 'rich' | 'html';\n  /**\n   * 轴标签内容格式化函数\n   * @param text 原始标签文本值\n   * @param datum 图形数据\n   * @returns 格式化后的文本\n   */\n  formatMethod?: (text: string | string[], datum?: Datum) => string | string[] | IRichTextCharacter[];\n  /** 标签同 tick 之间的间距 */\n  space?: number;\n  /**\n   * 标签朝向，默认朝外(坐标线包围盒外部)\n   * @default false\n   */\n  inside?: boolean;\n  /**\n   * 标签之间的最小间距（单位为像素），仅当轴采样开始时生效（`sampling: true`）。\n   * 该配置会影响轴采样的结果。\n   */\n  minGap?: number;\n  /**\n   * 文本样式设置\n   */\n  style?: ITextMarkSpec | StyleCallback<ITextMarkSpec | undefined>;\n  /**\n   * label 不同交互状态下的样式配置，支持：\n   * 1. hover\n   * 2. hover_reverse\n   * 3. selected\n   * 4. selected_reverse\n   */\n  state?: AxisItemStateStyle<ITextMarkSpec>;\n  /**\n   * 用于 label 的数据过滤\n   * @since 1.1.0\n   */\n  dataFilter?: (data: AxisItem[], layer: number) => AxisItem[];\n}\n\n// 轴线配置\nexport interface IDomainLine extends IAxisItem<IRuleMarkSpec> {\n  /**\n   * domainLine 在不同交互状态下的样式配置，支持：\n   * 1. hover\n   * 2. hover_reverse\n   * 3. selected\n   * 4. selected_reverse\n   */\n  state?: AxisItemStateStyle<IRuleMarkSpec>;\n}\n\n// 轴标题配置\nexport interface ITitle extends IAxisItem<ITextMarkSpec> {\n  /**\n   * 标题的显示位置，直角坐标系默认 'middle'；\n   * 极坐标系的圆弧轴如果配置了内半径，则默认 'middle'，否则 'end'\n   */\n  position?: 'start' | 'middle' | 'end';\n  /**\n   * 标题距离坐标轴(轴线、刻度、标签共同构成的包围盒)的距离\n   */\n  space?: number;\n  /**\n   * 标题内边距配置\n   */\n  padding?: IPadding | number | number[];\n  /**\n   * 标题背景色设置\n   */\n  background?: IAxisItem<IRectMarkSpec> & {\n    /**\n     * 背景的交互状态样式配置\n     */\n    state?: AxisItemStateStyle<Partial<IRectMarkSpec>>;\n  };\n  /**\n   * TODO: 接入富文本\n   * 标题 shape 配置\n   */\n  shape?: IAxisItem<ISymbolMarkSpec> & {\n    /**\n     * shape 同标题文本之间的间距\n     */\n    space?: number;\n    /**\n     * shape 标记的交互状态样式配置\n     */\n    state?: AxisItemStateStyle<Partial<ISymbolMarkSpec>>;\n  };\n  /** 文本类型：text, rich, html */\n  type?: 'text' | 'rich' | 'html';\n  /**\n   * 文本内容\n   * 支持富文本内容, 如textConfig, html\n   */\n  text?: string | string[] | IRichTextCharacter[];\n  /**\n   * 标题整体的旋转角度（如果标题配置了 background、shape 等属性的话，需要使用该属性进行整体的配置旋转）。\n   */\n  angle?: number;\n  /**\n   * text 文本的交互状态样式配置\n   */\n  state?: AxisItemStateStyle<Partial<ITextMarkSpec>>;\n}\n"]}

package/cjs/component/axis/mixin/band-axis-mixin.d.ts

@@ -1,17 +1,23 @@
 import type { BandScale } from '@visactor/vscale';
-import type { StringOrNumber } from '../../../typings';
+import type { Dict } from '@visactor/vutils';
+import type { IOrientType, IPolarOrientType, StringOrNumber } from '../../../typings';
 import type { IEvent } from '../../../event/interface';
 import type { IAxisLocationCfg } from '../interface';
+import { CompilableData } from '../../../compile/data/compilable-data';
 export interface BandAxisMixin {
+    _orient: IOrientType | IPolarOrientType;
+    _option: any;
     _scale: BandScale;
     _scales: BandScale[];
     _spec: any;
+    _tick: any;
+    _tickData: CompilableData[];
     _defaultBandPosition: number;
     _defaultBandInnerPadding: number;
     _defaultBandOuterPadding: number;
     event: IEvent;
     isSeriesDataEnable: () => boolean;
-    collectData: (depth: number) => {
+    collectData: (depth: number, rawData?: boolean) => {
         min: number;
         max: number;
         values: any[];
@@ -22,8 +28,16 @@ export interface BandAxisMixin {
         values: any[];
     }[]) => StringOrNumber[];
     transformScaleDomain: () => void;
+    _initTickDataSet: (options: any, index?: number) => any;
+    _tickTransformOption: () => any;
+    _forceLayout: () => void;
+    _getNormalizedValue: (values: any[], length: number) => number;
 }
 export declare class BandAxisMixin {
+    protected _initData(): void;
+    protected _rawDomainIndex: {
+        [key: string | number | symbol]: number;
+    }[];
     dataToPosition(values: any[], cfg?: IAxisLocationCfg): number;
     valueToPosition(value: any): number;
     updateGroupScaleRange(): void;
@@ -38,4 +52,7 @@ export declare class BandAxisMixin {
         values: any[];
     }[]): StringOrNumber[];
     protected updateScaleDomain(): void;
+    protected getLabelItems(length: number): Dict<any>[][];
+    protected _updateRawDomain(): void;
+    protected _clearRawDomain(): void;
 }

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

@@ -4,9 +4,25 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BandAxisMixin = void 0;
 
-const vutils_1 = require("@visactor/vutils"), event_1 = require("../../../constant/event");
+const vutils_1 = require("@visactor/vutils"), event_1 = require("../../../constant/event"), compilable_data_1 = require("../../../compile/data/compilable-data"), util_1 = require("../util");
 
 class BandAxisMixin {
+    constructor() {
+        this._rawDomainIndex = [];
+    }
+    _initData() {
+        var _a;
+        if (this._spec.showAllGroupLayers && this._scales.length > 1) for (let layer = 0; layer < this._scales.length; layer++) {
+            const layerConfig = (null !== (_a = this._spec.layers) && void 0 !== _a ? _a : [])[this._scales.length - 1 - layer] || {};
+            if (!1 !== layerConfig.visible && 0 !== layerConfig.tickCount && 0 !== layerConfig.forceTickCount) {
+                const tickData = this._initTickDataSet(Object.assign(Object.assign({}, this._tickTransformOption()), layerConfig), layer);
+                tickData.target.addListener("change", this._forceLayout.bind(this)), this._tickData.push(new compilable_data_1.CompilableData(this._option, tickData));
+            }
+        } else {
+            const tickData = this._initTickDataSet(this._tickTransformOption());
+            tickData.target.addListener("change", this._forceLayout.bind(this)), this._tickData = [ new compilable_data_1.CompilableData(this._option, tickData) ];
+        }
+    }
     dataToPosition(values, cfg = {}) {
         var _a, _b;
         if (0 === values.length || 0 === this._scales.length) return 0;
@@ -51,11 +67,13 @@ class BandAxisMixin {
         return Array.from(tempSet);
     }
     updateScaleDomain() {
+        var _a;
         if (!this.isSeriesDataEnable()) return;
+        !(null === (_a = this._rawDomainIndex) || void 0 === _a ? void 0 : _a.length) && this._scales.length && this._updateRawDomain();
         const userDomain = this._spec.domain;
         for (let i = 0; i < this._scales.length; i++) if (userDomain && userDomain.length && 0 === i) this._scales[i].domain(userDomain); else {
             const data = this.collectData(i), domain = this.computeDomain(data);
-            this._scales[i].domain(domain);
+            this._scales[i].domain(domain.sort(((a, b) => this._rawDomainIndex[i][a] - this._rawDomainIndex[i][b])));
         }
         this.transformScaleDomain(), this.event.emit(event_1.ChartEvent.scaleDomainUpdate, {
             model: this
@@ -64,6 +82,36 @@ class BandAxisMixin {
             value: "domain"
         });
     }
+    getLabelItems(length) {
+        const labelItems = [];
+        let preData = [];
+        return this._tickData.forEach(((eachTickData, index) => {
+            const latestData = eachTickData.getLatestData();
+            if (latestData && latestData.length) if (preData && preData.length) {
+                const currentLabelItems = [], curData = [];
+                preData.forEach((value => {
+                    latestData.forEach((obj => {
+                        const values = (0, vutils_1.array)(value).concat(obj.value);
+                        curData.push(values);
+                        const axisItem = (0, util_1.getAxisItem)(obj.value, this._getNormalizedValue(values, length));
+                        currentLabelItems.push(axisItem);
+                    }));
+                })), labelItems.push(currentLabelItems.filter((entry => entry.value >= 0 && entry.value <= 1))), 
+                preData = curData;
+            } else labelItems.push(latestData.map((obj => (preData.push(obj.value), (0, util_1.getAxisItem)(obj.value, this._getNormalizedValue([ obj.value ], length))))).filter((entry => entry.value >= 0 && entry.value <= 1)));
+        })), labelItems.reverse();
+    }
+    _updateRawDomain() {
+        this._rawDomainIndex = [];
+        const userDomain = this._spec.domain;
+        for (let i = 0; i < this._scales.length; i++) if (userDomain && userDomain.length && 0 === i) this._scales[i].domain(userDomain); else {
+            const data = this.collectData(i, !0), domain = this.computeDomain(data);
+            this._rawDomainIndex[i] = {}, domain.forEach(((d, _i) => this._rawDomainIndex[i][d] = _i));
+        }
+    }
+    _clearRawDomain() {
+        this._rawDomainIndex = [];
+    }
 }
 
 exports.BandAxisMixin = BandAxisMixin;

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/axis/mixin/band-axis-mixin.ts"],"names":[],"mappings":"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","file":"band-axis-mixin.js","sourcesContent":["import type { BandScale } from '@visactor/vscale';\nimport { isArray } from '@visactor/vutils';\nimport type { StringOrNumber } from '../../../typings';\nimport type { IEvent } from '../../../event/interface';\nimport { ChartEvent } from '../../../constant/event';\nimport type { IModel } from '../../../model/interface';\nimport type { IAxisLocationCfg } from '../interface';\n\nexport interface BandAxisMixin {\n  _scale: BandScale;\n  _scales: BandScale[];\n  _spec: any;\n  _defaultBandPosition: number;\n  _defaultBandInnerPadding: number;\n  _defaultBandOuterPadding: number;\n  event: IEvent;\n  isSeriesDataEnable: () => boolean;\n  collectData: (depth: number) => { min: number; max: number; values: any[] }[];\n  computeDomain: (data: { min: number; max: number; values: any[] }[]) => StringOrNumber[];\n  transformScaleDomain: () => void;\n}\n\nexport class BandAxisMixin {\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._spec.bandPosition ?? this._defaultBandPosition)\n    );\n  }\n\n  valueToPosition(value: any): number {\n    const bandStart = this._scale.scale(value);\n    return bandStart;\n  }\n\n  updateGroupScaleRange() {\n    let parentScale = this._scale;\n    this._scales.forEach((scale, i) => {\n      if (i > 0) {\n        scale.range([0, parentScale.bandwidth()]);\n        parentScale = scale;\n      }\n    });\n  }\n\n  getPosition(values: any[]) {\n    let position = 0;\n    let bandScale = this._scale;\n    // 要不要性能优化？\n    // 优化有没有用？\n    if (this._scales.length === 1 || values.length === 1) {\n      position = this.valueToPosition(values[0]);\n    } else {\n      const max = Math.min(values.length, this._scales.length);\n      for (let i = 0; i < max; i++) {\n        position += this._scales[i].scale(values[i]);\n      }\n      bandScale = this._scales[max - 1];\n    }\n    return { position, bandScale };\n  }\n\n  calcScales(DEFAULT_BAND_INNER_PADDING: number, DEFAULT_BAND_OUTER_PADDING: number) {\n    const { bandPadding, paddingInner, paddingOuter } = this._spec;\n    const isBandPaddingArray = isArray(bandPadding);\n    const isPaddingInnerArray = isArray(paddingInner);\n    const isPaddingOuterArray = isArray(paddingOuter);\n\n    for (let i = 0; i < this._scales.length; i++) {\n      const _padding = isBandPaddingArray ? bandPadding[i] : bandPadding;\n      const _paddingInner = isPaddingInnerArray ? paddingInner[i] : paddingInner;\n      const _paddingOuter = isPaddingOuterArray ? paddingOuter[i] : paddingOuter;\n\n      this._scales[i]\n        .paddingInner(_paddingInner ?? _padding ?? DEFAULT_BAND_INNER_PADDING, true)\n        .paddingOuter(_paddingOuter ?? _padding ?? DEFAULT_BAND_OUTER_PADDING, true);\n    }\n  }\n  computeBandDomain(data: { min: number; max: number; values: any[] }[]): StringOrNumber[] {\n    // 性能优化 9.13\n    if (data.length === 1) {\n      return data[0].values;\n    }\n    const tempSet = new Set();\n    for (let i = 0; i < data.length; i++) {\n      for (let j = 0; j < data[i].values.length; j++) {\n        tempSet.add(data[i].values[j]);\n      }\n    }\n    return Array.from(tempSet) as StringOrNumber[];\n  }\n\n  protected updateScaleDomain() {\n    if (!this.isSeriesDataEnable()) {\n      return;\n    }\n\n    const userDomain = this._spec.domain;\n    for (let i = 0; i < this._scales.length; i++) {\n      if (userDomain && userDomain.length && i === 0) {\n        // 当数字映射字段存在分组时，只作用于第一个分组的domain，如 xField: ['x', 'type']\n        this._scales[i].domain(userDomain);\n      } else {\n        const data = this.collectData(i);\n        const domain = this.computeDomain(data);\n        this._scales[i].domain(domain);\n      }\n    }\n    this.transformScaleDomain();\n    this.event.emit(ChartEvent.scaleDomainUpdate, { model: this as unknown as IModel });\n    this.event.emit(ChartEvent.scaleUpdate, { model: this as unknown as IModel, value: 'domain' });\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/axis/mixin/band-axis-mixin.ts"],"names":[],"mappings":"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","file":"band-axis-mixin.js","sourcesContent":["import type { BandScale } from '@visactor/vscale';\nimport type { Dict } from '@visactor/vutils';\nimport { array, isArray } from '@visactor/vutils';\nimport type { Datum, IOrientType, IPolarOrientType, StringOrNumber } from '../../../typings';\nimport type { IEvent } from '../../../event/interface';\nimport { ChartEvent } from '../../../constant/event';\nimport type { IModel } from '../../../model/interface';\nimport type { IAxisLocationCfg } from '../interface';\nimport { CompilableData } from '../../../compile/data/compilable-data';\nimport type { AxisItem } from '@visactor/vrender-components';\nimport { getAxisItem } from '../util';\n\nexport interface BandAxisMixin {\n  _orient: IOrientType | IPolarOrientType;\n  _option: any;\n  _scale: BandScale;\n  _scales: BandScale[];\n  _spec: any;\n  _tick: any;\n  _tickData: CompilableData[];\n  _defaultBandPosition: number;\n  _defaultBandInnerPadding: number;\n  _defaultBandOuterPadding: number;\n  event: IEvent;\n  isSeriesDataEnable: () => boolean;\n  collectData: (depth: number, rawData?: boolean) => { min: number; max: number; values: any[] }[];\n  computeDomain: (data: { min: number; max: number; values: any[] }[]) => StringOrNumber[];\n  transformScaleDomain: () => void;\n  _initTickDataSet: (options: any, index?: number) => any;\n  _tickTransformOption: () => any;\n  _forceLayout: () => void;\n  _getNormalizedValue: (values: any[], length: number) => number;\n}\n\nexport class BandAxisMixin {\n  protected _initData() {\n    if (this._spec.showAllGroupLayers && this._scales.length > 1) {\n      // 显示所有分组层级\n      for (let layer = 0; layer < this._scales.length; layer++) {\n        const layers = this._spec.layers ?? [];\n        const layerConfig = layers[this._scales.length - 1 - layer] || {};\n        if (layerConfig.visible !== false && layerConfig.tickCount !== 0 && layerConfig.forceTickCount !== 0) {\n          const tickData = this._initTickDataSet(\n            {\n              ...this._tickTransformOption(),\n              ...layerConfig\n            },\n            layer\n          );\n          tickData.target.addListener('change', this._forceLayout.bind(this));\n          this._tickData.push(new CompilableData(this._option, tickData));\n        }\n      }\n    } else {\n      const tickData = this._initTickDataSet(this._tickTransformOption());\n      tickData.target.addListener('change', this._forceLayout.bind(this));\n      this._tickData = [new CompilableData(this._option, tickData)];\n    }\n  }\n  protected _rawDomainIndex: { [key: string | number | symbol]: number }[] = [];\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._spec.bandPosition ?? this._defaultBandPosition)\n    );\n  }\n\n  valueToPosition(value: any): number {\n    const bandStart = this._scale.scale(value);\n    return bandStart;\n  }\n\n  updateGroupScaleRange() {\n    let parentScale = this._scale;\n    this._scales.forEach((scale, i) => {\n      if (i > 0) {\n        scale.range([0, parentScale.bandwidth()]);\n        parentScale = scale;\n      }\n    });\n  }\n\n  getPosition(values: any[]) {\n    let position = 0;\n    let bandScale = this._scale;\n    // 要不要性能优化？\n    // 优化有没有用？\n    if (this._scales.length === 1 || values.length === 1) {\n      position = this.valueToPosition(values[0]);\n    } else {\n      const max = Math.min(values.length, this._scales.length);\n      for (let i = 0; i < max; i++) {\n        position += this._scales[i].scale(values[i]);\n      }\n      bandScale = this._scales[max - 1];\n    }\n    return { position, bandScale };\n  }\n\n  calcScales(DEFAULT_BAND_INNER_PADDING: number, DEFAULT_BAND_OUTER_PADDING: number) {\n    const { bandPadding, paddingInner, paddingOuter } = this._spec;\n    const isBandPaddingArray = isArray(bandPadding);\n    const isPaddingInnerArray = isArray(paddingInner);\n    const isPaddingOuterArray = isArray(paddingOuter);\n\n    for (let i = 0; i < this._scales.length; i++) {\n      const _padding = isBandPaddingArray ? bandPadding[i] : bandPadding;\n      const _paddingInner = isPaddingInnerArray ? paddingInner[i] : paddingInner;\n      const _paddingOuter = isPaddingOuterArray ? paddingOuter[i] : paddingOuter;\n\n      this._scales[i]\n        .paddingInner(_paddingInner ?? _padding ?? DEFAULT_BAND_INNER_PADDING, true)\n        .paddingOuter(_paddingOuter ?? _padding ?? DEFAULT_BAND_OUTER_PADDING, true);\n    }\n  }\n  computeBandDomain(data: { min: number; max: number; values: any[] }[]): StringOrNumber[] {\n    // 性能优化 9.13\n    if (data.length === 1) {\n      return data[0].values;\n    }\n    const tempSet = new Set();\n    for (let i = 0; i < data.length; i++) {\n      for (let j = 0; j < data[i].values.length; j++) {\n        tempSet.add(data[i].values[j]);\n      }\n    }\n    return Array.from(tempSet) as StringOrNumber[];\n  }\n\n  protected updateScaleDomain() {\n    if (!this.isSeriesDataEnable()) {\n      return;\n    }\n    if (!this._rawDomainIndex?.length && this._scales.length) {\n      this._updateRawDomain();\n    }\n    const userDomain = this._spec.domain;\n    for (let i = 0; i < this._scales.length; i++) {\n      if (userDomain && userDomain.length && i === 0) {\n        // 当数字映射字段存在分组时，只作用于第一个分组的domain，如 xField: ['x', 'type']\n        this._scales[i].domain(userDomain);\n      } else {\n        const data = this.collectData(i);\n        const domain = this.computeDomain(data);\n        this._scales[i].domain(domain.sort((a, b) => this._rawDomainIndex[i][a] - this._rawDomainIndex[i][b]));\n      }\n    }\n    this.transformScaleDomain();\n    this.event.emit(ChartEvent.scaleDomainUpdate, { model: this as unknown as IModel });\n    this.event.emit(ChartEvent.scaleUpdate, { model: this as unknown as IModel, value: 'domain' });\n  }\n\n  protected getLabelItems(length: number) {\n    const labelItems: Dict<any>[][] = [];\n    let preData: any[] = [];\n    this._tickData.forEach((eachTickData, index) => {\n      const latestData = eachTickData.getLatestData();\n      if (latestData && latestData.length) {\n        if (preData && preData.length) {\n          const currentLabelItems: any[] = [];\n          const curData: any[] = [];\n          preData.forEach(value => {\n            latestData.forEach((obj: Datum) => {\n              const values = array(value).concat(obj.value);\n              curData.push(values);\n              const axisItem = getAxisItem(obj.value, this._getNormalizedValue(values, length));\n\n              currentLabelItems.push(axisItem);\n            });\n          });\n          labelItems.push(currentLabelItems.filter((entry: AxisItem) => entry.value >= 0 && entry.value <= 1));\n          preData = curData;\n        } else {\n          labelItems.push(\n            latestData\n              .map((obj: Datum) => {\n                preData.push(obj.value);\n                return getAxisItem(obj.value, this._getNormalizedValue([obj.value], length));\n              })\n              .filter((entry: AxisItem) => entry.value >= 0 && entry.value <= 1)\n          );\n        }\n      }\n    });\n\n    return labelItems.reverse();\n  }\n\n  protected _updateRawDomain() {\n    // 默认值设置了无效？\n    this._rawDomainIndex = [];\n\n    const userDomain = this._spec.domain;\n    for (let i = 0; i < this._scales.length; i++) {\n      if (userDomain && userDomain.length && i === 0) {\n        // 当数字映射字段存在分组时，只作用于第一个分组的domain，如 xField: ['x', 'type']\n        this._scales[i].domain(userDomain);\n      } else {\n        const data = this.collectData(i, true);\n        const domain = this.computeDomain(data);\n        this._rawDomainIndex[i] = {};\n        domain.forEach((d, _i) => (this._rawDomainIndex[i][d] = _i));\n      }\n    }\n  }\n\n  protected _clearRawDomain() {\n    this._rawDomainIndex = [];\n  }\n}\n"]}

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

@@ -1,6 +1,8 @@
 import type { LinearScale } from '@visactor/vscale';
 import type { IAxisLocationCfg, ITick } from '../interface';
 import type { IEvent } from '../../../event/interface';
+import type { IOrientType } from '../../../typings/space';
+import type { IComponentOption } from '../../interface/common';
 export declare const e10: number;
 export declare const e5: number;
 export declare const e2: number;
@@ -21,8 +23,14 @@ export interface LinearAxisMixin {
     _tick: ITick | undefined;
     isSeriesDataEnable: any;
     computeDomain: any;
-    collectData: any;
+    collectData: (depth?: number) => {
+        min: number;
+        max: number;
+        values: any[];
+    }[];
     event: IEvent;
+    _orient: IOrientType;
+    _option: IComponentOption;
 }
 export declare class LinearAxisMixin {
     protected _extend: {

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.LinearAxisMixin = exports.e2 = exports.e5 = exports.e10 = void 0;
 
-const vutils_1 = require("@visactor/vutils"), array_1 = require("../../../util/array"), util_1 = require("../util"), constant_1 = require("../../../constant");
+const vutils_1 = require("@visactor/vutils"), array_1 = require("../../../util/array"), util_1 = require("../util"), constant_1 = require("../../../constant"), common_1 = require("../cartesian/util/common");
 
 exports.e10 = Math.sqrt(50), exports.e5 = Math.sqrt(10), exports.e2 = Math.sqrt(2);
 
@@ -22,10 +22,23 @@ class LinearAxisMixin {
         this.setScaleNice();
     }
     setLinearScaleNice() {
-        var _a, _b, _c, _d, _e;
-        let tickCount = null !== (_d = null !== (_b = null === (_a = this._spec.tick) || void 0 === _a ? void 0 : _a.forceTickCount) && void 0 !== _b ? _b : null === (_c = this._spec.tick) || void 0 === _c ? void 0 : _c.tickCount) && void 0 !== _d ? _d : 5;
-        (0, vutils_1.isValidNumber)(tickCount) || (tickCount = 5), "accurateFirst" === this._spec.niceType && (tickCount = Math.max(5, tickCount));
-        const {min: min, max: max} = null !== (_e = this._domain) && void 0 !== _e ? _e : {};
+        var _a;
+        let tickCount = 5;
+        const tick = this._spec.tick || {};
+        if ((0, vutils_1.isValidNumber)(tick.forceTickCount)) tickCount = tick.forceTickCount; else if ((0, 
+        vutils_1.isFunction)(tick.tickCount)) {
+            const range = this._scale.range();
+            let rangeSize = Math.abs(range[range.length - 1] - range[0]);
+            if (1 === rangeSize && this._option) {
+                rangeSize = (0, common_1.isXAxis)(this._orient) ? this._option.getChartViewRect().width : this._option.getChartViewRect().height;
+            }
+            tickCount = tick.tickCount({
+                rangeSize: rangeSize,
+                labelStyle: this._spec.label && this._spec.label.style
+            });
+        } else tickCount = (0, vutils_1.isValidNumber)(tick.tickCount) ? tick.tickCount : 5;
+        "accurateFirst" === this._spec.niceType && (tickCount = Math.max(5, tickCount));
+        const {min: min, max: max} = null !== (_a = this._domain) && void 0 !== _a ? _a : {};
         (0, vutils_1.isNil)(min) && (0, vutils_1.isNil)(max) ? this._nice && this._scale.nice(tickCount) : (0, 
         vutils_1.isValid)(min) && (0, vutils_1.isNil)(max) ? this._nice && this._scale.niceMax(tickCount) : (0, 
         vutils_1.isNil)(min) && (0, vutils_1.isValid)(max) && this._nice && this._scale.niceMin(tickCount);
@@ -44,7 +57,7 @@ class LinearAxisMixin {
         return this.valueToPosition(values[0]);
     }
     valueToPosition(value) {
-        return "log" !== this._spec.type || 0 !== value && 0 !== value[0] ? this._scale.scale(value) : this._scale.range()[0];
+        return "log" !== this._spec.type || (0, vutils_1.isNil)(value) || 0 !== value && 0 !== value[0] ? this._scale.scale(value) : this._scale.range()[0];
     }
     computeLinearDomain(data) {
         const domain = [];