@visactor/vchart 0.0.1-alpha.0

package/esm/series/bar/bar.js

@@ -0,0 +1,144 @@
+import { isContinuous } from "@visactor/vscale";
+
+import { Direction } from "../../typings/space";
+
+import { CartesianSeries } from "../cartesian/cartesian";
+
+import { MarkTypeEnum } from "../../mark/interface";
+
+import { AttributeLevel } from "../../constant";
+
+import { getActualNumValue } from "../util/utils";
+
+import { merge, valueInScaleRange } from "../../util";
+
+import { animationConfig, userAnimationConfig } from "../../animation/utils";
+
+import { SeriesTypeEnum } from "../interface";
+
+import { DEFAULT_MARK_ANIMATION } from "../../animation/config";
+
+export const DefaultBandWidth = 6;
+
+export class BarSeries extends CartesianSeries {
+    constructor() {
+        super(...arguments), this.type = SeriesTypeEnum.bar, this._barMarkType = MarkTypeEnum.rect, 
+        this._stack = !0, this._bandPosition = 0;
+    }
+    initMark() {
+        const progressive = {
+            progressiveStep: this._spec.progressiveStep,
+            progressiveThreshold: this._spec.progressiveThreshold,
+            large: this._spec.large,
+            largeThreshold: this._spec.largeThreshold
+        };
+        this._rectMark = this._createMark(this._barMarkType, "bar", {
+            defaultMorphElementKey: this.getDimensionField()[0],
+            groupKey: this._seriesField,
+            isSeriesMark: !0,
+            label: merge({
+                animation: this._spec.animation
+            }, this._spec.label),
+            progressive: progressive
+        });
+    }
+    initMarkStyle() {
+        var _a;
+        const rectMark = this._rectMark;
+        rectMark && (this.setMarkStyle(rectMark, {
+            fill: this.getColorAttribute(),
+            fillOpacity: this._theme.fillOpacity
+        }, "normal", AttributeLevel.Series), this._trigger.registerMark(rectMark), null === (_a = this._tooltipHelper) || void 0 === _a || _a.activeTriggerSet.mark.add(rectMark));
+    }
+    initLabelMarkStyle(textMark) {
+        textMark && this.setMarkStyle(textMark, {
+            fill: this.getColorAttribute(),
+            text: datum => datum[this.getStackValueField()]
+        });
+    }
+    init(option) {
+        var _a, _b;
+        super.init(option), "vertical" === this.direction ? "band" === (null === (_a = this._xAxisHelper) || void 0 === _a ? void 0 : _a.getScale(0).type) ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle() : "band" === (null === (_b = this._yAxisHelper) || void 0 === _b ? void 0 : _b.getScale(0).type) ? this.initBandRectMarkStyle() : this.initLinearRectMarkStyle();
+    }
+    initBandRectMarkStyle() {
+        var _a, _b, _c, _d;
+        const xScale = null === (_b = null === (_a = this._xAxisHelper) || void 0 === _a ? void 0 : _a.getScale) || void 0 === _b ? void 0 : _b.call(_a, 0), yScale = null === (_d = null === (_c = this._yAxisHelper) || void 0 === _c ? void 0 : _c.getScale) || void 0 === _d ? void 0 : _d.call(_c, 0);
+        this.direction === Direction.horizontal ? this.setMarkStyle(this._rectMark, {
+            x: datum => valueInScaleRange(this.dataToPositionX(datum), xScale),
+            x1: datum => valueInScaleRange(this.dataToPositionX1(datum), xScale),
+            y: datum => {
+                var _a, _b, _c;
+                const bandWidth = null !== (_c = null === (_b = (_a = this.getYAxisHelper()).getBandwidth) || void 0 === _b ? void 0 : _b.call(_a, this._groups ? this._groups.fields.length - 1 : 0)) && void 0 !== _c ? _c : 6, continuous = isContinuous(yScale.type || "band");
+                return this.dataToPositionY(datum) + .5 * (bandWidth - this._rectMark.getAttribute("height", datum)) + (continuous ? -bandWidth / 2 : 0);
+            },
+            height: () => this.getBarWidth(this._yAxisHelper)
+        }, "normal", AttributeLevel.Series) : this.setMarkStyle(this._rectMark, {
+            x: datum => {
+                var _a, _b, _c, _d, _e;
+                const bandWidth = null !== (_c = null === (_b = (_a = this.getXAxisHelper()).getBandwidth) || void 0 === _b ? void 0 : _b.call(_a, this._groups ? this._groups.fields.length - 1 : 0)) && void 0 !== _c ? _c : 6, width = this._rectMark.getAttribute("width", datum), continuous = isContinuous((null === (_e = (_d = this.getXAxisHelper()).getScale) || void 0 === _e ? void 0 : _e.call(_d, 0).type) || "band");
+                return this.dataToPositionX(datum) + (bandWidth - width) / 2 + (continuous ? -bandWidth / 2 : 0);
+            },
+            y: datum => valueInScaleRange(this.dataToPositionY(datum), yScale),
+            y1: datum => valueInScaleRange(this.dataToPositionY1(datum), yScale),
+            width: () => this.getBarWidth(this._xAxisHelper)
+        }, "normal", AttributeLevel.Series);
+    }
+    initLinearRectMarkStyle() {
+        var _a, _b, _c, _d;
+        const xScale = null === (_b = null === (_a = this._xAxisHelper) || void 0 === _a ? void 0 : _a.getScale) || void 0 === _b ? void 0 : _b.call(_a, 0), yScale = null === (_d = null === (_c = this._yAxisHelper) || void 0 === _c ? void 0 : _c.getScale) || void 0 === _d ? void 0 : _d.call(_c, 0);
+        this.setMarkStyle(this._rectMark, {
+            x: datum => valueInScaleRange(this.dataToPositionX(datum), xScale),
+            x1: datum => valueInScaleRange(this.dataToPositionX1(datum), xScale),
+            y: datum => valueInScaleRange(this.dataToPositionY(datum), yScale),
+            y1: datum => valueInScaleRange(this.dataToPositionY1(datum), yScale)
+        }, "normal", AttributeLevel.Series);
+    }
+    initAnimation() {
+        var _a, _b;
+        const animationParams = {
+            yField: this._fieldY[0],
+            xField: this._fieldX[0],
+            direction: this.direction,
+            growFrom: () => {
+                var _a, _b;
+                return "horizontal" === this.direction ? null === (_a = this._xAxisHelper) || void 0 === _a ? void 0 : _a.getScale(0).scale(0) : null === (_b = this._yAxisHelper) || void 0 === _b ? void 0 : _b.getScale(0).scale(0);
+            }
+        }, appearPreset = null === (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.animationAppear) || void 0 === _b ? void 0 : _b.preset;
+        this._rectMark.setAnimationConfig(animationConfig(DEFAULT_MARK_ANIMATION.bar(animationParams, appearPreset), userAnimationConfig("bar", this._spec), {
+            dataIndex: datum => {
+                var _a, _b, _c;
+                const xValue = null == datum ? void 0 : datum[this._fieldX[0]];
+                return (null === (_c = null === (_b = null === (_a = this.getViewDataStatistics()) || void 0 === _a ? void 0 : _a.latestData) || void 0 === _b ? void 0 : _b[this._fieldX[0]]) || void 0 === _c ? void 0 : _c.values.indexOf(xValue)) || 0;
+            }
+        }));
+    }
+    getBarWidth(axisHelper) {
+        var _a, _b;
+        const hasBarWidth = void 0 !== this._spec.barWidth, bandWidth = null !== (_b = null === (_a = axisHelper.getBandwidth) || void 0 === _a ? void 0 : _a.call(axisHelper, this._groups ? this._groups.fields.length - 1 : 0)) && void 0 !== _b ? _b : 6;
+        if (hasBarWidth) return getActualNumValue(this._spec.barWidth, bandWidth);
+        const hasBarMinWidth = void 0 !== this._spec.barMinWidth, hasBarMaxWidth = void 0 !== this._spec.barMaxWidth;
+        let width = bandWidth;
+        return hasBarMinWidth && (width = Math.max(width, getActualNumValue(this._spec.barMinWidth, bandWidth))), 
+        hasBarMaxWidth && (width = Math.min(width, getActualNumValue(this._spec.barMaxWidth, bandWidth))), 
+        width;
+    }
+    updateSpec(spec) {
+        const {direction: direction} = this._spec, result = super.updateSpec(spec);
+        return spec.direction !== direction && (result.change = !0, result.reRender = !0, 
+        result.reMake = !0), result;
+    }
+    getDefaultShapeType() {
+        return "square";
+    }
+}
+
+BarSeries.type = SeriesTypeEnum.bar;
+
+export class Bar3dSeries extends BarSeries {
+    constructor() {
+        super(...arguments), this.type = SeriesTypeEnum.bar3d, this._barMarkType = MarkTypeEnum.rect3d;
+    }
+}
+
+Bar3dSeries.type = SeriesTypeEnum.bar3d;
+//# sourceMappingURL=bar.js.map

