@visactor/vchart 1.6.1-alpha.0 → 1.6.2

package/esm/theme/builtin/light/color-scheme.js

@@ -6,31 +6,22 @@ export const colorScheme = {
         palette: {
             backgroundColor: "#ffffff",
             borderColor: "#e3e5e8",
-            shadowColor: "rgba(33,37,44,0.1)",
-            hoverBackgroundColor: "#f1f2f5",
-            sliderRailColor: "#f1f3f4",
-            sliderHandleColor: "#ffffff",
-            sliderTrackColor: "#0040ff",
-            popupBackgroundColor: "#ffffff",
+            shadowColor: "#21252c",
             primaryFontColor: "#21252c",
             secondaryFontColor: "#606773",
-            tertiaryFontColor: "#89909d",
-            axisLabelFontColor: "#89909d",
+            axisFontColor: "#89909d",
             disableFontColor: "#bcc1cb",
-            axisMarkerFontColor: "#ffffff",
+            labelReverseFontColor: "#ffffff",
             axisGridColor: "#f1f2f5",
             axisDomainColor: "#d9dde4",
-            dataZoomHandleStrokeColor: "#aeb5be",
+            dataZoomHandlerStrokeColor: "#aeb5be",
+            dataZoomHandlerFillColor: "#ffffff",
+            dataZoomBackgroundColor: "#f1f3f4",
             dataZoomChartColor: "#c9ced8",
-            playerControllerColor: "#0040ff",
+            dataZoomSelectedColor: "#0040ff",
             scrollBarSliderColor: "#000000",
-            axisMarkerBackgroundColor: "#21252c",
-            markLabelBackgroundColor: "#f1f2f5",
-            markLineStrokeColor: "#606773",
-            dangerColor: "#e33232",
-            warningColor: "#ffc528",
-            successColor: "#07a35a",
-            infoColor: "#3073f2"
+            tooltipBackgroundColor: "#ffffff",
+            markLabelBackgroundColor: "#ffc528"
         }
     }
 };

