@visactor/vchart 1.5.4 → 1.6.0

package/cjs/theme/color-scheme/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("./interface"), exports), __exportStar(require("./util"), exports), 
+__exportStar(require("./builtin"), exports);
+//# sourceMappingURL=index.js.map

package/cjs/theme/color-scheme/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/theme/color-scheme/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,yCAAuB;AACvB,4CAA0B","file":"index.js","sourcesContent":["export * from './interface';\nexport * from './util';\nexport * from './builtin';\n"]}

package/cjs/theme/color-scheme/interface.d.ts

@@ -1,4 +1,4 @@
-import type { SeriesTypeEnum } from '../../series/interface';
+import type { SeriesTypeEnum, SeriesTypeForThemeEnum } from '../../series/interface';
 import type { IGradient } from '../../typings';
 export type IColorSchemeStruct = {
     dataScheme: Array<DataSchemeItem> | ProgressiveDataScheme<DataSchemeItem>;
@@ -27,4 +27,4 @@ export type ColorSchemeItem = string | IGradient;
 export type ColorScheme = Array<string> | ProgressiveDataScheme<string> | IColorSchemeStruct;
 export type IThemeColorScheme = {
     default: ColorScheme;
-} & Partial<Record<SeriesTypeEnum, ColorScheme>>;
+} & Partial<Record<SeriesTypeEnum, ColorScheme>> & Partial<Record<SeriesTypeForThemeEnum, ColorScheme>>;

package/cjs/theme/color-scheme/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/color-scheme/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { SeriesTypeEnum } from '../../series/interface';\nimport type { IGradient } from '../../typings';\n\n/** 色板总结构，包含数据色板和语义色板 */\nexport type IColorSchemeStruct = {\n  /** 数据色板 */\n  dataScheme: Array<DataSchemeItem> | ProgressiveDataScheme<DataSchemeItem>;\n\n  /** 语义色板 */\n  palette?: {\n    /** 主色调（可选） */\n    bandColor?: ColorSchemeItem;\n    /** 背景颜色（可选） */\n    backgroundColor?: ColorSchemeItem;\n    /** 其他的语义化色值 */\n    [key: string]: ColorSchemeItem;\n  };\n};\n\n/** 渐进式数据色板：由多个色板组成，应用时会依次调用色板的 `isAvailable` 回调，如果当前回调返回 true 则立即应用对应色板 */\nexport type ProgressiveDataScheme<T> = Array<IProgressiveDataSchemeCase<T>>;\n\nexport interface IProgressiveDataSchemeCase<T> {\n  /** 可选，适合此色板的 domain 数量 */\n  maxDomainLength?: number;\n  /** 可选，自定义回调，返回是否应用此色板，将覆盖 maxDomainLength 等配置 */\n  isAvailable?: boolean | IsProgressiveDataSchemeAvailableCallback;\n  /** 色板 */\n  scheme: T[];\n}\n\nexport type IsProgressiveDataSchemeAvailableCallback = (domain: any[]) => boolean;\n\n/** 语义化色值的色值索引 */\nexport interface IColorKey {\n  /** 颜色type声明 */\n  type: 'palette';\n\n  /** 颜色 token */\n  key: string;\n\n  /** 明度系数（可选，0~1） */\n  l?: number;\n\n  /** 透明度系数（可选，0~1） */\n  a?: number;\n\n  /**\n   * 默认色值，在没有取到 key 对应的色值时返回\n   * @since 1.3.0\n   */\n  default?: ColorSchemeItem;\n}\n\nexport type DataSchemeItem = string | IColorKey;\n\nexport type ColorSchemeItem = string | IGradient; // 纯色或渐变色\n\nexport type ColorScheme = Array<string> | ProgressiveDataScheme<string> | IColorSchemeStruct;\n\nexport type IThemeColorScheme = {\n  /** 必选 */\n  default: ColorScheme;\n} & Partial<Record<SeriesTypeEnum, ColorScheme>>;\n"]}
+{"version":3,"sources":["../src/theme/color-scheme/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { SeriesTypeEnum, SeriesTypeForThemeEnum } from '../../series/interface';\nimport type { IGradient } from '../../typings';\n\n/** 色板总结构，包含数据色板和语义色板 */\nexport type IColorSchemeStruct = {\n  /** 数据色板 */\n  dataScheme: Array<DataSchemeItem> | ProgressiveDataScheme<DataSchemeItem>;\n\n  /** 语义色板 */\n  palette?: {\n    /** 主色调（可选） */\n    bandColor?: ColorSchemeItem;\n    /** 背景颜色（可选） */\n    backgroundColor?: ColorSchemeItem;\n    /** 其他的语义化色值 */\n    [key: string]: ColorSchemeItem;\n  };\n};\n\n/** 渐进式数据色板：由多个色板组成，应用时会依次调用色板的 `isAvailable` 回调，如果当前回调返回 true 则立即应用对应色板 */\nexport type ProgressiveDataScheme<T> = Array<IProgressiveDataSchemeCase<T>>;\n\nexport interface IProgressiveDataSchemeCase<T> {\n  /** 可选，适合此色板的 domain 数量 */\n  maxDomainLength?: number;\n  /** 可选，自定义回调，返回是否应用此色板，将覆盖 maxDomainLength 等配置 */\n  isAvailable?: boolean | IsProgressiveDataSchemeAvailableCallback;\n  /** 色板 */\n  scheme: T[];\n}\n\nexport type IsProgressiveDataSchemeAvailableCallback = (domain: any[]) => boolean;\n\n/** 语义化色值的色值索引 */\nexport interface IColorKey {\n  /** 颜色type声明 */\n  type: 'palette';\n\n  /** 颜色 token */\n  key: string;\n\n  /** 明度系数（可选，0~1） */\n  l?: number;\n\n  /** 透明度系数（可选，0~1） */\n  a?: number;\n\n  /**\n   * 默认色值，在没有取到 key 对应的色值时返回\n   * @since 1.3.0\n   */\n  default?: ColorSchemeItem;\n}\n\nexport type DataSchemeItem = string | IColorKey;\n\nexport type ColorSchemeItem = string | IGradient; // 纯色或渐变色\n\nexport type ColorScheme = Array<string> | ProgressiveDataScheme<string> | IColorSchemeStruct;\n\nexport type IThemeColorScheme = {\n  /** 必选 */\n  default: ColorScheme;\n} & Partial<Record<SeriesTypeEnum, ColorScheme>> &\n  Partial<Record<SeriesTypeForThemeEnum, ColorScheme>>;\n"]}

package/cjs/theme/color-scheme/util.d.ts

@@ -1,9 +1,10 @@
-import type { SeriesTypeEnum } from '../../series/interface';
 import type { ColorScheme, ColorSchemeItem, IColorKey, IColorSchemeStruct, IThemeColorScheme, ProgressiveDataScheme } from './interface';
-export declare function getDataScheme(colorScheme: IThemeColorScheme, seriesType?: SeriesTypeEnum): Array<ColorSchemeItem> | ProgressiveDataScheme<ColorSchemeItem>;
+import type { ISeriesSpec } from '../../typings';
+export declare function getDataScheme(colorScheme?: IThemeColorScheme, seriesSpec?: ISeriesSpec): Array<ColorSchemeItem> | ProgressiveDataScheme<ColorSchemeItem>;
 export declare function computeActualDataScheme(dataScheme: Array<ColorSchemeItem> | ProgressiveDataScheme<ColorSchemeItem>, colorDomain: any[]): Array<ColorSchemeItem>;
-export declare function queryColorFromColorScheme(colorScheme: IThemeColorScheme, colorKey: IColorKey, seriesType?: SeriesTypeEnum): ColorSchemeItem | undefined;
-export declare const getActualColor: (value: any, colorScheme?: IThemeColorScheme, seriesType?: SeriesTypeEnum) => any;
+export declare function queryColorFromColorScheme(colorScheme: IThemeColorScheme, colorKey: IColorKey, seriesSpec?: ISeriesSpec): ColorSchemeItem | undefined;
+export declare const getActualColor: (value: any, colorScheme?: IThemeColorScheme, seriesSpec?: ISeriesSpec) => any;
 export declare function isColorKey(obj: any): obj is IColorKey;
 export declare function isProgressiveDataColorScheme<T>(obj: any): obj is ProgressiveDataScheme<T>;
 export declare function transformColorSchemeToStandardStruct(colorScheme: ColorScheme): IColorSchemeStruct;
+export declare function getColorSchemeBySeries(colorScheme?: IThemeColorScheme, seriesSpec?: ISeriesSpec): ColorScheme | undefined;

package/cjs/theme/color-scheme/util.js

