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

package/cjs/typings/visual.d.ts

@@ -6,10 +6,11 @@ import type { ScaleType } from './scale';
 import type { ShapeType } from './shape';
 import type { IPoint } from './coordinate';
 import type { IAttributeOpt, IModelMarkAttributeContext } from '../compile/mark';
-import type { Datum, StringOrNumber } from './common';
+import type { Datum } from './common';
 import type { IPadding } from '@visactor/vutils';
 import type { IColorKey } from '../theme/color-scheme/interface';
-import type { IRepeatType, TextAlignType, TextBaselineType, IRichTextCharacter } from '@visactor/vrender-core';
+import type { ITokenKey } from '../theme/token';
+import type { IRepeatType, TextAlignType, TextBaselineType, IRichTextAttribute, IGraphicStyle } from '@visactor/vrender-core';
 export interface IVisualSpecBase<D, T> {
     type: ScaleType;
     domain: D[];
@@ -80,6 +81,7 @@ export interface ICommonSpec {
     texturePadding?: number;
     outerBorder?: IBorder;
     innerBorder?: IBorder;
+    html?: IMarkHtmlSpec;
     [key: string]: any;
 }
 export interface IFillMarkSpec extends ICommonSpec {
@@ -87,6 +89,7 @@ export interface IFillMarkSpec extends ICommonSpec {
     fillOpacity?: number;
     background?: string | HTMLImageElement | HTMLCanvasElement | null;
 }
+export type IMarkHtmlSpec = Partial<IGraphicStyle['html']>;
 export interface ISymbolMarkSpec extends IFillMarkSpec {
     dx?: number;
     dy?: number;
@@ -116,11 +119,10 @@ export interface IRuleMarkSpec extends ILineMarkSpec {
     y1?: number;
 }
 export interface ITextMarkSpec extends IFillMarkSpec {
-    type?: 'html' | 'rich' | 'text';
-    text?: StringOrNumber | string[] | IRichTextCharacter[] | Function;
+    text?: string | number | string[] | number[];
     dx?: number;
     dy?: number;
-    fontSize?: number;
+    fontSize?: number | ITokenKey;
     textAlign?: TextAlign;
     textBaseline?: TextBaseLine;
     fontFamily?: string;
@@ -129,13 +131,17 @@ export interface ITextMarkSpec extends IFillMarkSpec {
     maxLineWidth?: number;
     ellipsis?: string;
     suffixPosition?: 'start' | 'end' | 'middle';
-    lineBreak?: string;
     underline?: boolean;
     lineThrough?: boolean;
-    lineHeight?: number | string;
+    lineHeight?: number | string | ITokenKey;
     poptip?: PopTipAttributes;
     direction?: 'horizontal' | 'vertical';
 }
+export type IRichTextMarkSpec = IRichTextAttribute & IFillMarkSpec & {
+    type: 'rich';
+    text: IRichTextAttribute['textConfig'];
+};
+export type IComposedTextMarkSpec = ITextMarkSpec | IRichTextMarkSpec;
 export type IPositionedTextMarkSpec = Omit<ITextMarkSpec, 'align' | 'textAlign' | 'baseline' | 'textBaseline'>;
 export interface IRectMarkSpec extends IFillMarkSpec {
     cornerRadius?: number | number[];
@@ -201,6 +207,8 @@ export interface IArcMarkSpec extends IFillMarkSpec {
     outerRadius?: number;
     innerRadius?: number;
     cornerRadius?: number;
+    innerPadding?: number;
+    outerPadding?: number;
     centerOffset?: number;
     cap?: boolean | [boolean, boolean];
     autoCapConical?: boolean;
@@ -208,10 +216,6 @@ export interface IArcMarkSpec extends IFillMarkSpec {
 export interface IArc3dMarkSpec extends IArcMarkSpec {
     height?: number;
 }
-export interface IProgressArcMarkSpec extends IArcMarkSpec {
-    innerPadding?: number;
-    outerPadding?: number;
-}
 export interface ICellMarkSpec extends ISymbolMarkSpec {
     padding?: number | number[] | IPadding;
 }

package/cjs/typings/visual.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/typings/visual.ts"],"names":[],"mappings":"","file":"visual.js","sourcesContent":["import type { PopTipAttributes } from '@visactor/vrender-components';\nimport type { DataView } from '@visactor/vdataset';\nimport type { Cursor } from './cursor';\nimport type { InterpolateType } from './interpolate';\nimport type { ScaleType } from './scale';\nimport type { ShapeType } from './shape';\nimport type { IPoint } from './coordinate';\nimport type { IAttributeOpt, IModelMarkAttributeContext } from '../compile/mark';\nimport type { Datum, StringOrNumber } from './common';\nimport type { IPadding } from '@visactor/vutils';\nimport type { IColorKey } from '../theme/color-scheme/interface';\nimport type { IRepeatType, TextAlignType, TextBaselineType, IRichTextCharacter } from '@visactor/vrender-core';\n\n// 基础的visual 对应 scale 的属性\nexport interface IVisualSpecBase<D, T> {\n  /**\n   * type of scale\n   */\n  type: ScaleType;\n  /**\n   * will set to scale.domain, it means input of scale\n   */\n  domain: D[];\n  /**\n   * will set to scale.range, it means output of scale\n   */\n  range: T[];\n  /**\n   * will set to scale.specified if scale support, as a key-value pair matching capability\n   * @since 1.1.0\n   */\n  specified?: { [key: string]: unknown };\n}\n// 用来给用户进行mark.style上的映射配置。所以要配置数据维度\nexport interface IVisualSpecStyle<D, T> extends IVisualSpecBase<D, T> {\n  field?: string;\n}\n\nexport type IDataDomainSpec = {\n  dataId: string;\n  fields: string[];\n};\n\n// 用来提供给用户进行 scale 配置 所以名字是必选的 对用户配置\nexport interface IVisualSpecScale<D, T> extends Omit<IVisualSpecBase<D, T>, 'domain'> {\n  id: string;\n  domain:\n    | IVisualSpecBase<D, T>['domain']\n    // 使用数据的字段值，如果 scale 是连续的，就取区间，如果是离散的就使用 values 。\n    // 不考虑图表内的交互等数据筛选，这里只用原始数据的统计信息\n    | IDataDomainSpec[];\n}\n// 对用户配置\nexport type IVisual<D = any, R = any> = IVisualSpecStyle<D, R> | IVisualScale;\n\nexport interface IVisualScale {\n  /**\n   * 对应 IVisualSpecScale 的用户配置 scale-id\n   */\n  scale: string;\n  /**\n   * 指定参与映射的数据字段\n   */\n  field?: string;\n  /**\n   * 当用户指定 field 后，用该属性来控制值域。\n   * @default 'none'\n   */\n  changeDomain?: 'none' | 'replace' | 'expand';\n}\n\nexport type FunctionType<T> = (\n  datum: Datum,\n  context: IModelMarkAttributeContext,\n  opt?: IAttributeOpt,\n  source?: DataView\n) => T;\nexport type ValueType<T> = T;\nexport type VisualType<T> = ValueType<T> | FunctionType<T> | IVisual<unknown, T>;\n\nexport type TextureType =\n  | 'circle'\n  | 'dimond'\n  | 'rect'\n  | 'vertical-line'\n  | 'horizontal-line'\n  | 'bias-lr'\n  | 'bias-rl'\n  | 'grid';\n\n/**\n * style格式转换\n */\nexport type ConvertToMarkStyleSpec<T extends Record<string, any>> = {\n  [key in keyof T]: VisualType<T[key]>;\n};\n\n/**\n * border\n */\n\nexport interface IBorder {\n  distance: number | string;\n  stroke?: string | IGradient;\n  strokeOpacity?: number;\n  lineWidth?: number;\n  lineDash?: number[];\n  lineDashOffset?: number;\n}\n\nexport interface ICommonSpec {\n  visible?: boolean;\n  x?: number;\n  y?: number;\n  z?: number;\n  /**\n   * @todo 隔离主题和 spec 配置\n   * IColorKey 类型只适用于主题\n   */\n  stroke?: string | IGradient | false | (number | boolean)[] | IColorKey;\n  strokeOpacity?: number;\n  opacity?: number;\n  lineWidth?: number;\n  lineDash?: number[];\n  lineDashOffset?: number;\n\n  cursor?: Cursor;\n  zIndex?: number;\n  angle?: number;\n  anchor?: [number, number];\n\n  // 缩放属性\n  scaleX?: number;\n  scaleY?: number;\n  /**\n   * 图形缩放中心\n   * @since 1.4.0\n   * 可以配置固定坐标，例如 [100, 100]；或者百分比坐标，例如 ['50%', '50%']，代表以图元中心为缩放中心\n   * */\n  scaleCenter?: [number | string, number | string];\n\n  // 3d旋转的属性\n  beta?: number;\n  alpha?: number;\n  anchor3d?: [number, number];\n\n  /**\n   * 选择模式，精确模式，粗糙模式（包围盒模式），自定义模式\n   */\n  pickMode?: 'accurate' | 'imprecise' | 'custom';\n  boundsMode?: 'accurate' | 'imprecise';\n\n  /**\n   * 用于扩展描边的拾取范围，为 0 就是默认线宽，正数就加宽，负数就减宽\n   * @default 0\n   * @since 1.7.3\n   */\n  pickStrokeBuffer?: number;\n\n  // 以下是纹理相关的属性\n  /**\n   * 纹理的类型\n   */\n  texture?: TextureType | string;\n  /**\n   * 纹理的颜色\n   */\n  textureColor?: string;\n  /**\n   * 纹理单元的大小\n   */\n  textureSize?: number; // 纹理大小\n  /**\n   * 纹理之间空隙的大小\n   */\n  texturePadding?: number;\n\n  /**\n   * 外边框\n   */\n  outerBorder?: IBorder;\n  /**\n   * 内边框\n   */\n  innerBorder?: IBorder;\n\n  [key: string]: any;\n}\n\nexport interface IFillMarkSpec extends ICommonSpec {\n  /**\n   * @todo 隔离主题和 spec 配置\n   * IColorKey 类型只适用于主题\n   */\n  fill?: VisualType<string> | IGradient | false | IColorKey;\n  fillOpacity?: number;\n  // TODO：waite VRender support this api\n  // backgroundMode: number; // 填充模式（与具体图元有关）\n  // can coexist with fill\n  background?: string | HTMLImageElement | HTMLCanvasElement | null;\n}\n\n// export interface IFillImageMarkSpec {\n//   fillImage?: string;\n//   repeatX?: RepeatXYType;\n//   repeatY?: RepeatXYType;\n//   imageOrigin?: ImageOriginType;\n// }\n\nexport interface ISymbolMarkSpec extends IFillMarkSpec {\n  dx?: number;\n  dy?: number;\n  size?: number | number[];\n  /** 对外声明使用shape，vrender图形属性对应的是shape */\n  shape?: ShapeType | string;\n  /** FIXME:  vrender Symbol接收的图形属性，暂时都申明一下 */\n  symbolType?: ShapeType | string;\n  scaleX?: number;\n  scaleY?: number;\n}\n\n// lineMark 和 areaMark 共同配置\nexport interface ILineLikeMarkSpec extends IFillMarkSpec {\n  curveType?: InterpolateType;\n  defined?: boolean;\n}\n\nexport interface IAreaMarkSpec extends ILineLikeMarkSpec {\n  x1?: number;\n  y1?: number;\n\n  orient?: 'horizontal' | 'vertical';\n}\n\nexport interface ILineMarkSpec extends ILineLikeMarkSpec {\n  lineCap?: LineStrokeCap;\n  lineJoin?: LineStrokeJoin;\n  miterLimit?: number;\n  strokeBoundsBuffer?: number;\n}\n\nexport interface IRuleMarkSpec extends ILineMarkSpec {\n  x1?: number;\n  y1?: number;\n}\n\nexport interface ITextMarkSpec extends IFillMarkSpec {\n  /**\n   * 文字类型\n   * 可选，'html', 'rich', 'text'\n   * @default 'text'\n   */\n  type?: 'html' | 'rich' | 'text';\n  /**\n   * 文字内容\n   */\n  text?: StringOrNumber | string[] | IRichTextCharacter[] | Function;\n  /**\n   * x 方向偏移\n   */\n  dx?: number;\n  /**\n   * y 方向偏移\n   */\n  dy?: number;\n  /**\n   * 字号\n   */\n  fontSize?: number;\n  /**\n   * 文字对齐方式\n   */\n  textAlign?: TextAlign;\n  /**\n   * 文字居中方式\n   */\n  textBaseline?: TextBaseLine;\n  /**\n   * 字体\n   */\n  fontFamily?: string;\n  /**\n   * 字重\n   */\n  fontWeight?: FontWeight;\n  /**\n   * 字体样式\n   */\n  fontStyle?: FontStyle;\n  /**\n   * 文字的最大长度\n   */\n  maxLineWidth?: number;\n  /**\n   * 文字超出 maxLineWidth 后的省略符\n   */\n  ellipsis?: string;\n  /**\n   * 文本省略的位置，默认尾部省略\n   * 1. 'start' 文字首部省略\n   * 2. 'middle' 文本中间省略\n   * 3. 'end' 文本尾部省略\n   * @default 'end'\n   * @since 1.7.3\n   */\n  suffixPosition?: 'start' | 'end' | 'middle';\n  // TODO: 这些不是常规的文字mark属性，待确认需求背景\n  lineBreak?: string;\n  /**\n   * 下划线\n   */\n  underline?: boolean;\n  /**\n   * 中划线\n   */\n  lineThrough?: boolean;\n  /**\n   * 行高（1.3.1 版本新增字符串类型表示比例值，如\"150%\"）\n   * @since 1.3.1\n   */\n  lineHeight?: number | string;\n  /**\n   * poptip 相关配置\n   */\n  poptip?: PopTipAttributes;\n  /**\n   * 文本的排布方向，如果需要文本纵向排布，可以配置为 'vertical'\n   * @default 'horizontal'\n   */\n  direction?: 'horizontal' | 'vertical';\n}\n\nexport type IPositionedTextMarkSpec = Omit<ITextMarkSpec, 'align' | 'textAlign' | 'baseline' | 'textBaseline'>;\n\nexport interface IRectMarkSpec extends IFillMarkSpec {\n  /**\n   * 圆角配置。\n   * 1. 如果传入数值，则统一为四个角设置圆角\n   * 2. 如果传入数组，则分别为 [上左, 上右, 下右, 下左]\n   */\n  cornerRadius?: number | number[];\n  width?: number;\n  height?: number;\n  x1?: number;\n  y1?: number;\n}\n\n// 3d rect，支持length表示长宽高中的长属性（深度属性）\nexport interface IRect3dMarkSpec extends IRectMarkSpec {\n  length?: number;\n}\n\nexport interface IBoxPlotMarkSpec extends ICommonSpec {\n  /**\n   * box描边宽度\n   */\n  lineWidth?: number;\n  /**\n   * box宽度\n   */\n  boxWidth?: number;\n  /**\n   * 最大最小值宽度\n   */\n  shaftWidth?: number;\n  /**\n   * 中轴线类型\n   */\n  shaftShape?: BoxPlotShaftShape;\n  /**\n   * 盒子填充颜色，为空则不填充\n   */\n  boxFill?: string;\n  // /**\n  //  * 描边颜色\n  //  */\n  // stroke?: string;\n  /**\n   * 中轴线透明度，仅当shaftType=bar时生效\n   */\n  shaftFillOpacity?: number;\n\n  min?: (datum: Datum) => number;\n  q1?: (datum: Datum) => number;\n  median?: (datum: Datum) => number;\n  q3?: (datum: Datum) => number;\n  max?: (datum: Datum) => number;\n}\n\nexport interface IRippleMarkSpec extends ICommonSpec {\n  /**\n   * 波纹密度ripple\n   * ripple 取值范为[0,1]\n   */\n  ripple?: number;\n  /**\n   * 水波纹最大半径\n   */\n  size?: number;\n}\n\nexport interface ILiquidMarkSpec extends ICommonSpec {\n  /**\n   * 波浪的变化状态，范围为 [0, 1]\n   */\n  wave?: number;\n}\n\nexport interface ILiquidOutlineSpec extends ISymbolMarkSpec {\n  lineWidth: number;\n}\n\nexport interface IOutlierMarkSpec {\n  //异常点填充颜色\n  fill?: string;\n  //异常点大小\n  size?: number;\n}\n\nexport interface IPathMarkSpec extends IFillMarkSpec {\n  path?: string;\n  // TODO: 该属性后续可能会删除，未定\n  // 平滑缩放，不然会发生跳变，在地图交互场景需要配置为true；常规path缩放不需要\n  smoothScale?: boolean;\n}\n\nexport interface ILinkPathMarkSpec extends IFillMarkSpec {\n  x0?: number;\n  y0?: number;\n  x1?: number;\n  y1?: number;\n  thickness?: number;\n  curvature?: number;\n  /** round all the coordinates */\n  round?: boolean;\n  /** the ratio of normal style path */\n  ratio?: number;\n  align?: 'start' | 'end' | 'center';\n  pathType?: 'line' | 'smooth' | 'polyline';\n  endArrow?: boolean;\n  startArrow?: boolean;\n  backgroundStyle?: any;\n  direction?: 'horizontal' | 'vertical' | 'LR' | 'RL' | 'TB' | 'BL' | 'radial';\n}\n\nexport interface IArcMarkSpec extends IFillMarkSpec {\n  startAngle?: number;\n  endAngle?: number;\n  padAngle?: number;\n\n  outerRadius?: number;\n  innerRadius?: number;\n  cornerRadius?: number;\n\n  /** arc的中心点偏移距离 */\n  centerOffset?: number;\n\n  /** arc 的 roundCap 属性，即圆角是否伸出 startAngle 和 endAngle 之外 */\n  cap?: boolean | [boolean, boolean];\n  /** arc 在 roundCap 打开且应用环形渐变时是否对 cap 部分生效 */\n  autoCapConical?: boolean;\n}\n\n// 3d arc，有高度配置\nexport interface IArc3dMarkSpec extends IArcMarkSpec {\n  height?: number;\n}\n\nexport interface IProgressArcMarkSpec extends IArcMarkSpec {\n  /** 进度条内侧 padding（接受负值） */\n  innerPadding?: number;\n  /** 进度条外侧 padding（接受负值） */\n  outerPadding?: number;\n}\n\nexport interface ICellMarkSpec extends ISymbolMarkSpec {\n  padding?: number | number[] | IPadding;\n}\n\nexport interface IGroupMarkSpec extends IFillMarkSpec {\n  clip?: boolean;\n  width?: number;\n  height?: number;\n  /**\n   * 圆角配置。\n   * 1. 如果传入数值，则统一为四个角设置圆角\n   * 2. 如果传入数组，则分别为 [上左, 上右, 下右, 下左]\n   */\n  cornerRadius?: number | number[];\n}\n\nexport interface IPolygonMarkSpec extends ICommonSpec, IFillMarkSpec {\n  points?: IPoint[];\n  /**\n   * 圆角配置，支持数组配置，数组的顺序同组成 polygon 的顺序对应\n   */\n  cornerRadius?: number | number[];\n  scaleX?: number;\n  scaleY?: number;\n}\n\nexport interface IPyramid3dMarkSpec extends IPolygonMarkSpec {\n  // 只能有4个顶点\n  points?: IPoint[];\n}\n\n/**\n * ImageFill\n */\nexport type RepeatType = 'no-repeat' | 'repeat-x' | 'repeat-y' | 'repeat';\nexport type RepeatXYType = 'no-repeat' | 'repeat' | 'stretch';\nexport type ImageOriginType = 'top' | 'bottom';\n\n/**\n *  gradient\n */\nexport type GradientPropValue<T> = ValueType<T> | FunctionType<T>;\nexport type GradientStop = {\n  offset: GradientPropValue<number>;\n  color?: GradientPropValue<string>;\n  opacity?: number;\n};\nexport interface IGradientLinear {\n  x0?: GradientPropValue<number>;\n  y0?: GradientPropValue<number>;\n  x1?: GradientPropValue<number>;\n  y1?: GradientPropValue<number>;\n  stops: GradientStop[];\n  gradient: 'linear';\n}\n\nexport interface IGradientRadial {\n  r0?: GradientPropValue<number>;\n  x0?: GradientPropValue<number>;\n  y0?: GradientPropValue<number>;\n  x1?: GradientPropValue<number>;\n  y1?: GradientPropValue<number>;\n  r1?: GradientPropValue<number>;\n  stops: GradientStop[];\n  gradient: 'radial';\n}\n\nexport interface IGradientConical {\n  x?: GradientPropValue<number>;\n  y?: GradientPropValue<number>;\n  startAngle?: GradientPropValue<number>;\n  endAngle?: GradientPropValue<number>;\n  stops: GradientStop[];\n  gradient: 'conical';\n}\n\nexport type GradientType = 'linear' | 'radial' | 'conical';\nexport type IGradient = IGradientLinear | IGradientRadial | IGradientConical;\n\nexport type LineStrokeCap = 'butt' | 'round' | 'square';\nexport type LineStrokeJoin = 'arcs' | 'bevel' | 'miter' | 'miter-clip' | 'round';\n\nexport type BoxPlotShaftShape = 'line' | 'bar';\n/**\n *  threshold\n */\nexport interface IThresholdStyle extends IVisualSpecStyle<number, string> {\n  domain: number[];\n  field: string;\n  range: string[];\n  type: 'threshold';\n}\n\n// FIXME: For some tool methods that need to use common configuration types\nexport interface IUnknownMarkSpec extends ICommonSpec {\n  [key: string]: unknown;\n}\n\nexport interface IImageMarkSpec extends IFillMarkSpec {\n  /**\n   * 圆角配置。\n   * 1. 如果传入数值，则统一为四个角设置圆角\n   * 2. 如果传入数组，则分别为 [上左, 上右, 下右, 下左]\n   */\n  cornerRadius?: number | number[];\n  width?: number;\n  height?: number;\n  repeatX?: IRepeatType;\n  repeatY?: IRepeatType;\n  image: string | HTMLImageElement | HTMLCanvasElement;\n}\n\n/**\n * text\n */\nexport type TextAlign = TextAlignType;\nexport type TextBaseLine = TextBaselineType;\nexport type FontStyle = 'normal' | 'italic' | 'oblique' | string;\nexport type FontWeight = 'normal' | 'bold' | 'lighter' | 'bolder' | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900;\n"]}
+{"version":3,"sources":["../src/typings/visual.ts"],"names":[],"mappings":"","file":"visual.js","sourcesContent":["import type { PopTipAttributes } from '@visactor/vrender-components';\nimport type { DataView } from '@visactor/vdataset';\nimport type { Cursor } from './cursor';\nimport type { InterpolateType } from './interpolate';\nimport type { ScaleType } from './scale';\nimport type { ShapeType } from './shape';\nimport type { IPoint } from './coordinate';\nimport type { IAttributeOpt, IModelMarkAttributeContext } from '../compile/mark';\nimport type { Datum } from './common';\nimport type { IPadding } from '@visactor/vutils';\nimport type { IColorKey } from '../theme/color-scheme/interface';\nimport type { ITokenKey } from '../theme/token';\nimport type {\n  IRepeatType,\n  TextAlignType,\n  TextBaselineType,\n  IRichTextAttribute,\n  IGraphicStyle\n} from '@visactor/vrender-core';\n\n// 基础的visual 对应 scale 的属性\nexport interface IVisualSpecBase<D, T> {\n  /**\n   * type of scale\n   */\n  type: ScaleType;\n  /**\n   * will set to scale.domain, it means input of scale\n   */\n  domain: D[];\n  /**\n   * will set to scale.range, it means output of scale\n   */\n  range: T[];\n  /**\n   * will set to scale.specified if scale support, as a key-value pair matching capability\n   * @since 1.1.0\n   */\n  specified?: { [key: string]: unknown };\n}\n// 用来给用户进行mark.style上的映射配置。所以要配置数据维度\nexport interface IVisualSpecStyle<D, T> extends IVisualSpecBase<D, T> {\n  field?: string;\n}\n\nexport type IDataDomainSpec = {\n  dataId: string;\n  fields: string[];\n};\n\n// 用来提供给用户进行 scale 配置 所以名字是必选的 对用户配置\nexport interface IVisualSpecScale<D, T> extends Omit<IVisualSpecBase<D, T>, 'domain'> {\n  id: string;\n  domain:\n    | IVisualSpecBase<D, T>['domain']\n    // 使用数据的字段值，如果 scale 是连续的，就取区间，如果是离散的就使用 values 。\n    // 不考虑图表内的交互等数据筛选，这里只用原始数据的统计信息\n    | IDataDomainSpec[];\n}\n// 对用户配置\nexport type IVisual<D = any, R = any> = IVisualSpecStyle<D, R> | IVisualScale;\n\nexport interface IVisualScale {\n  /**\n   * 对应 IVisualSpecScale 的用户配置 scale-id\n   */\n  scale: string;\n  /**\n   * 指定参与映射的数据字段\n   */\n  field?: string;\n  /**\n   * 当用户指定 field 后，用该属性来控制值域。\n   * @default 'none'\n   */\n  changeDomain?: 'none' | 'replace' | 'expand';\n}\n\nexport type FunctionType<T> = (\n  datum: Datum,\n  context: IModelMarkAttributeContext,\n  opt?: IAttributeOpt,\n  source?: DataView\n) => T;\nexport type ValueType<T> = T;\nexport type VisualType<T> = ValueType<T> | FunctionType<T> | IVisual<unknown, T>;\n\nexport type TextureType =\n  | 'circle'\n  | 'dimond'\n  | 'rect'\n  | 'vertical-line'\n  | 'horizontal-line'\n  | 'bias-lr'\n  | 'bias-rl'\n  | 'grid';\n\n/**\n * style格式转换\n */\nexport type ConvertToMarkStyleSpec<T extends Record<string, any>> = {\n  [key in keyof T]: VisualType<T[key]>;\n};\n\n/**\n * border\n */\nexport interface IBorder {\n  distance: number | string;\n  stroke?: string | IGradient;\n  strokeOpacity?: number;\n  lineWidth?: number;\n  lineDash?: number[];\n  lineDashOffset?: number;\n}\n\nexport interface ICommonSpec {\n  visible?: boolean;\n  x?: number;\n  y?: number;\n  z?: number;\n  /**\n   * @todo 隔离主题和 spec 配置\n   * IColorKey 类型只适用于主题\n   */\n  stroke?: string | IGradient | false | (number | boolean)[] | IColorKey;\n  strokeOpacity?: number;\n  opacity?: number;\n  lineWidth?: number;\n  lineDash?: number[];\n  lineDashOffset?: number;\n\n  cursor?: Cursor;\n  zIndex?: number;\n  angle?: number;\n  anchor?: [number, number];\n\n  // 缩放属性\n  scaleX?: number;\n  scaleY?: number;\n  /**\n   * 图形缩放中心\n   * @since 1.4.0\n   * 可以配置固定坐标，例如 [100, 100]；或者百分比坐标，例如 ['50%', '50%']，代表以图元中心为缩放中心\n   * */\n  scaleCenter?: [number | string, number | string];\n\n  // 3d旋转的属性\n  beta?: number;\n  alpha?: number;\n  anchor3d?: [number, number];\n\n  /**\n   * 选择模式，精确模式，粗糙模式（包围盒模式），自定义模式\n   */\n  pickMode?: 'accurate' | 'imprecise' | 'custom';\n  boundsMode?: 'accurate' | 'imprecise';\n\n  /**\n   * 用于扩展描边的拾取范围，为 0 就是默认线宽，正数就加宽，负数就减宽\n   * @default 0\n   * @since 1.7.3\n   */\n  pickStrokeBuffer?: number;\n\n  // 以下是纹理相关的属性\n  /**\n   * 纹理的类型\n   */\n  texture?: TextureType | string;\n  /**\n   * 纹理的颜色\n   */\n  textureColor?: string;\n  /**\n   * 纹理单元的大小\n   */\n  textureSize?: number; // 纹理大小\n  /**\n   * 纹理之间空隙的大小\n   */\n  texturePadding?: number;\n\n  /**\n   * 外边框\n   */\n  outerBorder?: IBorder;\n  /**\n   * 内边框\n   */\n  innerBorder?: IBorder;\n  /**\n   * @experimental\n   * @since 1.10.0\n   * html 浮层\n   */\n  html?: IMarkHtmlSpec;\n\n  [key: string]: any;\n}\n\nexport interface IFillMarkSpec extends ICommonSpec {\n  /**\n   * @todo 隔离主题和 spec 配置\n   * IColorKey 类型只适用于主题\n   */\n  fill?: VisualType<string> | IGradient | false | IColorKey;\n  fillOpacity?: number;\n  // TODO：waite VRender support this api\n  // backgroundMode: number; // 填充模式（与具体图元有关）\n  // can coexist with fill\n  background?: string | HTMLImageElement | HTMLCanvasElement | null;\n}\n\nexport type IMarkHtmlSpec = Partial<IGraphicStyle['html']>;\n\nexport interface ISymbolMarkSpec extends IFillMarkSpec {\n  dx?: number;\n  dy?: number;\n  size?: number | number[];\n  /** 对外声明使用shape，vrender图形属性对应的是shape */\n  shape?: ShapeType | string;\n  /** FIXME:  vrender Symbol接收的图形属性，暂时都申明一下 */\n  symbolType?: ShapeType | string;\n  scaleX?: number;\n  scaleY?: number;\n}\n\n// lineMark 和 areaMark 共同配置\nexport interface ILineLikeMarkSpec extends IFillMarkSpec {\n  curveType?: InterpolateType;\n  defined?: boolean;\n}\n\nexport interface IAreaMarkSpec extends ILineLikeMarkSpec {\n  x1?: number;\n  y1?: number;\n\n  orient?: 'horizontal' | 'vertical';\n}\n\nexport interface ILineMarkSpec extends ILineLikeMarkSpec {\n  lineCap?: LineStrokeCap;\n  lineJoin?: LineStrokeJoin;\n  miterLimit?: number;\n  strokeBoundsBuffer?: number;\n}\n\nexport interface IRuleMarkSpec extends ILineMarkSpec {\n  x1?: number;\n  y1?: number;\n}\n\nexport interface ITextMarkSpec extends IFillMarkSpec {\n  /**\n   * 文字内容\n   */\n  text?: string | number | string[] | number[];\n  /**\n   * x 方向偏移\n   */\n  dx?: number;\n  /**\n   * y 方向偏移\n   */\n  dy?: number;\n  /**\n   * 字号\n   */\n  fontSize?: number | ITokenKey;\n  /**\n   * 文字对齐方式\n   */\n  textAlign?: TextAlign;\n  /**\n   * 文字居中方式\n   */\n  textBaseline?: TextBaseLine;\n  /**\n   * 字体\n   */\n  fontFamily?: string;\n  /**\n   * 字重\n   */\n  fontWeight?: FontWeight;\n  /**\n   * 字体样式\n   */\n  fontStyle?: FontStyle;\n  /**\n   * 文字的最大长度\n   */\n  maxLineWidth?: number;\n  /**\n   * 文字超出 maxLineWidth 后的省略符\n   */\n  ellipsis?: string;\n  /**\n   * 文本省略的位置，默认尾部省略\n   * 1. 'start' 文字首部省略\n   * 2. 'middle' 文本中间省略\n   * 3. 'end' 文本尾部省略\n   * @default 'end'\n   * @since 1.7.3\n   */\n  suffixPosition?: 'start' | 'end' | 'middle';\n  /**\n   * 下划线\n   */\n  underline?: boolean;\n  /**\n   * 中划线\n   */\n  lineThrough?: boolean;\n  /**\n   * 行高（1.3.1 版本新增字符串类型表示比例值，如\"150%\"）\n   * @since 1.3.1\n   */\n  lineHeight?: number | string | ITokenKey;\n  /**\n   * poptip 相关配置\n   */\n  poptip?: PopTipAttributes;\n  /**\n   * 文本的排布方向，如果需要文本纵向排布，可以配置为 'vertical'\n   * @default 'horizontal'\n   */\n  direction?: 'horizontal' | 'vertical';\n}\n\nexport type IRichTextMarkSpec = IRichTextAttribute &\n  IFillMarkSpec & { type: 'rich'; text: IRichTextAttribute['textConfig'] };\n\nexport type IComposedTextMarkSpec = ITextMarkSpec | IRichTextMarkSpec;\n\nexport type IPositionedTextMarkSpec = Omit<ITextMarkSpec, 'align' | 'textAlign' | 'baseline' | 'textBaseline'>;\n\nexport interface IRectMarkSpec extends IFillMarkSpec {\n  /**\n   * 圆角配置。\n   * 1. 如果传入数值，则统一为四个角设置圆角\n   * 2. 如果传入数组，则分别为 [上左, 上右, 下右, 下左]\n   */\n  cornerRadius?: number | number[];\n  width?: number;\n  height?: number;\n  x1?: number;\n  y1?: number;\n}\n\n// 3d rect，支持length表示长宽高中的长属性（深度属性）\nexport interface IRect3dMarkSpec extends IRectMarkSpec {\n  length?: number;\n}\n\nexport interface IBoxPlotMarkSpec extends ICommonSpec {\n  /**\n   * box描边宽度\n   */\n  lineWidth?: number;\n  /**\n   * box宽度\n   */\n  boxWidth?: number;\n  /**\n   * 最大最小值宽度\n   */\n  shaftWidth?: number;\n  /**\n   * 中轴线类型\n   */\n  shaftShape?: BoxPlotShaftShape;\n  /**\n   * 盒子填充颜色，为空则不填充\n   */\n  boxFill?: string;\n  // /**\n  //  * 描边颜色\n  //  */\n  // stroke?: string;\n  /**\n   * 中轴线透明度，仅当shaftType=bar时生效\n   */\n  shaftFillOpacity?: number;\n\n  min?: (datum: Datum) => number;\n  q1?: (datum: Datum) => number;\n  median?: (datum: Datum) => number;\n  q3?: (datum: Datum) => number;\n  max?: (datum: Datum) => number;\n}\n\nexport interface IRippleMarkSpec extends ICommonSpec {\n  /**\n   * 波纹密度ripple\n   * ripple 取值范为[0,1]\n   */\n  ripple?: number;\n  /**\n   * 水波纹最大半径\n   */\n  size?: number;\n}\n\nexport interface ILiquidMarkSpec extends ICommonSpec {\n  /**\n   * 波浪的变化状态，范围为 [0, 1]\n   */\n  wave?: number;\n}\n\nexport interface ILiquidOutlineSpec extends ISymbolMarkSpec {\n  lineWidth: number;\n}\n\nexport interface IOutlierMarkSpec {\n  //异常点填充颜色\n  fill?: string;\n  //异常点大小\n  size?: number;\n}\n\nexport interface IPathMarkSpec extends IFillMarkSpec {\n  path?: string;\n  // TODO: 该属性后续可能会删除，未定\n  // 平滑缩放，不然会发生跳变，在地图交互场景需要配置为true；常规path缩放不需要\n  smoothScale?: boolean;\n}\n\nexport interface ILinkPathMarkSpec extends IFillMarkSpec {\n  x0?: number;\n  y0?: number;\n  x1?: number;\n  y1?: number;\n  thickness?: number;\n  curvature?: number;\n  /** round all the coordinates */\n  round?: boolean;\n  /** the ratio of normal style path */\n  ratio?: number;\n  align?: 'start' | 'end' | 'center';\n  pathType?: 'line' | 'smooth' | 'polyline';\n  endArrow?: boolean;\n  startArrow?: boolean;\n  backgroundStyle?: any;\n  direction?: 'horizontal' | 'vertical' | 'LR' | 'RL' | 'TB' | 'BL' | 'radial';\n}\n\nexport interface IArcMarkSpec extends IFillMarkSpec {\n  startAngle?: number;\n  endAngle?: number;\n  padAngle?: number;\n\n  outerRadius?: number;\n  innerRadius?: number;\n  cornerRadius?: number;\n\n  innerPadding?: number;\n  outerPadding?: number;\n\n  /** arc的中心点偏移距离 */\n  centerOffset?: number;\n\n  /** arc 的 roundCap 属性，即圆角是否伸出 startAngle 和 endAngle 之外 */\n  cap?: boolean | [boolean, boolean];\n  /** arc 在 roundCap 打开且应用环形渐变时是否对 cap 部分生效 */\n  autoCapConical?: boolean;\n}\n\n// 3d arc，有高度配置\nexport interface IArc3dMarkSpec extends IArcMarkSpec {\n  height?: number;\n}\n\nexport interface ICellMarkSpec extends ISymbolMarkSpec {\n  padding?: number | number[] | IPadding;\n}\n\nexport interface IGroupMarkSpec extends IFillMarkSpec {\n  clip?: boolean;\n  width?: number;\n  height?: number;\n  /**\n   * 圆角配置。\n   * 1. 如果传入数值，则统一为四个角设置圆角\n   * 2. 如果传入数组，则分别为 [上左, 上右, 下右, 下左]\n   */\n  cornerRadius?: number | number[];\n}\n\nexport interface IPolygonMarkSpec extends ICommonSpec, IFillMarkSpec {\n  points?: IPoint[];\n  /**\n   * 圆角配置，支持数组配置，数组的顺序同组成 polygon 的顺序对应\n   */\n  cornerRadius?: number | number[];\n  scaleX?: number;\n  scaleY?: number;\n}\n\nexport interface IPyramid3dMarkSpec extends IPolygonMarkSpec {\n  // 只能有4个顶点\n  points?: IPoint[];\n}\n\n/**\n * ImageFill\n */\nexport type RepeatType = 'no-repeat' | 'repeat-x' | 'repeat-y' | 'repeat';\nexport type RepeatXYType = 'no-repeat' | 'repeat' | 'stretch';\nexport type ImageOriginType = 'top' | 'bottom';\n\n/**\n *  gradient\n */\nexport type GradientPropValue<T> = ValueType<T> | FunctionType<T>;\nexport type GradientStop = {\n  offset: GradientPropValue<number>;\n  color?: GradientPropValue<string>;\n  opacity?: number;\n};\nexport interface IGradientLinear {\n  x0?: GradientPropValue<number>;\n  y0?: GradientPropValue<number>;\n  x1?: GradientPropValue<number>;\n  y1?: GradientPropValue<number>;\n  stops: GradientStop[];\n  gradient: 'linear';\n}\n\nexport interface IGradientRadial {\n  r0?: GradientPropValue<number>;\n  x0?: GradientPropValue<number>;\n  y0?: GradientPropValue<number>;\n  x1?: GradientPropValue<number>;\n  y1?: GradientPropValue<number>;\n  r1?: GradientPropValue<number>;\n  stops: GradientStop[];\n  gradient: 'radial';\n}\n\nexport interface IGradientConical {\n  x?: GradientPropValue<number>;\n  y?: GradientPropValue<number>;\n  startAngle?: GradientPropValue<number>;\n  endAngle?: GradientPropValue<number>;\n  stops: GradientStop[];\n  gradient: 'conical';\n}\n\nexport type GradientType = 'linear' | 'radial' | 'conical';\nexport type IGradient = IGradientLinear | IGradientRadial | IGradientConical;\n\nexport type LineStrokeCap = 'butt' | 'round' | 'square';\nexport type LineStrokeJoin = 'arcs' | 'bevel' | 'miter' | 'miter-clip' | 'round';\n\nexport type BoxPlotShaftShape = 'line' | 'bar';\n/**\n *  threshold\n */\nexport interface IThresholdStyle extends IVisualSpecStyle<number, string> {\n  domain: number[];\n  field: string;\n  range: string[];\n  type: 'threshold';\n}\n\n// FIXME: For some tool methods that need to use common configuration types\nexport interface IUnknownMarkSpec extends ICommonSpec {\n  [key: string]: unknown;\n}\n\nexport interface IImageMarkSpec extends IFillMarkSpec {\n  /**\n   * 圆角配置。\n   * 1. 如果传入数值，则统一为四个角设置圆角\n   * 2. 如果传入数组，则分别为 [上左, 上右, 下右, 下左]\n   */\n  cornerRadius?: number | number[];\n  width?: number;\n  height?: number;\n  repeatX?: IRepeatType;\n  repeatY?: IRepeatType;\n  image: string | HTMLImageElement | HTMLCanvasElement;\n}\n\n/**\n * text\n */\nexport type TextAlign = TextAlignType;\nexport type TextBaseLine = TextBaselineType;\nexport type FontStyle = 'normal' | 'italic' | 'oblique' | string;\nexport type FontWeight = 'normal' | 'bold' | 'lighter' | 'bolder' | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900;\n"]}

package/cjs/util/data.d.ts

@@ -21,6 +21,7 @@ export interface IStackCacheNode {
     nodes: {
         [key: string]: IStackCacheNode;
     };
+    key: string;
 }
 export interface IStackCacheRoot {
     nodes: {
@@ -35,4 +36,4 @@ export declare function getRegionStackGroup(region: {
 export declare function stackTotal(stackData: IStackCacheNode, valueField: string): void;
 export declare function stackOffsetSilhouette(stackCache: IStackCacheNode): void;
 export declare function stack(stackCache: IStackCacheNode, stackInverse: boolean, hasPercent?: boolean): void;
-export declare function stackGroup(s: ISeries, stackData: ISeriesStackDataMeta, stackCache: IStackCacheNode, valueField: string, setInitialValue: boolean): void;
+export declare function stackGroup(s: ISeries, stackData: ISeriesStackDataMeta, stackCache: IStackCacheNode, valueField: string, setInitialValue: boolean, stackKey?: string): void;

package/cjs/util/data.js

@@ -62,7 +62,8 @@ function stack(stackCache, stackInverse, hasPercent) {
             const v = stackCache.values[stackInverse ? maxLength - 1 - index : index];
             value = v[constant_1.STACK_FIELD_END], value >= 0 ? (v[constant_1.STACK_FIELD_START] = positiveStart, 
             positiveStart += v[constant_1.STACK_FIELD_END], v[constant_1.STACK_FIELD_END] = positiveStart) : (v[constant_1.STACK_FIELD_START] = negativeStart, 
-            negativeStart += v[constant_1.STACK_FIELD_END], v[constant_1.STACK_FIELD_END] = negativeStart);
+            negativeStart += v[constant_1.STACK_FIELD_END], v[constant_1.STACK_FIELD_END] = negativeStart), 
+            v[constant_1.STACK_FIELD_KEY] = stackCache.key;
         }
         if (hasPercent) for (let index = 0; index < maxLength; index++) {
             const v = stackCache.values[stackInverse ? maxLength - 1 - index : index];
@@ -75,18 +76,22 @@ function stack(stackCache, stackInverse, hasPercent) {
     for (const key in stackCache.nodes) stack(stackCache.nodes[key], stackInverse, hasPercent);
 }
 
-function stackGroup(s, stackData, stackCache, valueField, setInitialValue) {
+function stackGroup(s, stackData, stackCache, valueField, setInitialValue, stackKey) {
     if ("values" in stackData) return setInitialValue && stackData.values.forEach((v => v[constant_1.STACK_FIELD_END] = (0, 
     type_1.toValidNumber)(v[valueField]))), stackCache.values.push(...stackData.values), 
     void stackCache.series.push({
         s: s,
         values: stackData.values
     });
-    for (const key in stackData.nodes) !stackCache.nodes[key] && (stackCache.nodes[key] = {
-        values: [],
-        series: [],
-        nodes: {}
-    }), stackGroup(s, stackData.nodes[key], stackCache.nodes[key], valueField, setInitialValue);
+    for (const key in stackData.nodes) {
+        const newStackKey = stackKey ? `${stackKey}_${key}` : key;
+        !stackCache.nodes[key] && (stackCache.nodes[key] = {
+            values: [],
+            series: [],
+            nodes: {},
+            key: newStackKey
+        }), stackGroup(s, stackData.nodes[key], stackCache.nodes[key], valueField, setInitialValue, newStackKey);
+    }
 }
 
 exports.mergeFields = mergeFields, exports.getFieldAlias = getFieldAlias, exports.getRegionStackGroup = getRegionStackGroup, 

package/cjs/util/data.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/data.ts"],"names":[],"mappings":"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","file":"data.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { StatisticOperations } from '../data/transforms/dimension-statistics';\nimport {\n  STACK_FIELD_END,\n  STACK_FIELD_START_PERCENT,\n  STACK_FIELD_END_PERCENT,\n  STACK_FIELD_END_OffsetSilhouette,\n  STACK_FIELD_START_OffsetSilhouette,\n  STACK_FIELD_TOTAL,\n  STACK_FIELD_TOTAL_PERCENT,\n  STACK_FIELD_TOTAL_TOP,\n  STACK_FIELD_START\n} from '../constant';\nimport { toValidNumber } from './type';\nimport { max, sum } from './math';\nimport type { ISeries, ISeriesStackDataMeta } from '../series/interface';\n\nexport function mergeFields(\n  targetFields: {\n    key: string;\n    operations: StatisticOperations;\n  }[],\n  mergeFields: {\n    key: string;\n    operations: StatisticOperations;\n  }[]\n): {\n  key: string;\n  operations: StatisticOperations;\n}[] {\n  for (let i = 0; i < mergeFields.length; i++) {\n    const element = mergeFields[i];\n    const _target = findFields(targetFields, element.key);\n    if (!_target) {\n      targetFields.push(element);\n    } else {\n      _target.operations = [...new Set(_target.operations.concat(element.operations))];\n    }\n  }\n  return targetFields;\n}\n\nfunction findFields(\n  list: {\n    key: string;\n    operations: StatisticOperations;\n  }[],\n  fieldKey: string\n) {\n  return list.find(i => i.key === fieldKey);\n}\n\n// 如果不存在别名就返回 field\nexport function getFieldAlias(dataView: DataView, field: string) {\n  if (!dataView) {\n    return field ?? null;\n  }\n  const fields = dataView.getFields();\n  if (!fields) {\n    return field ?? null;\n  }\n  if (!fields[field]) {\n    return field ?? null;\n  }\n  return fields[field].alias ?? field;\n}\n\nexport interface IStackCacheNode {\n  values: any[];\n  series: {\n    s: ISeries;\n    values: any[];\n  }[];\n  nodes: {\n    [key: string]: IStackCacheNode;\n  };\n}\nexport interface IStackCacheRoot {\n  nodes: {\n    [key: string]: IStackCacheNode;\n  };\n}\n\nexport function getRegionStackGroup(\n  region: { getSeries: () => any[] },\n  setInitialValue: boolean,\n  filter?: (s: any) => boolean\n) {\n  const stackValueGroup: { [key: string]: IStackCacheRoot } = {};\n  // 分组\n  region.getSeries().forEach(s => {\n    const stackData = s.getStackData();\n    const stackValue = s.getStackValue();\n    const stackValueField = s.getStackValueField();\n    const filterEnable = filter ? filter(s) : true;\n    if (stackData && stackValueField && filterEnable) {\n      stackValueGroup[stackValue] = stackValueGroup[stackValue] ?? {\n        nodes: {}\n      };\n      stackGroup(s, stackData, stackValueGroup[stackValue] as IStackCacheNode, stackValueField, setInitialValue);\n    }\n  });\n  return stackValueGroup;\n}\n\nexport function stackTotal(stackData: IStackCacheNode, valueField: string) {\n  if ('values' in stackData && stackData.values.length) {\n    const total = sum(stackData.values, valueField);\n    const percent = max(stackData.values, STACK_FIELD_END_PERCENT);\n    stackData.values.forEach(v => {\n      v[STACK_FIELD_TOTAL] = total;\n      v[STACK_FIELD_TOTAL_PERCENT] = percent;\n      delete v[STACK_FIELD_TOTAL_TOP];\n    });\n    const maxNode = stackData.values.reduce((max, current) => {\n      return current[STACK_FIELD_END] > max[STACK_FIELD_END] ? current : max;\n    });\n    maxNode[STACK_FIELD_TOTAL_TOP] = true;\n    return;\n  }\n  for (const key in stackData.nodes) {\n    stackTotal(stackData.nodes[key], valueField);\n  }\n}\n\nexport function stackOffsetSilhouette(stackCache: IStackCacheNode) {\n  if (!stackCache.values.length) {\n    return;\n  }\n  const centerValue = stackCache.values[stackCache.values.length - 1][STACK_FIELD_END] / 2;\n  for (let j = 0; j < stackCache.values.length; j++) {\n    stackCache.values[j][STACK_FIELD_START_OffsetSilhouette] = stackCache.values[j][STACK_FIELD_START] - centerValue;\n    stackCache.values[j][STACK_FIELD_END_OffsetSilhouette] = stackCache.values[j][STACK_FIELD_END] - centerValue;\n  }\n}\n\nexport function stack(stackCache: IStackCacheNode, stackInverse: boolean, hasPercent?: boolean) {\n  if (stackCache.values.length > 0) {\n    // 设置一个小数以保证 log 计算不会报错\n    let positiveStart = 0;\n    let negativeStart = 0;\n    // temp\n    let sign = 1;\n    let value = 0;\n\n    // stack\n    const maxLength = stackCache.values.length;\n    for (let index = 0; index < maxLength; index++) {\n      const v = stackCache.values[stackInverse ? maxLength - 1 - index : index];\n      value = v[STACK_FIELD_END];\n      if (value >= 0) {\n        v[STACK_FIELD_START] = positiveStart;\n        positiveStart += v[STACK_FIELD_END];\n        v[STACK_FIELD_END] = positiveStart;\n      } else {\n        v[STACK_FIELD_START] = negativeStart;\n        negativeStart += v[STACK_FIELD_END];\n        v[STACK_FIELD_END] = negativeStart;\n      }\n    }\n    if (hasPercent) {\n      // normalize\n      for (let index = 0; index < maxLength; index++) {\n        const v = stackCache.values[stackInverse ? maxLength - 1 - index : index];\n        value = v[STACK_FIELD_END];\n        const denominator = value >= 0 ? positiveStart : negativeStart;\n        sign = value >= 0 ? 1 : -1;\n        v[STACK_FIELD_START_PERCENT] = denominator === 0 ? 0 : Math.min(1, v[STACK_FIELD_START] / denominator) * sign;\n        v[STACK_FIELD_END_PERCENT] = denominator === 0 ? 0 : Math.min(1, v[STACK_FIELD_END] / denominator) * sign;\n      }\n    }\n  }\n\n  for (const key in stackCache.nodes) {\n    stack(stackCache.nodes[key], stackInverse, hasPercent);\n  }\n}\n\nexport function stackGroup(\n  s: ISeries,\n  stackData: ISeriesStackDataMeta,\n  stackCache: IStackCacheNode,\n  valueField: string,\n  setInitialValue: boolean\n) {\n  if ('values' in stackData) {\n    // 初值\n    setInitialValue && stackData.values.forEach(v => (v[STACK_FIELD_END] = toValidNumber(v[valueField])));\n    stackCache.values.push(...stackData.values);\n    stackCache.series.push({ s: s, values: stackData.values });\n    return;\n  }\n  for (const key in stackData.nodes) {\n    !stackCache.nodes[key] &&\n      (stackCache.nodes[key] = {\n        values: [],\n        series: [],\n        nodes: {}\n      });\n    stackGroup(s, stackData.nodes[key], stackCache.nodes[key], valueField, setInitialValue);\n  }\n}\n"]}
+{"version":3,"sources":["../src/util/data.ts"],"names":[],"mappings":";;;AAEA,0CAWqB;AACrB,iCAAuC;AACvC,iCAAkC;AAGlC,SAAgB,WAAW,CACzB,YAGG,EACH,WAGG;IAKH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC3C,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,CAAC,OAAO,EAAE;YACZ,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC5B;aAAM;YACL,OAAO,CAAC,UAAU,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;SAClF;KACF;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAvBD,kCAuBC;AAED,SAAS,UAAU,CACjB,IAGG,EACH,QAAgB;IAEhB,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC;AAC5C,CAAC;AAGD,SAAgB,aAAa,CAAC,QAAkB,EAAE,KAAa;;IAC7D,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC;KACtB;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IACpC,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC;KACtB;IACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QAClB,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC;KACtB;IACD,OAAO,MAAA,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,mCAAI,KAAK,CAAC;AACtC,CAAC;AAZD,sCAYC;AAmBD,SAAgB,mBAAmB,CACjC,MAAkC,EAClC,eAAwB,EACxB,MAA4B;IAE5B,MAAM,eAAe,GAAuC,EAAE,CAAC;IAE/D,MAAM,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;;QAC7B,MAAM,SAAS,GAAG,CAAC,CAAC,YAAY,EAAE,CAAC;QACnC,MAAM,UAAU,GAAG,CAAC,CAAC,aAAa,EAAE,CAAC;QACrC,MAAM,eAAe,GAAG,CAAC,CAAC,kBAAkB,EAAE,CAAC;QAC/C,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC/C,IAAI,SAAS,IAAI,eAAe,IAAI,YAAY,EAAE;YAChD,eAAe,CAAC,UAAU,CAAC,GAAG,MAAA,eAAe,CAAC,UAAU,CAAC,mCAAI;gBAC3D,KAAK,EAAE,EAAE;aACV,CAAC;YACF,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,eAAe,CAAC,UAAU,CAAoB,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;SAC5G;IACH,CAAC,CAAC,CAAC;IACH,OAAO,eAAe,CAAC;AACzB,CAAC;AApBD,kDAoBC;AAED,SAAgB,UAAU,CAAC,SAA0B,EAAE,UAAkB;IACvE,IAAI,QAAQ,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE;QACpD,MAAM,KAAK,GAAG,IAAA,UAAG,EAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,IAAA,UAAG,EAAC,SAAS,CAAC,MAAM,EAAE,kCAAuB,CAAC,CAAC;QAC/D,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC3B,CAAC,CAAC,4BAAiB,CAAC,GAAG,KAAK,CAAC;YAC7B,CAAC,CAAC,oCAAyB,CAAC,GAAG,OAAO,CAAC;YACvC,OAAO,CAAC,CAAC,gCAAqB,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;YACvD,OAAO,OAAO,CAAC,0BAAe,CAAC,GAAG,GAAG,CAAC,0BAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;QACzE,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,gCAAqB,CAAC,GAAG,IAAI,CAAC;QACtC,OAAO;KACR;IACD,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,KAAK,EAAE;QACjC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;KAC9C;AACH,CAAC;AAlBD,gCAkBC;AAED,SAAgB,qBAAqB,CAAC,UAA2B;IAC/D,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE;QAC7B,OAAO;KACR;IACD,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,0BAAe,CAAC,GAAG,CAAC,CAAC;IACzF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACjD,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,6CAAkC,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,4BAAiB,CAAC,GAAG,WAAW,CAAC;QACjH,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,2CAAgC,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,0BAAe,CAAC,GAAG,WAAW,CAAC;KAC9G;AACH,CAAC;AATD,sDASC;AAED,SAAgB,KAAK,CAAC,UAA2B,EAAE,YAAqB,EAAE,UAAoB;IAC5F,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QAEhC,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,IAAI,aAAa,GAAG,CAAC,CAAC;QAEtB,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,IAAI,KAAK,GAAG,CAAC,CAAC;QAGd,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC;QAC3C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,EAAE,KAAK,EAAE,EAAE;YAC9C,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC1E,KAAK,GAAG,CAAC,CAAC,0BAAe,CAAC,CAAC;YAC3B,IAAI,KAAK,IAAI,CAAC,EAAE;gBACd,CAAC,CAAC,4BAAiB,CAAC,GAAG,aAAa,CAAC;gBACrC,aAAa,IAAI,CAAC,CAAC,0BAAe,CAAC,CAAC;gBACpC,CAAC,CAAC,0BAAe,CAAC,GAAG,aAAa,CAAC;aACpC;iBAAM;gBACL,CAAC,CAAC,4BAAiB,CAAC,GAAG,aAAa,CAAC;gBACrC,aAAa,IAAI,CAAC,CAAC,0BAAe,CAAC,CAAC;gBACpC,CAAC,CAAC,0BAAe,CAAC,GAAG,aAAa,CAAC;aACpC;YACD,CAAC,CAAC,0BAAe,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC;SACrC;QACD,IAAI,UAAU,EAAE;YAEd,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,EAAE,KAAK,EAAE,EAAE;gBAC9C,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBAC1E,KAAK,GAAG,CAAC,CAAC,0BAAe,CAAC,CAAC;gBAC3B,MAAM,WAAW,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC;gBAC/D,IAAI,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC3B,CAAC,CAAC,oCAAyB,CAAC,GAAG,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,4BAAiB,CAAC,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC;gBAC9G,CAAC,CAAC,kCAAuB,CAAC,GAAG,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,0BAAe,CAAC,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC;aAC3G;SACF;KACF;IAED,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,KAAK,EAAE;QAClC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;KACxD;AACH,CAAC;AAzCD,sBAyCC;AAED,SAAgB,UAAU,CACxB,CAAU,EACV,SAA+B,EAC/B,UAA2B,EAC3B,UAAkB,EAClB,eAAwB,EACxB,QAAiB;IAEjB,IAAI,QAAQ,IAAI,SAAS,EAAE;QAEzB,eAAe,IAAI,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,0BAAe,CAAC,GAAG,IAAA,oBAAa,EAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACtG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;QAC5C,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QAC3D,OAAO;KACR;IACD,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,KAAK,EAAE;QACjC,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;QAC1D,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC;YACpB,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG;gBACvB,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,EAAE;gBACV,KAAK,EAAE,EAAE;gBACT,GAAG,EAAE,WAAW;aACjB,CAAC,CAAC;QACL,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;KACtG;AACH,CAAC;AA1BD,gCA0BC","file":"data.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { StatisticOperations } from '../data/transforms/dimension-statistics';\nimport {\n  STACK_FIELD_END,\n  STACK_FIELD_START_PERCENT,\n  STACK_FIELD_END_PERCENT,\n  STACK_FIELD_END_OffsetSilhouette,\n  STACK_FIELD_START_OffsetSilhouette,\n  STACK_FIELD_TOTAL,\n  STACK_FIELD_TOTAL_PERCENT,\n  STACK_FIELD_TOTAL_TOP,\n  STACK_FIELD_START,\n  STACK_FIELD_KEY\n} from '../constant';\nimport { toValidNumber } from './type';\nimport { max, sum } from './math';\nimport type { ISeries, ISeriesStackDataMeta } from '../series/interface';\n\nexport function mergeFields(\n  targetFields: {\n    key: string;\n    operations: StatisticOperations;\n  }[],\n  mergeFields: {\n    key: string;\n    operations: StatisticOperations;\n  }[]\n): {\n  key: string;\n  operations: StatisticOperations;\n}[] {\n  for (let i = 0; i < mergeFields.length; i++) {\n    const element = mergeFields[i];\n    const _target = findFields(targetFields, element.key);\n    if (!_target) {\n      targetFields.push(element);\n    } else {\n      _target.operations = [...new Set(_target.operations.concat(element.operations))];\n    }\n  }\n  return targetFields;\n}\n\nfunction findFields(\n  list: {\n    key: string;\n    operations: StatisticOperations;\n  }[],\n  fieldKey: string\n) {\n  return list.find(i => i.key === fieldKey);\n}\n\n// 如果不存在别名就返回 field\nexport function getFieldAlias(dataView: DataView, field: string) {\n  if (!dataView) {\n    return field ?? null;\n  }\n  const fields = dataView.getFields();\n  if (!fields) {\n    return field ?? null;\n  }\n  if (!fields[field]) {\n    return field ?? null;\n  }\n  return fields[field].alias ?? field;\n}\n\nexport interface IStackCacheNode {\n  values: any[];\n  series: {\n    s: ISeries;\n    values: any[];\n  }[];\n  nodes: {\n    [key: string]: IStackCacheNode;\n  };\n  key: string;\n}\nexport interface IStackCacheRoot {\n  nodes: {\n    [key: string]: IStackCacheNode;\n  };\n}\n\nexport function getRegionStackGroup(\n  region: { getSeries: () => any[] },\n  setInitialValue: boolean,\n  filter?: (s: any) => boolean\n) {\n  const stackValueGroup: { [key: string]: IStackCacheRoot } = {};\n  // 分组\n  region.getSeries().forEach(s => {\n    const stackData = s.getStackData();\n    const stackValue = s.getStackValue();\n    const stackValueField = s.getStackValueField();\n    const filterEnable = filter ? filter(s) : true;\n    if (stackData && stackValueField && filterEnable) {\n      stackValueGroup[stackValue] = stackValueGroup[stackValue] ?? {\n        nodes: {}\n      };\n      stackGroup(s, stackData, stackValueGroup[stackValue] as IStackCacheNode, stackValueField, setInitialValue);\n    }\n  });\n  return stackValueGroup;\n}\n\nexport function stackTotal(stackData: IStackCacheNode, valueField: string) {\n  if ('values' in stackData && stackData.values.length) {\n    const total = sum(stackData.values, valueField);\n    const percent = max(stackData.values, STACK_FIELD_END_PERCENT);\n    stackData.values.forEach(v => {\n      v[STACK_FIELD_TOTAL] = total;\n      v[STACK_FIELD_TOTAL_PERCENT] = percent;\n      delete v[STACK_FIELD_TOTAL_TOP];\n    });\n    const maxNode = stackData.values.reduce((max, current) => {\n      return current[STACK_FIELD_END] > max[STACK_FIELD_END] ? current : max;\n    });\n    maxNode[STACK_FIELD_TOTAL_TOP] = true;\n    return;\n  }\n  for (const key in stackData.nodes) {\n    stackTotal(stackData.nodes[key], valueField);\n  }\n}\n\nexport function stackOffsetSilhouette(stackCache: IStackCacheNode) {\n  if (!stackCache.values.length) {\n    return;\n  }\n  const centerValue = stackCache.values[stackCache.values.length - 1][STACK_FIELD_END] / 2;\n  for (let j = 0; j < stackCache.values.length; j++) {\n    stackCache.values[j][STACK_FIELD_START_OffsetSilhouette] = stackCache.values[j][STACK_FIELD_START] - centerValue;\n    stackCache.values[j][STACK_FIELD_END_OffsetSilhouette] = stackCache.values[j][STACK_FIELD_END] - centerValue;\n  }\n}\n\nexport function stack(stackCache: IStackCacheNode, stackInverse: boolean, hasPercent?: boolean) {\n  if (stackCache.values.length > 0) {\n    // 设置一个小数以保证 log 计算不会报错\n    let positiveStart = 0;\n    let negativeStart = 0;\n    // temp\n    let sign = 1;\n    let value = 0;\n\n    // stack\n    const maxLength = stackCache.values.length;\n    for (let index = 0; index < maxLength; index++) {\n      const v = stackCache.values[stackInverse ? maxLength - 1 - index : index];\n      value = v[STACK_FIELD_END];\n      if (value >= 0) {\n        v[STACK_FIELD_START] = positiveStart;\n        positiveStart += v[STACK_FIELD_END];\n        v[STACK_FIELD_END] = positiveStart;\n      } else {\n        v[STACK_FIELD_START] = negativeStart;\n        negativeStart += v[STACK_FIELD_END];\n        v[STACK_FIELD_END] = negativeStart;\n      }\n      v[STACK_FIELD_KEY] = stackCache.key;\n    }\n    if (hasPercent) {\n      // normalize\n      for (let index = 0; index < maxLength; index++) {\n        const v = stackCache.values[stackInverse ? maxLength - 1 - index : index];\n        value = v[STACK_FIELD_END];\n        const denominator = value >= 0 ? positiveStart : negativeStart;\n        sign = value >= 0 ? 1 : -1;\n        v[STACK_FIELD_START_PERCENT] = denominator === 0 ? 0 : Math.min(1, v[STACK_FIELD_START] / denominator) * sign;\n        v[STACK_FIELD_END_PERCENT] = denominator === 0 ? 0 : Math.min(1, v[STACK_FIELD_END] / denominator) * sign;\n      }\n    }\n  }\n\n  for (const key in stackCache.nodes) {\n    stack(stackCache.nodes[key], stackInverse, hasPercent);\n  }\n}\n\nexport function stackGroup(\n  s: ISeries,\n  stackData: ISeriesStackDataMeta,\n  stackCache: IStackCacheNode,\n  valueField: string,\n  setInitialValue: boolean,\n  stackKey?: string\n) {\n  if ('values' in stackData) {\n    // 初值\n    setInitialValue && stackData.values.forEach(v => (v[STACK_FIELD_END] = toValidNumber(v[valueField])));\n    stackCache.values.push(...stackData.values);\n    stackCache.series.push({ s: s, values: stackData.values });\n    return;\n  }\n  for (const key in stackData.nodes) {\n    const newStackKey = stackKey ? `${stackKey}_${key}` : key;\n    !stackCache.nodes[key] &&\n      (stackCache.nodes[key] = {\n        values: [],\n        series: [],\n        nodes: {},\n        key: newStackKey\n      });\n    stackGroup(s, stackData.nodes[key], stackCache.nodes[key], valueField, setInitialValue, newStackKey);\n  }\n}\n"]}

package/cjs/util/index.d.ts

@@ -1,5 +1,4 @@
-import { TimeUtil } from '../component/axis/cartesian/util/time';
-import { debounce, throttle, clamp } from '@visactor/vutils';
+import { debounce, throttle, clamp, TimeUtil } from '@visactor/vutils';
 export { debounce, throttle, clamp };
 export * from './array';
 export * from './color';

package/cjs/util/index.js

@@ -19,7 +19,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.Utils = exports.clamp = exports.throttle = exports.debounce = void 0;
 
-const time_1 = require("../component/axis/cartesian/util/time"), vutils_1 = require("@visactor/vutils");
+const vutils_1 = require("@visactor/vutils");
 
 Object.defineProperty(exports, "debounce", {
     enumerable: !0,
@@ -45,6 +45,6 @@ __exportStar(require("./type"), exports), __exportStar(require("./spec"), export
 __exportStar(require("./text"), exports), __exportStar(require("./data"), exports), 
 __exportStar(require("./hierarchy"), exports), __exportStar(require("./style"), exports), 
 exports.Utils = {
-    TimeUtil: time_1.TimeUtil
+    TimeUtil: vutils_1.TimeUtil
 };
 //# sourceMappingURL=index.js.map

package/cjs/util/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gEAAiE;AACjE,6CAA6D;AAEpD,yFAFA,iBAAQ,OAEA;AAAE,yFAFA,iBAAQ,OAEA;AAAE,sFAFA,cAAK,OAEA;AAElC,0CAAwB;AACxB,0CAAwB;AACxB,0CAAwB;AACxB,wCAAsB;AACtB,uCAAqB;AACrB,yCAAuB;AACvB,0CAAwB;AACxB,2CAAyB;AACzB,0CAAwB;AACxB,0CAAwB;AACxB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,8CAA4B;AAC5B,0CAAwB;AAEX,QAAA,KAAK,GAAG,EAAE,QAAQ,EAAR,eAAQ,EAAE,CAAC","file":"index.js","sourcesContent":["import { TimeUtil } from '../component/axis/cartesian/util/time';\nimport { debounce, throttle, clamp } from '@visactor/vutils';\n\nexport { debounce, throttle, clamp };\n\nexport * from './array';\nexport * from './color';\nexport * from './debug';\nexport * from './env';\nexport * from './id';\nexport * from './math';\nexport * from './model';\nexport * from './object';\nexport * from './scale';\nexport * from './space';\nexport * from './type';\nexport * from './spec';\nexport * from './text';\nexport * from './data';\nexport * from './hierarchy';\nexport * from './style';\n\nexport const Utils = { TimeUtil };\n"]}
+{"version":3,"sources":["../src/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6CAAuE;AAE9D,yFAFA,iBAAQ,OAEA;AAAE,yFAFA,iBAAQ,OAEA;AAAE,sFAFA,cAAK,OAEA;AAElC,0CAAwB;AACxB,0CAAwB;AACxB,0CAAwB;AACxB,wCAAsB;AACtB,uCAAqB;AACrB,yCAAuB;AACvB,0CAAwB;AACxB,2CAAyB;AACzB,0CAAwB;AACxB,0CAAwB;AACxB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,8CAA4B;AAC5B,0CAAwB;AAEX,QAAA,KAAK,GAAG,EAAE,QAAQ,EAAR,iBAAQ,EAAE,CAAC","file":"index.js","sourcesContent":["import { debounce, throttle, clamp, TimeUtil } from '@visactor/vutils';\n\nexport { debounce, throttle, clamp };\n\nexport * from './array';\nexport * from './color';\nexport * from './debug';\nexport * from './env';\nexport * from './id';\nexport * from './math';\nexport * from './model';\nexport * from './object';\nexport * from './scale';\nexport * from './space';\nexport * from './type';\nexport * from './spec';\nexport * from './text';\nexport * from './data';\nexport * from './hierarchy';\nexport * from './style';\n\nexport const Utils = { TimeUtil };\n"]}

package/cjs/util/spec/common.d.ts

@@ -1,5 +1,3 @@
 import { DataView } from '@visactor/vdataset';
-import type { ITheme } from '../../theme';
 export declare function isDataView(obj: any): obj is DataView;
 export declare function isHTMLElement(obj: any): obj is Element;
-export declare function getThemeObject(theme?: string | ITheme, transformed?: boolean): ITheme;

package/cjs/util/spec/common.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.getThemeObject = exports.isHTMLElement = exports.isDataView = void 0;
+}), exports.isHTMLElement = exports.isDataView = void 0;
 
-const vdataset_1 = require("@visactor/vdataset"), theme_1 = require("../../theme"), vutils_1 = require("@visactor/vutils");
+const vdataset_1 = require("@visactor/vdataset");
 
 function isDataView(obj) {
     return obj instanceof vdataset_1.DataView;
@@ -19,10 +19,5 @@ function isHTMLElement(obj) {
     }
 }
 
-function getThemeObject(theme, transformed) {
-    return (0, vutils_1.isString)(theme) ? theme_1.ThemeManager.themeExist(theme) ? theme_1.ThemeManager.getTheme(theme, transformed) : {} : (0, 
-    vutils_1.isObject)(theme) ? theme : {};
-}
-
-exports.isDataView = isDataView, exports.isHTMLElement = isHTMLElement, exports.getThemeObject = getThemeObject;
+exports.isDataView = isDataView, exports.isHTMLElement = isHTMLElement;
 //# sourceMappingURL=common.js.map

package/cjs/util/spec/common.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/spec/common.ts"],"names":[],"mappings":";;;AAAA,iDAA8C;AAG9C,uCAA2C;AAC3C,6CAAsD;AAEtD,SAAgB,UAAU,CAAC,GAAQ;IACjC,OAAO,GAAG,YAAY,mBAAQ,CAAC;AACjC,CAAC;AAFD,gCAEC;AAED,SAAgB,aAAa,CAAC,GAAQ;IACpC,IAAI;QACF,OAAO,GAAG,YAAY,OAAO,CAAC;KAC/B;IAAC,WAAM;QAEN,MAAM,eAAe,GAAsB;YACzC,UAAU;YACV,WAAW;YACX,WAAW;YACX,cAAc;YACd,SAAS;YACT,uBAAuB;SACxB,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9B,OAAO,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;KACzD;AACH,CAAC;AAhBD,sCAgBC;AAED,SAAgB,cAAc,CAAC,KAAuB,EAAE,WAAqB;IAC3E,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;QACnB,IAAI,oBAAY,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAClC,OAAO,oBAAY,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;SAClD;QACD,OAAO,EAAE,CAAC;KACX;SAAM,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;QAC1B,OAAO,KAAK,CAAC;KACd;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAVD,wCAUC","file":"common.js","sourcesContent":["import { DataView } from '@visactor/vdataset';\nimport type { ITheme } from '../../theme';\n// eslint-disable-next-line no-duplicate-imports\nimport { ThemeManager } from '../../theme';\nimport { isObject, isString } from '@visactor/vutils';\n\nexport function isDataView(obj: any): obj is DataView {\n  return obj instanceof DataView;\n}\n\nexport function isHTMLElement(obj: any): obj is Element {\n  try {\n    return obj instanceof Element;\n  } catch {\n    // 跨端 plan B\n    const htmlElementKeys: (keyof Element)[] = [\n      'children',\n      'innerHTML',\n      'classList',\n      'setAttribute',\n      'tagName',\n      'getBoundingClientRect'\n    ];\n    const keys = Object.keys(obj);\n    return htmlElementKeys.every(key => keys.includes(key));\n  }\n}\n\nexport function getThemeObject(theme?: string | ITheme, transformed?: boolean): ITheme {\n  if (isString(theme)) {\n    if (ThemeManager.themeExist(theme)) {\n      return ThemeManager.getTheme(theme, transformed);\n    }\n    return {};\n  } else if (isObject(theme)) {\n    return theme;\n  }\n  return {};\n}\n"]}
+{"version":3,"sources":["../src/util/spec/common.ts"],"names":[],"mappings":";;;AAAA,iDAA8C;AAE9C,SAAgB,UAAU,CAAC,GAAQ;IACjC,OAAO,GAAG,YAAY,mBAAQ,CAAC;AACjC,CAAC;AAFD,gCAEC;AAED,SAAgB,aAAa,CAAC,GAAQ;IACpC,IAAI;QACF,OAAO,GAAG,YAAY,OAAO,CAAC;KAC/B;IAAC,WAAM;QAEN,MAAM,eAAe,GAAsB;YACzC,UAAU;YACV,WAAW;YACX,WAAW;YACX,cAAc;YACd,SAAS;YACT,uBAAuB;SACxB,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9B,OAAO,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;KACzD;AACH,CAAC;AAhBD,sCAgBC","file":"common.js","sourcesContent":["import { DataView } from '@visactor/vdataset';\n\nexport function isDataView(obj: any): obj is DataView {\n  return obj instanceof DataView;\n}\n\nexport function isHTMLElement(obj: any): obj is Element {\n  try {\n    return obj instanceof Element;\n  } catch {\n    // 跨端 plan B\n    const htmlElementKeys: (keyof Element)[] = [\n      'children',\n      'innerHTML',\n      'classList',\n      'setAttribute',\n      'tagName',\n      'getBoundingClientRect'\n    ];\n    const keys = Object.keys(obj);\n    return htmlElementKeys.every(key => keys.includes(key));\n  }\n}\n"]}

package/cjs/util/spec/index.d.ts

@@ -2,6 +2,6 @@ export * from './background';
 export * from './clone-deep';
 export * from './common';
 export * from './merge-spec';
-export * from './merge-theme';
-export * from './preprocess';
+export * from '../theme/merge-theme';
+export * from '../theme/preprocess';
 export * from './transform';

package/cjs/util/spec/index.js

@@ -19,6 +19,6 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), __exportStar(require("./background"), exports), __exportStar(require("./clone-deep"), exports), 
 __exportStar(require("./common"), exports), __exportStar(require("./merge-spec"), exports), 
-__exportStar(require("./merge-theme"), exports), __exportStar(require("./preprocess"), exports), 
+__exportStar(require("../theme/merge-theme"), exports), __exportStar(require("../theme/preprocess"), exports), 
 __exportStar(require("./transform"), exports);
 //# sourceMappingURL=index.js.map

package/cjs/util/spec/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/spec/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,+CAA6B;AAC7B,2CAAyB;AACzB,+CAA6B;AAC7B,gDAA8B;AAC9B,+CAA6B;AAC7B,8CAA4B","file":"index.js","sourcesContent":["export * from './background';\nexport * from './clone-deep';\nexport * from './common';\nexport * from './merge-spec';\nexport * from './merge-theme';\nexport * from './preprocess';\nexport * from './transform';\n"]}
+{"version":3,"sources":["../src/util/spec/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,+CAA6B;AAC7B,2CAAyB;AACzB,+CAA6B;AAC7B,uDAAqC;AACrC,sDAAoC;AACpC,8CAA4B","file":"index.js","sourcesContent":["export * from './background';\nexport * from './clone-deep';\nexport * from './common';\nexport * from './merge-spec';\nexport * from '../theme/merge-theme';\nexport * from '../theme/preprocess';\nexport * from './transform';\n"]}

package/cjs/util/text.js

@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.measureText = exports.initTextMeasure = void 0;
 
-const constants_1 = require("../theme/builtin/common/constants"), vutils_extension_1 = require("@visactor/vutils-extension"), initTextMeasure = (textSpec, option, useNaiveCanvas) => (0, 
+const vutils_extension_1 = require("@visactor/vutils-extension"), token_1 = require("../theme/token"), initTextMeasure = (textSpec, option, useNaiveCanvas) => (0, 
 vutils_extension_1.initTextMeasure)(textSpec, option, useNaiveCanvas, {
-    fontFamily: constants_1.THEME_CONSTANTS.defaultFontFamily,
-    fontSize: constants_1.THEME_CONSTANTS.defaultFontSize
+    fontFamily: token_1.tokenMap.defaultFontFamily,
+    fontSize: token_1.tokenMap.defaultFontSize
 });
 
 exports.initTextMeasure = initTextMeasure;

package/cjs/util/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":";;;AAGA,iEAAoE;AACpE,iEAAoF;AAG7E,MAAM,eAAe,GAAG,CAC7B,QAAyC,EACzC,MAAoC,EACpC,cAAwB,EACY,EAAE;IACtC,OAAO,IAAA,kCAAmB,EAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE;QAC3D,UAAU,EAAE,2BAAe,CAAC,iBAAiB;QAC7C,QAAQ,EAAE,2BAAe,CAAC,eAAe;KAC1C,CAAC,CAAC;AACL,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B;AAEK,MAAM,WAAW,GAAG,CACzB,IAAY,EACZ,QAAyC,EACzC,MAAoC,EACpC,cAAwB,EACb,EAAE;IACb,OAAO,IAAA,uBAAe,EAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACzE,CAAC,CAAC;AAPW,QAAA,WAAW,eAOtB","file":"text.js","sourcesContent":["import type { ITextMeasureOption, ITextSize } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport type { TextMeasure } from '@visactor/vutils';\nimport { THEME_CONSTANTS } from '../theme/builtin/common/constants';\nimport { initTextMeasure as initTextMeasureFunc } from '@visactor/vutils-extension';\nimport type { ITextGraphicAttribute } from '@visactor/vrender-core';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextGraphicAttribute>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): TextMeasure<ITextGraphicAttribute> => {\n  return initTextMeasureFunc(textSpec, option, useNaiveCanvas, {\n    fontFamily: THEME_CONSTANTS.defaultFontFamily,\n    fontSize: THEME_CONSTANTS.defaultFontSize\n  });\n};\n\nexport const measureText = (\n  text: string,\n  textSpec?: Partial<ITextGraphicAttribute>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): ITextSize => {\n  return initTextMeasure(textSpec, option, useNaiveCanvas).measure(text);\n};\n"]}
+{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":";;;AAGA,iEAAoF;AAEpF,0CAA0C;AAEnC,MAAM,eAAe,GAAG,CAC7B,QAAyC,EACzC,MAAoC,EACpC,cAAwB,EACY,EAAE;IACtC,OAAO,IAAA,kCAAmB,EAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE;QAC3D,UAAU,EAAE,gBAAQ,CAAC,iBAAiB;QACtC,QAAQ,EAAE,gBAAQ,CAAC,eAAe;KACnC,CAAC,CAAC;AACL,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B;AAEK,MAAM,WAAW,GAAG,CACzB,IAAY,EACZ,QAAyC,EACzC,MAAoC,EACpC,cAAwB,EACb,EAAE;IACb,OAAO,IAAA,uBAAe,EAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACzE,CAAC,CAAC;AAPW,QAAA,WAAW,eAOtB","file":"text.js","sourcesContent":["import type { ITextMeasureOption, ITextSize } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport type { TextMeasure } from '@visactor/vutils';\nimport { initTextMeasure as initTextMeasureFunc } from '@visactor/vutils-extension';\nimport type { ITextGraphicAttribute } from '@visactor/vrender-core';\nimport { tokenMap } from '../theme/token';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextGraphicAttribute>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): TextMeasure<ITextGraphicAttribute> => {\n  return initTextMeasureFunc(textSpec, option, useNaiveCanvas, {\n    fontFamily: tokenMap.defaultFontFamily,\n    fontSize: tokenMap.defaultFontSize\n  });\n};\n\nexport const measureText = (\n  text: string,\n  textSpec?: Partial<ITextGraphicAttribute>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): ITextSize => {\n  return initTextMeasure(textSpec, option, useNaiveCanvas).measure(text);\n};\n"]}

package/cjs/util/theme/common.d.ts

@@ -0,0 +1,2 @@
+import type { ITheme } from '../../theme';
+export declare function getThemeObject(theme?: string | ITheme, transformed?: boolean): ITheme;

package/cjs/util/theme/common.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.getThemeObject = void 0;
+
+const theme_1 = require("../../theme"), vutils_1 = require("@visactor/vutils");
+
+function getThemeObject(theme, transformed) {
+    return (0, vutils_1.isString)(theme) ? theme_1.ThemeManager.themeExist(theme) ? theme_1.ThemeManager.getTheme(theme, transformed) : {} : (0, 
+    vutils_1.isObject)(theme) ? theme : {};
+}
+
+exports.getThemeObject = getThemeObject;
+//# sourceMappingURL=common.js.map

package/cjs/util/theme/common.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/util/theme/common.ts"],"names":[],"mappings":";;;AAEA,uCAA2C;AAC3C,6CAAsD;AAEtD,SAAgB,cAAc,CAAC,KAAuB,EAAE,WAAqB;IAC3E,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;QACnB,IAAI,oBAAY,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAClC,OAAO,oBAAY,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;SAClD;QACD,OAAO,EAAE,CAAC;KACX;SAAM,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;QAC1B,OAAO,KAAK,CAAC;KACd;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAVD,wCAUC","file":"common.js","sourcesContent":["import type { ITheme } from '../../theme';\n// eslint-disable-next-line no-duplicate-imports\nimport { ThemeManager } from '../../theme';\nimport { isObject, isString } from '@visactor/vutils';\n\nexport function getThemeObject(theme?: string | ITheme, transformed?: boolean): ITheme {\n  if (isString(theme)) {\n    if (ThemeManager.themeExist(theme)) {\n      return ThemeManager.getTheme(theme, transformed);\n    }\n    return {};\n  } else if (isObject(theme)) {\n    return theme;\n  }\n  return {};\n}\n"]}

package/cjs/util/theme/index.d.ts

@@ -0,0 +1,3 @@
+export * from './common';
+export * from './merge-theme';
+export * from './preprocess';

package/cjs/util/theme/index.js

@@ -0,0 +1,22 @@
+"use strict";
+
+var __createBinding = this && this.__createBinding || (Object.create ? function(o, m, k, k2) {
+    void 0 === k2 && (k2 = k);
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    desc && !("get" in desc ? !m.__esModule : desc.writable || desc.configurable) || (desc = {
+        enumerable: !0,
+        get: function() {
+            return m[k];
+        }
+    }), Object.defineProperty(o, k2, desc);
+} : function(o, m, k, k2) {
+    void 0 === k2 && (k2 = k), o[k2] = m[k];
+}), __exportStar = this && this.__exportStar || function(m, exports) {
+    for (var p in m) "default" === p || Object.prototype.hasOwnProperty.call(exports, p) || __createBinding(exports, m, p);
+};
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), __exportStar(require("./common"), exports), __exportStar(require("./merge-theme"), exports), 
+__exportStar(require("./preprocess"), exports);
+//# sourceMappingURL=index.js.map

package/cjs/util/theme/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/util/theme/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,gDAA8B;AAC9B,+CAA6B","file":"index.js","sourcesContent":["export * from './common';\nexport * from './merge-theme';\nexport * from './preprocess';\n"]}

package/cjs/util/{spec → theme}/merge-theme.js

@@ -4,13 +4,14 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.transformSeriesThemeToMerge = exports.transformColorSchemeToMerge = exports.mergeTheme = void 0;
 
-const vutils_1 = require("@visactor/vutils"), util_1 = require("../../theme/color-scheme/util"), theme_1 = require("../../series/interface/theme"), merge_spec_1 = require("./merge-spec");
+const vutils_1 = require("@visactor/vutils"), util_1 = require("../../theme/color-scheme/util"), theme_1 = require("../../series/interface/theme"), merge_spec_1 = require("../spec/merge-spec");
 
 function mergeTheme(target, ...sources) {
     return (0, merge_spec_1.mergeSpec)(transformThemeToMerge(target), ...sources.map(transformThemeToMerge));
 }
 
 function transformThemeToMerge(theme) {
+    var _a;
     if (!theme) return theme;
     const colorScheme = transformColorSchemeToMerge(theme.colorScheme), {series: series} = theme, {mark: markByType, markByName: markByName} = theme;
     let newSeriesTheme;
@@ -21,6 +22,7 @@ function transformThemeToMerge(theme) {
         newSeriesTheme;
     }), {})), Object.assign({}, theme, {
         colorScheme: colorScheme,
+        tokenMap: null !== (_a = theme.tokenMap) && void 0 !== _a ? _a : {},
         series: Object.assign({}, theme.series, newSeriesTheme)
     });
 }

package/cjs/util/theme/merge-theme.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/util/theme/merge-theme.ts"],"names":[],"mappings":";;;AAEA,6CAAyC;AAEzC,wDAAqF;AAKrF,wDAAiE;AACjE,mDAA+C;AAE/C,SAAgB,UAAU,CAAC,MAAqB,EAAE,GAAG,OAAwB;IAC3E,OAAO,IAAA,sBAAS,EAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC;AACzF,CAAC;AAFD,gCAEC;AAED,SAAS,qBAAqB,CAAC,KAAqB;;IAClD,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,KAAK,CAAC;KACd;IAGD,MAAM,WAAW,GAAG,2BAA2B,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAGnE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACzB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAC/C,IAAI,cAAc,CAAC;IACnB,IAAI,UAAU,IAAI,UAAU,EAAE;QAC5B,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,yBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE,GAAG,EAAE,EAAE;;YAC7E,MAAM,KAAK,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,GAAG,CAAC,mCAAI,EAAE,CAAC;YAClC,cAAc,CAAC,GAAG,CAAC,GAAG,2BAA2B,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YACtF,OAAO,cAAc,CAAC;QACxB,CAAC,EAAE,EAAkB,CAAC,CAAC;KACxB;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE;QAC9B,WAAW;QACX,QAAQ,EAAE,MAAA,KAAK,CAAC,QAAQ,mCAAI,EAAE;QAC9B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,cAAc,CAAC;KACxD,CAAC,CAAC;AACL,CAAC;AAGD,SAAgB,2BAA2B,CAAC,WAAsC;IAChF,IAAI,WAAW,EAAE;QACf,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,CAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YAC/E,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,2CAAoC,EAAC,KAAK,CAAC,CAAC;YAC1D,OAAO,MAAM,CAAC;QAChB,CAAC,EAAE,EAAuB,CAAC,CAAC;KAC7B;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AATD,kEASC;AAGD,SAAgB,2BAA2B,CACzC,WAAgB,EAChB,UAAkB,EAClB,UAAkC,EAClC,UAAkC;IAElC,IAAI,CAAC,yBAAiB,CAAC,UAAU,CAAC,EAAE;QAClC,OAAO,WAAW,CAAC;KACpB;IACD,MAAM,QAAQ,GAAQ,EAAE,CAAC;IACzB,MAAM,CAAC,MAAM,CAAkB,yBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;QACvF,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAA,sBAAS,EAAC,EAAE,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,IAAI,CAAC,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAG,IAAI,CAAC,CAAC,CAAC;IACxG,CAAC,CAAC,CAAC;IACH,uCACK,WAAW,GACX,QAAQ,EACX;AACJ,CAAC;AAjBD,kEAiBC","file":"merge-theme.js","sourcesContent":["import type { Maybe } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { array } from '@visactor/vutils';\nimport type { IGlobalMarkThemeByName, IGlobalMarkThemeByType, ITheme } from '../../theme';\nimport { transformColorSchemeToStandardStruct } from '../../theme/color-scheme/util';\nimport type { IThemeColorScheme } from '../../theme/color-scheme/interface';\nimport type { ISeriesTheme } from '../../series/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport type { ISeriesMarkInfo } from '../../series/interface/common';\nimport { seriesMarkInfoMap } from '../../series/interface/theme';\nimport { mergeSpec } from '../spec/merge-spec';\n\nexport function mergeTheme(target: Maybe<ITheme>, ...sources: Maybe<ITheme>[]): Maybe<ITheme> {\n  return mergeSpec(transformThemeToMerge(target), ...sources.map(transformThemeToMerge));\n}\n\nfunction transformThemeToMerge(theme?: Maybe<ITheme>): Maybe<ITheme> {\n  if (!theme) {\n    return theme;\n  }\n\n  // 将色板转化为标准形式\n  const colorScheme = transformColorSchemeToMerge(theme.colorScheme);\n\n  // 将全局 mark 主题 merge 进系列主题\n  const { series } = theme;\n  const { mark: markByType, markByName } = theme;\n  let newSeriesTheme;\n  if (markByType || markByName) {\n    newSeriesTheme = Object.keys(seriesMarkInfoMap).reduce((newSeriesTheme, key) => {\n      const value = series?.[key] ?? {};\n      newSeriesTheme[key] = transformSeriesThemeToMerge(value, key, markByType, markByName);\n      return newSeriesTheme;\n    }, {} as ISeriesTheme);\n  }\n\n  return Object.assign({}, theme, {\n    colorScheme,\n    tokenMap: theme.tokenMap ?? {},\n    series: Object.assign({}, theme.series, newSeriesTheme)\n  });\n}\n\n/** 将色板转化为标准形式 */\nexport function transformColorSchemeToMerge(colorScheme?: Maybe<IThemeColorScheme>): Maybe<IThemeColorScheme> {\n  if (colorScheme) {\n    colorScheme = Object.keys(colorScheme).reduce<IThemeColorScheme>((scheme, key) => {\n      const value = colorScheme[key];\n      scheme[key] = transformColorSchemeToStandardStruct(value);\n      return scheme;\n    }, {} as IThemeColorScheme);\n  }\n  return colorScheme;\n}\n\n/** 将全局 mark 主题 merge 进系列主题 */\nexport function transformSeriesThemeToMerge(\n  seriesTheme: any,\n  seriesType: string,\n  markByType: IGlobalMarkThemeByType,\n  markByName: IGlobalMarkThemeByName\n): any {\n  if (!seriesMarkInfoMap[seriesType]) {\n    return seriesTheme;\n  }\n  const newTheme: any = {};\n  Object.values<ISeriesMarkInfo>(seriesMarkInfoMap[seriesType]).forEach(({ type, name }) => {\n    newTheme[name] = mergeSpec({}, markByType?.[array(type)[0]], markByName?.[name], seriesTheme?.[name]);\n  });\n  return {\n    ...seriesTheme,\n    ...newTheme\n  };\n}\n"]}

package/cjs/util/{spec → theme}/preprocess.d.ts

@@ -1,3 +1,4 @@
 import type { IThemeColorScheme } from '../../theme/color-scheme/interface';
 import type { ISeriesSpec } from '../../typings';
-export declare function preprocessTheme(obj: any, colorScheme?: IThemeColorScheme, seriesSpec?: ISeriesSpec): any;
+import type { TokenMap } from '../../theme/token';
+export declare function preprocessTheme(obj: any, colorScheme?: IThemeColorScheme, tokenMap?: TokenMap, seriesSpec?: ISeriesSpec): any;

package/cjs/util/{spec → theme}/preprocess.js

@@ -4,15 +4,17 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.preprocessTheme = void 0;
 
-const vutils_1 = require("@visactor/vutils"), util_1 = require("../../theme/color-scheme/util"), IGNORE_KEYS = [ "animationThreshold", "colorScheme", "fontFamily", "name", "padding" ];
+const vutils_1 = require("@visactor/vutils"), util_1 = require("../../theme/color-scheme/util"), token_1 = require("../../theme/token"), IGNORE_KEYS = [ "animationThreshold", "colorScheme", "name", "padding" ];
 
-function preprocessTheme(obj, colorScheme, seriesSpec) {
+function preprocessTheme(obj, colorScheme, tokenMap, seriesSpec) {
     if (!obj) return obj;
+    colorScheme || (colorScheme = obj.colorScheme), tokenMap || (tokenMap = obj.tokenMap);
     const newObj = {};
     return Object.keys(obj).forEach((key => {
         const value = obj[key];
         IGNORE_KEYS.includes(key) ? newObj[key] = value : (0, vutils_1.isPlainObject)(value) ? (0, 
-        util_1.isColorKey)(value) ? newObj[key] = (0, util_1.getActualColor)(value, colorScheme, seriesSpec) : newObj[key] = preprocessTheme(value, colorScheme, seriesSpec) : newObj[key] = value;
+        util_1.isColorKey)(value) ? newObj[key] = (0, util_1.getActualColor)(value, colorScheme, seriesSpec) : (0, 
+        token_1.isTokenKey)(value) ? newObj[key] = (0, token_1.queryToken)(tokenMap, value) : newObj[key] = preprocessTheme(value, colorScheme, tokenMap, seriesSpec) : newObj[key] = value;
     })), newObj;
 }
 

package/cjs/util/theme/preprocess.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/util/theme/preprocess.ts"],"names":[],"mappings":";;;AAAA,6CAAiD;AAEjD,wDAA2E;AAI3E,6CAA2D;AAE3D,MAAM,WAAW,GAAG,CAAC,oBAAoB,EAAE,aAAa,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;AAE7E,SAAgB,eAAe,CAC7B,GAAQ,EACR,WAA+B,EAC/B,QAAmB,EACnB,UAAwB;IAExB,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,GAAG,CAAC;KACZ;IACD,IAAI,CAAC,WAAW,EAAE;QAChB,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC;KAC/B;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;KACzB;IACD,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC7B,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC7B,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SACrB;aAAM,IAAI,IAAA,sBAAa,EAAC,KAAK,CAAC,EAAE;YAC/B,IAAI,IAAA,iBAAU,EAAC,KAAK,CAAC,EAAE;gBAErB,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,qBAAc,EAAC,KAAK,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;aAC9D;iBAAM,IAAI,IAAA,kBAAU,EAAC,KAAK,CAAC,EAAE;gBAE5B,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,kBAAU,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;aAC3C;iBAAM;gBACL,MAAM,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;aACzE;SACF;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SACrB;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AApCD,0CAoCC","file":"preprocess.js","sourcesContent":["import { isPlainObject } from '@visactor/vutils';\nimport type { IThemeColorScheme } from '../../theme/color-scheme/interface';\nimport { getActualColor, isColorKey } from '../../theme/color-scheme/util';\nimport type { ISeriesSpec } from '../../typings';\nimport type { TokenMap } from '../../theme/token';\n// eslint-disable-next-line no-duplicate-imports\nimport { isTokenKey, queryToken } from '../../theme/token';\n\nconst IGNORE_KEYS = ['animationThreshold', 'colorScheme', 'name', 'padding'];\n\nexport function preprocessTheme(\n  obj: any,\n  colorScheme?: IThemeColorScheme,\n  tokenMap?: TokenMap,\n  seriesSpec?: ISeriesSpec\n): any {\n  if (!obj) {\n    return obj;\n  }\n  if (!colorScheme) {\n    colorScheme = obj.colorScheme;\n  }\n  if (!tokenMap) {\n    tokenMap = obj.tokenMap;\n  }\n  const newObj = {};\n  Object.keys(obj).forEach(key => {\n    const value = obj[key];\n    if (IGNORE_KEYS.includes(key)) {\n      newObj[key] = value;\n    } else if (isPlainObject(value)) {\n      if (isColorKey(value)) {\n        // 查询、替换语义化颜色\n        newObj[key] = getActualColor(value, colorScheme, seriesSpec);\n      } else if (isTokenKey(value)) {\n        // 查询、替换语义化 token\n        newObj[key] = queryToken(tokenMap, value);\n      } else {\n        newObj[key] = preprocessTheme(value, colorScheme, tokenMap, seriesSpec);\n      }\n    } else {\n      newObj[key] = value;\n    }\n  });\n\n  return newObj;\n}\n"]}

package/cjs/vchart-all.js

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VChart", {
     }
 });
 
-const line_1 = require("./chart/line"), area_1 = require("./chart/area"), bar_1 = require("./chart/bar"), scatter_1 = require("./chart/scatter"), map_1 = require("./chart/map"), pie_1 = require("./chart/pie"), rose_1 = require("./chart/rose"), radar_1 = require("./chart/radar"), common_1 = require("./chart/common"), sequence_1 = require("./chart/sequence"), histogram_1 = require("./chart/histogram"), circular_1 = require("./chart/progress/circular"), gauge_1 = require("./chart/gauge"), word_cloud_1 = require("./chart/word-cloud"), funnel_1 = require("./chart/funnel"), linear_1 = require("./chart/progress/linear"), range_column_1 = require("./chart/range-column"), sunburst_1 = require("./chart/sunburst"), circle_packing_1 = require("./chart/circle-packing"), treemap_1 = require("./chart/treemap"), waterfall_1 = require("./chart/waterfall"), box_plot_1 = require("./chart/box-plot"), sankey_1 = require("./chart/sankey"), range_area_1 = require("./chart/range-area"), heatmap_1 = require("./chart/heatmap"), correlation_1 = require("./chart/correlation"), cartesian_1 = require("./component/axis/cartesian"), polar_1 = require("./component/axis/polar"), legend_1 = require("./component/legend"), tooltip_1 = require("./component/tooltip"), crosshair_1 = require("./component/crosshair"), data_zoom_1 = require("./component/data-zoom"), indicator_1 = require("./component/indicator"), geo_1 = require("./component/geo"), mark_line_1 = require("./component/marker/mark-line"), title_1 = require("./component/title"), mark_area_1 = require("./component/marker/mark-area"), player_1 = require("./component/player"), label_1 = require("./component/label"), total_label_1 = require("./component/label/total-label"), mark_point_1 = require("./component/marker/mark-point"), brush_1 = require("./component/brush"), custom_mark_1 = require("./component/custom-mark"), map_label_1 = require("./component/map-label"), grid_layout_1 = require("./layout/grid-layout/grid-layout"), layout3d_1 = require("./layout/layout3d"), poptip_1 = require("./component/poptip"), tooltip_handler_1 = require("./plugin/components/tooltip-handler"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const line_1 = require("./chart/line"), area_1 = require("./chart/area"), bar_1 = require("./chart/bar"), scatter_1 = require("./chart/scatter"), map_1 = require("./chart/map"), pie_1 = require("./chart/pie"), rose_1 = require("./chart/rose"), radar_1 = require("./chart/radar"), common_1 = require("./chart/common"), sequence_1 = require("./chart/sequence"), histogram_1 = require("./chart/histogram"), circular_1 = require("./chart/progress/circular"), gauge_1 = require("./chart/gauge"), word_cloud_1 = require("./chart/word-cloud"), funnel_1 = require("./chart/funnel"), linear_1 = require("./chart/progress/linear"), range_column_1 = require("./chart/range-column"), sunburst_1 = require("./chart/sunburst"), circle_packing_1 = require("./chart/circle-packing"), treemap_1 = require("./chart/treemap"), waterfall_1 = require("./chart/waterfall"), box_plot_1 = require("./chart/box-plot"), sankey_1 = require("./chart/sankey"), range_area_1 = require("./chart/range-area"), heatmap_1 = require("./chart/heatmap"), correlation_1 = require("./chart/correlation"), cartesian_1 = require("./component/axis/cartesian"), polar_1 = require("./component/axis/polar"), legend_1 = require("./component/legend"), tooltip_1 = require("./component/tooltip"), crosshair_1 = require("./component/crosshair"), data_zoom_1 = require("./component/data-zoom"), indicator_1 = require("./component/indicator"), geo_1 = require("./component/geo"), mark_line_1 = require("./component/marker/mark-line"), title_1 = require("./component/title"), mark_area_1 = require("./component/marker/mark-area"), player_1 = require("./component/player"), label_1 = require("./component/label"), total_label_1 = require("./component/label/total-label"), mark_point_1 = require("./component/marker/mark-point"), brush_1 = require("./component/brush"), custom_mark_1 = require("./component/custom-mark"), map_label_1 = require("./component/map-label"), grid_layout_1 = require("./layout/grid-layout/grid-layout"), layout3d_1 = require("./layout/layout3d"), poptip_1 = require("./component/poptip"), plugin_1 = require("./plugin"), formatter_1 = require("./plugin/chart/formatter"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
-core_1.VChart.useRegisters([ line_1.registerLineChart, area_1.registerAreaChart, bar_1.registerBarChart, scatter_1.registerScatterChart, pie_1.registerPieChart, rose_1.registerRoseChart, radar_1.registerRadarChart, histogram_1.registerHistogramChart, map_1.registerMapChart, gauge_1.registerGaugeChart, word_cloud_1.registerWordCloudChart, word_cloud_1.registerWordCloudShapeChart, funnel_1.registerFunnelChart, waterfall_1.registerWaterfallChart, box_plot_1.registerBoxplotChart, circular_1.registerCircularProgressChart, linear_1.registerLinearProgressChart, range_column_1.registerRangeColumnChart, range_area_1.registerRangeAreaChart, sunburst_1.registerSunburstChart, circle_packing_1.registerCirclePackingChart, treemap_1.registerTreemapChart, sankey_1.registerSankeyChart, heatmap_1.registerHeatmapChart, sequence_1.registerSequenceChart, correlation_1.registerCorrelationChart, common_1.registerCommonChart, bar_1.registerBar3dChart, pie_1.registerPie3dChart, histogram_1.registerHistogram3dChart, funnel_1.registerFunnel3dChart, range_column_1.registerRangeColumn3dChart, word_cloud_1.registerWordCloud3dChart, word_cloud_1.registerWordCloudShape3dChart, cartesian_1.registerCartesianLinearAxis, cartesian_1.registerCartesianBandAxis, cartesian_1.registerCartesianTimeAxis, cartesian_1.registerCartesianLogAxis, cartesian_1.registerCartesianSymlogAxis, polar_1.registerPolarBandAxis, polar_1.registerPolarLinearAxis, legend_1.registerDiscreteLegend, legend_1.registerContinuousLegend, tooltip_1.registerTooltip, crosshair_1.registerCartesianCrossHair, crosshair_1.registerPolarCrossHair, data_zoom_1.registerDataZoom, data_zoom_1.registerScrollBar, indicator_1.registerIndicator, geo_1.registerGeoCoordinate, mark_point_1.registerMarkPoint, mark_line_1.registerMarkLine, mark_area_1.registerMarkArea, title_1.registerTitle, player_1.registerPlayer, label_1.registerLabel, total_label_1.registerTotalLabel, brush_1.registerBrush, custom_mark_1.registerCustomMark, map_label_1.registerMapLabel, poptip_1.registerPoptip, grid_layout_1.registerGridLayout, layout3d_1.registerLayout3d, tooltip_handler_1.registerDomTooltipHandler, tooltip_handler_1.registerCanvasTooltipHandler, vgrammar_core_1.registerElementActive, vgrammar_core_1.registerElementHighlight, vgrammar_core_1.registerElementSelect, vgrammar_core_1.registerElementActiveByLegend, vgrammar_core_1.registerElementHighlightByLegend, vgrammar_core_1.registerElementHighlightByName, vgrammar_core_1.registerElementHighlightByGroup, vgrammar_core_1.registerElementHighlightByKey ]);
+core_1.VChart.useRegisters([ line_1.registerLineChart, area_1.registerAreaChart, bar_1.registerBarChart, scatter_1.registerScatterChart, pie_1.registerPieChart, rose_1.registerRoseChart, radar_1.registerRadarChart, histogram_1.registerHistogramChart, map_1.registerMapChart, gauge_1.registerGaugeChart, word_cloud_1.registerWordCloudChart, word_cloud_1.registerWordCloudShapeChart, funnel_1.registerFunnelChart, waterfall_1.registerWaterfallChart, box_plot_1.registerBoxplotChart, circular_1.registerCircularProgressChart, linear_1.registerLinearProgressChart, range_column_1.registerRangeColumnChart, range_area_1.registerRangeAreaChart, sunburst_1.registerSunburstChart, circle_packing_1.registerCirclePackingChart, treemap_1.registerTreemapChart, sankey_1.registerSankeyChart, heatmap_1.registerHeatmapChart, sequence_1.registerSequenceChart, correlation_1.registerCorrelationChart, common_1.registerCommonChart, bar_1.registerBar3dChart, pie_1.registerPie3dChart, histogram_1.registerHistogram3dChart, funnel_1.registerFunnel3dChart, range_column_1.registerRangeColumn3dChart, word_cloud_1.registerWordCloud3dChart, word_cloud_1.registerWordCloudShape3dChart, cartesian_1.registerCartesianLinearAxis, cartesian_1.registerCartesianBandAxis, cartesian_1.registerCartesianTimeAxis, cartesian_1.registerCartesianLogAxis, cartesian_1.registerCartesianSymlogAxis, polar_1.registerPolarBandAxis, polar_1.registerPolarLinearAxis, legend_1.registerDiscreteLegend, legend_1.registerContinuousLegend, tooltip_1.registerTooltip, crosshair_1.registerCartesianCrossHair, crosshair_1.registerPolarCrossHair, data_zoom_1.registerDataZoom, data_zoom_1.registerScrollBar, indicator_1.registerIndicator, geo_1.registerGeoCoordinate, mark_point_1.registerMarkPoint, mark_line_1.registerMarkLine, mark_area_1.registerMarkArea, title_1.registerTitle, player_1.registerPlayer, label_1.registerLabel, total_label_1.registerTotalLabel, brush_1.registerBrush, custom_mark_1.registerCustomMark, map_label_1.registerMapLabel, poptip_1.registerPoptip, grid_layout_1.registerGridLayout, layout3d_1.registerLayout3d, plugin_1.registerDomTooltipHandler, plugin_1.registerCanvasTooltipHandler, formatter_1.registerFormatPlugin, vgrammar_core_1.registerElementActive, vgrammar_core_1.registerElementHighlight, vgrammar_core_1.registerElementSelect, vgrammar_core_1.registerElementActiveByLegend, vgrammar_core_1.registerElementHighlightByLegend, vgrammar_core_1.registerElementHighlightByName, vgrammar_core_1.registerElementHighlightByGroup, vgrammar_core_1.registerElementHighlightByKey ]);
 //# sourceMappingURL=vchart-all.js.map