@visactor/vchart 1.10.0-alpha.1 → 1.10.0-alpha.4

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

@@ -3,7 +3,7 @@ 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 { ILabelSpec, IMultiLabelSpec } from '../../component/label';
 import type { IDataSamping, IMarkProgressiveConfig } from '../../mark/interface';
 import type { SeriesMarkNameEnum } from '../interface/type';
 import type { Functional } from '@visactor/vrender-components';
@@ -14,14 +14,15 @@ export interface IBarSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<Bar
     yField?: string | string[];
     [SeriesMarkNameEnum.bar]?: IMarkSpec<IRectMarkSpec>;
     [SeriesMarkNameEnum.barBackground]?: IMarkSpec<IRectMarkSpec> & IBarBackgroundSpec;
-    [SeriesMarkNameEnum.label]?: Omit<ILabelSpec, 'position'> & {
+    [SeriesMarkNameEnum.label]?: IMultiLabelSpec<Omit<ILabelSpec, 'position'> & {
         position?: Functional<'outside' | 'top' | 'bottom' | 'left' | 'right' | 'inside' | 'inside-top' | 'inside-bottom' | 'inside-right' | 'inside-left' | 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left'>;
-    };
+    }>;
     barWidth?: number | string;
     barMinWidth?: number | string;
     barMaxWidth?: number | string;
     barGapInGroup?: number | string | (number | string)[];
     barMinHeight?: number;