@@ -2,19 +2,20 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.transformColorSchemeToStandardStruct = exports.isProgressiveDataColorScheme = exports.isColorKey = exports.getActualColor = exports.queryColorFromColorScheme = exports.computeActualDataScheme = exports.getDataScheme = void 0;
+}), exports.getColorSchemeBySeries = exports.transformColorSchemeToStandardStruct = exports.isProgressiveDataColorScheme = exports.isColorKey = exports.getActualColor = exports.queryColorFromColorScheme = exports.computeActualDataScheme = exports.getDataScheme = void 0;
 
-const vutils_1 = require("@visactor/vutils"), vutils_2 = require("@visactor/vutils"), color_1 = require("../../util/color");
+const vutils_1 = require("@visactor/vutils"), color_1 = require("../../util/color"), spec_1 = require("../../series/util/spec");
 
-function getDataScheme(colorScheme, seriesType) {
+function getDataScheme(colorScheme, seriesSpec) {
     var _a;
-    const scheme = (0, vutils_1.isValid)(seriesType) && null !== (_a = null == colorScheme ? void 0 : colorScheme[seriesType]) && void 0 !== _a ? _a : null == colorScheme ? void 0 : colorScheme.default;
-    if (!scheme || (0, vutils_1.isArray)(scheme)) return scheme;
+    if (!colorScheme) return [];
+    const scheme = getColorSchemeBySeries(colorScheme, seriesSpec);
+    if (!scheme || (0, vutils_1.isArray)(scheme)) return null !== (_a = scheme) && void 0 !== _a ? _a : [];
     if ((0, vutils_1.isObject)(scheme)) {
         const {dataScheme: dataScheme} = scheme;
         return dataScheme ? isProgressiveDataColorScheme(dataScheme) ? dataScheme.map((item => Object.assign(Object.assign({}, item), {
-            scheme: item.scheme.map((color => isColorKey(color) ? queryColorFromColorScheme(colorScheme, color, seriesType) : color)).filter(vutils_1.isValid)
-        }))) : dataScheme.map((color => isColorKey(color) ? queryColorFromColorScheme(colorScheme, color, seriesType) : color)).filter(vutils_1.isValid) : [];
+            scheme: item.scheme.map((color => isColorKey(color) ? queryColorFromColorScheme(colorScheme, color, seriesSpec) : color)).filter(vutils_1.isValid)
+        }))) : dataScheme.map((color => isColorKey(color) ? queryColorFromColorScheme(colorScheme, color, seriesSpec) : color)).filter(vutils_1.isValid) : [];
     }
     return [];
 }
@@ -26,19 +27,19 @@ function computeActualDataScheme(dataScheme, colorDomain) {
     vutils_1.isValid)(item.maxDomainLength) || (null == colorDomain ? void 0 : colorDomain.length) <= item.maxDomainLength))) || void 0 === _a ? void 0 : _a.scheme) && void 0 !== _b ? _b : dataScheme[dataScheme.length - 1].scheme : dataScheme;
 }
 