package/esm/series/bar/bar.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["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, 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, 'bar', {\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          fillOpacity: this._theme.fillOpacity\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    });\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('bar', 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"]}

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

@@ -0,0 +1,28 @@
+import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/interface';
+import type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';
+import type { IRect3dMarkSpec, IRectMarkSpec } from '../../typings/visual';
+import type { IAnimationSpec } from '../../animation/spec';
+import type { BarAppearPreset } from './animation';
+import type { ILabelSpec } from '../../component/label';
+import type { IMarkProgressiveConfig } from '../../mark/interface';
+type BarMarks = 'bar';
+export interface IBarSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<BarMarks, BarAppearPreset>, IMarkProgressiveConfig {
+    type: 'bar';
+    bar?: IMarkSpec<IRectMarkSpec>;
+    label?: ILabelSpec & {
+        position?: 'outside' | 'top' | 'bottom' | 'left' | 'right' | 'inside' | 'inside-top' | 'inside-bottom' | 'inside-right' | 'inside-left';
+    };
+    barWidth?: number;
+    barMinWidth?: number;
+    barMaxWidth?: number;
+}
+export interface IBarSeriesTheme extends ICartesianSeriesTheme {
+    bar?: Partial<IMarkTheme<IRectMarkSpec>>;
+}
+export type IBar3dSeriesSpec = {
+    type: 'bar3d';
+} & Omit<IBarSeriesSpec, 'type'> & ICartesianSeriesSpec & IAnimationSpec<BarMarks, BarAppearPreset>;
+export interface IBar3dSeriesTheme extends ICartesianSeriesTheme {
+    bar3d?: Partial<IMarkTheme<IRect3dMarkSpec>>;
+}
+export {};

