@visactor/vchart 1.2.3 → 1.3.0-beta.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":["/* eslint-disable no-duplicate-imports */\nimport { 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, DirectionType } 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';\nimport { SeriesMarkNameEnum } from '../interface';\nimport { SeriesTypeEnum } from '../interface';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport { BaseSeries } from '../base/base-series';\nimport { VChart } from '../../core/vchart';\nimport { RectMark } from '../../mark/rect';\nimport { TextMark } from '../../mark/text';\nimport { array, isValid, last } from '@visactor/vutils';\n\nVChart.useMark([RectMark, TextMark]);\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) => this._getPosition(this.direction, datum),\n          height: () => this._getBarWidth(this._yAxisHelper)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    } else {\n      this.setMarkStyle(\n        this._rectMark,\n        {\n          x: (datum: Datum) => this._getPosition(this.direction, datum),\n          y: (datum: Datum) => 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\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  protected _getPosition(direction: DirectionType, datum: Datum) {\n    let axisHelper;\n    let sizeAttribute;\n    let dataToPosition;\n    if (direction === Direction.horizontal) {\n      axisHelper = this.getYAxisHelper();\n      sizeAttribute = 'height';\n      dataToPosition = this.dataToPositionY.bind(this);\n    } else {\n      axisHelper = this.getXAxisHelper();\n      sizeAttribute = 'width';\n      dataToPosition = this.dataToPositionX.bind(this);\n    }\n    const scale = axisHelper.getScale(0);\n    const size = this._rectMark.getAttribute(sizeAttribute, datum) as number;\n    const bandWidth = axisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n    if (this._groups?.fields?.length > 1 && isValid(this._spec.barGapInGroup)) {\n      // 自里向外计算，沿着第一层分组的中心点进行位置调整\n      const groupFields = this._groups.fields;\n      const barInGroup = array(this._spec.barGapInGroup);\n      let totalWidth: number = 0;\n      let offSet: number = 0;\n\n      for (let index = groupFields.length - 1; index >= 1; index--) {\n        const groupField = groupFields[index];\n        const groupValues = this.getViewDataStatistics()?.latestData?.[groupField]?.values ?? [];\n        const groupCount = groupValues.length;\n        const gap = getActualNumValue(barInGroup[index - 1] ?? last(barInGroup), bandWidth);\n        const i = groupValues.indexOf(datum[groupField]);\n        if (index === groupFields.length - 1) {\n          totalWidth += groupCount * size + (groupCount - 1) * gap;\n          offSet += i * (size + gap);\n        } else {\n          offSet += i * (totalWidth + gap);\n          totalWidth += totalWidth + (groupCount - 1) * gap;\n        }\n      }\n\n      const center = scale.scale(datum[groupFields[0]]) + axisHelper.getBandwidth(0) / 2;\n      return center - totalWidth / 2 + offSet;\n    }\n\n    const continuous = isContinuous(scale.type || 'band');\n    const pos = dataToPosition(datum);\n    return pos + (bandWidth - size) * 0.5 + (continuous ? -bandWidth / 2 : 0);\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"]}
+{"version":3,"sources":["../src/series/bar/bar.ts"],"names":[],"mappings":"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","file":"bar.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { isContinuous } from '@visactor/vscale';\nimport { Direction } from '../../typings/space';\nimport { CartesianSeries } from '../cartesian/cartesian';\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { AttributeLevel } from '../../constant';\nimport type { Maybe, Datum, DirectionType } from '../../typings';\nimport { mergeSpec, valueInScaleRange, getActualNumValue } 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';\nimport { SeriesMarkNameEnum } from '../interface';\nimport { SeriesTypeEnum } from '../interface';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport type { IStateAnimateSpec } from '../../animation/spec';\nimport { VChart } from '../../core/vchart';\nimport { RectMark } from '../../mark/rect';\nimport { TextMark } from '../../mark/text';\nimport { array, isValid, last } from '@visactor/vutils';\nimport { barSeriesMark } from './constant';\n\nVChart.useMark([RectMark, TextMark]);\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 = barSeriesMark;\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: mergeSpec({ 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._fieldZ ? this.dataToPositionZ.bind(this) : null\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) => this._getPosition(this.direction, datum),\n          height: () => this._getBarWidth(this._yAxisHelper)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    } else {\n      this.setMarkStyle(\n        this._rectMark,\n        {\n          x: (datum: Datum) => this._getPosition(this.direction, datum),\n          y: (datum: Datum) => 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\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  protected _getPosition(direction: DirectionType, datum: Datum) {\n    let axisHelper;\n    let sizeAttribute;\n    let dataToPosition;\n    if (direction === Direction.horizontal) {\n      axisHelper = this.getYAxisHelper();\n      sizeAttribute = 'height';\n      dataToPosition = this.dataToPositionY.bind(this);\n    } else {\n      axisHelper = this.getXAxisHelper();\n      sizeAttribute = 'width';\n      dataToPosition = this.dataToPositionX.bind(this);\n    }\n    const scale = axisHelper.getScale(0);\n    const size = this._rectMark.getAttribute(sizeAttribute, datum) as number;\n    const bandWidth = axisHelper.getBandwidth?.(this._groups ? this._groups.fields.length - 1 : 0) ?? DefaultBandWidth;\n    if (this._groups?.fields?.length > 1 && isValid(this._spec.barGapInGroup)) {\n      // 自里向外计算，沿着第一层分组的中心点进行位置调整\n      const groupFields = this._groups.fields;\n      const barInGroup = array(this._spec.barGapInGroup);\n      let totalWidth: number = 0;\n      let offSet: number = 0;\n\n      for (let index = groupFields.length - 1; index >= 1; index--) {\n        const groupField = groupFields[index];\n        const groupValues = this.getViewDataStatistics()?.latestData?.[groupField]?.values ?? [];\n        const groupCount = groupValues.length;\n        const gap = getActualNumValue(barInGroup[index - 1] ?? last(barInGroup), bandWidth);\n        const i = groupValues.indexOf(datum[groupField]);\n        if (index === groupFields.length - 1) {\n          totalWidth += groupCount * size + (groupCount - 1) * gap;\n          offSet += i * (size + gap);\n        } else {\n          offSet += i * (totalWidth + gap);\n          totalWidth += totalWidth + (groupCount - 1) * gap;\n        }\n      }\n\n      const center = scale.scale(datum[groupFields[0]]) + axisHelper.getBandwidth(0) / 2;\n      return center - totalWidth / 2 + offSet;\n    }\n\n    const continuous = isContinuous(scale.type || 'band');\n    const pos = dataToPosition(datum);\n    return pos + (bandWidth - size) * 0.5 + (continuous ? -bandWidth / 2 : 0);\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"]}

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