-function queryColorFromColorScheme(colorScheme, colorKey, seriesType) {
-    var _a, _b;
-    const scheme = (0, vutils_1.isValid)(seriesType) && null !== (_a = colorScheme[seriesType]) && void 0 !== _a ? _a : colorScheme.default;
+function queryColorFromColorScheme(colorScheme, colorKey, seriesSpec) {
+    var _a;
+    const scheme = getColorSchemeBySeries(colorScheme, seriesSpec);
     if (!scheme) return;
     let color;
     const {palette: palette} = scheme;
-    if ((0, vutils_1.isObject)(palette) && (color = null !== (_b = palette[colorKey.key]) && void 0 !== _b ? _b : colorKey.default), 
+    if ((0, vutils_1.isObject)(palette) && (color = null !== (_a = palette[colorKey.key]) && void 0 !== _a ? _a : colorKey.default), 
     !color) return;
     if (!(0, vutils_1.isValid)(colorKey.a) && !(0, vutils_1.isValid)(colorKey.l) || !(0, 
     vutils_1.isString)(color)) return color;
     let c = new color_1.Color(color);
     if ((0, vutils_1.isValid)(colorKey.l)) {
-        const {r: r, g: g, b: b} = c.color, {h: h, s: s} = vutils_2.ColorUtil.rgbToHsl(r, g, b), rgb = vutils_2.ColorUtil.hslToRgb(h, s, colorKey.l), newColor = new color_1.Color(`rgb(${rgb.r}, ${rgb.g}, ${rgb.b})`);
+        const {r: r, g: g, b: b} = c.color, {h: h, s: s} = vutils_1.ColorUtil.rgbToHsl(r, g, b), rgb = vutils_1.ColorUtil.hslToRgb(h, s, colorKey.l), newColor = new color_1.Color(`rgb(${rgb.r}, ${rgb.g}, ${rgb.b})`);
         newColor.setOpacity(c.color.opacity), c = newColor;
     }
     return (0, vutils_1.isValid)(colorKey.a) && c.setOpacity(colorKey.a), c.toRGBA();
@@ -47,9 +48,9 @@ function queryColorFromColorScheme(colorScheme, colorKey, seriesType) {
 exports.getDataScheme = getDataScheme, exports.computeActualDataScheme = computeActualDataScheme, 
 exports.queryColorFromColorScheme = queryColorFromColorScheme;
 
-const getActualColor = (value, colorScheme, seriesType) => {
+const getActualColor = (value, colorScheme, seriesSpec) => {
     if (isColorKey(value) && colorScheme) {
-        const color = queryColorFromColorScheme(colorScheme, value, seriesType);
+        const color = queryColorFromColorScheme(colorScheme, value, seriesSpec);
         if (color) return color;
     }
     return value;
@@ -70,6 +71,18 @@ function transformColorSchemeToStandardStruct(colorScheme) {
     } : colorScheme;
 }
 
+function getColorSchemeBySeries(colorScheme, seriesSpec) {
+    var _a, _b;
+    const {type: seriesType} = null != seriesSpec ? seriesSpec : {};
+    let scheme;
+    if (seriesSpec && (0, vutils_1.isValid)(seriesType)) {
+        const direction = (0, spec_1.getDirectionFromSeriesSpec)(seriesSpec);
+        scheme = null !== (_b = null !== (_a = null == colorScheme ? void 0 : colorScheme[`${seriesType}_${direction}`]) && void 0 !== _a ? _a : null == colorScheme ? void 0 : colorScheme[seriesType]) && void 0 !== _b ? _b : null == colorScheme ? void 0 : colorScheme.default;
+    } else scheme = null == colorScheme ? void 0 : colorScheme.default;
+    return scheme;
+}
+
 exports.getActualColor = getActualColor, exports.isColorKey = isColorKey, exports.isProgressiveDataColorScheme = isProgressiveDataColorScheme, 
-exports.transformColorSchemeToStandardStruct = transformColorSchemeToStandardStruct;
+exports.transformColorSchemeToStandardStruct = transformColorSchemeToStandardStruct, 
+exports.getColorSchemeBySeries = getColorSchemeBySeries;
 //# sourceMappingURL=util.js.map

package/cjs/theme/color-scheme/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/color-scheme/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { array, isArray, isFunction, isObject, isString, isValid } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { ColorUtil } from '@visactor/vutils';\nimport type { SeriesTypeEnum } from '../../series/interface';\nimport { Color } from '../../util/color';\nimport type {\n  ColorScheme,\n  ColorSchemeItem,\n  IColorKey,\n  IColorSchemeStruct,\n  IProgressiveDataSchemeCase,\n  IThemeColorScheme,\n  ProgressiveDataScheme\n} from './interface';\n\n/**\n * 从色板中获取数据色板（在此步骤中替换语义色值）\n * @param colorScheme\n * @param seriesType\n * @returns\n */\nexport function getDataScheme(\n  colorScheme: IThemeColorScheme,\n  seriesType?: SeriesTypeEnum\n): Array<ColorSchemeItem> | ProgressiveDataScheme<ColorSchemeItem> {\n  const scheme = !isValid(seriesType) ? colorScheme?.default : colorScheme?.[seriesType] ?? colorScheme?.default;\n  if (!scheme || isArray(scheme)) {\n    // 不带语义色板，直接输出\n    return scheme as Array<ColorSchemeItem> | ProgressiveDataScheme<ColorSchemeItem>;\n  } else if (isObject(scheme)) {\n    // 带语义色板，转换颜色后输出\n    const { dataScheme } = scheme as IColorSchemeStruct;\n    if (!dataScheme) {\n      return [];\n    }\n    // 渐进式色板的情况\n    if (isProgressiveDataColorScheme(dataScheme)) {\n      return dataScheme.map(item => ({\n        ...item,\n        scheme: item.scheme\n          .map(color => {\n            if (isColorKey(color)) {\n              return queryColorFromColorScheme(colorScheme, color, seriesType);\n            }\n            return color;\n          })\n          .filter(isValid)\n      }));\n    }\n    // 普通色板的情况\n    return dataScheme\n      .map(color => {\n        if (isColorKey(color)) {\n          return queryColorFromColorScheme(colorScheme, color, seriesType);\n        }\n        return color;\n      })\n      .filter(isValid);\n  }\n  return [];\n}\n\n/**\n * 计算最终数据色板（在此步骤中获得渐进式色板的最终色板）\n * @param colorScheme\n * @param seriesType\n * @returns\n */\nexport function computeActualDataScheme(\n  dataScheme: Array<ColorSchemeItem> | ProgressiveDataScheme<ColorSchemeItem>,\n  colorDomain: any[]\n): Array<ColorSchemeItem> {\n  if (isProgressiveDataColorScheme(dataScheme)) {\n    return (\n      dataScheme.find(item => {\n        if (isValid(item.isAvailable)) {\n          if (isFunction(item.isAvailable)) {\n            return item.isAvailable(colorDomain);\n          }\n          return !!item.isAvailable;\n        } else if (isValid(item.maxDomainLength)) {\n          return colorDomain?.length <= item.maxDomainLength;\n        }\n        return true;\n      })?.scheme ?? dataScheme[dataScheme.length - 1].scheme\n    );\n  }\n  return dataScheme;\n}\n\n/**\n * 根据色板和色值索引生成颜色\n * @param colorScheme\n * @param colorKey\n * @param seriesType\n * @returns\n */\nexport function queryColorFromColorScheme(\n  colorScheme: IThemeColorScheme,\n  colorKey: IColorKey,\n  seriesType?: SeriesTypeEnum\n): ColorSchemeItem | undefined {\n  const scheme = !isValid(seriesType) ? colorScheme.default : colorScheme[seriesType] ?? colorScheme.default;\n  if (!scheme) {\n    return undefined;\n  }\n  let color;\n  const { palette } = scheme as IColorSchemeStruct;\n  if (isObject(palette)) {\n    color = palette[colorKey.key] ?? colorKey.default;\n  }\n  if (!color) {\n    return undefined;\n  }\n  if ((!isValid(colorKey.a) && !isValid(colorKey.l)) || !isString(color)) {\n    return color;\n  }\n  let c = new Color(color);\n  if (isValid(colorKey.l)) {\n    const { r, g, b } = c.color;\n    const { h, s } = ColorUtil.rgbToHsl(r, g, b);\n    const rgb = ColorUtil.hslToRgb(h, s, colorKey.l);\n    const newColor = new Color(`rgb(${rgb.r}, ${rgb.g}, ${rgb.b})`);\n    newColor.setOpacity(c.color.opacity);\n    c = newColor;\n  }\n  if (isValid(colorKey.a)) {\n    c.setOpacity(colorKey.a);\n  }\n  return c.toRGBA();\n}\n\n/** 查询语义化颜色 */\nexport const getActualColor = (value: any, colorScheme?: IThemeColorScheme, seriesType?: SeriesTypeEnum) => {\n  if (isColorKey(value)) {\n    if (colorScheme) {\n      const color = queryColorFromColorScheme(colorScheme, value, seriesType);\n      if (color) {\n        return color;\n      }\n    }\n  }\n  return value;\n};\n\nexport function isColorKey(obj: any): obj is IColorKey {\n  return isObject(obj) && (obj as IColorKey).type === 'palette' && !!(obj as IColorKey).key;\n}\n\nexport function isProgressiveDataColorScheme<T>(obj: any): obj is ProgressiveDataScheme<T> {\n  if (!isArray(obj) || obj.length === 0) {\n    return false;\n  }\n  return obj.every(item => {\n    return isValid((item as IProgressiveDataSchemeCase<T>).scheme);\n  });\n}\n\n/** 将色板转化为标准形式 */\nexport function transformColorSchemeToStandardStruct(colorScheme: ColorScheme): IColorSchemeStruct {\n  if (isArray(colorScheme)) {\n    return {\n      dataScheme: colorScheme\n    };\n  }\n  return colorScheme;\n}\n"]}
+{"version":3,"sources":["../src/theme/color-scheme/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { isArray, isFunction, isObject, isString, isValid, ColorUtil } from '@visactor/vutils';\nimport { Color } from '../../util/color';\nimport type {\n  ColorScheme,\n  ColorSchemeItem,\n  IColorKey,\n  IColorSchemeStruct,\n  IProgressiveDataSchemeCase,\n  IThemeColorScheme,\n  ProgressiveDataScheme\n} from './interface';\nimport type { ISeriesSpec } from '../../typings';\nimport { getDirectionFromSeriesSpec } from '../../series/util/spec';\n\n/**\n * 从色板中获取数据色板（在此步骤中替换语义色值）\n * @param colorScheme\n * @param seriesType\n * @returns\n */\nexport function getDataScheme(\n  colorScheme?: IThemeColorScheme,\n  seriesSpec?: ISeriesSpec\n): Array<ColorSchemeItem> | ProgressiveDataScheme<ColorSchemeItem> {\n  if (!colorScheme) {\n    return [];\n  }\n  const scheme = getColorSchemeBySeries(colorScheme, seriesSpec);\n  if (!scheme || isArray(scheme)) {\n    // 不带语义色板，直接输出\n    return (scheme as Array<ColorSchemeItem> | ProgressiveDataScheme<ColorSchemeItem>) ?? [];\n  } else if (isObject(scheme)) {\n    // 带语义色板，转换颜色后输出\n    const { dataScheme } = scheme as IColorSchemeStruct;\n    if (!dataScheme) {\n      return [];\n    }\n    // 渐进式色板的情况\n    if (isProgressiveDataColorScheme(dataScheme)) {\n      return dataScheme.map(item => ({\n        ...item,\n        scheme: item.scheme\n          .map(color => {\n            if (isColorKey(color)) {\n              return queryColorFromColorScheme(colorScheme, color, seriesSpec);\n            }\n            return color;\n          })\n          .filter(isValid)\n      }));\n    }\n    // 普通色板的情况\n    return dataScheme\n      .map(color => {\n        if (isColorKey(color)) {\n          return queryColorFromColorScheme(colorScheme, color, seriesSpec);\n        }\n        return color;\n      })\n      .filter(isValid);\n  }\n  return [];\n}\n\n/**\n * 计算最终数据色板（在此步骤中获得渐进式色板的最终色板）\n * @param colorScheme\n * @param seriesType\n * @returns\n */\nexport function computeActualDataScheme(\n  dataScheme: Array<ColorSchemeItem> | ProgressiveDataScheme<ColorSchemeItem>,\n  colorDomain: any[]\n): Array<ColorSchemeItem> {\n  if (isProgressiveDataColorScheme(dataScheme)) {\n    return (\n      dataScheme.find(item => {\n        if (isValid(item.isAvailable)) {\n          if (isFunction(item.isAvailable)) {\n            return item.isAvailable(colorDomain);\n          }\n          return !!item.isAvailable;\n        } else if (isValid(item.maxDomainLength)) {\n          return colorDomain?.length <= item.maxDomainLength;\n        }\n        return true;\n      })?.scheme ?? dataScheme[dataScheme.length - 1].scheme\n    );\n  }\n  return dataScheme;\n}\n\n/**\n * 根据色板和色值索引生成颜色\n * @param colorScheme\n * @param colorKey\n * @param seriesType\n * @returns\n */\nexport function queryColorFromColorScheme(\n  colorScheme: IThemeColorScheme,\n  colorKey: IColorKey,\n  seriesSpec?: ISeriesSpec\n): ColorSchemeItem | undefined {\n  const scheme = getColorSchemeBySeries(colorScheme, seriesSpec);\n  if (!scheme) {\n    return undefined;\n  }\n  let color;\n  const { palette } = scheme as IColorSchemeStruct;\n  if (isObject(palette)) {\n    color = palette[colorKey.key] ?? colorKey.default;\n  }\n  if (!color) {\n    return undefined;\n  }\n  if ((!isValid(colorKey.a) && !isValid(colorKey.l)) || !isString(color)) {\n    return color;\n  }\n  let c = new Color(color);\n  if (isValid(colorKey.l)) {\n    const { r, g, b } = c.color;\n    const { h, s } = ColorUtil.rgbToHsl(r, g, b);\n    const rgb = ColorUtil.hslToRgb(h, s, colorKey.l);\n    const newColor = new Color(`rgb(${rgb.r}, ${rgb.g}, ${rgb.b})`);\n    newColor.setOpacity(c.color.opacity);\n    c = newColor;\n  }\n  if (isValid(colorKey.a)) {\n    c.setOpacity(colorKey.a);\n  }\n  return c.toRGBA();\n}\n\n/** 查询语义化颜色 */\nexport const getActualColor = (value: any, colorScheme?: IThemeColorScheme, seriesSpec?: ISeriesSpec) => {\n  if (isColorKey(value)) {\n    if (colorScheme) {\n      const color = queryColorFromColorScheme(colorScheme, value, seriesSpec);\n      if (color) {\n        return color;\n      }\n    }\n  }\n  return value;\n};\n\nexport function isColorKey(obj: any): obj is IColorKey {\n  return isObject(obj) && (obj as IColorKey).type === 'palette' && !!(obj as IColorKey).key;\n}\n\nexport function isProgressiveDataColorScheme<T>(obj: any): obj is ProgressiveDataScheme<T> {\n  if (!isArray(obj) || obj.length === 0) {\n    return false;\n  }\n  return obj.every(item => {\n    return isValid((item as IProgressiveDataSchemeCase<T>).scheme);\n  });\n}\n\n/** 将色板转化为标准形式 */\nexport function transformColorSchemeToStandardStruct(colorScheme: ColorScheme): IColorSchemeStruct {\n  if (isArray(colorScheme)) {\n    return {\n      dataScheme: colorScheme\n    };\n  }\n  return colorScheme;\n}\n\nexport function getColorSchemeBySeries(\n  colorScheme?: IThemeColorScheme,\n  seriesSpec?: ISeriesSpec\n): ColorScheme | undefined {\n  const { type: seriesType } = seriesSpec ?? {};\n  let scheme: ColorScheme | undefined;\n  if (!seriesSpec || !isValid(seriesType)) {\n    scheme = colorScheme?.default;\n  } else {\n    const direction = getDirectionFromSeriesSpec(seriesSpec);\n    scheme = colorScheme?.[`${seriesType}_${direction}`] ?? colorScheme?.[seriesType] ?? colorScheme?.default;\n  }\n  return scheme;\n}\n"]}

package/cjs/theme/index.d.ts

@@ -1,3 +1,4 @@
 export * from './builtin';
 export * from './interface';
 export * from './theme-manager';
+export * from './color-scheme';

package/cjs/theme/index.js

@@ -18,5 +18,5 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), __exportStar(require("./builtin"), exports), __exportStar(require("./interface"), exports), 
-__exportStar(require("./theme-manager"), exports);
+__exportStar(require("./theme-manager"), exports), __exportStar(require("./color-scheme"), exports);
 //# sourceMappingURL=index.js.map

package/cjs/theme/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,8CAA4B;AAC5B,kDAAgC","file":"index.js","sourcesContent":["export * from './builtin';\nexport * from './interface';\nexport * from './theme-manager';\n"]}
+{"version":3,"sources":["../src/theme/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,8CAA4B;AAC5B,kDAAgC;AAChC,iDAA+B","file":"index.js","sourcesContent":["export * from './builtin';\nexport * from './interface';\nexport * from './theme-manager';\nexport * from './color-scheme';\n"]}

package/cjs/theme/interface.d.ts

@@ -8,6 +8,8 @@ import type { IGradientColor } from '@visactor/vrender-core';
 import type { IComponentTheme } from '../component/interface';
 export interface ITheme {
     name?: string;
+    description?: string;
+    type?: 'light' | 'dark';
     background?: string | IGradientColor | IColorKey;
     padding?: ILayoutPaddingSpec;
     fontFamily?: string;

package/cjs/theme/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { ILayoutPaddingSpec } from '../model/interface';\nimport type { ISeriesTheme } from '../series/interface';\nimport type { IMarkTheme } from '../typings/spec';\nimport type {\n  IArcMarkSpec,\n  IAreaMarkSpec,\n  ILineMarkSpec,\n  IRectMarkSpec,\n  ISymbolMarkSpec,\n  ITextMarkSpec,\n  IPathMarkSpec\n} from '../typings';\nimport type { MarkTypeEnum } from '../mark/interface';\nimport type { IColorKey, IThemeColorScheme } from './color-scheme/interface';\nimport type { IGradientColor } from '@visactor/vrender-core';\nimport type { IComponentTheme } from '../component/interface';\n\nexport interface ITheme {\n  /**\n   * 第 1 种配置：主题信息\n   */\n  /** 主题命名 */\n  name?: string;\n\n  /**\n   * 第 2 种配置：图表层级的样式属性\n   */\n  /** 图表背景色 */\n  background?: string | IGradientColor | IColorKey;\n  /** 图表内边距 */\n  padding?: ILayoutPaddingSpec;\n  /** 图表字体配置 */\n  fontFamily?: string;\n\n  /**\n   * 第 3 种配置：色板\n   */\n  /** 全局色板 */\n  colorScheme?: IThemeColorScheme;\n\n  /**\n   * 第 4 种配置：全局 mark 属性配置\n   */\n  /** 全局 mark 样式属性，按 mark 类别索引 */\n  mark?: IGlobalMarkThemeByType;\n  /** 全局 mark 样式属性，按 mark 名称索引，优先级更高 */\n  markByName?: IGlobalMarkThemeByName;\n\n  /**\n   * 第 5 种配置：系列属性配置\n   */\n  /** 系列样式属性 */\n  series?: ISeriesTheme;\n  /**\n   * 自动关闭动画的阀值，对应的是单系列data的长度\n   */\n  animationThreshold?: number;\n\n  /**\n   * 第 6 种配置：组件属性配置\n   */\n  /** 组件样式属性 */\n  component?: IComponentTheme;\n}\n\nexport interface IGlobalMarkThemeByType {\n  [MarkTypeEnum.line]?: Partial<IMarkTheme<ILineMarkSpec>>;\n  [MarkTypeEnum.symbol]?: Partial<IMarkTheme<ISymbolMarkSpec>>;\n  [MarkTypeEnum.area]?: Partial<IMarkTheme<IAreaMarkSpec>>;\n  [MarkTypeEnum.rect]?: Partial<IMarkTheme<IRectMarkSpec>>;\n  [MarkTypeEnum.arc]?: Partial<IMarkTheme<IArcMarkSpec>>;\n  [MarkTypeEnum.text]?: Partial<IMarkTheme<ITextMarkSpec>>;\n  [MarkTypeEnum.path]?: Partial<IMarkTheme<IPathMarkSpec>>;\n}\n\nexport interface IGlobalMarkThemeByName {\n  /** used in lineSeries, areaSeries, radarSeries, etc. */\n  line?: Partial<IMarkTheme<ILineMarkSpec>>;\n  /** used in lineSeries, areaSeries, radarSeries, scatterSeries etc. */\n  point?: Partial<IMarkTheme<ISymbolMarkSpec>>;\n  /** used in lineSeries, areaSeries, radarSeries, etc. */\n  area?: Partial<IMarkTheme<IAreaMarkSpec>>;\n  /** used in barSeries, rangeColumnSeries etc. */\n  bar?: Partial<IMarkTheme<IRectMarkSpec>>;\n  /** used in many series */\n  label?: Partial<IMarkTheme<ITextMarkSpec>>;\n\n  [markName: string]: Partial<IMarkTheme<any>>;\n}\n\nexport interface IThemeConstants {\n  /** 默认字体 */\n  defaultFontFamily: string;\n  /** 默认字号 */\n  defaultFontSize: number;\n\n  /** 1级字阶字号，用于：环形图中间数值 / 展示型数值 */\n  l1FontSize: number;\n  /** 1级字阶行高 */\n  l1LineHeight: number | string;\n\n  /** 2级字阶字号，用于：展示型文字 / 指标卡数值 */\n  l2FontSize: number;\n  /** 2级字阶行高 */\n  l2LineHeight: number | string;\n\n  /** 3级字阶字号，用于：图表标题 */\n  l3FontSize: number;\n  /** 3级字阶行高 */\n  l3LineHeight: number | string;\n\n  /** 4级字阶字号，用于：数据标签、tooltip */\n  l4FontSize: number;\n  /** 4级字阶行高 */\n  l4LineHeight: number | string;\n\n  /** 5级字阶字号，用于：坐标轴标题、轴标签、图例文字 */\n  l5FontSize: number;\n  /** 5级字阶行高 */\n  l5LineHeight: number | string;\n\n  /** 6级字阶字号，用于：地图标签 */\n  l6FontSize: number;\n  /** 6级字阶行高 */\n  l6LineHeight: number | string;\n\n  /** 轴 tick 长度 */\n  axisTickSize: number;\n\n  /** 面积图元透明度 */\n  areaOpacity: number;\n}\n"]}
+{"version":3,"sources":["../src/theme/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { ILayoutPaddingSpec } from '../model/interface';\nimport type { ISeriesTheme } from '../series/interface';\nimport type { IMarkTheme } from '../typings/spec';\nimport type {\n  IArcMarkSpec,\n  IAreaMarkSpec,\n  ILineMarkSpec,\n  IRectMarkSpec,\n  ISymbolMarkSpec,\n  ITextMarkSpec,\n  IPathMarkSpec\n} from '../typings';\nimport type { MarkTypeEnum } from '../mark/interface';\nimport type { IColorKey, IThemeColorScheme } from './color-scheme/interface';\nimport type { IGradientColor } from '@visactor/vrender-core';\nimport type { IComponentTheme } from '../component/interface';\n\nexport interface ITheme {\n  /**\n   * 第 1 种配置：主题信息\n   */\n  /** 主题命名 */\n  name?: string;\n  /** 主题描述 */\n  description?: string;\n  /**\n   * 主题类别：亮色或者暗色\n   * 该配置用于指定该主题需要 merge 的是内置的亮色主题还是暗色主题\n   */\n  type?: 'light' | 'dark';\n\n  /**\n   * 第 2 种配置：图表层级的样式属性\n   */\n  /** 图表背景色 */\n  background?: string | IGradientColor | IColorKey;\n  /** 图表内边距 */\n  padding?: ILayoutPaddingSpec;\n  /** 图表字体配置 */\n  fontFamily?: string;\n\n  /**\n   * 第 3 种配置：色板\n   */\n  /** 全局色板 */\n  colorScheme?: IThemeColorScheme;\n\n  /**\n   * 第 4 种配置：全局 mark 属性配置\n   */\n  /** 全局 mark 样式属性，按 mark 类别索引 */\n  mark?: IGlobalMarkThemeByType;\n  /** 全局 mark 样式属性，按 mark 名称索引，优先级更高 */\n  markByName?: IGlobalMarkThemeByName;\n\n  /**\n   * 第 5 种配置：系列属性配置\n   */\n  /** 系列样式属性 */\n  series?: ISeriesTheme;\n  /**\n   * 自动关闭动画的阀值，对应的是单系列data的长度\n   */\n  animationThreshold?: number;\n\n  /**\n   * 第 6 种配置：组件属性配置\n   */\n  /** 组件样式属性 */\n  component?: IComponentTheme;\n}\n\nexport interface IGlobalMarkThemeByType {\n  [MarkTypeEnum.line]?: Partial<IMarkTheme<ILineMarkSpec>>;\n  [MarkTypeEnum.symbol]?: Partial<IMarkTheme<ISymbolMarkSpec>>;\n  [MarkTypeEnum.area]?: Partial<IMarkTheme<IAreaMarkSpec>>;\n  [MarkTypeEnum.rect]?: Partial<IMarkTheme<IRectMarkSpec>>;\n  [MarkTypeEnum.arc]?: Partial<IMarkTheme<IArcMarkSpec>>;\n  [MarkTypeEnum.text]?: Partial<IMarkTheme<ITextMarkSpec>>;\n  [MarkTypeEnum.path]?: Partial<IMarkTheme<IPathMarkSpec>>;\n}\n\nexport interface IGlobalMarkThemeByName {\n  /** used in lineSeries, areaSeries, radarSeries, etc. */\n  line?: Partial<IMarkTheme<ILineMarkSpec>>;\n  /** used in lineSeries, areaSeries, radarSeries, scatterSeries etc. */\n  point?: Partial<IMarkTheme<ISymbolMarkSpec>>;\n  /** used in lineSeries, areaSeries, radarSeries, etc. */\n  area?: Partial<IMarkTheme<IAreaMarkSpec>>;\n  /** used in barSeries, rangeColumnSeries etc. */\n  bar?: Partial<IMarkTheme<IRectMarkSpec>>;\n  /** used in many series */\n  label?: Partial<IMarkTheme<ITextMarkSpec>>;\n\n  [markName: string]: Partial<IMarkTheme<any>>;\n}\n\nexport interface IThemeConstants {\n  /** 默认字体 */\n  defaultFontFamily: string;\n  /** 默认字号 */\n  defaultFontSize: number;\n\n  /** 1级字阶字号，用于：环形图中间数值 / 展示型数值 */\n  l1FontSize: number;\n  /** 1级字阶行高 */\n  l1LineHeight: number | string;\n\n  /** 2级字阶字号，用于：展示型文字 / 指标卡数值 */\n  l2FontSize: number;\n  /** 2级字阶行高 */\n  l2LineHeight: number | string;\n\n  /** 3级字阶字号，用于：图表标题 */\n  l3FontSize: number;\n  /** 3级字阶行高 */\n  l3LineHeight: number | string;\n\n  /** 4级字阶字号，用于：数据标签、tooltip */\n  l4FontSize: number;\n  /** 4级字阶行高 */\n  l4LineHeight: number | string;\n\n  /** 5级字阶字号，用于：坐标轴标题、轴标签、图例文字 */\n  l5FontSize: number;\n  /** 5级字阶行高 */\n  l5LineHeight: number | string;\n\n  /** 6级字阶字号，用于：地图标签 */\n  l6FontSize: number;\n  /** 6级字阶行高 */\n  l6LineHeight: number | string;\n\n  /** 轴 tick 长度 */\n  axisTickSize: number;\n\n  /** 面积图元透明度 */\n  areaOpacity: number;\n}\n"]}

package/cjs/theme/theme-manager.js

@@ -4,21 +4,20 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.ThemeManager = void 0;
 
-const builtin_1 = require("./builtin"), instance_manager_1 = require("../core/instance-manager"), vutils_1 = require("@visactor/vutils");
+const builtin_1 = require("./builtin"), instance_manager_1 = require("../core/instance-manager");
 
 class ThemeManager {
     static registerTheme(name, theme) {
-        name && (ThemeManager.themes.set(name, (0, builtin_1.getMergedTheme)(theme)), builtin_1.hasThemeMerged.set(name, !0));
+        (0, builtin_1.registerTheme)(name, theme);
     }
     static getTheme(name) {
-        return builtin_1.hasThemeMerged.has(name) && !builtin_1.hasThemeMerged.get(name) && ThemeManager.registerTheme(name, ThemeManager.themes.get(name)), 
-        ThemeManager.themes.get(name) || ThemeManager.getDefaultTheme();
+        return (0, builtin_1.getTheme)(name);
     }
     static removeTheme(name) {
-        return ThemeManager.themes.delete(name) && builtin_1.hasThemeMerged.delete(name);
+        return (0, builtin_1.removeTheme)(name);
     }
     static themeExist(name) {
-        return !!(0, vutils_1.isString)(name) && ThemeManager.themes.has(name);
+        return (0, builtin_1.themeExist)(name);
     }
     static getDefaultTheme() {
         return ThemeManager.themes.get(builtin_1.defaultThemeName);

package/cjs/theme/theme-manager.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/theme-manager.ts"],"names":[],"mappings":";;;AAAA,uCAAqF;AAErF,+DAA2D;AAE3D,6CAA4C;AAE5C,MAAa,YAAY;IAYvB,MAAM,CAAC,aAAa,CAAC,IAAY,EAAE,KAAsB;QACvD,IAAI,CAAC,IAAI,EAAE;YACT,OAAO;SACR;QAED,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,IAAA,wBAAc,EAAC,KAAK,CAAC,CAAC,CAAC;QACrD,wBAAc,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACjC,CAAC;IAOD,MAAM,CAAC,QAAQ,CAAC,IAAY;QAC1B,IAAI,wBAAc,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAEzD,YAAY,CAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;SACjE;QACD,OAAO,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,eAAe,EAAE,CAAC;IACzE,CAAC;IAOD,MAAM,CAAC,WAAW,CAAC,IAAY;QAC7B,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,wBAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzE,CAAC;IAOD,MAAM,CAAC,UAAU,CAAC,IAAS;QACzB,IAAI,CAAC,IAAA,iBAAQ,EAAC,IAAI,CAAC,EAAE;YACnB,OAAO,KAAK,CAAC;SACd;QACD,OAAO,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAGD,MAAM,CAAC,eAAe;QACpB,OAAO,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,0BAAgB,CAAC,CAAC;IACnD,CAAC;IAGD,MAAM,CAAC,eAAe,CAAC,IAAY;QACjC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YAClC,OAAO;SACR;QACD,YAAY,CAAC,iBAAiB,GAAG,IAAI,CAAC;QACtC,kCAAe,CAAC,OAAO,CAAC,CAAC,QAAiB,EAAE,EAAE,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;IAClF,CAAC;IAGD,MAAM,CAAC,eAAe;QACpB,OAAO,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAC/D,CAAC;IAGD,MAAM,CAAC,mBAAmB;QACxB,OAAO,YAAY,CAAC,iBAAiB,CAAC;IACxC,CAAC;;AA7EH,oCA8EC;AA5EiB,mBAAM,GAAG,gBAAM,CAAC;AAEjB,8BAAiB,GAAW,0BAAgB,CAAC","file":"theme-manager.js","sourcesContent":["import { defaultThemeName, getMergedTheme, hasThemeMerged, themes } from './builtin';\nimport type { ITheme } from './interface';\nimport { InstanceManager } from '../core/instance-manager';\nimport type { IVChart } from '../core/interface';\nimport { isString } from '@visactor/vutils';\n\nexport class ThemeManager {\n  /** 主题字典 */\n  static readonly themes = themes;\n\n  private static _currentThemeName: string = defaultThemeName; // 设置缺省为默认主题\n\n  /**\n   * 注册主题\n   * @param name 主题名称\n   * @param theme 主题配置\n   * @returns\n   */\n  static registerTheme(name: string, theme: Partial<ITheme>) {\n    if (!name) {\n      return;\n    }\n    // 所有主题基于默认主题扩展，保证基础值\n    ThemeManager.themes.set(name, getMergedTheme(theme));\n    hasThemeMerged.set(name, true);\n  }\n\n  /**\n   * 获取主题\n   * @param name 主题名称\n   * @returns\n   */\n  static getTheme(name: string) {\n    if (hasThemeMerged.has(name) && !hasThemeMerged.get(name)) {\n      // 重新 merge 默认主题\n      ThemeManager.registerTheme(name, ThemeManager.themes.get(name));\n    }\n    return ThemeManager.themes.get(name) || ThemeManager.getDefaultTheme();\n  }\n\n  /**\n   * 移除主题\n   * @param name 主题名称\n   * @returns 是否移除成功\n   */\n  static removeTheme(name: string): boolean {\n    return ThemeManager.themes.delete(name) && hasThemeMerged.delete(name);\n  }\n\n  /**\n   * 判断主题是否存在\n   * @param name 主题名称\n   * @returns 是否存在\n   */\n  static themeExist(name: any) {\n    if (!isString(name)) {\n      return false;\n    }\n    return ThemeManager.themes.has(name);\n  }\n\n  /** 获取图表默认主题（非用户配置） */\n  static getDefaultTheme(): ITheme {\n    return ThemeManager.themes.get(defaultThemeName);\n  }\n\n  /** 设置当前主题（所有实例生效） */\n  static setCurrentTheme(name: string) {\n    if (!ThemeManager.themeExist(name)) {\n      return;\n    }\n    ThemeManager._currentThemeName = name;\n    InstanceManager.forEach((instance: IVChart) => instance?.setCurrentTheme(name));\n  }\n\n  /** 获取当前主题（只能获取用户通过`setCurrentTheme`方法设置过的主题，默认值为默认主题） */\n  static getCurrentTheme(): ITheme {\n    return ThemeManager.getTheme(ThemeManager._currentThemeName);\n  }\n\n  /** 获取当前主题名称（只能获取用户通过`setCurrentTheme`方法设置过的主题，默认值为默认主题） */\n  static getCurrentThemeName(): string {\n    return ThemeManager._currentThemeName;\n  }\n}\n"]}
+{"version":3,"sources":["../src/theme/theme-manager.ts"],"names":[],"mappings":";;;AAAA,uCAAuG;AAEvG,+DAA2D;AAG3D,MAAa,YAAY;IAYvB,MAAM,CAAC,aAAa,CAAC,IAAY,EAAE,KAAsB;QACvD,IAAA,uBAAa,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC;IAOD,MAAM,CAAC,QAAQ,CAAC,IAAY;QAC1B,OAAO,IAAA,kBAAQ,EAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAOD,MAAM,CAAC,WAAW,CAAC,IAAY;QAC7B,OAAO,IAAA,qBAAW,EAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAOD,MAAM,CAAC,UAAU,CAAC,IAAS;QACzB,OAAO,IAAA,oBAAU,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAGD,MAAM,CAAC,eAAe;QACpB,OAAO,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,0BAAgB,CAAC,CAAC;IACnD,CAAC;IAGD,MAAM,CAAC,eAAe,CAAC,IAAY;QACjC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YAClC,OAAO;SACR;QACD,YAAY,CAAC,iBAAiB,GAAG,IAAI,CAAC;QACtC,kCAAe,CAAC,OAAO,CAAC,CAAC,QAAiB,EAAE,EAAE,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;IAClF,CAAC;IAGD,MAAM,CAAC,eAAe;QACpB,OAAO,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAC/D,CAAC;IAGD,MAAM,CAAC,mBAAmB;QACxB,OAAO,YAAY,CAAC,iBAAiB,CAAC;IACxC,CAAC;;AAjEH,oCAkEC;AAhEiB,mBAAM,GAAG,gBAAM,CAAC;AAEjB,8BAAiB,GAAW,0BAAgB,CAAC","file":"theme-manager.js","sourcesContent":["import { defaultThemeName, getTheme, registerTheme, removeTheme, themeExist, themes } from './builtin';\nimport type { ITheme } from './interface';\nimport { InstanceManager } from '../core/instance-manager';\nimport type { IVChart } from '../core/interface';\n\nexport class ThemeManager {\n  /** 主题字典 */\n  static readonly themes = themes;\n\n  private static _currentThemeName: string = defaultThemeName; // 设置缺省为默认主题\n\n  /**\n   * 注册主题\n   * @param name 主题名称\n   * @param theme 主题配置\n   * @returns\n   */\n  static registerTheme(name: string, theme: Partial<ITheme>) {\n    registerTheme(name, theme);\n  }\n\n  /**\n   * 获取主题\n   * @param name 主题名称\n   * @returns\n   */\n  static getTheme(name: string) {\n    return getTheme(name);\n  }\n\n  /**\n   * 移除主题\n   * @param name 主题名称\n   * @returns 是否移除成功\n   */\n  static removeTheme(name: string): boolean {\n    return removeTheme(name);\n  }\n\n  /**\n   * 判断主题是否存在\n   * @param name 主题名称\n   * @returns 是否存在\n   */\n  static themeExist(name: any) {\n    return themeExist(name);\n  }\n\n  /** 获取图表默认主题（非用户配置） */\n  static getDefaultTheme(): ITheme {\n    return ThemeManager.themes.get(defaultThemeName);\n  }\n\n  /** 设置当前主题（所有实例生效） */\n  static setCurrentTheme(name: string) {\n    if (!ThemeManager.themeExist(name)) {\n      return;\n    }\n    ThemeManager._currentThemeName = name;\n    InstanceManager.forEach((instance: IVChart) => instance?.setCurrentTheme(name));\n  }\n\n  /** 获取当前主题（只能获取用户通过`setCurrentTheme`方法设置过的主题，默认值为默认主题） */\n  static getCurrentTheme(): ITheme {\n    return ThemeManager.getTheme(ThemeManager._currentThemeName);\n  }\n\n  /** 获取当前主题名称（只能获取用户通过`setCurrentTheme`方法设置过的主题，默认值为默认主题） */\n  static getCurrentThemeName(): string {\n    return ThemeManager._currentThemeName;\n  }\n}\n"]}

package/cjs/theme/util.js

@@ -4,25 +4,26 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.getThemeFromOption = exports.mergeThemeAndGet = void 0;
 
-const vutils_1 = require("@visactor/vutils"), theme_manager_1 = require("./theme-manager"), util_1 = require("../util"), util_2 = require("./color-scheme/util"), builtin_1 = require("./builtin"), mergeThemeAndGet = (path, currentThemeName, optionTheme, specTheme, colorScheme) => (0, 
+const vutils_1 = require("@visactor/vutils"), theme_manager_1 = require("./theme-manager"), merge_spec_1 = require("../util/spec/merge-spec"), merge_theme_1 = require("../util/spec/merge-theme"), util_1 = require("./color-scheme/util"), builtin_1 = require("./builtin"), mergeThemeAndGet = (path, currentThemeName, optionTheme, specTheme, colorScheme) => (0, 
 vutils_1.isString)(specTheme) && theme_manager_1.ThemeManager.themeExist(specTheme) ? getMergedValue(getThemeValue(path, specTheme, colorScheme)) : (0, 
 vutils_1.isString)(optionTheme) && theme_manager_1.ThemeManager.themeExist(optionTheme) ? getMergedValue(getThemeValue(path, optionTheme, colorScheme), getThemeValue(path, specTheme, colorScheme)) : getMergedValue(getThemeValue(path, currentThemeName, colorScheme), getThemeValue(path, optionTheme, colorScheme), getThemeValue(path, specTheme, colorScheme));
 
 exports.mergeThemeAndGet = mergeThemeAndGet;
 
 const getThemeValue = (path, theme, colorScheme) => {
+    if ((0, vutils_1.isNil)(theme)) return;
     let themeObject;
     if ((0, vutils_1.isString)(theme) && theme_manager_1.ThemeManager.themeExist(theme) ? themeObject = theme_manager_1.ThemeManager.getTheme(theme) : (0, 
     vutils_1.isObject)(theme) && (themeObject = theme), (0, vutils_1.isNil)(themeObject)) return;
     const paths = path.split(".");
-    if ("colorScheme" === path) return (0, util_1.transformColorSchemeToMerge)(themeObject.colorScheme);
-    if ("background" === path) return (0, util_2.getActualColor)(themeObject.background, colorScheme);
+    if ("colorScheme" === path) return (0, merge_theme_1.transformColorSchemeToMerge)(themeObject.colorScheme);
+    if ("background" === path) return (0, util_1.getActualColor)(themeObject.background, colorScheme);
     if (2 === paths.length && "series" === paths[0]) {
         const {markByName: markByName, mark: mark} = themeObject;
-        return (0, util_1.transformSeriesThemeToMerge)((0, vutils_1.get)(themeObject, paths), paths[1], mark, markByName);
+        return (0, merge_theme_1.transformSeriesThemeToMerge)((0, vutils_1.get)(themeObject, paths), paths[1], mark, markByName);
     }
     return (0, vutils_1.get)(themeObject, paths);
-}, getMergedValue = (...sources) => (0, util_1.mergeSpec)({}, ...sources.map((source => ({
+}, getMergedValue = (...sources) => (0, merge_spec_1.mergeSpec)({}, ...sources.map((source => ({
     __TMP_KEY__: source
 })))).__TMP_KEY__, getThemeFromOption = (path, option) => {
     var _a, _b;

package/cjs/theme/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { isString, get, isObject, isNil } from '@visactor/vutils';\nimport type { ITheme } from './interface';\nimport { ThemeManager } from './theme-manager';\nimport { mergeSpec, transformColorSchemeToMerge, transformSeriesThemeToMerge } from '../util';\nimport { getActualColor } from './color-scheme/util';\nimport type { IThemeColorScheme } from './color-scheme/interface';\nimport type { IModelOption } from '../model/interface';\nimport { defaultChartLevelTheme, defaultThemeName } from './builtin';\n\n/**\n * 性能优化过的主题合并，只合并需要取用的主题部分\n * @param path 需要取用的路径\n * @param currentThemeName （低优先级）当前全局主题 name\n * @param optionTheme （中优先级）option 中设置的主题\n * @param specTheme （高优先级）spec 中设置的主题\n * @returns\n */\nexport const mergeThemeAndGet = (\n  path: string,\n  currentThemeName?: string,\n  optionTheme?: string | ITheme,\n  specTheme?: string | ITheme,\n  colorScheme?: IThemeColorScheme\n) => {\n  if (isString(specTheme) && ThemeManager.themeExist(specTheme)) {\n    // 以 specTheme 为最底开始合并\n    return getMergedValue(getThemeValue(path, specTheme, colorScheme));\n  } else if (isString(optionTheme) && ThemeManager.themeExist(optionTheme)) {\n    // 以 optionTheme 为最底开始合并\n    return getMergedValue(getThemeValue(path, optionTheme, colorScheme), getThemeValue(path, specTheme, colorScheme));\n  }\n  // 以 baseTheme 为最底开始合并\n  return getMergedValue(\n    getThemeValue(path, currentThemeName, colorScheme),\n    getThemeValue(path, optionTheme, colorScheme),\n    getThemeValue(path, specTheme, colorScheme)\n  );\n};\n\n/** 从 theme 取特定 path 的值，但可能会改变形式为 merge 作准备 */\nconst getThemeValue = (path: string, theme?: string | ITheme, colorScheme?: IThemeColorScheme) => {\n  let themeObject: ITheme;\n  if (isString(theme) && ThemeManager.themeExist(theme)) {\n    themeObject = ThemeManager.getTheme(theme);\n  } else if (isObject(theme)) {\n    themeObject = theme;\n  }\n  if (isNil(themeObject)) {\n    return undefined;\n  }\n\n  const paths = path.split('.');\n\n  const colorSchemePath: keyof ITheme = 'colorScheme';\n  if (path === colorSchemePath) {\n    return transformColorSchemeToMerge(themeObject.colorScheme);\n  }\n  const backgroundPath: keyof ITheme = 'background';\n  if (path === backgroundPath) {\n    return getActualColor(themeObject.background, colorScheme);\n  }\n  const seriesPath: keyof ITheme = 'series';\n  if (paths.length === 2 && paths[0] === seriesPath) {\n    const { markByName, mark } = themeObject;\n    return transformSeriesThemeToMerge(get(themeObject, paths), paths[1], mark, markByName);\n  }\n\n  return get(themeObject, paths);\n};\n\nconst getMergedValue = (...sources: any[]) => {\n  const tmpKey = '__TMP_KEY__';\n  const obj = mergeSpec(\n    {},\n    ...sources.map(source => ({\n      [tmpKey]: source\n    }))\n  );\n  return obj[tmpKey];\n};\n\nexport const getThemeFromOption = (path: string, option: Partial<IModelOption>) => {\n  const {\n    globalTheme = defaultThemeName,\n    optionTheme,\n    specTheme,\n    chartLevelTheme = defaultChartLevelTheme\n  } = option.getThemeConfig?.() ?? {};\n  return mergeThemeAndGet(path, globalTheme, optionTheme, specTheme, chartLevelTheme?.colorScheme);\n};\n"]}
+{"version":3,"sources":["../src/theme/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { isString, get, isObject, isNil } from '@visactor/vutils';\nimport type { ITheme } from './interface';\nimport { ThemeManager } from './theme-manager';\nimport { mergeSpec } from '../util/spec/merge-spec';\nimport { transformColorSchemeToMerge, transformSeriesThemeToMerge } from '../util/spec/merge-theme';\nimport { getActualColor } from './color-scheme/util';\nimport type { IThemeColorScheme } from './color-scheme/interface';\nimport type { IModelOption } from '../model/interface';\nimport { defaultChartLevelTheme, defaultThemeName } from './builtin';\n\n/**\n * 性能优化过的主题合并，只合并需要取用的主题部分\n * @param path 需要取用的路径\n * @param currentThemeName （低优先级）当前全局主题 name\n * @param optionTheme （中优先级）option 中设置的主题\n * @param specTheme （高优先级）spec 中设置的主题\n * @returns\n */\nexport const mergeThemeAndGet = (\n  path: string,\n  currentThemeName?: string,\n  optionTheme?: string | ITheme,\n  specTheme?: string | ITheme,\n  colorScheme?: IThemeColorScheme\n) => {\n  if (isString(specTheme) && ThemeManager.themeExist(specTheme)) {\n    // 以 specTheme 为最底开始合并\n    return getMergedValue(getThemeValue(path, specTheme, colorScheme));\n  } else if (isString(optionTheme) && ThemeManager.themeExist(optionTheme)) {\n    // 以 optionTheme 为最底开始合并\n    return getMergedValue(getThemeValue(path, optionTheme, colorScheme), getThemeValue(path, specTheme, colorScheme));\n  }\n  // 以 baseTheme 为最底开始合并\n  return getMergedValue(\n    getThemeValue(path, currentThemeName, colorScheme),\n    getThemeValue(path, optionTheme, colorScheme),\n    getThemeValue(path, specTheme, colorScheme)\n  );\n};\n\n/** 从 theme 取特定 path 的值，但可能会改变形式为 merge 作准备 */\nconst getThemeValue = (path: string, theme?: string | ITheme, colorScheme?: IThemeColorScheme) => {\n  if (isNil(theme)) {\n    return undefined;\n  }\n\n  let themeObject: ITheme;\n  if (isString(theme) && ThemeManager.themeExist(theme)) {\n    themeObject = ThemeManager.getTheme(theme);\n  } else if (isObject(theme)) {\n    themeObject = theme;\n  }\n  if (isNil(themeObject)) {\n    return undefined;\n  }\n\n  const paths = path.split('.');\n\n  const colorSchemePath: keyof ITheme = 'colorScheme';\n  if (path === colorSchemePath) {\n    return transformColorSchemeToMerge(themeObject.colorScheme);\n  }\n  const backgroundPath: keyof ITheme = 'background';\n  if (path === backgroundPath) {\n    return getActualColor(themeObject.background, colorScheme);\n  }\n  const seriesPath: keyof ITheme = 'series';\n  if (paths.length === 2 && paths[0] === seriesPath) {\n    const { markByName, mark } = themeObject;\n    return transformSeriesThemeToMerge(get(themeObject, paths), paths[1], mark, markByName);\n  }\n\n  return get(themeObject, paths);\n};\n\nconst getMergedValue = (...sources: any[]) => {\n  const tmpKey = '__TMP_KEY__';\n  const obj = mergeSpec(\n    {},\n    ...sources.map(source => ({\n      [tmpKey]: source\n    }))\n  );\n  return obj[tmpKey];\n};\n\nexport const getThemeFromOption = (path: string, option: Partial<IModelOption>) => {\n  const {\n    globalTheme = defaultThemeName,\n    optionTheme,\n    specTheme,\n    chartLevelTheme = defaultChartLevelTheme\n  } = option.getThemeConfig?.() ?? {};\n  return mergeThemeAndGet(path, globalTheme, optionTheme, specTheme, chartLevelTheme?.colorScheme);\n};\n"]}

package/cjs/typings/tooltip/tooltip.d.ts

@@ -1,6 +1,6 @@
 import type { MaybeArray } from '../common';
 import type { TooltipPatternProperty, TooltipUpdateCallback } from './common';
-import type { TooltipActiveType } from './handler';
+import type { TooltipActiveType, TooltipData } from './handler';
 import type { IToolTipLineActual, IToolTipLinePattern } from './line';
 import type { ITooltipPositionActual, TooltipPositionMode, TooltipPosition } from './position';
 import type { ITooltipShapePattern } from './shape';
@@ -22,4 +22,5 @@ export interface IToolTipActual {
     content?: IToolTipLineActual[];
     activeType?: TooltipActiveType;
     position?: ITooltipPositionActual;
+    data?: TooltipData;
 }

package/cjs/typings/tooltip/tooltip.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/typings/tooltip/tooltip.ts"],"names":[],"mappings":"","file":"tooltip.js","sourcesContent":["import type { MaybeArray } from '../common';\nimport type { TooltipPatternProperty, TooltipUpdateCallback } from './common';\nimport type { TooltipActiveType } from './handler';\nimport type { IToolTipLineActual, IToolTipLinePattern } from './line';\nimport type { ITooltipPositionActual, TooltipPositionMode, TooltipPosition } from './position';\nimport type { ITooltipShapePattern } from './shape';\n\nexport interface ITooltipPattern extends ITooltipShapePattern {\n  visible?: TooltipPatternProperty<boolean>;\n  title?: TooltipPatternProperty<IToolTipLinePattern>;\n  content?: MaybeArray<TooltipPatternProperty<MaybeArray<IToolTipLinePattern>>>;\n  position?: TooltipPatternProperty<TooltipPosition>;\n  /**\n   * 决定 `position` 相对固定于什么图形，如固定在鼠标指针周围或图元周围。该配置只有 `position` 设为字符串时生效。默认为 `'mark'`\n   * @since 1.4.0\n   */\n  positionMode?: TooltipPatternProperty<TooltipPositionMode>;\n\n  updateTitle?: TooltipUpdateCallback<IToolTipLineActual>;\n  updateContent?: TooltipUpdateCallback<IToolTipLineActual[]>;\n  updatePosition?: TooltipUpdateCallback<ITooltipPositionActual>;\n\n  /** tooltip content 保留的最大数据行数，默认为 20 */\n  maxLineCount?: number;\n\n  /** 方便内部逻辑辨别 tooltip 类型，不暴露给用户 */\n  activeType?: TooltipActiveType;\n}\n\nexport interface IToolTipActual {\n  visible?: boolean;\n  title?: IToolTipLineActual;\n  content?: IToolTipLineActual[];\n  activeType?: TooltipActiveType;\n  position?: ITooltipPositionActual;\n}\n"]}
+{"version":3,"sources":["../src/typings/tooltip/tooltip.ts"],"names":[],"mappings":"","file":"tooltip.js","sourcesContent":["import type { MaybeArray } from '../common';\nimport type { TooltipPatternProperty, TooltipUpdateCallback } from './common';\nimport type { TooltipActiveType, TooltipData } from './handler';\nimport type { IToolTipLineActual, IToolTipLinePattern } from './line';\nimport type { ITooltipPositionActual, TooltipPositionMode, TooltipPosition } from './position';\nimport type { ITooltipShapePattern } from './shape';\n\nexport interface ITooltipPattern extends ITooltipShapePattern {\n  visible?: TooltipPatternProperty<boolean>;\n  title?: TooltipPatternProperty<IToolTipLinePattern>;\n  content?: MaybeArray<TooltipPatternProperty<MaybeArray<IToolTipLinePattern>>>;\n  position?: TooltipPatternProperty<TooltipPosition>;\n  /**\n   * 决定 `position` 相对固定于什么图形，如固定在鼠标指针周围或图元周围。该配置只有 `position` 设为字符串时生效。默认为 `'mark'`\n   * @since 1.4.0\n   */\n  positionMode?: TooltipPatternProperty<TooltipPositionMode>;\n\n  updateTitle?: TooltipUpdateCallback<IToolTipLineActual>;\n  updateContent?: TooltipUpdateCallback<IToolTipLineActual[]>;\n  updatePosition?: TooltipUpdateCallback<ITooltipPositionActual>;\n\n  /** tooltip content 保留的最大数据行数，默认为 20 */\n  maxLineCount?: number;\n\n  /** 方便内部逻辑辨别 tooltip 类型，不暴露给用户 */\n  activeType?: TooltipActiveType;\n}\n\nexport interface IToolTipActual {\n  visible?: boolean;\n  title?: IToolTipLineActual;\n  content?: IToolTipLineActual[];\n  activeType?: TooltipActiveType;\n  position?: ITooltipPositionActual;\n  data?: TooltipData;\n}\n"]}

package/cjs/typings/visual.d.ts

@@ -228,7 +228,7 @@ export type ImageOriginType = 'top' | 'bottom';
 export type GradientPropValue<T> = ValueType<T> | FunctionType<T>;
 export type GradientStop = {
     offset: GradientPropValue<number>;
-    color: GradientPropValue<string>;
+    color?: GradientPropValue<string>;
     opacity?: number;
 };
 export interface IGradientLinear {

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 } 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  stroke?: string | IGradient | IColorKey | false | (number | boolean)[];\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  /**\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  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   * @private 一个标志位，用于通知 VGrammar 是否执行 getLineSegmentConfigs 方法\n   */\n  enableSegments?: 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?: StringOrNumber | string[];\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  // 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 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, StringOrNumber } from './common';\nimport type { IPadding } from '@visactor/vutils';\nimport type { IColorKey } from '../theme/color-scheme/interface';\nimport type { IRepeatType, TextAlignType, TextBaselineType } 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  stroke?: string | IGradient | IColorKey | false | (number | boolean)[];\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  /**\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  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   * @private 一个标志位，用于通知 VGrammar 是否执行 getLineSegmentConfigs 方法\n   */\n  enableSegments?: 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?: StringOrNumber | string[];\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  // 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 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"]}

package/cjs/util/data.d.ts

@@ -34,5 +34,5 @@ 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): 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;

package/cjs/util/data.js

@@ -54,7 +54,7 @@ function stackOffsetSilhouette(stackCache) {
     stackCache.values[j][constant_1.STACK_FIELD_END_OffsetSilhouette] = stackCache.values[j][constant_1.STACK_FIELD_END] - centerValue;
 }
 
-function stack(stackCache, stackInverse) {
+function stack(stackCache, stackInverse, hasPercent) {
     if (stackCache.values.length > 0) {
         let positiveStart = 0, negativeStart = 0, sign = 1, value = 0;
         const maxLength = stackCache.values.length;
@@ -64,7 +64,7 @@ function stack(stackCache, stackInverse) {
             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);
         }
-        for (let index = 0; index < maxLength; index++) {
+        if (hasPercent) for (let index = 0; index < maxLength; index++) {
             const v = stackCache.values[stackInverse ? maxLength - 1 - index : index];
             value = v[constant_1.STACK_FIELD_END];
             const denominator = value >= 0 ? positiveStart : negativeStart;
@@ -72,7 +72,7 @@ function stack(stackCache, stackInverse) {
             v[constant_1.STACK_FIELD_END_PERCENT] = 0 === denominator ? 0 : Math.min(1, v[constant_1.STACK_FIELD_END] / denominator) * sign;
         }
     }
-    for (const key in stackCache.nodes) stack(stackCache.nodes[key], stackInverse);
+    for (const key in stackCache.nodes) stack(stackCache.nodes[key], stackInverse, hasPercent);
 }
 
 function stackGroup(s, stackData, stackCache, valueField, setInitialValue) {