+    stackCornerRadius?: number | number[];
 }
 export interface IBarBackgroundSpec {
     fieldLevel?: number;

package/esm/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 { IDataSamping, IMarkProgressiveConfig } from '../../mark/interface';\nimport type { SeriesMarkNameEnum } from '../interface/type';\nimport type { Functional } from '@visactor/vrender-components';\n\ntype BarMarks = 'bar';\n\nexport interface IBarSeriesSpec\n  extends ICartesianSeriesSpec,\n    IAnimationSpec<BarMarks, BarAppearPreset>,\n    IMarkProgressiveConfig,\n    IDataSamping {\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   * 柱状背景图元\n   * @since 1.6.0\n   */\n  [SeriesMarkNameEnum.barBackground]?: IMarkSpec<IRectMarkSpec> & IBarBackgroundSpec;\n  /** 标签配置*/\n  [SeriesMarkNameEnum.label]?: Omit<ILabelSpec, 'position'> & {\n    /**\n     * 标签位置\n     * @since 1.6.0\n     * 支持'top-right' | 'top-left'| 'bottom-right' | 'bottom-left'，以及函数形式配置\n     * */\n    position?: Functional<\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      | 'top-right'\n      | 'top-left'\n      | 'bottom-right'\n      | 'bottom-left'\n    >;\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  /**\n   * 柱条最小高度，可用于防止某数据项的值过小的视觉调整。\n   * @since 1.4.0\n   */\n  barMinHeight?: number;\n}\n\nexport interface IBarBackgroundSpec {\n  /**\n   * 决定柱状背景图元是否显示在组的层级上，以及显示在哪个层级上。\n   * 例如：在分组柱状图中，xField 为 `['A', 'B', 'C']`，如果配置为 0，则以 'A' 划分的每个组对应一个整体的 barBackground；如果配置为 1，则以 'B' 划分的每个组对应一个整体的 barBackground；如果配置为 2，则每个柱条对应一个 barBackground。\n   * @since 1.9.0\n   */\n  fieldLevel?: number;\n}\n\nexport interface IBarSeriesTheme extends ICartesianSeriesTheme {\n  [SeriesMarkNameEnum.bar]?: Partial<IMarkTheme<IRectMarkSpec>>;\n  /**\n   * 柱状背景图元\n   * @since 1.6.0\n   */\n  [SeriesMarkNameEnum.barBackground]?: Partial<IMarkTheme<IRectMarkSpec>> & IBarBackgroundSpec;\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, IMultiLabelSpec } from '../../component/label';\nimport type { IDataSamping, IMarkProgressiveConfig } from '../../mark/interface';\nimport type { SeriesMarkNameEnum } from '../interface/type';\nimport type { Functional } from '@visactor/vrender-components';\n\ntype BarMarks = 'bar';\n\nexport interface IBarSeriesSpec\n  extends ICartesianSeriesSpec,\n    IAnimationSpec<BarMarks, BarAppearPreset>,\n    IMarkProgressiveConfig,\n    IDataSamping {\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   * 柱状背景图元\n   * @since 1.6.0\n   */\n  [SeriesMarkNameEnum.barBackground]?: IMarkSpec<IRectMarkSpec> & IBarBackgroundSpec;\n  /** 标签配置*/\n  [SeriesMarkNameEnum.label]?: IMultiLabelSpec<\n    Omit<ILabelSpec, 'position'> & {\n      /**\n       * 标签位置\n       * @since 1.6.0\n       * 支持'top-right' | 'top-left'| 'bottom-right' | 'bottom-left'，以及函数形式配置\n       * */\n      position?: Functional<\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        | 'top-right'\n        | 'top-left'\n        | 'bottom-right'\n        | 'bottom-left'\n      >;\n    }\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  /**\n   * 柱条最小高度，可用于防止某数据项的值过小的视觉调整。\n   * @since 1.4.0\n   */\n  barMinHeight?: number;\n\n  /**\n   * 堆叠柱整体的圆角\n   * @since 1.10.0\n   */\n  stackCornerRadius?: number | number[];\n}\n\nexport interface IBarBackgroundSpec {\n  /**\n   * 决定柱状背景图元是否显示在组的层级上，以及显示在哪个层级上。\n   * 例如：在分组柱状图中，xField 为 `['A', 'B', 'C']`，如果配置为 0，则以 'A' 划分的每个组对应一个整体的 barBackground；如果配置为 1，则以 'B' 划分的每个组对应一个整体的 barBackground；如果配置为 2，则每个柱条对应一个 barBackground。\n   * @since 1.9.0\n   */\n  fieldLevel?: number;\n}\n\nexport interface IBarSeriesTheme extends ICartesianSeriesTheme {\n  [SeriesMarkNameEnum.bar]?: Partial<IMarkTheme<IRectMarkSpec>>;\n  /**\n   * 柱状背景图元\n   * @since 1.6.0\n   */\n  [SeriesMarkNameEnum.barBackground]?: Partial<IMarkTheme<IRectMarkSpec>> & IBarBackgroundSpec;\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/esm/series/base/base-series-transformer.d.ts

@@ -15,4 +15,8 @@ export declare class BaseSeriesSpecTransformer<T extends ISeriesSpec, K> extends
     protected _transformLabelSpec(spec: T): void;
     protected _addMarkLabelSpec<V extends ISeries = ISeries>(spec: T, markName: SeriesMarkNameEnum, labelSpecKey?: keyof T, styleHandlerName?: keyof V, hasAnimation?: boolean, head?: boolean): void;
     protected _getDefaultSpecFromChart(chartSpec: any): any;
+    protected _mergeThemeToSpec(spec: T, chartSpec: any): {
+        spec: T;
+        theme: K;
+    };
 }

package/esm/series/base/base-series-transformer.js

@@ -1,6 +1,8 @@
+import { isObject } from "@visactor/vutils";
+
 import { BaseModelSpecTransformer } from "../../model/base-model-transformer";
 
-import { array, get, isValid, mergeSpec, transformSeriesThemeToMerge } from "../../util";
+import { array, get, isArray, isValid, mergeSpec, transformSeriesThemeToMerge } from "../../util";
 
 import { getDirectionFromSeriesSpec } from "../util/spec";
 
@@ -30,15 +32,17 @@ export class BaseSeriesSpecTransformer extends BaseModelSpecTransformer {
     }
     _transformLabelSpec(spec) {}
     _addMarkLabelSpec(spec, markName, labelSpecKey = "label", styleHandlerName = "initLabelMarkStyle", hasAnimation, head) {
-        const labelSpec = null == spec ? void 0 : spec[labelSpecKey];
-        (null == labelSpec ? void 0 : labelSpec.visible) && this.addLabelSpec(markName, Object.assign(Object.assign({
-            animation: null != hasAnimation ? hasAnimation : spec.animation
-        }, labelSpec), {
-            getStyleHandler: series => {
-                var _a;
-                return null === (_a = series[styleHandlerName]) || void 0 === _a ? void 0 : _a.bind(series);
-            }
-        }), head);
+        if (!spec) return;
+        array(spec[labelSpecKey]).forEach((labelSpec => {
+            labelSpec && labelSpec.visible && this.addLabelSpec(markName, Object.assign(Object.assign({
+                animation: null != hasAnimation ? hasAnimation : spec.animation
+            }, labelSpec), {
+                getStyleHandler: series => {
+                    var _a;
+                    return null === (_a = series[styleHandlerName]) || void 0 === _a ? void 0 : _a.bind(series);
+                }
+            }), head);
+        }));
     }
     _getDefaultSpecFromChart(chartSpec) {
         var _a;
@@ -46,5 +50,26 @@ export class BaseSeriesSpecTransformer extends BaseModelSpecTransformer {
         return isValid(outerRadius) && (spec.outerRadius = outerRadius), isValid(innerRadius) && (spec.innerRadius = innerRadius), 
         isValid(direction) && (spec.direction = direction), Object.keys(spec).length > 0 ? spec : void 0;
     }
+    _mergeThemeToSpec(spec, chartSpec) {
+        const theme = this._theme;
+        if (this._shouldMergeThemeToSpec()) {
+            const specFromChart = this._getDefaultSpecFromChart(chartSpec), merge = originalSpec => {
+                const result = mergeSpec({}, theme, specFromChart, originalSpec), labelTheme = theme.label;
+                return labelTheme && isObject(labelTheme) && isArray(result.label) && (result.label = result.label.map((label => mergeSpec({}, labelTheme, label)))), 
+                result;
+            };
+            return isArray(spec) ? {
+                spec: spec.map((specItem => merge(specItem))),
+                theme: theme
+            } : {
+                spec: merge(spec),
+                theme: theme
+            };
+        }
+        return {
+            spec: spec,
+            theme: theme
+        };
+    }
 }
 //# sourceMappingURL=base-series-transformer.js.map

package/esm/series/base/base-series-transformer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/base/base-series-transformer.ts"],"names":[],"mappings":"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","file":"base-series-transformer.js","sourcesContent":["import type { IChartSpecInfo } from '../../chart/interface';\nimport type { ILabelSpec, TransformedLabelSpec } from '../../component/label';\nimport type { IBaseModelSpecTransformerResult } from '../../model/interface';\nimport { BaseModelSpecTransformer } from '../../model/base-model-transformer';\nimport type { ISeriesSpec } from '../../typings';\nimport { array, get, isValid, mergeSpec, transformSeriesThemeToMerge } from '../../util';\nimport type { SeriesMarkNameEnum } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport type { ISeries } from '../interface';\nimport { getDirectionFromSeriesSpec } from '../util/spec';\n\nexport class BaseSeriesSpecTransformer<T extends ISeriesSpec, K> extends BaseModelSpecTransformer<T, K> {\n  markLabelSpec: Partial<Record<SeriesMarkNameEnum, TransformedLabelSpec[]>> = {};\n\n  getLabelSpec(markName: string) {\n    return this.markLabelSpec[markName];\n  }\n\n  setLabelSpec(markName: string, label: TransformedLabelSpec | TransformedLabelSpec[]) {\n    this.markLabelSpec[markName] = array(label);\n  }\n\n  addLabelSpec(markName: string, label: TransformedLabelSpec, head = false) {\n    if (!this.markLabelSpec[markName]) {\n      this.markLabelSpec[markName] = [];\n    }\n    if (head) {\n      // 排序靠前的 label 优先布局，尽可能避免碰撞隐藏\n      this.markLabelSpec[markName].unshift(label);\n    } else {\n      this.markLabelSpec[markName].push(label);\n    }\n  }\n\n  getTheme(spec: T, chartSpec: any): K {\n    const direction = getDirectionFromSeriesSpec(spec);\n    const chartTheme = this._option?.getTheme();\n    const { markByName, mark } = chartTheme;\n    const type = this._option.type;\n    const theme = transformSeriesThemeToMerge(get(chartTheme, `series.${type}`), type, mark, markByName);\n    const themeWithDirection = transformSeriesThemeToMerge(\n      get(chartTheme, `series.${type}_${direction}`),\n      `${type}_${direction}`,\n      mark,\n      markByName\n    );\n    return mergeSpec({}, theme, themeWithDirection);\n  }\n\n  /** 不建议重写该方法，最好重写对应子步骤 */\n  transformSpec(spec: T, chartSpec: any, chartSpecInfo?: IChartSpecInfo): IBaseModelSpecTransformerResult<T, K> {\n    const result = super.transformSpec(spec, chartSpec, chartSpecInfo);\n    this._transformLabelSpec(result.spec);\n    return {\n      ...result,\n      markLabelSpec: this.markLabelSpec\n    };\n  }\n\n  protected _transformLabelSpec(spec: T) {\n    // empty\n  }\n\n  protected _addMarkLabelSpec<V extends ISeries = ISeries>(\n    spec: T,\n    markName: SeriesMarkNameEnum,\n    labelSpecKey: keyof T = 'label' as any,\n    styleHandlerName: keyof V = 'initLabelMarkStyle',\n    hasAnimation?: boolean,\n    head?: boolean\n  ): void {\n    const labelSpec = spec?.[labelSpecKey] as ILabelSpec;\n    if (labelSpec?.visible) {\n      this.addLabelSpec(\n        markName,\n        {\n          animation: hasAnimation ?? spec.animation,\n          ...labelSpec,\n          getStyleHandler: (series: V) => (series[styleHandlerName] as any)?.bind(series)\n        } as TransformedLabelSpec,\n        head\n      );\n    }\n  }\n\n  protected _getDefaultSpecFromChart(chartSpec: any): any {\n    const spec = (super._getDefaultSpecFromChart(chartSpec) as any) ?? {};\n    const { outerRadius, innerRadius, direction } = chartSpec;\n    if (isValid(outerRadius)) {\n      spec.outerRadius = outerRadius;\n    }\n    if (isValid(innerRadius)) {\n      spec.innerRadius = innerRadius;\n    }\n\n    if (isValid(direction)) {\n      spec.direction = direction;\n    }\n\n    return Object.keys(spec).length > 0 ? spec : undefined;\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/base/base-series-transformer.ts"],"names":[],"mappings":"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","file":"base-series-transformer.js","sourcesContent":["import { isObject } from '@visactor/vutils';\nimport type { IChartSpecInfo } from '../../chart/interface';\nimport type { ILabelSpec, TransformedLabelSpec } from '../../component/label';\nimport type { IBaseModelSpecTransformerResult } from '../../model/interface';\nimport { BaseModelSpecTransformer } from '../../model/base-model-transformer';\nimport type { ISeriesSpec } from '../../typings';\nimport { array, get, isArray, isValid, mergeSpec, transformSeriesThemeToMerge } from '../../util';\nimport type { SeriesMarkNameEnum } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport type { ISeries } from '../interface';\nimport { getDirectionFromSeriesSpec } from '../util/spec';\n\nexport class BaseSeriesSpecTransformer<T extends ISeriesSpec, K> extends BaseModelSpecTransformer<T, K> {\n  markLabelSpec: Partial<Record<SeriesMarkNameEnum, TransformedLabelSpec[]>> = {};\n\n  getLabelSpec(markName: string) {\n    return this.markLabelSpec[markName];\n  }\n\n  setLabelSpec(markName: string, label: TransformedLabelSpec | TransformedLabelSpec[]) {\n    this.markLabelSpec[markName] = array(label);\n  }\n\n  addLabelSpec(markName: string, label: TransformedLabelSpec, head = false) {\n    if (!this.markLabelSpec[markName]) {\n      this.markLabelSpec[markName] = [];\n    }\n    if (head) {\n      // 排序靠前的 label 优先布局，尽可能避免碰撞隐藏\n      this.markLabelSpec[markName].unshift(label);\n    } else {\n      this.markLabelSpec[markName].push(label);\n    }\n  }\n\n  getTheme(spec: T, chartSpec: any): K {\n    const direction = getDirectionFromSeriesSpec(spec);\n    const chartTheme = this._option?.getTheme();\n    const { markByName, mark } = chartTheme;\n    const type = this._option.type;\n    const theme = transformSeriesThemeToMerge(get(chartTheme, `series.${type}`), type, mark, markByName);\n    const themeWithDirection = transformSeriesThemeToMerge(\n      get(chartTheme, `series.${type}_${direction}`),\n      `${type}_${direction}`,\n      mark,\n      markByName\n    );\n    return mergeSpec({}, theme, themeWithDirection);\n  }\n\n  /** 不建议重写该方法，最好重写对应子步骤 */\n  transformSpec(spec: T, chartSpec: any, chartSpecInfo?: IChartSpecInfo): IBaseModelSpecTransformerResult<T, K> {\n    const result = super.transformSpec(spec, chartSpec, chartSpecInfo);\n    this._transformLabelSpec(result.spec);\n    return {\n      ...result,\n      markLabelSpec: this.markLabelSpec\n    };\n  }\n\n  protected _transformLabelSpec(spec: T) {\n    // empty\n  }\n\n  protected _addMarkLabelSpec<V extends ISeries = ISeries>(\n    spec: T,\n    markName: SeriesMarkNameEnum,\n    labelSpecKey: keyof T = 'label' as any,\n    styleHandlerName: keyof V = 'initLabelMarkStyle',\n    hasAnimation?: boolean,\n    head?: boolean\n  ): void {\n    if (!spec) {\n      return;\n    }\n    const labels = array<ILabelSpec>(spec[labelSpecKey]);\n    labels.forEach(labelSpec => {\n      if (labelSpec && labelSpec.visible) {\n        this.addLabelSpec(\n          markName,\n          {\n            animation: hasAnimation ?? spec.animation,\n            ...labelSpec,\n            getStyleHandler: (series: V) => (series[styleHandlerName] as any)?.bind(series)\n          } as TransformedLabelSpec,\n          head\n        );\n      }\n    });\n  }\n\n  protected _getDefaultSpecFromChart(chartSpec: any): any {\n    const spec = (super._getDefaultSpecFromChart(chartSpec) as any) ?? {};\n    const { outerRadius, innerRadius, direction } = chartSpec;\n    if (isValid(outerRadius)) {\n      spec.outerRadius = outerRadius;\n    }\n    if (isValid(innerRadius)) {\n      spec.innerRadius = innerRadius;\n    }\n\n    if (isValid(direction)) {\n      spec.direction = direction;\n    }\n\n    return Object.keys(spec).length > 0 ? spec : undefined;\n  }\n\n  protected _mergeThemeToSpec(spec: T, chartSpec: any): { spec: T; theme: K } {\n    const theme = this._theme;\n\n    if (this._shouldMergeThemeToSpec()) {\n      const specFromChart = this._getDefaultSpecFromChart(chartSpec);\n      // this._originalSpec + specFromChart + this._theme = this._spec\n      const merge = (originalSpec: any) => {\n        const result = mergeSpec({}, theme, specFromChart, originalSpec);\n        const labelTheme = (theme as any).label;\n        if (labelTheme && isObject(labelTheme) && isArray(result.label)) {\n          result.label = result.label.map((label: ILabelSpec) => mergeSpec({}, labelTheme, label));\n        }\n        return result;\n      };\n\n      if (isArray(spec)) {\n        return {\n          spec: spec.map(specItem => merge(specItem)) as unknown as T,\n          theme\n        };\n      }\n\n      return {\n        spec: merge(spec),\n        theme\n      };\n    }\n    return { spec, theme };\n  }\n}\n"]}

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

@@ -4,7 +4,7 @@ import type { IRegion } from '../../region/interface';
 import type { IMark } from '../../mark/interface';
 import type { CoordinateType, IInvalidType, IPoint, DataKeyType, Datum, Maybe, ISeriesSpec, IGroup, ILayoutType, ILayoutPoint, ILayoutRect } from '../../typings';
 import { BaseModel } from '../../model/base-model';
-import type { ISeriesOption, ISeries, ISeriesMarkInitOption, ISeriesStackData, ISeriesTooltipHelper, SeriesMarkMap, ISeriesMarkInfo, ISeriesSpecInfo } from '../interface';
+import type { ISeriesOption, ISeries, ISeriesMarkInitOption, ISeriesStackData, ISeriesTooltipHelper, SeriesMarkMap, ISeriesMarkInfo, ISeriesSpecInfo, ISeriesStackDataLeaf, ISeriesStackDataMeta } from '../interface';
 import type { IModelEvaluateOption, IModelRenderOption } from '../../model/interface';
 import type { AddVChartPropertyContext } from '../../data/transforms/add-property';
 import type { StatisticOperations } from '../../data/transforms/dimension-statistics';
@@ -130,6 +130,7 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     protected _updateExtensionMarkSpec(lastSpec?: any): void;
     getStackData(): ISeriesStackData;
     protected _parseDefaultInteractionConfig(mainMarks?: IMark[]): ({
+        vchartState: STATE_VALUE_ENUM;
         seriesId: number;
         regionId: number;
         selector: string[];
@@ -142,6 +143,7 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
         state?: undefined;
         isMultiple?: undefined;
     } | {
+        vchartState: STATE_VALUE_ENUM;
         type: string;
         seriesId: number;
         regionId: number;
@@ -225,4 +227,5 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     protected _getInvalidConnectType(): "none" | "zero" | "connect";
     protected _getInvalidDefined: (datum: Datum) => boolean;
     protected _getRelatedComponentSpecInfo(specKey: string): import("../../model/interface").IModelSpecInfo<any>[];
+    protected _forEachStackGroup(callback: (node: ISeriesStackDataLeaf) => void, node?: ISeriesStackDataMeta): void;
 }

package/esm/series/base/base-series.js

@@ -415,6 +415,7 @@ export class BaseSeries extends BaseModel {
         finalSelectSpec = mergeSpec(finalSelectSpec, selectSpec));
         const res = [];
         return finalHoverSpec.enable && res.push({
+            vchartState: STATE_VALUE_ENUM.STATE_HOVER,
             seriesId: this.id,
             regionId: this._region.id,
             selector: mainMarks.map((mark => `#${mark.getProductId()}`)),
@@ -424,6 +425,7 @@ export class BaseSeries extends BaseModel {
             blurState: STATE_VALUE_ENUM.STATE_HOVER_REVERSE,
             highlightState: STATE_VALUE_ENUM.STATE_HOVER
         }), finalSelectSpec.enable && res.push({
+            vchartState: STATE_VALUE_ENUM.STATE_SELECTED,
             type: "element-select",
             seriesId: this.id,
             regionId: this._region.id,
@@ -637,7 +639,7 @@ export class BaseSeries extends BaseModel {
     onMarkTreePositionUpdate(marks) {}
     _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, depend: depend, progressive: progressive, support3d: support3d = this._spec.support3d || !!this._spec.zField, morph: morph = !1, customShape: customShape, stateSort: stateSort} = option, m = super._createMark(markInfo, {
+        const {key: key, groupKey: groupKey, skipBeforeLayouted: skipBeforeLayouted, themeSpec: themeSpec = {}, markSpec: markSpec, dataView: dataView, dataProductId: dataProductId, parent: parent, isSeriesMark: isSeriesMark, depend: depend, progressive: progressive, support3d: support3d = this._spec.support3d || !!this._spec.zField, morph: morph = !1, clip: clip, customShape: customShape, stateSort: stateSort} = option, m = super._createMark(markInfo, {
             key: null != key ? key : this._getDataIdKey(),
             support3d: support3d,
             seriesId: this.id,
@@ -656,7 +658,7 @@ export class BaseSeries extends BaseModel {
             m.setMorphElementKey(null !== (_d = null === (_c = spec.morph) || void 0 === _c ? void 0 : _c.morphElementKey) && void 0 !== _d ? _d : option.defaultMorphElementKey), 
             isNil(progressive) || m.setProgressiveConfig(progressive), isNil(groupKey) || m.setGroupKey(groupKey), 
             customShape && m.setCustomizedShapeCallback(customShape), stateSort && m.setStateSortCallback(stateSort), 
-            this.initMarkStyleWithSpec(m, mergeSpec({}, themeSpec, markSpec || spec[m.name]));
+            clip && m.setClip(clip), this.initMarkStyleWithSpec(m, mergeSpec({}, themeSpec, markSpec || spec[m.name]));
         }
         return m;
     }
@@ -713,6 +715,12 @@ export class BaseSeries extends BaseModel {
         const specIndex = this.getSpecIndex(), relatedComponent = null === (_a = this._option.getSpecInfo().component[specKey]) || void 0 === _a ? void 0 : _a.filter((componentInfo => componentInfo.seriesIndexes.includes(specIndex)));
         return null != relatedComponent ? relatedComponent : [];
     }
+    _forEachStackGroup(callback, node) {
+        var _a, _b;
+        (node = null != node ? node : null === (_a = this._viewStackData) || void 0 === _a ? void 0 : _a.latestData) && ((null === (_b = node.values) || void 0 === _b ? void 0 : _b.length) ? callback(node) : node.nodes && Object.values(node.nodes).forEach((n => {
+            this._forEachStackGroup(callback, n);
+        })));
+    }
 }
 
 BaseSeries.mark = baseSeriesMark, BaseSeries.transformerConstructor = BaseSeriesSpecTransformer;