@@ -0,0 +1,3 @@
+import { type SeriesMarkMap } from '../interface/common';
+export declare const barSeriesMark: SeriesMarkMap;
+export declare const bar3dSeriesMark: SeriesMarkMap;

package/cjs/series/bar/constant.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.bar3dSeriesMark = exports.barSeriesMark = void 0;
+
+const interface_1 = require("../../mark/interface"), constant_1 = require("../base/constant"), common_1 = require("../interface/common");
+
+exports.barSeriesMark = Object.assign(Object.assign({}, constant_1.baseSeriesMark), {
+    [common_1.SeriesMarkNameEnum.bar]: {
+        name: common_1.SeriesMarkNameEnum.bar,
+        type: interface_1.MarkTypeEnum.rect
+    }
+}), exports.bar3dSeriesMark = Object.assign(Object.assign({}, constant_1.baseSeriesMark), {
+    [common_1.SeriesMarkNameEnum.bar3d]: {
+        name: common_1.SeriesMarkNameEnum.bar3d,
+        type: interface_1.MarkTypeEnum.rect3d
+    }
+});
+//# sourceMappingURL=constant.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/series/bar/constant.ts"],"names":[],"mappings":";;;AAAA,oDAAoD;AACpD,+CAAkD;AAClD,gDAA6E;AAEhE,QAAA,aAAa,mCACrB,yBAAc,KACjB,CAAC,2BAAkB,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,2BAAkB,CAAC,GAAG,EAAE,IAAI,EAAE,wBAAY,CAAC,IAAI,EAAE,IACnF;AAEW,QAAA,eAAe,mCACvB,yBAAc,KACjB,CAAC,2BAAkB,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,2BAAkB,CAAC,KAAK,EAAE,IAAI,EAAE,wBAAY,CAAC,MAAM,EAAE,IACzF","file":"constant.js","sourcesContent":["import { MarkTypeEnum } from '../../mark/interface';\nimport { baseSeriesMark } from '../base/constant';\nimport { SeriesMarkNameEnum, type SeriesMarkMap } from '../interface/common';\n\nexport const barSeriesMark: SeriesMarkMap = {\n  ...baseSeriesMark,\n  [SeriesMarkNameEnum.bar]: { name: SeriesMarkNameEnum.bar, type: MarkTypeEnum.rect }\n};\n\nexport const bar3dSeriesMark: SeriesMarkMap = {\n  ...baseSeriesMark,\n  [SeriesMarkNameEnum.bar3d]: { name: SeriesMarkNameEnum.bar3d, type: MarkTypeEnum.rect3d }\n};\n"]}

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