package/esm/theme/builtin/light/color-scheme.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/light/color-scheme.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAGhE,MAAM,CAAC,MAAM,WAAW,GAAsB;IAC5C,OAAO,EAAE;QACP,UAAU;QACV,OAAO,EAAE;YAEP,eAAe,EAAE,SAAS;YAE1B,WAAW,EAAE,SAAS;YAEtB,WAAW,EAAE,oBAAoB;YAEjC,oBAAoB,EAAE,SAAS;YAE/B,eAAe,EAAE,SAAS;YAE1B,iBAAiB,EAAE,SAAS;YAE5B,gBAAgB,EAAE,SAAS;YAE3B,oBAAoB,EAAE,SAAS;YAG/B,gBAAgB,EAAE,SAAS;YAE3B,kBAAkB,EAAE,SAAS;YAE7B,iBAAiB,EAAE,SAAS;YAE5B,kBAAkB,EAAE,SAAS;YAE7B,gBAAgB,EAAE,SAAS;YAE3B,mBAAmB,EAAE,SAAS;YAG9B,aAAa,EAAE,SAAS;YAExB,eAAe,EAAE,SAAS;YAG1B,yBAAyB,EAAE,SAAS;YAEpC,kBAAkB,EAAE,SAAS;YAG7B,qBAAqB,EAAE,SAAS;YAGhC,oBAAoB,EAAE,SAAS;YAG/B,yBAAyB,EAAE,SAAS;YAEpC,wBAAwB,EAAE,SAAS;YAEnC,mBAAmB,EAAE,SAAS;YAG9B,WAAW,EAAE,SAAS;YAEtB,YAAY,EAAE,SAAS;YAEvB,YAAY,EAAE,SAAS;YAEvB,SAAS,EAAE,SAAS;SACE;KACzB;CACF,CAAC","file":"color-scheme.js","sourcesContent":["import type { IThemeColorScheme } from '../../color-scheme/interface';\nimport { dataScheme } from '../../color-scheme/builtin/default';\nimport type { BuiltinColorPalette } from '../../color-scheme/builtin/interface';\n\nexport const colorScheme: IThemeColorScheme = {\n  default: {\n    dataScheme,\n    palette: {\n      /** 背景色 */\n      backgroundColor: '#ffffff',\n      /** 图表边框色 */\n      borderColor: '#e3e5e8',\n      /** 默认阴影颜色 */\n      shadowColor: 'rgba(33,37,44,0.1)',\n      /** 鼠标 hover 项背景颜色 */\n      hoverBackgroundColor: '#f1f2f5',\n      /** 滑块类组件背景条填充颜色 */\n      sliderRailColor: '#f1f3f4',\n      /** 滑块类组件滑块填充颜色 */\n      sliderHandleColor: '#ffffff',\n      /** 滑块类组件已选范围填充颜色 */\n      sliderTrackColor: '#0040ff',\n      /** 浮层背景区域颜色 */\n      popupBackgroundColor: '#ffffff',\n\n      /** 主要字色 */\n      primaryFontColor: '#21252c',\n      /** 次要字色 */\n      secondaryFontColor: '#606773',\n      /** 第三字色 */\n      tertiaryFontColor: '#89909d',\n      /** 轴标签字色 */\n      axisLabelFontColor: '#89909d',\n      /** 禁用字色 */\n      disableFontColor: '#bcc1cb',\n      /** 轴高亮标记字色 */\n      axisMarkerFontColor: '#ffffff',\n\n      /** 轴网格线颜色 */\n      axisGridColor: '#f1f2f5',\n      /** 轴线颜色 */\n      axisDomainColor: '#d9dde4',\n\n      /** 缩略轴滑块描边颜色 */\n      dataZoomHandleStrokeColor: '#aeb5be',\n      /** 缩略轴图表区域颜色 */\n      dataZoomChartColor: '#c9ced8',\n\n      /** 播放器控制器填充颜色 */\n      playerControllerColor: '#0040ff',\n\n      /** 滚动条滑块颜色 */\n      scrollBarSliderColor: '#000000',\n\n      /** 轴高亮标记背景色 */\n      axisMarkerBackgroundColor: '#21252c',\n      /** 标注标签背景颜色 */\n      markLabelBackgroundColor: '#f1f2f5',\n      /** 标注线颜色 */\n      markLineStrokeColor: '#606773',\n\n      /** 危险色 */\n      dangerColor: '#e33232',\n      /** 警告色 */\n      warningColor: '#ffc528',\n      /** 成功色 */\n      successColor: '#07a35a',\n      /** 信息色 */\n      infoColor: '#3073f2'\n    } as BuiltinColorPalette\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/light/color-scheme.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAGhE,MAAM,CAAC,MAAM,WAAW,GAAsB;IAC5C,OAAO,EAAE;QACP,UAAU;QACV,OAAO,EAAE;YAEP,eAAe,EAAE,SAAS;YAE1B,WAAW,EAAE,SAAS;YAEtB,WAAW,EAAE,SAAS;YAGtB,gBAAgB,EAAE,SAAS;YAE3B,kBAAkB,EAAE,SAAS;YAE7B,aAAa,EAAE,SAAS;YAExB,gBAAgB,EAAE,SAAS;YAE3B,qBAAqB,EAAE,SAAS;YAGhC,aAAa,EAAE,SAAS;YAExB,eAAe,EAAE,SAAS;YAG1B,0BAA0B,EAAE,SAAS;YAErC,wBAAwB,EAAE,SAAS;YAEnC,uBAAuB,EAAE,SAAS;YAElC,kBAAkB,EAAE,SAAS;YAE7B,qBAAqB,EAAE,SAAS;YAGhC,oBAAoB,EAAE,SAAS;YAG/B,sBAAsB,EAAE,SAAS;YAGjC,wBAAwB,EAAE,SAAS;SACb;KACzB;CACF,CAAC","file":"color-scheme.js","sourcesContent":["import type { IThemeColorScheme } from '../../color-scheme/interface';\nimport { dataScheme } from '../../color-scheme/builtin/default';\nimport type { BuiltinColorPalette } from '../../color-scheme/builtin/interface';\n\nexport const colorScheme: IThemeColorScheme = {\n  default: {\n    dataScheme,\n    palette: {\n      /** 背景色 */\n      backgroundColor: '#ffffff',\n      /** 图表边框色 */\n      borderColor: '#e3e5e8',\n      /** 默认阴影颜色 */\n      shadowColor: '#21252c',\n\n      /** 主要字色 */\n      primaryFontColor: '#21252c',\n      /** 次要字色 */\n      secondaryFontColor: '#606773',\n      /** 轴字色 */\n      axisFontColor: '#89909d',\n      /** 禁用字色 */\n      disableFontColor: '#bcc1cb',\n      /** 标签反转字色 */\n      labelReverseFontColor: '#ffffff',\n\n      /** 轴网格线颜色 */\n      axisGridColor: '#f1f2f5',\n      /** 轴线颜色 */\n      axisDomainColor: '#d9dde4',\n\n      /** 缩略轴滑块描边颜色 */\n      dataZoomHandlerStrokeColor: '#aeb5be',\n      /** 缩略轴滑块填充颜色 */\n      dataZoomHandlerFillColor: '#ffffff',\n      /** 缩略轴背景区域颜色 */\n      dataZoomBackgroundColor: '#f1f3f4',\n      /** 缩略轴图表区域颜色 */\n      dataZoomChartColor: '#c9ced8',\n      /** 缩略轴选择区域颜色 */\n      dataZoomSelectedColor: '#0040ff',\n\n      /** 滚动条滑块颜色 */\n      scrollBarSliderColor: '#000000',\n\n      /** 提示信息背景区域颜色 */\n      tooltipBackgroundColor: '#ffffff',\n\n      /** 标注标签背景颜色 */\n      markLabelBackgroundColor: '#ffc528'\n    } as BuiltinColorPalette\n  }\n};\n"]}

package/esm/theme/color-scheme/builtin/interface.d.ts

@@ -3,28 +3,19 @@ export type BuiltinColorPalette = IColorSchemeStruct['palette'] & {
     backgroundColor: string;
     borderColor: string;
     shadowColor: string;
-    hoverBackgroundColor: string;
-    sliderRailColor: string;
-    sliderHandleColor: string;
-    sliderTrackColor: string;
-    popupBackgroundColor: string;
     primaryFontColor: string;
     secondaryFontColor: string;
-    tertiaryFontColor: string;
-    axisLabelFontColor: string;
+    axisFontColor: string;
     disableFontColor: string;
-    axisMarkerFontColor: string;
+    labelReverseFontColor: string;
     axisGridColor: string;
     axisDomainColor: string;
-    dataZoomHandleStrokeColor: string;
+    dataZoomHandlerStrokeColor: string;
+    dataZoomHandlerFillColor: string;
+    dataZoomBackgroundColor: string;
     dataZoomChartColor: string;
-    playerControllerColor: string;
+    dataZoomSelectedColor: string;
     scrollBarSliderColor: string;
-    axisMarkerBackgroundColor: string;
+    tooltipBackgroundColor: string;
     markLabelBackgroundColor: string;
-    markLineStrokeColor: string;
-    dangerColor: string;
-    warningColor: string;
-    successColor: string;
-    infoColor: string;
 };

package/esm/theme/color-scheme/builtin/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/color-scheme/builtin/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IColorSchemeStruct } from '../interface';\n\nexport type BuiltinColorPalette = IColorSchemeStruct['palette'] & {\n  /** 背景色 */\n  backgroundColor: string;\n  /** 图表边框色 */\n  borderColor: string;\n  /** 默认阴影颜色 */\n  shadowColor: string;\n  /** 鼠标 hover 项背景颜色 */\n  hoverBackgroundColor: string;\n  /** 滑块类组件背景条填充颜色 */\n  sliderRailColor: string;\n  /** 滑块类组件滑块填充颜色 */\n  sliderHandleColor: string;\n  /** 滑块类组件已选范围填充颜色 */\n  sliderTrackColor: string;\n  /** 浮层背景区域颜色 */\n  popupBackgroundColor: string;\n\n  /** 主要字色（图表标题、大数字） */\n  primaryFontColor: string;\n  /** 次要字色（图例、tooltip、数据标签） */\n  secondaryFontColor: string;\n  /** 第三字色（图表副标题） */\n  tertiaryFontColor: string;\n  /** 轴标签字色 */\n  axisLabelFontColor: string;\n  /** 禁用字色（非激活态字色） */\n  disableFontColor: string;\n  /** 轴高亮标记字色（crosshair 标签字色） */\n  axisMarkerFontColor: string;\n\n  /** 轴网格线颜色 */\n  axisGridColor: string;\n  /** 轴线颜色 */\n  axisDomainColor: string;\n\n  /** 缩略轴滑块描边颜色 */\n  dataZoomHandleStrokeColor: string;\n  /** 缩略轴图表区域颜色 */\n  dataZoomChartColor: string;\n\n  /** 播放器控制器填充颜色 */\n  playerControllerColor: string;\n\n  /** 滚动条滑块颜色 */\n  scrollBarSliderColor: string;\n\n  /** 轴高亮标记背景色（crosshair 标签背景色） */\n  axisMarkerBackgroundColor: string;\n  /** 标注标签背景颜色 */\n  markLabelBackgroundColor: string;\n  /** 标注线颜色 */\n  markLineStrokeColor: string;\n\n  /** 危险色 */\n  dangerColor: string;\n  /** 警告色 */\n  warningColor: string;\n  /** 成功色 */\n  successColor: string;\n  /** 信息色 */\n  infoColor: string;\n};\n"]}
+{"version":3,"sources":["../src/theme/color-scheme/builtin/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IColorSchemeStruct } from '../interface';\n\nexport type BuiltinColorPalette = IColorSchemeStruct['palette'] & {\n  /** 背景色 */\n  backgroundColor: string;\n  /** 图表边框色 */\n  borderColor: string;\n  /** 默认阴影颜色 */\n  shadowColor: string;\n\n  /** 主要字色（图表标题、大数字） */\n  primaryFontColor: string;\n  /** 次要字色（图例、tooltip、数据标签） */\n  secondaryFontColor: string;\n  /** 轴字色 */\n  axisFontColor: string;\n  /** 禁用字色（非激活态字色） */\n  disableFontColor: string;\n  /** 标签反转字色 */\n  labelReverseFontColor: string;\n\n  /** 轴网格线颜色 */\n  axisGridColor: string;\n  /** 轴线颜色 */\n  axisDomainColor: string;\n\n  /** 缩略轴滑块描边颜色 */\n  dataZoomHandlerStrokeColor: string;\n  /** 缩略轴滑块填充颜色 */\n  dataZoomHandlerFillColor: string;\n  /** 缩略轴背景区域颜色 */\n  dataZoomBackgroundColor: string;\n  /** 缩略轴图表区域颜色 */\n  dataZoomChartColor: string;\n  /** 缩略轴选择区域颜色 */\n  dataZoomSelectedColor: string;\n\n  /** 滚动条滑块颜色 */\n  scrollBarSliderColor: string;\n\n  /** 提示信息背景区域颜色 */\n  tooltipBackgroundColor: string;\n\n  /** 标注标签背景颜色 */\n  markLabelBackgroundColor: string;\n};\n"]}

package/esm/theme/color-scheme/legacy.d.ts

@@ -0,0 +1,5 @@
+import type { BuiltinColorPalette } from './builtin';
+import type { ColorSchemeItem, IColorSchemeStruct } from './interface';
+export declare const newTokenToLegacyToken: Record<keyof BuiltinColorPalette, string>;
+export declare const legacyTokenToNewToken: Record<string, keyof BuiltinColorPalette>;
+export declare function getUpgradedTokenValue(palette: IColorSchemeStruct['palette'], key: string): ColorSchemeItem;

package/esm/theme/color-scheme/legacy.js

@@ -0,0 +1,18 @@
+export const newTokenToLegacyToken = {
+    primaryFontColor: "titleFontColor",
+    secondaryFontColor: "labelFontColor"
+};
+
+export const legacyTokenToNewToken = {
+    titleFontColor: "primaryFontColor",
+    labelFontColor: "secondaryFontColor"
+};
+
+export function getUpgradedTokenValue(palette, key) {
+    const legacyKey = newTokenToLegacyToken[key];
+    if (legacyKey && palette[legacyKey]) return palette[legacyKey];
+    if (palette[key]) return palette[key];
+    const newKey = legacyTokenToNewToken[key];
+    return newKey ? palette[newKey] : void 0;
+}
+//# sourceMappingURL=legacy.js.map

package/esm/theme/color-scheme/legacy.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/theme/color-scheme/legacy.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,qBAAqB,GAA8C;IAC9E,gBAAgB,EAAE,gBAAgB;IAClC,kBAAkB,EAAE,gBAAgB;CACrC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAA8C;IAC9E,cAAc,EAAE,kBAAkB;IAClC,cAAc,EAAE,oBAAoB;CACrC,CAAC;AAEF,MAAM,UAAU,qBAAqB,CAAC,OAAsC,EAAE,GAAW;IAEvF,MAAM,SAAS,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE;QACnC,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;KAC3B;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE;QAChB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;KACrB;IAED,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC1C,IAAI,MAAM,EAAE;QACV,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;KACxB;IAED,OAAO,SAAS,CAAC;AACnB,CAAC","file":"legacy.js","sourcesContent":["// FIXME: token 兼容策略，照目前的设计不应该硬编码。\n// 后续需要二选一：\n// - 主题模块指定唯一一套支持的 token（可以保留这段硬编码）\n// - 在默认主题中做声明式的兼容（需要删除这段硬编码，并在 IColorKey 中支持新属性）\n\nimport type { BuiltinColorPalette } from './builtin';\nimport type { ColorSchemeItem, IColorSchemeStruct } from './interface';\n\nexport const newTokenToLegacyToken: Record<keyof BuiltinColorPalette, string> = {\n  primaryFontColor: 'titleFontColor',\n  secondaryFontColor: 'labelFontColor'\n};\n\nexport const legacyTokenToNewToken: Record<string, keyof BuiltinColorPalette> = {\n  titleFontColor: 'primaryFontColor',\n  labelFontColor: 'secondaryFontColor'\n};\n\nexport function getUpgradedTokenValue(palette: IColorSchemeStruct['palette'], key: string): ColorSchemeItem {\n  // 情况一：用户定义了包含旧 token 的新色板\n  const legacyKey = newTokenToLegacyToken[key];\n  if (legacyKey && palette[legacyKey]) {\n    return palette[legacyKey];\n  }\n  // 情况二：默认情况，用户尝试取色（大部分情况下在此退出）\n  if (palette[key]) {\n    return palette[key];\n  }\n  // 情况三：用户没有取到颜色，判断用户是否在尝试用旧 token 取色\n  const newKey = legacyTokenToNewToken[key];\n  if (newKey) {\n    return palette[newKey];\n  }\n  // 情况四：真的取不到颜色\n  return undefined;\n}\n"]}

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

@@ -1,9 +1,11 @@
-import { isArray, isFunction, isObject, isString, isValid, ColorUtil } from "@visactor/vutils";
+import { isArray, isFunction, isObject, isString, isValid, ColorUtil, isNil } from "@visactor/vutils";
 
 import { Color } from "../../util/color";
 
 import { getDirectionFromSeriesSpec } from "../../series/util/spec";
 
+import { getUpgradedTokenValue } from "./legacy";
+
 export function getDataScheme(colorScheme, seriesSpec) {
     var _a;
     if (!colorScheme) return [];
@@ -29,9 +31,9 @@ export function queryColorFromColorScheme(colorScheme, colorKey, seriesSpec) {
     if (!scheme) return;
     let color;
     const {palette: palette} = scheme;
-    if (isObject(palette) && (color = null !== (_a = palette[colorKey.key]) && void 0 !== _a ? _a : colorKey.default), 
+    if (isObject(palette) && (color = null !== (_a = getUpgradedTokenValue(palette, colorKey.key)) && void 0 !== _a ? _a : colorKey.default), 
     !color) return;
-    if (!isValid(colorKey.a) && !isValid(colorKey.l) || !isString(color)) return color;
+    if (isNil(colorKey.a) && isNil(colorKey.l) || !isString(color)) return color;
     let c = new Color(color);
     if (isValid(colorKey.l)) {
         const {r: r, g: g, b: b} = c.color, {h: h, s: s} = ColorUtil.rgbToHsl(r, g, b), rgb = ColorUtil.hslToRgb(h, s, colorKey.l), newColor = new Color(`rgb(${rgb.r}, ${rgb.g}, ${rgb.b})`);
@@ -66,10 +68,10 @@ export function getColorSchemeBySeries(colorScheme, seriesSpec) {
     var _a, _b;
     const {type: seriesType} = null != seriesSpec ? seriesSpec : {};
     let scheme;
-    if (seriesSpec && isValid(seriesType)) {
+    if (!seriesSpec || isNil(seriesType)) scheme = null == colorScheme ? void 0 : colorScheme.default; else {
         const direction = 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;
 }
 //# sourceMappingURL=util.js.map

package/esm/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 { 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"]}
+{"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, isNil } 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';\nimport { getUpgradedTokenValue } from './legacy';\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 = getUpgradedTokenValue(palette, colorKey.key) ?? colorKey.default;\n  }\n  if (!color) {\n    return undefined;\n  }\n  if ((isNil(colorKey.a) && isNil(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 || isNil(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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vchart",
-  "version": "1.6.1-alpha.0",
+  "version": "1.6.2",
   "description": "charts lib based @visactor/VGrammar",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -76,17 +76,17 @@
     "size-limit": "9.0.0",
     "@size-limit/file": "9.0.0",
     "@internal/typescript-json-schema": "0.0.1",
-    "@internal/bundler": "0.0.1",
     "@internal/eslint-config": "0.0.1",
-    "@internal/ts-config": "0.0.1"
+    "@internal/ts-config": "0.0.1",
+    "@internal/bundler": "0.0.1"
   },
   "dependencies": {
-    "@visactor/vutils": "~0.16.6",
+    "@visactor/vutils": "~0.16.7",
     "@visactor/vdataset": "~0.16.6",
-    "@visactor/vscale": "~0.16.6",
-    "@visactor/vrender-core": "~0.16.11",
-    "@visactor/vrender-kits": "~0.16.11",
-    "@visactor/vrender-components": "~0.16.11",
+    "@visactor/vscale": "~0.16.7",
+    "@visactor/vrender-core": "~0.16.12",
+    "@visactor/vrender-kits": "~0.16.12",
+    "@visactor/vrender-components": "~0.16.12",
     "@visactor/vgrammar-core": "~0.8.2",
     "@visactor/vgrammar-projection": "~0.8.2",
     "@visactor/vgrammar-wordcloud": "~0.8.2",
@@ -94,7 +94,7 @@
     "@visactor/vgrammar-hierarchy": "~0.8.2",
     "@visactor/vgrammar-sankey": "~0.8.2",
     "@visactor/vgrammar-util": "~0.8.2",
-    "@visactor/vutils-extension": "1.6.1-alpha.0"
+    "@visactor/vutils-extension": "1.6.2"
   },
   "publishConfig": {
     "access": "public",