package/esm/series/bar/interface.js

@@ -0,0 +1,2 @@
+export { };
+//# sourceMappingURL=interface.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["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\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"]}

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

@@ -0,0 +1,166 @@
+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 { CoordinateType, IInvalidType, IPoint, DataKeyType, Datum, Maybe, ISeriesSpec } from '../../typings';
+import { BaseModel } from '../../model/base-model';
+import type { ISeriesOption, ISeries } from '../interface';
+import type { IModelEvaluateOption, IModelRenderOption } from '../../model/interface';
+import { Group } from './group';
+import type { AddChartSpacePropertyContext } 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';
+import type { IGroupMark } from '../../mark/group';
+import type { ISeriesMarkAttributeContext } from '../../compile/mark';
+export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseModel implements ISeries {
+    readonly type: string;
+    layoutType: LayoutItem['layoutType'];
+    readonly modelType: string;
+    readonly name: string | undefined;
+    protected _trigger: ITrigger;
+    getTrigger(): ITrigger;
+    protected _option: ISeriesOption;
+    protected _spec: T;
+    readonly coordinate: CoordinateType;
+    protected _region: IRegion;
+    getRegion(): IRegion;
+    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;
+    protected _rawDataStatistics: DataView;
+    getRawDataStatistics(): DataView;
+    protected _viewDataMap: Map<number, DataView>;
+    protected _viewDataFilter: DataView;
+    getViewDataFilter(): DataView;
+    protected _data: SeriesData;
+    getViewData(): DataView;
+    getViewDataProductId(): string;
+    protected _viewDataStatistics: DataView;
+    getViewDataStatistics(): DataView;
+    protected _viewStackData: DataView;
+    getViewStackData(): DataView;
+    protected _seriesField?: string;
+    getSeriesField(): string;
+    setSeriesField(field: string): void;
+    protected _groups?: Group;
+    getGroups(): Group;
+    protected _stackValue: string;
+    protected _stack: boolean;
+    getStack(): boolean;
+    protected _percent: boolean;
+    getPercent(): boolean;
+    protected _stackOffsetSilhouette: boolean;
+    getStackOffsetSilhouette(): boolean;
+    protected _dataSet: DataSet;
+    protected _tooltipHelper: ISeriesTooltipHelper | undefined;
+    get tooltipHelper(): ISeriesTooltipHelper;
+    protected _invalidType: IInvalidType;
+    getInvalidType(): IInvalidType;
+    setInvalidType(t: IInvalidType): void;
+    protected _markAttributeContext: ISeriesMarkAttributeContext;
+    constructor(spec: any, options: ISeriesOption);
+    created(): void;
+    protected _buildMarkAttributeContext(): void;
+    setAttrFromSpec(): void;
+    protected initData(): void;
+    protected initGroups(): void;
+    protected initStatisticalData(): void;
+    protected _statisticRawData(): void;
+    protected _statisticViewData(): void;
+    protected createStatisticalData(dataName: string, rawData: DataView, staticFields?: (dataId: string) => {
+        key: string;
+        operations: StatisticOperations;
+    }[]): DataView;
+    private createdStackData;
+    protected generateDefaultDataKey(dataKey: DataKeyType, datum: Datum, index: number, context: AddChartSpacePropertyContext): any;
+    protected _addDataIndexAndKey(): void;
+    updateRawData(d: any): void;
+    rawDataUpdate(d: DataView): void;
+    rawDataStatisticsUpdate(d: DataView): void;
+    viewDataFilterOver(d: DataView): void;
+    viewDataUpdate(d: DataView): void;
+    viewDataStatisticsUpdate(d: DataView): void;
+    getDatumPositionValues(datum: Datum, fields: string | string[]): any[];
+    abstract getStatisticFields(): {
+        key: string;
+        operations: StatisticOperations;
+    }[];
+    abstract getGroupFields(): string[];
+    abstract dataToPosition(data: Datum): IPoint;
+    abstract dataToPositionX(data: any): number;
+    abstract dataToPositionY(data: any): number;
+    abstract initMark(): void;
+    abstract initMarkStyle(): void;
+    abstract getStackGroupFields(): string[];
+    abstract getStackValueField(): string | undefined;
+    abstract setValueFieldToStack(): void;
+    abstract setValueFieldToPercent(): void;
+    abstract setValueFieldToStackOffsetSilhouette(): void;
+    initRootMark(): void;
+    protected _initExtensionMark(): void;
+    private _createExtensionMark;
+    getStackData(): ISeriesStackData;
+    initTrigger(): void;
+    initAnimation(): void;
+    initMarkState(): void;
+    initSeriesStyleState(): void;
+    afterInitMark(): void;
+    getMarks(): IMark[];
+    getMarksWithoutRoot(): IMark[];
+    getMarksInType(type: string | string[]): IMark[];
+    getMarkInName(name: string): IMark | undefined;
+    getMarkInId(markId: number): IMark | undefined;
+    protected initEvent(): void;
+    protected releaseEvent(): void;
+    protected initTooltip(): void;
+    updateSpec(spec: any): {
+        change: boolean;
+        reMake: boolean;
+        reRender: boolean;
+        reSize: boolean;
+        reCompile: boolean;
+    };
+    reInit(): void;
+    onEvaluateEnd(ctx: IModelEvaluateOption): void;
+    onRender(ctx: IModelRenderOption): void;
+    release(): void;
+    onLayoutEnd(ctx: any): void;
+    getSeriesKeys(): string[];
+    getSeriesStyle(datum: Datum): (attribute: string) => unknown;
+    getSeriesInfoList(): {
+        key: string;
+        style: (attribute: string) => unknown;
+        shapeType: string;
+    }[];
+    protected getDefaultColorScale(): OrdinalScale;
+    getColorAttribute(): {
+        scale: import("@visactor/vscale").IBaseScale | OrdinalScale;
+        field: string;
+    };
+    getDimensionField(): string[];
+    getMeasureField(): string[];
+    protected onMarkPositionUpdate(): void;
+    protected onMarkTreePositionUpdate(marks: IMark[]): void;
+    setCurrentTheme(theme: any, noRender?: boolean): Promise<void>;
+    protected _initTheme(theme?: any): void;
+    protected _getDefaultSpecFromChart(chartSpec: any): Partial<T>;
+    protected _createMark<T extends IMark>(type: MarkType, name: string, option?: ISeriesMarkInitOption): NonNullable<T>;
+    protected _getDataIdKey(): string | ((datum: Datum) => string);
+    protected _getSeriesDataKey(datum: Datum): string;
+    addViewDataFilter(option: ITransformOptions): void;
+    reFilterViewData(): void;
+    reTransformViewData(): void;
+    fillData(): void;
+    compile(): void;
+    getDefaultShapeType(): string;
+    getFieldAlias(field: string): any;
+}