@@ -6,10 +6,11 @@ import type { BarAppearPreset } from './animation';
 import type { ILabelSpec } from '../../component/label';
 import type { IMarkProgressiveConfig } from '../../mark/interface';
 import type { SeriesMarkNameEnum } from '../interface';
-import type { MaybeArray } from '../../typings';
 type BarMarks = 'bar';
 export interface IBarSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<BarMarks, BarAppearPreset>, IMarkProgressiveConfig {
     type: 'bar';
+    xField: string | string[];
+    yField: string | string[];
     [SeriesMarkNameEnum.bar]?: IMarkSpec<IRectMarkSpec>;
     [SeriesMarkNameEnum.label]?: ILabelSpec & {
         position?: 'outside' | 'top' | 'bottom' | 'left' | 'right' | 'inside' | 'inside-top' | 'inside-bottom' | 'inside-right' | 'inside-left';
@@ -17,7 +18,7 @@ export interface IBarSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<Bar
     barWidth?: number | string;
     barMinWidth?: number | string;
     barMaxWidth?: number | string;
-    barGapInGroup?: MaybeArray<number | string>;
+    barGapInGroup?: number | string | (number | string)[];
 }
 export interface IBarSeriesTheme extends ICartesianSeriesTheme {
     [SeriesMarkNameEnum.bar]?: Partial<IMarkTheme<IRectMarkSpec>>;

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';\nimport type { SeriesMarkNameEnum } from '../interface';\nimport type { MaybeArray } from '../../typings';\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   * 柱体宽度，可以设置绝对的像素值，也可以使用百分比（如 '10%'）\n   * 1. number 类型，表示像素值\n   * 2. string 类型，百分比用法，如 '10%'，该值为对应最后一个分组字段对应的 scale 的 bandWidth 占比(因为柱子是等宽的，所以采用最后一层分组的 scale)\n   */\n  barWidth?: number | string;\n  /**\n   * 柱体最小宽度，可以设置绝对的像素值，也可以使用百分比（如 '10%'）\n   * 1. number 类型，表示像素值\n   * 2. string 类型，百分比用法，如 '10%'，该值为对应最后一个分组字段对应的 scale 的 bandWidth 占比(因为柱子是等宽的，所以采用最后一层分组的 scale)\n   */\n  barMinWidth?: number | string;\n  /**\n   * 柱体最大宽度，可以设置绝对的像素值，也可以使用百分比（如 '10%'）\n   * 1. number 类型，表示像素值\n   * 2. string 类型，百分比用法，如 '10%'，该值为对应最后一个分组字段对应的 scale 的 bandWidth 占比(因为柱子是等宽的，所以采用最后一层分组的 scale)\n   */\n  barMaxWidth?: number | string;\n  /**\n   * 分组柱图中各个分组内的柱子间距，可以设置绝对的像素值，也可以使用百分比（如 '10%'）。\n   * 当存在多层分组时，可以使用数组来设置不同层级的间距，如 [10, '20%']，表示第一层分组的间距为 10px，第二层分组的间距为 '20%'。\n   * 如果 barGapInGroup 的数组个数小于分组层数，则后面的分组间距使用最后一个值。\n   * 1. number 类型，表示像素值\n   * 2. string 类型，百分比用法，如 '10%'，该值为对应最后一个分组字段对应的 scale 的 bandWidth 占比(因为柱子是等宽的，所以采用最后一层分组的 scale)\n   * @since 1.2.0\n   */\n  barGapInGroup?: MaybeArray<number | string>;\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"]}
+{"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   * x轴字段\n   */\n  xField: string | string[];\n  /**\n   * y轴字段\n   */\n  yField: string | string[];\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   * 柱体宽度，可以设置绝对的像素值，也可以使用百分比（如 '10%'）\n   * 1. number 类型，表示像素值\n   * 2. string 类型，百分比用法，如 '10%'，该值为对应最后一个分组字段对应的 scale 的 bandWidth 占比(因为柱子是等宽的，所以采用最后一层分组的 scale)\n   */\n  barWidth?: number | string;\n  /**\n   * 柱体最小宽度，可以设置绝对的像素值，也可以使用百分比（如 '10%'）\n   * 1. number 类型，表示像素值\n   * 2. string 类型，百分比用法，如 '10%'，该值为对应最后一个分组字段对应的 scale 的 bandWidth 占比(因为柱子是等宽的，所以采用最后一层分组的 scale)\n   */\n  barMinWidth?: number | string;\n  /**\n   * 柱体最大宽度，可以设置绝对的像素值，也可以使用百分比（如 '10%'）\n   * 1. number 类型，表示像素值\n   * 2. string 类型，百分比用法，如 '10%'，该值为对应最后一个分组字段对应的 scale 的 bandWidth 占比(因为柱子是等宽的，所以采用最后一层分组的 scale)\n   */\n  barMaxWidth?: number | string;\n  /**\n   * 分组柱图中各个分组内的柱子间距，可以设置绝对的像素值，也可以使用百分比（如 '10%'）。\n   * 当存在多层分组时，可以使用数组来设置不同层级的间距，如 [10, '20%']，表示第一层分组的间距为 10px，第二层分组的间距为 '20%'。\n   * 如果 barGapInGroup 的数组个数小于分组层数，则后面的分组间距使用最后一个值。\n   * 1. number 类型，表示像素值\n   * 2. string 类型，百分比用法，如 '10%'，该值为对应最后一个分组字段对应的 scale 的 bandWidth 占比(因为柱子是等宽的，所以采用最后一层分组的 scale)\n   * @since 1.2.0\n   */\n  barGapInGroup?: number | string | (number | string)[];\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

@@ -14,7 +14,7 @@ import type { StatisticOperations } from '../../data/transforms/dimension-statis
 import { SeriesData } from './series-data';
 import type { IGroupMark } from '../../mark/group';
 import type { ISeriesMarkAttributeContext } from '../../compile/mark';
-export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseModel implements ISeries {
+export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseModel<T> implements ISeries {
     readonly type: string;
     layoutType: LayoutItem['layoutType'];
     readonly modelType: string;
@@ -23,7 +23,6 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     protected _trigger: ITrigger;
     getTrigger(): ITrigger;
     protected _option: ISeriesOption;
-    protected _spec: T;
     readonly coordinate: CoordinateType;
     protected _region: IRegion;
     getRegion(): IRegion;
@@ -64,7 +63,7 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     getInvalidType(): IInvalidType;
     setInvalidType(t: IInvalidType): void;
     protected _markAttributeContext: ISeriesMarkAttributeContext;
-    constructor(spec: any, options: ISeriesOption);
+    constructor(spec: T, options: ISeriesOption);
     created(): void;
     protected _buildMarkAttributeContext(): void;
     setAttrFromSpec(): void;
@@ -87,6 +86,7 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     viewDataFilterOver(d: DataView): void;
     viewDataUpdate(d: DataView): void;
     viewDataStatisticsUpdate(d: DataView): void;
+    getDatumPositionValue(datum: Datum, field: string): any;
     getDatumPositionValues(datum: Datum, fields: string | string[]): any[];
     abstract getStatisticFields(): {
         key: string;
@@ -107,6 +107,7 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     initRootMark(): void;
     protected _initExtensionMark(): void;
     private _createExtensionMark;
+    protected _updateExtensionMarkSpec(): void;
     getStackData(): ISeriesStackData;
     initTrigger(): void;
     initAnimation(): void;
@@ -123,6 +124,7 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     updateSpec(spec: any): {
         change: boolean;
         reMake: boolean;
+        reMakeData: boolean;
         reRender: boolean;
         reSize: boolean;
         reCompile: boolean;
@@ -161,9 +163,7 @@ 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>(markInfo: ISeriesMarkInfo, option?: ISeriesMarkInitOption): NonNullable<T>;
+    protected _createMark<M extends IMark>(markInfo: ISeriesMarkInfo, option?: ISeriesMarkInitOption): NonNullable<M>;
     protected _getDataIdKey(): string | ((datum: Datum) => string);
     protected _getSeriesDataKey(datum: Datum): string;
     addViewDataFilter(option: ITransformOptions): void;
@@ -174,4 +174,6 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     getDefaultShapeType(): string;
     getFieldAlias(field: string): any;
     getMarkInfoList(): import("../../model/interface").IModelMarkInfo[];
+    protected _getInvalidConnectType(): "none" | "zero" | "connect";
+    protected _getInvalidDefined: (datum: Datum) => boolean;
 }

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"), 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");
+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"), constant_1 = require("./constant");
 
 class BaseSeries extends base_model_1.BaseModel {
     getTrigger() {
@@ -69,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_2.MarkTypeEnum.line, interface_2.MarkTypeEnum.area ]).forEach((m => {
+        (0, util_1.isValid)(field) && (this._seriesField = field, this.getMarks().filter((m => m.getDataView() === this.getViewData())).forEach((m => {
             m.setFacet(this._seriesField);
         })));
     }
@@ -101,6 +101,7 @@ class BaseSeries extends base_model_1.BaseModel {
         this.modelType = "series", this.name = void 0, this.coordinate = "none", this._region = null, 
         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._invalidType = "break", this._getInvalidDefined = datum => (0, util_1.couldBeValidNumber)(datum[this.getStackValueField()]), 
         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() {
@@ -124,19 +125,20 @@ class BaseSeries extends base_model_1.BaseModel {
                 var _a;
                 return (0, util_1.isNil)(seriesValue) && (seriesValue = this.getSeriesKeys()[0]), 
                 null === (_a = this._option.globalScale.getScale("color")) || void 0 === _a ? void 0 : _a.scale(seriesValue);
-            }
+            },
+            getRegion: () => this._region
         };
     }
     setAttrFromSpec() {
         var _a;
         super.setAttrFromSpec(), this.setSeriesField(this._spec.seriesField), (0, util_1.isBoolean)(this._spec.stack) && (this._stack = this._spec.stack), 
         (0, util_1.isBoolean)(this._spec.percent) && (this._percent = this._spec.percent, 
-        this._stack = this._spec.stack || this._spec.percent), (0, util_1.isBoolean)(this._spec.stackOffsetSilhouette) && (this._stackOffsetSilhouette = this._spec.stackOffsetSilhouette, 
-        this._stack = this._spec.stack || this._spec.stackOffsetSilhouette), (0, util_1.isValid)(this._spec.invalidType) && (this._invalidType = this._spec.invalidType), 
+        this._stack = this._spec.percent || this._stack), (0, util_1.isBoolean)(this._spec.stackOffsetSilhouette) && (this._stackOffsetSilhouette = this._spec.stackOffsetSilhouette, 
+        this._stack = this._spec.stackOffsetSilhouette || this._stack), (0, util_1.isValid)(this._spec.invalidType) && (this._invalidType = this._spec.invalidType), 
         null === (_a = this._tooltipHelper) || void 0 === _a || _a.updateTooltipSpec();
     }
     initData() {
-        var _a, _b;
+        var _a, _b, _c;
         if (this._rawData = this._spec.data, null === (_a = this._rawData) || void 0 === _a || _a.target.addListener("change", this.rawDataUpdate.bind(this)), 
         this._addDataIndexAndKey(), this._rawData) {
             this._viewDataFilter = (0, initialize_1.dataViewFromDataView)(this._rawData, this._dataSet, {
@@ -147,8 +149,9 @@ class BaseSeries extends base_model_1.BaseModel {
             });
             this._data = new series_data_1.SeriesData(this._option, viewData), this._viewDataFilter.target.removeListener("change", viewData.reRunAllTransform);
         }
-        "link" !== this._invalidType && "zero" !== this._invalidType || ((0, register_1.registerDataSetInstanceTransform)(this._option.dataSet, "invalidTravel", invalid_travel_1.invalidTravel), 
-        null === (_b = this.getViewData()) || void 0 === _b || _b.transform({
+        "zero" === this._invalidType && (null === (_b = this._rawData) || void 0 === _b ? void 0 : _b.dataSet) && ((0, 
+        register_1.registerDataSetInstanceTransform)(this._rawData.dataSet, "invalidTravel", invalid_travel_1.invalidTravel), 
+        null === (_c = this._rawData) || void 0 === _c || _c.transform({
             type: "invalidTravel",
             options: {
                 config: () => ({
@@ -167,14 +170,50 @@ class BaseSeries extends base_model_1.BaseModel {
         this._rawData && this._statisticRawData(), this._data && this._statisticViewData();
     }
     _statisticRawData() {
-        const rawDataName = `${index_1.PREFIX}_series_${this.id}_rawDataStatic`;
-        this._rawDataStatistics = this.createStatisticalData(rawDataName, this._rawData, this._option.globalScale.getStatisticalFields), 
-        this._rawData.target.removeListener("change", this._rawDataStatistics.reRunAllTransform);
+        (0, register_1.registerDataSetInstanceTransform)(this._dataSet, "dimensionStatistics", dimension_statistics_1.dimensionStatistics);
+        const rawDataStatisticsName = `${index_1.PREFIX}_series_${this.id}_rawDataStatic`;
+        this._rawDataStatistics = new vdataset_1.DataView(this._dataSet, {
+            name: rawDataStatisticsName
+        }), this._rawDataStatistics.parse([ this._rawData ], {
+            type: "dataview"
+        }), this._rawDataStatistics.transform({
+            type: "dimensionStatistics",
+            options: {
+                operations: [ "max", "min", "values" ],
+                fields: () => {
+                    var _a;
+                    const fields = (0, util_1.mergeFields)(this.getStatisticFields(), null !== (_a = this._option.globalScale.getStatisticalFields(this._rawData.name)) && void 0 !== _a ? _a : []);
+                    return this._seriesField && (0, util_1.mergeFields)(fields, [ {
+                        key: this._seriesField,
+                        operations: [ "values" ]
+                    } ]), fields.filter((f => f.key !== index_1.STACK_FIELD_START_PERCENT && f.key !== index_1.STACK_FIELD_END_PERCENT && f.key !== index_1.STACK_FIELD_END && f.key !== index_1.STACK_FIELD_START));
+                },
+                target: "latest"
+            }
+        }, !1), this._rawData.target.removeListener("change", this._rawDataStatistics.reRunAllTransform);
     }
     _statisticViewData() {
-        const viewDataName = `${index_1.PREFIX}_series_${this.id}_viewDataStatic`;
-        this._viewDataStatistics = this.createStatisticalData(viewDataName, this._data.getDataView()), 
-        this._data.getDataView().target.removeListener("change", this._viewDataStatistics.reRunAllTransform), 
+        (0, register_1.registerDataSetInstanceTransform)(this._dataSet, "dimensionStatistics", dimension_statistics_1.dimensionStatistics);
+        const viewDataStatisticsName = `${index_1.PREFIX}_series_${this.id}_viewDataStatic`;
+        this._viewDataStatistics = new vdataset_1.DataView(this._dataSet, {
+            name: viewDataStatisticsName
+        }), this._viewDataStatistics.parse([ this._data.getDataView() ], {
+            type: "dataview"
+        }), this._viewDataStatistics.transform({
+            type: "dimensionStatistics",
+            options: {
+                fieldFollowSource: key => this._viewDataFilter.transformsArr.length <= 1,
+                sourceStatistics: () => this._rawDataStatistics.latestData,
+                fields: () => {
+                    const fields = this.getStatisticFields();
+                    return this._seriesField && (0, util_1.mergeFields)(fields, [ {
+                        key: this._seriesField,
+                        operations: [ "values" ]
+                    } ]), fields;
+                },
+                target: "latest"
+            }
+        }, !1), this._data.getDataView().target.removeListener("change", this._viewDataStatistics.reRunAllTransform), 
         (this._stack || this._stackValue) && this.createdStackData();
     }
     createStatisticalData(dataName, rawData, staticFields) {
@@ -269,6 +308,9 @@ class BaseSeries extends base_model_1.BaseModel {
             model: this
         });
     }
+    getDatumPositionValue(datum, field) {
+        return !datum || (0, util_1.isNil)(field) ? null : datum[field];
+    }
     getDatumPositionValues(datum, fields) {
         return !datum || (0, util_1.isNil)(fields) ? [] : (0, util_1.isString)(fields) ? [ datum[fields] ] : fields.map((f => datum[f]));
     }
@@ -292,7 +334,7 @@ class BaseSeries extends base_model_1.BaseModel {
         var _a;
         const mark = this._createMark({
             type: spec.type,
-            name: `${index_1.PREFIX}_${index}`
+            name: `${namePrefix}_${index}`
         }, {
             markSpec: spec,
             parent: parentMark,
@@ -305,6 +347,15 @@ class BaseSeries extends base_model_1.BaseModel {
             dataView === this._rawData ? mark.setDataView(this.getViewData(), this.getViewDataProductId()) : mark.setDataView(dataView);
         }
     }
+    _updateExtensionMarkSpec() {
+        var _a;
+        null === (_a = this._spec.extensionMark) || void 0 === _a || _a.forEach(((spec, i) => {
+            const mark = this._marks.getMarkWithInfo({
+                name: `${index_1.PREFIX}_series_${this.id}_extensionMark_${i}`
+            });
+            this.initMarkStyleWithSpec(mark, spec);
+        }));
+    }
     getStackData() {
         var _a;
         return null === (_a = this._viewStackData) || void 0 === _a ? void 0 : _a.latestData;
@@ -396,16 +447,22 @@ class BaseSeries extends base_model_1.BaseModel {
         this._tooltipHelper = new tooltip_helper_1.BaseSeriesTooltipHelper(this);
     }
     updateSpec(spec) {
-        const result = super.updateSpec(spec);
+        var _a, _b;
+        const originalSpec = this._spec, result = super.updateSpec(spec);
         spec.type !== this.type && (result.reMake = !0);
         const {invalidType: invalidType} = this._originalSpec;
-        return spec.invalidType !== invalidType && (result.change = !0, result.reRender = !0), 
+        return spec.invalidType !== invalidType && (result.reMake = !0), ((0, vutils_1.array)(originalSpec.extensionMark).length !== (0, 
+        vutils_1.array)(this._spec.extensionMark).length || (null === (_a = originalSpec.extensionMark) || void 0 === _a ? void 0 : _a.some(((mark, index) => mark.type !== this._spec.extensionMark[index].type || mark.id !== this._spec.extensionMark[index].id)))) && (result.reMake = !0), 
+        result.reMake || (this._marks.getMarks().some((m => {
+            var _a, _b;
+            return (null === (_a = originalSpec[m.name]) || void 0 === _a ? void 0 : _a.visible) !== (null === (_b = this._spec[m.name]) || void 0 === _b ? void 0 : _b.visible);
+        })) && (result.reCompile = !0), (null === (_b = originalSpec.extensionMark) || void 0 === _b ? void 0 : _b.some(((mark, index) => mark.visible !== this._spec.extensionMark[index].visible))) && (result.reCompile = !0)), 
         result;
     }
     reInit(theme) {
         super.reInit(theme), this.initMarkStyle(), this.getMarksWithoutRoot().forEach((mark => {
-            this.initMarkStyleWithSpec(mark, this._spec[mark.name]);
-        }));
+            this._spec[mark.name] && this.initMarkStyleWithSpec(mark, this._spec[mark.name]);
+        })), this._updateExtensionMarkSpec();
     }
     onEvaluateEnd(ctx) {
         this._data.updateData();
@@ -490,13 +547,6 @@ class BaseSeries extends base_model_1.BaseModel {
         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(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(markInfo, {
@@ -506,7 +556,9 @@ class BaseSeries extends base_model_1.BaseModel {
             attributeContext: this._markAttributeContext
         });
         if ((0, util_1.isValid)(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), 
+            this._marks.addMark(m, {
+                name: markInfo.name
+            }), 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), 
@@ -516,7 +568,7 @@ class BaseSeries extends base_model_1.BaseModel {
             m.setMorph(morph), m.setMorphKey((null === (_b = spec.morph) || void 0 === _b ? void 0 : _b.morphKey) || `${this._specIndex}`), 
             m.setMorphElementKey(null !== (_d = null === (_c = spec.morph) || void 0 === _c ? void 0 : _c.morphElementKey) && void 0 !== _d ? _d : option.defaultMorphElementKey), 
             (0, util_1.isNil)(progressive) || m.setProgressiveConfig(progressive), (0, util_1.isNil)(groupKey) || m.setGroupKey(groupKey), 
-            this.initMarkStyleWithSpec(m, (0, util_1.merge)({}, themeSpec, markSpec || spec[m.name]));
+            this.initMarkStyleWithSpec(m, (0, util_1.mergeSpec)({}, themeSpec, markSpec || spec[m.name]));
         }
         return m;
     }
@@ -531,7 +583,8 @@ class BaseSeries extends base_model_1.BaseModel {
         key;
     }
     addViewDataFilter(option) {
-        this._viewDataFilter.transform(option, !1);
+        var _a;
+        null === (_a = this._viewDataFilter) || void 0 === _a || _a.transform(option, !1);
     }
     reFilterViewData() {
         var _a;
@@ -559,18 +612,12 @@ class BaseSeries extends base_model_1.BaseModel {
     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;
+        return list.length ? list : Object.values(null !== (_a = interface_1.seriesMarkInfoMap[this.type]) && void 0 !== _a ? _a : {});
+    }
+    _getInvalidConnectType() {
+        return "zero" === this._invalidType ? "zero" : "link" === this._invalidType ? "connect" : "none";
     }
 }
 
-exports.BaseSeries = BaseSeries, BaseSeries.mark = {
-    [interface_1.SeriesMarkNameEnum.label]: {
-        name: interface_1.SeriesMarkNameEnum.label,
-        type: interface_2.MarkTypeEnum.text
-    }
-};
+exports.BaseSeries = BaseSeries, BaseSeries.mark = constant_1.baseSeriesMark;
 //# sourceMappingURL=base-series.js.map