@visactor/vchart 0.0.1-alpha.2 → 1.0.0-alpha.0

package/cjs/series/bar/bar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/bar/bar.ts"],"names":[],"mappings":"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","file":"bar.js","sourcesContent":["import { isContinuous } from '@visactor/vscale';\nimport { Direction } from '../../typings/space';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { AttributeLevel } from '../../constant';\nimport { getActualNumValue } from '../util/utils';\nimport type { Maybe, Datum } from '../../typings';\nimport { merge, valueInScaleRange } from '../../util';\nimport type { BarAppearPreset, IBarAnimationParams } from './animation';\nimport { animationConfig, shouldDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { IBarSeriesSpec, IBarSeriesTheme } from './interface';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { IRectMark } from '../../mark/rect';\nimport type { IModelInitOption } from '../../model/interface';\nimport type { ITextMark } from '../../mark/text';\nimport { SeriesTypeEnum } from '../interface';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { IStateAnimateSpec } from '../../animation/spec';\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\n\nexport class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.bar;\n  type = SeriesTypeEnum.bar;\n  protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect;\n\n  protected declare _theme: Maybe<IBarSeriesTheme>;\n\n  protected _stack: boolean = true;\n  protected _bandPosition = 0;\n  protected _rectMark!: IRectMark;\n\n  initMark(): void {\n    const progressive = {\n      progressiveStep: this._spec.progressiveStep,\n      progressiveThreshold: this._spec.progressiveThreshold,\n      large: this._spec.large,\n      largeThreshold: this._spec.largeThreshold\n    };\n\n    this._rectMark = this._createMark(this._barMarkType, this.type, {\n      morph: shouldDoMorph(this._spec.animation, this._spec.morph, userAnimationConfig(this.type, this._spec)),\n      defaultMorphElementKey: this.getDimensionField()[0],\n      groupKey: this._seriesField,\n      isSeriesMark: true,\n      label: merge({ animation: this._spec.animation }, this._spec.label),\n      progressive\n    }) as IRectMark;\n  }\n\n  initMarkStyle(): void {\n    const rectMark = this._rectMark;\n    if (rectMark) {\n      this.setMarkStyle(\n        rectMark,\n        {\n          fill: this.getColorAttribute()\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n\n      this._trigger.registerMark(rectMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(rectMark);\n    }\n  }\n\n  initLabelMarkStyle(textMark: ITextMark) {\n    if (!textMark) {\n      return;\n    }\n    this.setMarkStyle(textMark, {\n      fill: this.getColorAttribute(),\n      text: (datum: Datum) => {\n        return datum[this.getStackValueField()];\n      },\n      z: this.dataToPositionZ.bind(this)\n    });\n  }\n\n  init(option: IModelInitOption): void {\n    super.init(option);\n    if (this.direction === 'vertical') {\n      this._xAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n    } else {\n      this._yAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n    }\n  }\n\n  initBandRectMarkStyle() {\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n    // TODO: 这里要考虑更多 条件因素\n    // TODO: 这里要补充堆积\n    // guess the direction which the user want\n    if (this.direction === Direction.horizontal) {\n      this.setMarkStyle(\n        this._rectMark,\n        {\n          x: (datum: Datum) => valueInScaleRange(this.dataToPositionX(datum), xScale),\n          x1: (datum: Datum) => valueInScaleRange(this.dataToPositionX1(datum), xScale),\n          y: (datum: Datum) => {\n            const bandWidth =\n              this.getYAxisHelper().getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ??\n              DefaultBandWidth;\n            const continuous = isContinuous(yScale.type || 'band');\n            const pos = this.dataToPositionY(datum);\n            const width = this._rectMark.getAttribute('height', datum) as number;\n            return pos + (bandWidth - width) * 0.5 + (continuous ? -bandWidth / 2 : 0);\n          },\n          height: () => this.getBarWidth(this._yAxisHelper)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    } else {\n      this.setMarkStyle(\n        this._rectMark,\n        {\n          x: (datum: Datum) => {\n            const bandWidth =\n              this.getXAxisHelper().getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ??\n              DefaultBandWidth;\n            const width = this._rectMark.getAttribute('width', datum) as number;\n            const continuous = isContinuous(this.getXAxisHelper().getScale?.(0).type || 'band');\n            const pos = this.dataToPositionX(datum);\n            return pos + (bandWidth - width) / 2 + (continuous ? -bandWidth / 2 : 0);\n          },\n          y: (datum: Datum) => valueInScaleRange(this.dataToPositionY(datum), yScale),\n          y1: (datum: Datum) => valueInScaleRange(this.dataToPositionY1(datum), yScale),\n          width: () => {\n            return this.getBarWidth(this._xAxisHelper);\n          }\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  initLinearRectMarkStyle() {\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n    this.setMarkStyle(\n      this._rectMark,\n      {\n        x: (datum: Datum) => valueInScaleRange(this.dataToPositionX(datum), xScale),\n        x1: (datum: Datum) => valueInScaleRange(this.dataToPositionX1(datum), xScale),\n        y: (datum: Datum) => valueInScaleRange(this.dataToPositionY(datum), yScale),\n        y1: (datum: Datum) => valueInScaleRange(this.dataToPositionY1(datum), yScale)\n      },\n      'normal',\n      AttributeLevel.Series\n    );\n  }\n\n  initAnimation() {\n    // 这个数据在这个时候拿不到，因为组件还没创建结束，统计和筛选也还没添加。\n    // 而且这个值理论上是动态的，建议 监听 viewDataStatisticsUpdate 消息动态更新\n    const animationParams: IBarAnimationParams = {\n      yField: this._fieldY[0],\n      xField: this._fieldX[0],\n      direction: this.direction,\n      growFrom: () =>\n        this.direction === 'horizontal'\n          ? this._xAxisHelper?.getScale(0).scale(0)\n          : this._yAxisHelper?.getScale(0).scale(0)\n    };\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<BarAppearPreset>)?.preset;\n    // 分组数据的dataIndex应该与x轴顺序一致，而非data[DEFAULT_DATA_INDEX]顺序\n    const dataIndex = (datum: any) => {\n      const xValue = datum?.[this._fieldX[0]];\n      const xIndex = this.getViewDataStatistics()?.latestData?.[this._fieldX[0]]?.values.indexOf(xValue);\n      // 不应该出现xIndex === -1 || undefined的情况\n      return xIndex || 0;\n    };\n\n    this._rectMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.bar(animationParams, appearPreset),\n        userAnimationConfig(this.type, this._spec),\n        { dataIndex }\n      )\n    );\n  }\n\n  protected getBarWidth(axisHelper: IAxisHelper) {\n    const hasBarWidth = this._spec.barWidth !== undefined;\n    const bandWidth = axisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n    if (hasBarWidth) {\n      return getActualNumValue(this._spec.barWidth, bandWidth);\n    }\n    const hasBarMinWidth = this._spec.barMinWidth !== undefined;\n    const hasBarMaxWidth = this._spec.barMaxWidth !== undefined;\n    let width = bandWidth;\n    if (hasBarMinWidth) {\n      width = Math.max(width, getActualNumValue(this._spec.barMinWidth, bandWidth));\n    }\n    if (hasBarMaxWidth) {\n      width = Math.min(width, getActualNumValue(this._spec.barMaxWidth, bandWidth));\n    }\n    return width;\n  }\n\n  /**\n   * spec 更新\n   * @param spec\n   * @returns\n   */\n  updateSpec(spec: IBarSeriesSpec) {\n    // super updateSpec 会执行 setAttrFromSpec 所以先缓存比对值\n    const { direction } = this._spec;\n    const result = super.updateSpec(spec);\n    if (spec.direction !== direction) {\n      result.change = true;\n      result.reRender = true;\n      result.reMake = true;\n    }\n    return result;\n  }\n\n  getDefaultShapeType(): string {\n    return 'square';\n  }\n}\n\nexport class Bar3dSeries extends BarSeries {\n  static readonly type: string = SeriesTypeEnum.bar3d;\n  type = SeriesTypeEnum.bar3d;\n  protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect3d;\n}\n"]}
+{"version":3,"sources":["../src/series/bar/bar.ts"],"names":[],"mappings":"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","file":"bar.js","sourcesContent":["import { isContinuous } from '@visactor/vscale';\nimport { Direction } from '../../typings/space';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { AttributeLevel } from '../../constant';\nimport { getActualNumValue } from '../util/utils';\nimport type { Maybe, Datum } from '../../typings';\nimport { merge, valueInScaleRange } from '../../util';\nimport type { BarAppearPreset, IBarAnimationParams } from './animation';\nimport { animationConfig, shouldDoMorph, userAnimationConfig } from '../../animation/utils';\nimport type { IBarSeriesSpec, IBarSeriesTheme } from './interface';\nimport type { IAxisHelper } from '../../component/axis/cartesian/interface';\nimport type { IRectMark } from '../../mark/rect';\nimport type { IModelInitOption } from '../../model/interface';\nimport type { ITextMark } from '../../mark/text';\nimport type { SeriesMarkMap } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesMarkNameEnum } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { SeriesTypeEnum } from '../interface';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport { BaseSeries } from '../base/base-series';\n\nexport const DefaultBandWidth = 6; // 默认的bandWidth，避免连续轴没有bandWidth\n\nexport class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extends CartesianSeries<T> {\n  static readonly type: string = SeriesTypeEnum.bar;\n  type = SeriesTypeEnum.bar;\n  protected _barMarkName: SeriesMarkNameEnum = SeriesMarkNameEnum.bar;\n  protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect;\n\n  static readonly mark: SeriesMarkMap = {\n    ...BaseSeries.mark,\n    [SeriesMarkNameEnum.bar]: { name: SeriesMarkNameEnum.bar, type: MarkTypeEnum.rect }\n  };\n\n  protected declare _theme: Maybe<IBarSeriesTheme>;\n\n  protected _stack: boolean = true;\n  protected _bandPosition = 0;\n  protected _rectMark!: IRectMark;\n\n  initMark(): void {\n    const progressive = {\n      progressiveStep: this._spec.progressiveStep,\n      progressiveThreshold: this._spec.progressiveThreshold,\n      large: this._spec.large,\n      largeThreshold: this._spec.largeThreshold\n    };\n\n    this._rectMark = this._createMark(\n      {\n        ...BarSeries.mark.bar,\n        name: this._barMarkName,\n        type: this._barMarkType\n      },\n      {\n        morph: shouldDoMorph(this._spec.animation, this._spec.morph, userAnimationConfig(this.type, this._spec)),\n        defaultMorphElementKey: this.getDimensionField()[0],\n        groupKey: this._seriesField,\n        isSeriesMark: true,\n        label: merge({ animation: this._spec.animation }, this._spec.label),\n        progressive\n      }\n    ) as IRectMark;\n  }\n\n  initMarkStyle(): void {\n    const rectMark = this._rectMark;\n    if (rectMark) {\n      this.setMarkStyle(\n        rectMark,\n        {\n          fill: this.getColorAttribute()\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n\n      this._trigger.registerMark(rectMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(rectMark);\n    }\n  }\n\n  initLabelMarkStyle(textMark: ITextMark) {\n    if (!textMark) {\n      return;\n    }\n    this.setMarkStyle(textMark, {\n      fill: this.getColorAttribute(),\n      text: (datum: Datum) => {\n        return datum[this.getStackValueField()];\n      },\n      z: this.dataToPositionZ.bind(this)\n    });\n  }\n\n  init(option: IModelInitOption): void {\n    super.init(option);\n    if (this.direction === 'vertical') {\n      this._xAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n    } else {\n      this._yAxisHelper?.getScale(0).type === 'band' ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();\n    }\n  }\n\n  initBandRectMarkStyle() {\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n    // TODO: 这里要考虑更多 条件因素\n    // TODO: 这里要补充堆积\n    // guess the direction which the user want\n    if (this.direction === Direction.horizontal) {\n      this.setMarkStyle(\n        this._rectMark,\n        {\n          x: (datum: Datum) => valueInScaleRange(this.dataToPositionX(datum), xScale),\n          x1: (datum: Datum) => valueInScaleRange(this.dataToPositionX1(datum), xScale),\n          y: (datum: Datum) => {\n            const bandWidth =\n              this.getYAxisHelper().getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ??\n              DefaultBandWidth;\n            const continuous = isContinuous(yScale.type || 'band');\n            const pos = this.dataToPositionY(datum);\n            const width = this._rectMark.getAttribute('height', datum) as number;\n            return pos + (bandWidth - width) * 0.5 + (continuous ? -bandWidth / 2 : 0);\n          },\n          height: () => this.getBarWidth(this._yAxisHelper)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    } else {\n      this.setMarkStyle(\n        this._rectMark,\n        {\n          x: (datum: Datum) => {\n            const bandWidth =\n              this.getXAxisHelper().getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ??\n              DefaultBandWidth;\n            const width = this._rectMark.getAttribute('width', datum) as number;\n            const continuous = isContinuous(this.getXAxisHelper().getScale?.(0).type || 'band');\n            const pos = this.dataToPositionX(datum);\n            return pos + (bandWidth - width) / 2 + (continuous ? -bandWidth / 2 : 0);\n          },\n          y: (datum: Datum) => valueInScaleRange(this.dataToPositionY(datum), yScale),\n          y1: (datum: Datum) => valueInScaleRange(this.dataToPositionY1(datum), yScale),\n          width: () => {\n            return this.getBarWidth(this._xAxisHelper);\n          }\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  initLinearRectMarkStyle() {\n    const xScale = this._xAxisHelper?.getScale?.(0);\n    const yScale = this._yAxisHelper?.getScale?.(0);\n    this.setMarkStyle(\n      this._rectMark,\n      {\n        x: (datum: Datum) => valueInScaleRange(this.dataToPositionX(datum), xScale),\n        x1: (datum: Datum) => valueInScaleRange(this.dataToPositionX1(datum), xScale),\n        y: (datum: Datum) => valueInScaleRange(this.dataToPositionY(datum), yScale),\n        y1: (datum: Datum) => valueInScaleRange(this.dataToPositionY1(datum), yScale)\n      },\n      'normal',\n      AttributeLevel.Series\n    );\n  }\n\n  initAnimation() {\n    // 这个数据在这个时候拿不到，因为组件还没创建结束，统计和筛选也还没添加。\n    // 而且这个值理论上是动态的，建议 监听 viewDataStatisticsUpdate 消息动态更新\n    const animationParams: IBarAnimationParams = {\n      yField: this._fieldY[0],\n      xField: this._fieldX[0],\n      direction: this.direction,\n      growFrom: () =>\n        this.direction === 'horizontal'\n          ? this._xAxisHelper?.getScale(0).scale(0)\n          : this._yAxisHelper?.getScale(0).scale(0)\n    };\n    const appearPreset = (this._spec?.animationAppear as IStateAnimateSpec<BarAppearPreset>)?.preset;\n    // 分组数据的dataIndex应该与x轴顺序一致，而非data[DEFAULT_DATA_INDEX]顺序\n    const dataIndex = (datum: any) => {\n      const xValue = datum?.[this._fieldX[0]];\n      const xIndex = this.getViewDataStatistics()?.latestData?.[this._fieldX[0]]?.values.indexOf(xValue);\n      // 不应该出现xIndex === -1 || undefined的情况\n      return xIndex || 0;\n    };\n\n    this._rectMark.setAnimationConfig(\n      animationConfig(\n        DEFAULT_MARK_ANIMATION.bar(animationParams, appearPreset),\n        userAnimationConfig(this._barMarkName, this._spec),\n        { dataIndex }\n      )\n    );\n  }\n\n  protected getBarWidth(axisHelper: IAxisHelper) {\n    const hasBarWidth = this._spec.barWidth !== undefined;\n    const bandWidth = axisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n    if (hasBarWidth) {\n      return getActualNumValue(this._spec.barWidth, bandWidth);\n    }\n    const hasBarMinWidth = this._spec.barMinWidth !== undefined;\n    const hasBarMaxWidth = this._spec.barMaxWidth !== undefined;\n    let width = bandWidth;\n    if (hasBarMinWidth) {\n      width = Math.max(width, getActualNumValue(this._spec.barMinWidth, bandWidth));\n    }\n    if (hasBarMaxWidth) {\n      width = Math.min(width, getActualNumValue(this._spec.barMaxWidth, bandWidth));\n    }\n    return width;\n  }\n\n  /**\n   * spec 更新\n   * @param spec\n   * @returns\n   */\n  updateSpec(spec: IBarSeriesSpec) {\n    // super updateSpec 会执行 setAttrFromSpec 所以先缓存比对值\n    const { direction } = this._spec;\n    const result = super.updateSpec(spec);\n    if (spec.direction !== direction) {\n      result.change = true;\n      result.reRender = true;\n      result.reMake = true;\n    }\n    return result;\n  }\n\n  getDefaultShapeType(): string {\n    return 'square';\n  }\n}\n\nexport class Bar3dSeries extends BarSeries {\n  static readonly type: string = SeriesTypeEnum.bar3d;\n  type = SeriesTypeEnum.bar3d;\n\n  static readonly mark: SeriesMarkMap = {\n    ...BaseSeries.mark,\n    [SeriesMarkNameEnum.bar3d]: { name: SeriesMarkNameEnum.bar3d, type: MarkTypeEnum.rect3d }\n  };\n\n  protected _barMarkName: SeriesMarkNameEnum = SeriesMarkNameEnum.bar3d;\n  protected _barMarkType: MarkTypeEnum = MarkTypeEnum.rect3d;\n}\n"]}

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

@@ -5,11 +5,12 @@ import type { IAnimationSpec } from '../../animation/spec';
 import type { BarAppearPreset } from './animation';
 import type { ILabelSpec } from '../../component/label';
 import type { IMarkProgressiveConfig } from '../../mark/interface';
+import type { SeriesMarkNameEnum } from '../interface';
 type BarMarks = 'bar';
 export interface IBarSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<BarMarks, BarAppearPreset>, IMarkProgressiveConfig {
     type: 'bar';
-    bar?: IMarkSpec<IRectMarkSpec>;
-    label?: ILabelSpec & {
+    [SeriesMarkNameEnum.bar]?: IMarkSpec<IRectMarkSpec>;
+    [SeriesMarkNameEnum.label]?: ILabelSpec & {
         position?: 'outside' | 'top' | 'bottom' | 'left' | 'right' | 'inside' | 'inside-top' | 'inside-bottom' | 'inside-right' | 'inside-left';
     };
     barWidth?: number;
@@ -17,7 +18,7 @@ export interface IBarSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<Bar
     barMaxWidth?: number;
 }
 export interface IBarSeriesTheme extends ICartesianSeriesTheme {
-    bar?: Partial<IMarkTheme<IRectMarkSpec>>;
+    [SeriesMarkNameEnum.bar]?: Partial<IMarkTheme<IRectMarkSpec>>;
     barWidth?: number;
     barMinWidth?: number;
     barMaxWidth?: number;
@@ -26,6 +27,6 @@ export type IBar3dSeriesSpec = {
     type: 'bar3d';
 } & Omit<IBarSeriesSpec, 'type'> & ICartesianSeriesSpec & IAnimationSpec<BarMarks, BarAppearPreset>;
 export interface IBar3dSeriesTheme extends ICartesianSeriesTheme {
-    bar3d?: Partial<IMarkTheme<IRect3dMarkSpec>>;
+    [SeriesMarkNameEnum.bar3d]?: Partial<IMarkTheme<IRect3dMarkSpec>>;
 }
 export {};

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/bar/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/interface';\nimport type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';\nimport type { IRect3dMarkSpec, IRectMarkSpec } from '../../typings/visual';\nimport type { IAnimationSpec } from '../../animation/spec';\nimport type { BarAppearPreset } from './animation';\nimport type { ILabelSpec } from '../../component/label';\nimport type { IMarkProgressiveConfig } from '../../mark/interface';\n\ntype BarMarks = 'bar';\n\nexport interface IBarSeriesSpec\n  extends ICartesianSeriesSpec,\n    IAnimationSpec<BarMarks, BarAppearPreset>,\n    IMarkProgressiveConfig {\n  /**\n   *  系列类型\n   */\n  type: 'bar';\n  /**\n   * 图元配置\n   */\n  bar?: IMarkSpec<IRectMarkSpec>;\n  /** 标签配置*/\n  label?: ILabelSpec & {\n    /** 标签位置 */\n    position?:\n      | 'outside'\n      | 'top'\n      | 'bottom'\n      | 'left'\n      | 'right'\n      | 'inside'\n      | 'inside-top'\n      | 'inside-bottom'\n      | 'inside-right'\n      | 'inside-left';\n  };\n  /**\n   * 柱体宽度\n   */\n  barWidth?: number;\n  /**\n   * 柱体最小宽度\n   */\n  barMinWidth?: number;\n  /**\n   * 柱体最大宽度\n   */\n  barMaxWidth?: number;\n}\n\nexport interface IBarSeriesTheme extends ICartesianSeriesTheme {\n  bar?: Partial<IMarkTheme<IRectMarkSpec>>;\n  /**\n   * 柱体宽度\n   */\n  barWidth?: number;\n  /**\n   * 柱体最小宽度\n   */\n  barMinWidth?: number;\n  /**\n   * 柱体最大宽度\n   */\n  barMaxWidth?: number;\n}\n\nexport type IBar3dSeriesSpec = {\n  type: 'bar3d';\n} & Omit<IBarSeriesSpec, 'type'> &\n  ICartesianSeriesSpec &\n  IAnimationSpec<BarMarks, BarAppearPreset>;\n\nexport interface IBar3dSeriesTheme extends ICartesianSeriesTheme {\n  bar3d?: Partial<IMarkTheme<IRect3dMarkSpec>>;\n}\n"]}
+{"version":3,"sources":["../src/series/bar/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/interface';\nimport type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';\nimport type { IRect3dMarkSpec, IRectMarkSpec } from '../../typings/visual';\nimport type { IAnimationSpec } from '../../animation/spec';\nimport type { BarAppearPreset } from './animation';\nimport type { ILabelSpec } from '../../component/label';\nimport type { IMarkProgressiveConfig } from '../../mark/interface';\nimport type { SeriesMarkNameEnum } from '../interface';\n\ntype BarMarks = 'bar';\n\nexport interface IBarSeriesSpec\n  extends ICartesianSeriesSpec,\n    IAnimationSpec<BarMarks, BarAppearPreset>,\n    IMarkProgressiveConfig {\n  /**\n   *  系列类型\n   */\n  type: 'bar';\n  /**\n   * 图元配置\n   */\n  [SeriesMarkNameEnum.bar]?: IMarkSpec<IRectMarkSpec>;\n  /** 标签配置*/\n  [SeriesMarkNameEnum.label]?: ILabelSpec & {\n    /** 标签位置 */\n    position?:\n      | 'outside'\n      | 'top'\n      | 'bottom'\n      | 'left'\n      | 'right'\n      | 'inside'\n      | 'inside-top'\n      | 'inside-bottom'\n      | 'inside-right'\n      | 'inside-left';\n  };\n  /**\n   * 柱体宽度\n   */\n  barWidth?: number;\n  /**\n   * 柱体最小宽度\n   */\n  barMinWidth?: number;\n  /**\n   * 柱体最大宽度\n   */\n  barMaxWidth?: number;\n}\n\nexport interface IBarSeriesTheme extends ICartesianSeriesTheme {\n  [SeriesMarkNameEnum.bar]?: Partial<IMarkTheme<IRectMarkSpec>>;\n  /**\n   * 柱体宽度\n   */\n  barWidth?: number;\n  /**\n   * 柱体最小宽度\n   */\n  barMinWidth?: number;\n  /**\n   * 柱体最大宽度\n   */\n  barMaxWidth?: number;\n}\n\nexport type IBar3dSeriesSpec = {\n  type: 'bar3d';\n} & Omit<IBarSeriesSpec, 'type'> &\n  ICartesianSeriesSpec &\n  IAnimationSpec<BarMarks, BarAppearPreset>;\n\nexport interface IBar3dSeriesTheme extends ICartesianSeriesTheme {\n  [SeriesMarkNameEnum.bar3d]?: Partial<IMarkTheme<IRect3dMarkSpec>>;\n}\n"]}

package/cjs/series/base/base-series.d.ts

@@ -1,16 +1,14 @@
-import type { ISeriesMarkInitOption, ISeriesStackData, ISeriesTooltipHelper } from '../interface';
 import { DataView } from '@visactor/vdataset';
 import type { DataSet, ITransformOptions } from '@visactor/vdataset';
 import type { IRegion } from '../../region/interface';
-import type { IMark, MarkType } from '../../mark/interface';
+import type { IMark } from '../../mark/interface';
 import type { CoordinateType, IInvalidType, IPoint, DataKeyType, Datum, Maybe, ISeriesSpec } from '../../typings';
 import { BaseModel } from '../../model/base-model';
-import type { ISeriesOption, ISeries } from '../interface';
+import type { ISeriesOption, ISeries, ISeriesMarkInitOption, ISeriesStackData, ISeriesTooltipHelper, SeriesMarkMap, ISeriesMarkInfo } from '../interface';
 import type { IModelEvaluateOption, IModelRenderOption } from '../../model/interface';
 import { Group } from './group';
 import type { AddVChartPropertyContext } from '../../data/transforms/add-property';
 import type { ITrigger } from '../../interaction/interface';
-import { OrdinalScale } from '@visactor/vscale';
 import type { LayoutItem } from '../../model/layout-item';
 import type { StatisticOperations } from '../../data/transforms/dimension-statistics';
 import { SeriesData } from './series-data';
@@ -21,6 +19,7 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     layoutType: LayoutItem['layoutType'];
     readonly modelType: string;
     readonly name: string | undefined;
+    static readonly mark: SeriesMarkMap;
     protected _trigger: ITrigger;
     getTrigger(): ITrigger;
     protected _option: ISeriesOption;
@@ -31,8 +30,6 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     protected _rootMark: IGroupMark;
     getRootMark(): IGroupMark;
     protected _seriesMark: Maybe<IMark>;
-    protected _markMap: Record<string, IMark>;
-    getMarkMap(): Record<string, IMark>;
     protected _layoutLevel: number;
     protected _rawData: DataView;
     getRawData(): DataView;
@@ -114,7 +111,6 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     initMarkState(): void;
     initSeriesStyleState(): void;
     afterInitMark(): void;
-    getMarks(): IMark[];
     getMarksWithoutRoot(): IMark[];
     getMarksInType(type: string | string[]): IMark[];
     getMarkInName(name: string): IMark | undefined;
@@ -129,7 +125,7 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
         reSize: boolean;
         reCompile: boolean;
     };
-    reInit(): void;
+    reInit(theme?: any): void;
     onEvaluateEnd(ctx: IModelEvaluateOption): void;
     onRender(ctx: IModelRenderOption): void;
     release(): void;
@@ -141,9 +137,10 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
         style: (attribute: string) => unknown;
         shapeType: string;
     }[];
-    protected getDefaultColorScale(): OrdinalScale;
+    protected getDefaultColorScale(): any;
+    getDefaultColorDomain(): any[];
     getColorAttribute(): {
-        scale: import("@visactor/vscale").IBaseScale | OrdinalScale;
+        scale: any;
         field: string;
     };
     getDimensionField(): string[];
@@ -152,8 +149,9 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     protected onMarkTreePositionUpdate(marks: IMark[]): void;
     setCurrentTheme(theme: any, noRender?: boolean): Promise<void>;
     protected _initTheme(theme?: any): void;
+    protected _mergeThemeToSpec(): void;
     protected _getDefaultSpecFromChart(chartSpec: any): Partial<T>;
-    protected _createMark<T extends IMark>(type: MarkType, name: string, option?: ISeriesMarkInitOption): NonNullable<T>;
+    protected _createMark<T extends IMark>(markInfo: ISeriesMarkInfo, option?: ISeriesMarkInitOption): NonNullable<T>;
     protected _getDataIdKey(): string | ((datum: Datum) => string);
     protected _getSeriesDataKey(datum: Datum): string;
     addViewDataFilter(option: ITransformOptions): void;
@@ -163,4 +161,5 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     compile(): void;
     getDefaultShapeType(): string;
     getFieldAlias(field: string): any;
+    getMarkInfoList(): import("../../model/interface").IModelMarkInfo[];
 }

package/cjs/series/base/base-series.js

@@ -30,7 +30,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseSeries = void 0;
 
-const event_1 = require("../../constant/event"), index_1 = require("../../constant/index"), vdataset_1 = require("@visactor/vdataset"), interface_1 = require("../../mark/interface"), base_model_1 = require("../../model/base-model"), initialize_1 = require("../../data/initialize"), util_1 = require("../../util"), group_1 = require("./group"), add_property_1 = require("../../data/transforms/add-property"), trigger_1 = require("../../interaction/trigger"), register_1 = require("../../data/register"), vscale_1 = require("@visactor/vscale"), tooltip_helper_1 = require("./tooltip-helper"), dimension_statistics_1 = require("../../data/transforms/dimension-statistics"), invalid_travel_1 = require("../../data/transforms/invalid-travel"), util_2 = require("../../theme/color-scheme/util"), series_data_1 = require("./series-data"), data_key_1 = require("../../data/transforms/data-key"), vutils_1 = require("@visactor/vutils");
+const event_1 = require("../../constant/event"), index_1 = require("../../constant/index"), interface_1 = require("../interface"), vdataset_1 = require("@visactor/vdataset"), interface_2 = require("../../mark/interface"), base_model_1 = require("../../model/base-model"), initialize_1 = require("../../data/initialize"), util_1 = require("../../util"), group_1 = require("./group"), add_property_1 = require("../../data/transforms/add-property"), trigger_1 = require("../../interaction/trigger"), register_1 = require("../../data/register"), tooltip_helper_1 = require("./tooltip-helper"), dimension_statistics_1 = require("../../data/transforms/dimension-statistics"), invalid_travel_1 = require("../../data/transforms/invalid-travel"), util_2 = require("../../theme/color-scheme/util"), series_data_1 = require("./series-data"), data_key_1 = require("../../data/transforms/data-key"), vutils_1 = require("@visactor/vutils"), color_ordinal_scale_1 = require("../../scale/color-ordinal-scale"), factory_1 = require("../../core/factory");
 
 class BaseSeries extends base_model_1.BaseModel {
     getTrigger() {
@@ -42,9 +42,6 @@ class BaseSeries extends base_model_1.BaseModel {
     getRootMark() {
         return this._rootMark;
     }
-    getMarkMap() {
-        return this._markMap;
-    }
     getRawData() {
         return this._rawData;
     }
@@ -72,7 +69,7 @@ class BaseSeries extends base_model_1.BaseModel {
         return this._seriesField;
     }
     setSeriesField(field) {
-        (0, util_1.isValid)(field) && (this._seriesField = field, this.getMarksInType([ interface_1.MarkTypeEnum.line, interface_1.MarkTypeEnum.area ]).forEach((m => {
+        (0, util_1.isValid)(field) && (this._seriesField = field, this.getMarksInType([ interface_2.MarkTypeEnum.line, interface_2.MarkTypeEnum.area ]).forEach((m => {
             m.setFacet(this._seriesField);
         })));
     }
@@ -102,10 +99,9 @@ class BaseSeries extends base_model_1.BaseModel {
         var _a;
         super(spec, Object.assign({}, options)), this.type = "series", this.layoutType = "absolute", 
         this.modelType = "series", this.name = void 0, this.coordinate = "none", this._region = null, 
-        this._rootMark = null, this._seriesMark = null, this._markMap = {}, this._viewDataMap = new Map, 
-        this._viewDataFilter = null, this._data = null, this._stack = !1, this._percent = !1, 
-        this._stackOffsetSilhouette = !1, this._region = options.region, this._dataSet = options.dataSet, 
-        (null === (_a = this._spec) || void 0 === _a ? void 0 : _a.name) && (this.name = this._spec.name);
+        this._rootMark = null, this._seriesMark = null, this._viewDataMap = new Map, this._viewDataFilter = null, 
+        this._data = null, this._stack = !1, this._percent = !1, this._stackOffsetSilhouette = !1, 
+        this._region = options.region, this._dataSet = options.dataSet, (null === (_a = this._spec) || void 0 === _a ? void 0 : _a.name) && (this.name = this._spec.name);
     }
     created() {
         super.created(), this._buildMarkAttributeContext(), this.initData(), this.initGroups(), 
@@ -272,7 +268,10 @@ class BaseSeries extends base_model_1.BaseModel {
     }
     initRootMark() {
         var _a, _b;
-        this._rootMark = this._createMark(interface_1.MarkTypeEnum.group, `seriesGroup_${this.type}_${this.id}`, {
+        this._rootMark = this._createMark({
+            type: interface_2.MarkTypeEnum.group,
+            name: `seriesGroup_${this.type}_${this.id}`
+        }, {
             parent: null === (_b = (_a = this._region).getGroupMark) || void 0 === _b ? void 0 : _b.call(_a),
             dataView: !1
         }), this._rootMark.setZIndex(this.layoutZIndex);
@@ -285,7 +284,10 @@ class BaseSeries extends base_model_1.BaseModel {
     }
     _createExtensionMark(spec, parentMark, namePrefix, index) {
         var _a;
-        const mark = this._createMark(spec.type, `${index_1.PREFIX}_${index}`, {
+        const mark = this._createMark({
+            type: spec.type,
+            name: `${index_1.PREFIX}_${index}`
+        }, {
             markSpec: spec,
             parent: parentMark,
             dataView: !1
@@ -354,20 +356,19 @@ class BaseSeries extends base_model_1.BaseModel {
         this.event.emit(event_1.ChartEvent.afterInitMark, {
             model: this
         }), null === (_a = this._rawDataStatistics) || void 0 === _a || _a.reRunAllTransform(), 
-        this.setSeriesField(this._spec.seriesField);
-    }
-    getMarks() {
-        return Object.values(this._markMap);
+        this.setSeriesField(this._spec.seriesField), this.getMarks().forEach((m => {
+            var _a, _b;
+            (null === (_b = null === (_a = m.stateStyle.normal) || void 0 === _a ? void 0 : _a.fill) || void 0 === _b ? void 0 : _b.style) && m.setAttribute("stroke", m.stateStyle.normal.fill.style, "normal", index_1.AttributeLevel.Chart);
+        }));
     }
     getMarksWithoutRoot() {
-        return Object.values(this._markMap).filter((m => !m.name.includes("seriesGroup")));
+        return this.getMarks().filter((m => !m.name.includes("seriesGroup")));
     }
     getMarksInType(type) {
-        const typeList = (0, vutils_1.array)(type);
-        return this.getMarks().filter((m => typeList.includes(m.type)));
+        return this._marks.getMarksInType(type);
     }
     getMarkInName(name) {
-        return this.getMarks().find((m => m.name === name));
+        return this._marks.get(name);
     }
     getMarkInId(markId) {
         return this.getMarks().find((m => m.id === markId));
@@ -392,8 +393,8 @@ class BaseSeries extends base_model_1.BaseModel {
         return spec.invalidType !== invalidType && (result.change = !0, result.reRender = !0), 
         result;
     }
-    reInit() {
-        super.reInit(), this.initMarkStyle(), this.getMarksWithoutRoot().forEach((mark => {
+    reInit(theme) {
+        super.reInit(theme), this.initMarkStyle(), this.getMarksWithoutRoot().forEach((mark => {
             this.initMarkStyleWithSpec(mark, this._spec[mark.name]);
         }));
     }
@@ -403,7 +404,7 @@ class BaseSeries extends base_model_1.BaseModel {
     onRender(ctx) {}
     release() {
         var _a;
-        super.release(), this._markMap = {}, this._viewDataMap.clear(), null === (_a = this._data) || void 0 === _a || _a.release(), 
+        super.release(), this._viewDataMap.clear(), null === (_a = this._data) || void 0 === _a || _a.release(), 
         this._dataSet = this._data = this._rawData = this._rawDataStatistics = this._spec = this._region = this._viewDataStatistics = this._viewStackData = null;
     }
     onLayoutEnd(ctx) {
@@ -435,9 +436,13 @@ class BaseSeries extends base_model_1.BaseModel {
         }));
     }
     getDefaultColorScale() {
-        var _a, _b, _c, _d;
-        return null === (_d = (_c = (new vscale_1.OrdinalScale).domain(this._seriesField ? null === (_b = null === (_a = this._viewDataStatistics) || void 0 === _a ? void 0 : _a.latestData[this._seriesField]) || void 0 === _b ? void 0 : _b.values : [])).range) || void 0 === _d ? void 0 : _d.call(_c, (0, 
-        util_2.getDataScheme)(this._option.getTheme().colorScheme, this.type));
+        var _a, _b;
+        const colorDomain = this.getDefaultColorDomain(), colorRange = (0, util_2.getDataScheme)(this._option.getTheme().colorScheme, this.type);
+        return null === (_b = (_a = (new color_ordinal_scale_1.ColorOrdinalScale).domain(colorDomain)).range) || void 0 === _b ? void 0 : _b.call(_a, colorRange);
+    }
+    getDefaultColorDomain() {
+        var _a, _b;
+        return this._seriesField ? null === (_b = null === (_a = this._viewDataStatistics) || void 0 === _a ? void 0 : _a.latestData[this._seriesField]) || void 0 === _b ? void 0 : _b.values : [];
     }
     getColorAttribute() {
         var _a, _b;
@@ -458,7 +463,7 @@ class BaseSeries extends base_model_1.BaseModel {
     onMarkTreePositionUpdate(marks) {}
     setCurrentTheme(theme, noRender) {
         return __awaiter(this, void 0, void 0, (function*() {
-            const modifyConfig = () => (this._initTheme(theme), this.reInit(), {
+            const modifyConfig = () => (this.reInit(theme), {
                 change: !0,
                 reMake: !1
             });
@@ -468,23 +473,26 @@ class BaseSeries extends base_model_1.BaseModel {
     _initTheme(theme) {
         var _a;
         const globalTheme = this._option.getTheme();
-        theme ? super._initTheme(theme) : super._initTheme(null !== (_a = globalTheme.series[this.type]) && void 0 !== _a ? _a : {});
+        theme ? super._initTheme(theme) : super._initTheme(null !== (_a = globalTheme.series[this.type]) && void 0 !== _a ? _a : {}), 
+        this._mergeThemeToSpec(), this._preprocessSpec();
+    }
+    _mergeThemeToSpec() {
         const chartSpec = this.getChart().getSpec();
         this._spec = (0, util_1.merge)({}, this._theme, this._getDefaultSpecFromChart(chartSpec), this._originalSpec);
     }
     _getDefaultSpecFromChart(chartSpec) {
         return {};
     }
-    _createMark(type, name, option = {}) {
+    _createMark(markInfo, option = {}) {
         var _a, _b, _c, _d;
-        const {key: key, groupKey: groupKey, skipBeforeLayouted: skipBeforeLayouted, themeSpec: themeSpec = {}, markSpec: markSpec, dataView: dataView, dataProductId: dataProductId, parent: parent, isSeriesMark: isSeriesMark, dataStatistics: dataStatistics, depend: depend, label: label, progressive: progressive, support3d: support3d = this._spec.support3d || !!this._spec.zField, morph: morph = !1} = option, m = super._createMark(type, name, {
+        const {key: key, groupKey: groupKey, skipBeforeLayouted: skipBeforeLayouted, themeSpec: themeSpec = {}, markSpec: markSpec, dataView: dataView, dataProductId: dataProductId, parent: parent, isSeriesMark: isSeriesMark, dataStatistics: dataStatistics, depend: depend, label: label, progressive: progressive, support3d: support3d = this._spec.support3d || !!this._spec.zField, morph: morph = !1} = option, m = super._createMark(markInfo, {
             key: null != key ? key : this._getDataIdKey(),
             support3d: support3d,
             dataStatistics: null != dataStatistics ? dataStatistics : this._rawDataStatistics,
             attributeContext: this._markAttributeContext
         });
         if ((0, util_1.isValid)(m)) {
-            this._markMap[name] = m, isSeriesMark && (this._seriesMark = m), (0, util_1.isNil)(parent) ? null === (_a = this._rootMark) || void 0 === _a || _a.addMark(m) : !1 !== parent && parent.addMark(m), 
+            this._marks.addMark(m), isSeriesMark && (this._seriesMark = m), (0, util_1.isNil)(parent) ? null === (_a = this._rootMark) || void 0 === _a || _a.addMark(m) : !1 !== parent && parent.addMark(m), 
             (0, util_1.isNil)(dataView) ? (m.setDataView(this.getViewData(), this.getViewDataProductId()), 
             m.setSkipBeforeLayouted(!0)) : !1 !== dataView && m.setDataView(dataView, dataProductId), 
             (0, util_1.isBoolean)(skipBeforeLayouted) && m.setSkipBeforeLayouted(skipBeforeLayouted), 
@@ -534,7 +542,21 @@ class BaseSeries extends base_model_1.BaseModel {
         return field !== index_1.STACK_FIELD_END && field !== index_1.STACK_FIELD_END_PERCENT && field !== index_1.STACK_FIELD_START && field !== index_1.STACK_FIELD_START_PERCENT || (field = this.getStackValueField()), 
         null !== (_a = (0, util_1.getFieldAlias)(this.getRawData(), field)) && void 0 !== _a ? _a : field;
     }
+    getMarkInfoList() {
+        var _a;
+        const list = super.getMarkInfoList();
+        if (!list.length) {
+            const SeriesConstructor = factory_1.Factory.getSeries(this.type);
+            return Object.values(null !== (_a = SeriesConstructor.mark) && void 0 !== _a ? _a : {});
+        }
+        return list;
+    }
 }
 
-exports.BaseSeries = BaseSeries;
+exports.BaseSeries = BaseSeries, BaseSeries.mark = {
+    [interface_1.SeriesMarkNameEnum.label]: {
+        name: interface_1.SeriesMarkNameEnum.label,
+        type: interface_2.MarkTypeEnum.text
+    }
+};
 //# sourceMappingURL=base-series.js.map