@visactor/vchart 0.0.1-alpha.2 → 0.2.1-alpha.0

package/esm/theme/buildin-theme/light/series/scatter.js

@@ -1,8 +1,14 @@
-import { DEFAULT_TEXT_FONT_SIZE as fontSize } from "../../config";
+import { THEME_CONSTANTS } from "../constants";
 
 export const scatter = {
-    size: 10,
-    shape: "circle",
+    point: {
+        style: {
+            size: 8,
+            symbolType: "circle",
+            lineWidth: 0,
+            fillOpacity: .8
+        }
+    },
     label: {
         visible: !1,
         offset: 5,
@@ -10,7 +16,7 @@ export const scatter = {
         style: {
             lineWidth: 2,
             stroke: "white",
-            fontSize: fontSize
+            fontSize: THEME_CONSTANTS.LABEL_FONT_SIZE
         }
     }
 };

package/esm/theme/buildin-theme/light/series/scatter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/buildin-theme/light/series/scatter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAC;AAElE,MAAM,CAAC,MAAM,OAAO,GAAwB;IAC1C,IAAI,EAAE,EAAE;IACR,KAAK,EAAE,QAAQ;IACf,KAAK,EAAE;QACL,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,KAAK;QACf,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,OAAO;YACf,QAAQ;SACT;KACF;CACF,CAAC","file":"scatter.js","sourcesContent":["import type { IScatterSeriesTheme } from '../../../../series/scatter/interface';\nimport { DEFAULT_TEXT_FONT_SIZE as fontSize } from '../../config';\n\nexport const scatter: IScatterSeriesTheme = {\n  size: 10,\n  shape: 'circle',\n  label: {\n    visible: false,\n    offset: 5,\n    position: 'top',\n    style: {\n      lineWidth: 2,\n      stroke: 'white',\n      fontSize\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/buildin-theme/light/series/scatter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,MAAM,OAAO,GAAwB;IAC1C,KAAK,EAAE;QACL,KAAK,EAAE;YACL,IAAI,EAAE,CAAC;YACP,UAAU,EAAE,QAAQ;YACpB,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,GAAG;SACjB;KACF;IACD,KAAK,EAAE;QACL,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,KAAK;QACf,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,OAAO;YACf,QAAQ,EAAE,eAAe,CAAC,eAAe;SAC1C;KACF;CACF,CAAC","file":"scatter.js","sourcesContent":["import type { IScatterSeriesTheme } from '../../../../series/scatter/interface';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const scatter: IScatterSeriesTheme = {\n  point: {\n    style: {\n      size: 8,\n      symbolType: 'circle',\n      lineWidth: 0,\n      fillOpacity: 0.8\n    }\n  },\n  label: {\n    visible: false,\n    offset: 5,\n    position: 'top',\n    style: {\n      lineWidth: 2,\n      stroke: 'white',\n      fontSize: THEME_CONSTANTS.LABEL_FONT_SIZE\n    }\n  }\n};\n"]}

package/esm/theme/buildin-theme/light/series/treemap.js

@@ -1,4 +1,6 @@
-import { DEFAULT_TEXT_FONT_SIZE as fontSize } from "../../config";
+import { THEME_CONSTANTS } from "../constants";
+
+const fontSize = THEME_CONSTANTS.LABEL_FONT_SIZE;
 
 export const treemap = {
     gapWidth: 1,

package/esm/theme/buildin-theme/light/series/treemap.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/buildin-theme/light/series/treemap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAC;AAElE,MAAM,CAAC,MAAM,OAAO,GAAwB;IAC1C,QAAQ,EAAE,CAAC;IACX,WAAW,EAAE,CAAC,CAAC,CAAC;IAChB,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;QACd,KAAK,EAAE;YACL,WAAW,EAAE,GAAG;SACjB;KACF;IACD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,QAAQ,EAAE,QAAQ;YAClB,IAAI,EAAE,OAAO;YACb,YAAY,EAAE,QAAQ;YACtB,SAAS,EAAE,QAAQ;SACpB;KACF;IACD,YAAY,EAAE;QACZ,OAAO,EAAE,QAAQ,GAAG,CAAC;QACrB,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,OAAO;YACf,SAAS,EAAE,CAAC;YACZ,QAAQ,EAAE,QAAQ;YAClB,YAAY,EAAE,QAAQ;YACtB,SAAS,EAAE,QAAQ;SACpB;KACF;CACF,CAAC","file":"treemap.js","sourcesContent":["import type { ITreemapSeriesTheme } from '../../../../series/treemap/interface';\nimport { DEFAULT_TEXT_FONT_SIZE as fontSize } from '../../config';\n\nexport const treemap: ITreemapSeriesTheme = {\n  gapWidth: 1,\n  nodePadding: [5],\n  nonLeaf: {\n    visible: false,\n    style: {\n      fillOpacity: 0.5\n    }\n  },\n  label: {\n    style: {\n      fontSize: fontSize,\n      fill: 'white',\n      textBaseline: 'middle',\n      textAlign: 'center'\n    }\n  },\n  nonLeafLabel: {\n    padding: fontSize * 2,\n    style: {\n      fill: 'black',\n      stroke: 'white',\n      lineWidth: 2,\n      fontSize: fontSize,\n      textBaseline: 'middle',\n      textAlign: 'center'\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/buildin-theme/light/series/treemap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,QAAQ,GAAG,eAAe,CAAC,eAAe,CAAC;AAEjD,MAAM,CAAC,MAAM,OAAO,GAAwB;IAC1C,QAAQ,EAAE,CAAC;IACX,WAAW,EAAE,CAAC,CAAC,CAAC;IAChB,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;QACd,KAAK,EAAE;YACL,WAAW,EAAE,GAAG;SACjB;KACF;IACD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,QAAQ,EAAE,QAAQ;YAClB,IAAI,EAAE,OAAO;YACb,YAAY,EAAE,QAAQ;YACtB,SAAS,EAAE,QAAQ;SACpB;KACF;IACD,YAAY,EAAE;QACZ,OAAO,EAAE,QAAQ,GAAG,CAAC;QACrB,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,OAAO;YACf,SAAS,EAAE,CAAC;YACZ,QAAQ,EAAE,QAAQ;YAClB,YAAY,EAAE,QAAQ;YACtB,SAAS,EAAE,QAAQ;SACpB;KACF;CACF,CAAC","file":"treemap.js","sourcesContent":["import type { ITreemapSeriesTheme } from '../../../../series/treemap/interface';\nimport { THEME_CONSTANTS } from '../constants';\n\nconst fontSize = THEME_CONSTANTS.LABEL_FONT_SIZE;\n\nexport const treemap: ITreemapSeriesTheme = {\n  gapWidth: 1,\n  nodePadding: [5],\n  nonLeaf: {\n    visible: false,\n    style: {\n      fillOpacity: 0.5\n    }\n  },\n  label: {\n    style: {\n      fontSize: fontSize,\n      fill: 'white',\n      textBaseline: 'middle',\n      textAlign: 'center'\n    }\n  },\n  nonLeafLabel: {\n    padding: fontSize * 2,\n    style: {\n      fill: 'black',\n      stroke: 'white',\n      lineWidth: 2,\n      fontSize: fontSize,\n      textBaseline: 'middle',\n      textAlign: 'center'\n    }\n  }\n};\n"]}

package/esm/theme/buildin-theme/light/series/waterfall.js

@@ -1,4 +1,6 @@
-import { DEFAULT_TEXT_FONT_SIZE as fontSize } from "../../config";
+import { THEME_CONSTANTS } from "../constants";
+
+const fontSize = THEME_CONSTANTS.LABEL_FONT_SIZE;
 
 export const waterfall = {
     seriesFieldName: {

package/esm/theme/buildin-theme/light/series/waterfall.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/buildin-theme/light/series/waterfall.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,IAAI,QAAQ,EAAE,MAAM,cAAc,CAAC;AAElE,MAAM,CAAC,MAAM,SAAS,GAA0B;IAC9C,eAAe,EAAE;QACf,KAAK,EAAE,OAAO;QACd,QAAQ,EAAE,UAAU;QACpB,QAAQ,EAAE,UAAU;KACrB;IACD,UAAU,EAAE;QACV,KAAK,EAAE;YACL,MAAM,EAAE,OAAO;YACf,SAAS,EAAE,CAAC;YACZ,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;SACjB;KACF;IACD,UAAU,EAAE;QACV,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,YAAY;QACtB,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,QAAQ;SACT;KACF;IACD,KAAK,EAAE;QACL,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE;YACL,QAAQ;SACT;KACF;CACF,CAAC","file":"waterfall.js","sourcesContent":["import type { IWaterfallSeriesTheme } from '../../../../series/waterfall/interface';\nimport { DEFAULT_TEXT_FONT_SIZE as fontSize } from '../../config';\n\nexport const waterfall: IWaterfallSeriesTheme = {\n  seriesFieldName: {\n    total: 'total',\n    increase: 'increase',\n    decrease: 'decrease'\n  },\n  leaderLine: {\n    style: {\n      stroke: 'black',\n      lineWidth: 1,\n      lineDash: [4, 4]\n    }\n  },\n  stackLabel: {\n    offset: 12,\n    position: 'withChange',\n    style: {\n      fill: 'black',\n      fontSize\n    }\n  },\n  label: {\n    visible: false,\n    offset: 12,\n    position: 'inside',\n    style: {\n      fontSize\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/buildin-theme/light/series/waterfall.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,QAAQ,GAAG,eAAe,CAAC,eAAe,CAAC;AAEjD,MAAM,CAAC,MAAM,SAAS,GAA0B;IAC9C,eAAe,EAAE;QACf,KAAK,EAAE,OAAO;QACd,QAAQ,EAAE,UAAU;QACpB,QAAQ,EAAE,UAAU;KACrB;IACD,UAAU,EAAE;QACV,KAAK,EAAE;YACL,MAAM,EAAE,OAAO;YACf,SAAS,EAAE,CAAC;YACZ,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;SACjB;KACF;IACD,UAAU,EAAE;QACV,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,YAAY;QACtB,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,QAAQ;SACT;KACF;IACD,KAAK,EAAE;QACL,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE;YACL,QAAQ;SACT;KACF;CACF,CAAC","file":"waterfall.js","sourcesContent":["import type { IWaterfallSeriesTheme } from '../../../../series/waterfall/interface';\nimport { THEME_CONSTANTS } from '../constants';\n\nconst fontSize = THEME_CONSTANTS.LABEL_FONT_SIZE;\n\nexport const waterfall: IWaterfallSeriesTheme = {\n  seriesFieldName: {\n    total: 'total',\n    increase: 'increase',\n    decrease: 'decrease'\n  },\n  leaderLine: {\n    style: {\n      stroke: 'black',\n      lineWidth: 1,\n      lineDash: [4, 4]\n    }\n  },\n  stackLabel: {\n    offset: 12,\n    position: 'withChange',\n    style: {\n      fill: 'black',\n      fontSize\n    }\n  },\n  label: {\n    visible: false,\n    offset: 12,\n    position: 'inside',\n    style: {\n      fontSize\n    }\n  }\n};\n"]}

package/esm/theme/buildin-theme/light/series/word-cloud3d.js

@@ -1,5 +1,5 @@
 export const wordCloud3d = {
-    word3d: {
+    word: {
         padding: 1,
         style: {
             textAlign: "center",

package/esm/theme/buildin-theme/light/series/word-cloud3d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/buildin-theme/light/series/word-cloud3d.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,WAAW,GAA4B;IAClD,MAAM,EAAE;QACN,OAAO,EAAE,CAAC;QACV,KAAK,EAAE;YACL,SAAS,EAAE,QAAQ;YACnB,YAAY,EAAE,YAAY;SAC3B;KACF;CACF,CAAC","file":"word-cloud3d.js","sourcesContent":["import type { IWordCloud3dSeriesTheme } from '../../../../series/word-cloud/interface';\n\nexport const wordCloud3d: IWordCloud3dSeriesTheme = {\n  word3d: {\n    padding: 1,\n    style: {\n      textAlign: 'center',\n      textBaseline: 'alphabetic'\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/buildin-theme/light/series/word-cloud3d.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,WAAW,GAA4B;IAClD,IAAI,EAAE;QACJ,OAAO,EAAE,CAAC;QACV,KAAK,EAAE;YACL,SAAS,EAAE,QAAQ;YACnB,YAAY,EAAE,YAAY;SAC3B;KACF;CACF,CAAC","file":"word-cloud3d.js","sourcesContent":["import type { IWordCloud3dSeriesTheme } from '../../../../series/word-cloud/interface';\n\nexport const wordCloud3d: IWordCloud3dSeriesTheme = {\n  word: {\n    padding: 1,\n    style: {\n      textAlign: 'center',\n      textBaseline: 'alphabetic'\n    }\n  }\n};\n"]}

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

@@ -1,21 +1,29 @@
 import type { SeriesTypeEnum } from '../../series/interface';
 import type { IGradient } from '../../typings';
 export type IColorSchemeStruct = {
-    bandColor?: ColorSchemeItem;
-    background?: ColorSchemeItem;
-    dataScheme: ColorDataSchemeItem[];
-} & {
-    [key: string]: ColorSchemeItem;
+    dataScheme: Array<DataSchemeItem> | ProgressiveDataScheme<DataSchemeItem>;
+    palette?: {
+        bandColor?: ColorSchemeItem;
+        background?: ColorSchemeItem;
+        [key: string]: ColorSchemeItem;
+    };
 };
+export type ProgressiveDataScheme<T> = Array<IProgressiveDataSchemeCase<T>>;
+export interface IProgressiveDataSchemeCase<T> {
+    maxDomainLength?: number;
+    isAvailable?: boolean | IsProgressiveDataSchemeAvailableCallback;
+    scheme: T[];
+}
+export type IsProgressiveDataSchemeAvailableCallback = (domain: any[]) => boolean;
 export interface IColorKey {
-    type: 'scheme';
+    type: 'palette';
     key: string;
     l?: number;
     a?: number;
 }
-export type ColorDataSchemeItem = string | IColorKey;
+export type DataSchemeItem = string | IColorKey;
 export type ColorSchemeItem = string | IGradient;
-export type ColorScheme = string[] | IColorSchemeStruct;
+export type ColorScheme = Array<string> | ProgressiveDataScheme<string> | IColorSchemeStruct;
 export type IThemeColorScheme = {
     default: ColorScheme;
 } & Partial<Record<SeriesTypeEnum, ColorScheme>>;

package/esm/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\nexport type IColorSchemeStruct = {\n  /** 主色调（可选） */\n  bandColor?: ColorSchemeItem;\n  /** 背景颜色（可选） */\n  background?: ColorSchemeItem;\n  /** 数据色板，承载3.x版原有色板的功能 */\n  dataScheme: ColorDataSchemeItem[];\n} & {\n  /** 其他的语义化颜色 */\n  [key: string]: ColorSchemeItem;\n};\n\n/** 语义化颜色的色值索引 */\nexport interface IColorKey {\n  /** 颜色type声明 */\n  type: 'scheme';\n\n  /** 颜色索引 */\n  key: string;\n\n  /** 明度系数（可选，0~1） */\n  l?: number;\n\n  /** 透明度系数（可选，0~1） */\n  a?: number;\n}\n\nexport type ColorDataSchemeItem = string | IColorKey;\n\nexport type ColorSchemeItem = string | IGradient; // 纯色或渐变色\n\nexport type ColorScheme = 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 } 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    background?: 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  /** 颜色索引 */\n  key: string;\n\n  /** 明度系数（可选，0~1） */\n  l?: number;\n\n  /** 透明度系数（可选，0~1） */\n  a?: number;\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"]}

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

@@ -1,5 +1,8 @@
 import type { SeriesTypeEnum } from '../../series/interface';
-import type { ColorSchemeItem, IColorKey, IThemeColorScheme } from './interface';
-export declare function getDataScheme(colorScheme: IThemeColorScheme, seriesType?: SeriesTypeEnum): ColorSchemeItem[];
-export declare function findColor(colorScheme: IThemeColorScheme, colorKey: IColorKey, seriesType?: SeriesTypeEnum): ColorSchemeItem | undefined;
+import type { ColorSchemeItem, IColorKey, IThemeColorScheme, ProgressiveDataScheme } from './interface';
+export declare function getDataScheme(colorScheme: IThemeColorScheme, seriesType?: SeriesTypeEnum): 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 isColorKey(obj: any): obj is IColorKey;
+export declare function isProgressiveDataColorScheme<T>(obj: any): obj is ProgressiveDataScheme<T>;

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

@@ -1,20 +1,32 @@
-import { isArray, isObject, isString, isValid } from "@visactor/vutils";
+import { isArray, isFunction, isObject, isString, isValid } from "@visactor/vutils";
 
 import { ColorUtil } from "@visactor/vutils";
 
-import { Color } from "../../util";
+import { Color } from "../../util/color";
 
 export function getDataScheme(colorScheme, seriesType) {
     var _a;
     const scheme = isValid(seriesType) && null !== (_a = null == colorScheme ? void 0 : colorScheme[seriesType]) && void 0 !== _a ? _a : null == colorScheme ? void 0 : colorScheme.default;
-    return !scheme || isArray(scheme) ? scheme : isObject(scheme) ? scheme.dataScheme.map((color => isColorKey(color) ? findColor(colorScheme, color, seriesType) : color)) : [];
+    if (!scheme || isArray(scheme)) return scheme;
+    if (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(isValid)
+        }))) : dataScheme.map((color => isColorKey(color) ? queryColorFromColorScheme(colorScheme, color, seriesType) : color)).filter(isValid) : [];
+    }
+    return [];
 }
 
-export function findColor(colorScheme, colorKey, seriesType) {
-    var _a;
+export function computeActualDataScheme(dataScheme, colorDomain) {
+    var _a, _b;
+    return isProgressiveDataColorScheme(dataScheme) ? null !== (_b = null === (_a = dataScheme.find((item => isValid(item.isAvailable) ? isFunction(item.isAvailable) ? item.isAvailable(colorDomain) : !!item.isAvailable : !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;
+}
+
+export function queryColorFromColorScheme(colorScheme, colorKey, seriesType) {
+    var _a, _b;
     const scheme = isValid(seriesType) && null !== (_a = colorScheme[seriesType]) && void 0 !== _a ? _a : colorScheme.default;
     if (!scheme) return;
-    const color = scheme[colorKey.key];
+    const color = null === (_b = scheme.palette) || void 0 === _b ? void 0 : _b[colorKey.key];
     if (!color) return;
     if (!isValid(colorKey.a) && !isValid(colorKey.l) || !isString(color)) return color;
     let c = new Color(color);
@@ -25,7 +37,19 @@ export function findColor(colorScheme, colorKey, seriesType) {
     return isValid(colorKey.a) && c.setOpacity(colorKey.a), c.toRGBA();
 }
 
+export const getActualColor = (value, colorScheme, seriesType) => {
+    if (isColorKey(value) && colorScheme) {
+        const color = queryColorFromColorScheme(colorScheme, value, seriesType);
+        if (color) return color;
+    }
+    return value;
+};
+
 export function isColorKey(obj) {
-    return isObject(obj) && "scheme" === obj.type && !!obj.key;
+    return isObject(obj) && "palette" === obj.type && !!obj.key;
+}
+
+export function isProgressiveDataColorScheme(obj) {
+    return !!isArray(obj) && obj.every((item => isValid(item.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, 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';\nimport type { ColorSchemeItem, IColorKey, IColorSchemeStruct, IThemeColorScheme } from './interface';\n\n/**\n * 获取数据色板\n * @param colorScheme\n * @param seriesType\n * @returns\n */\nexport function getDataScheme(colorScheme: IThemeColorScheme, seriesType?: SeriesTypeEnum): ColorSchemeItem[] {\n  const scheme = !isValid(seriesType) ? colorScheme?.default : colorScheme?.[seriesType] ?? colorScheme?.default;\n  if (!scheme || isArray(scheme)) {\n    return scheme as string[];\n  } else if (isObject(scheme)) {\n    return (scheme as IColorSchemeStruct).dataScheme.map(color => {\n      if (isColorKey(color)) {\n        return findColor(colorScheme, color, seriesType);\n      }\n      return color;\n    });\n  }\n  return [];\n}\n\n/**\n * 根据色板和色值索引生成颜色\n * @param colorScheme\n * @param colorKey\n * @param seriesType\n * @returns\n */\nexport function findColor(\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  const color = scheme[colorKey.key];\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\nexport function isColorKey(obj: any): obj is IColorKey {\n  return isObject(obj) && (obj as IColorKey).type === 'scheme' && !!(obj as IColorKey).key;\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 } 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  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  const color = (scheme as IColorSchemeStruct).palette?.[colorKey.key];\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)) {\n    return false;\n  }\n  return obj.every(item => {\n    return isValid((item as IProgressiveDataSchemeCase<T>).scheme);\n  });\n}\n"]}

package/esm/theme/interface.d.ts

@@ -1,59 +1,43 @@
-import type { IAxisCommonTheme } from './../component/axis/interface';
 import type { ILayoutPaddingSpec } from '../model/interface';
-import type { IDataZoomTheme, IScrollBarTheme } from '../component/data-zoom';
-import type { ITooltipTheme } from '../component/tooltip/interface';
-import type { IDiscreteLegendTheme } from '../component/legend/discrete/interface';
-import type { IMarkLineTheme } from '../component/marker/mark-line/interface';
 import type { ISeriesTheme } from '../series/interface';
-import type { ICrosshairTheme } from '../component/crosshair/interface';
 import type { IMarkTheme } from '../typings/spec';
-import type { IArcMarkSpec, IAreaMarkSpec, ILineMarkSpec, IRectMarkSpec, ISymbolMarkSpec, ITextMarkSpec } from '../typings';
-import type { ICartesianAxisCommonTheme } from '../component/axis/cartesian/interface';
-import type { IPolarAxisCommonTheme } from '../component/axis/polar/interface';
-import type { ComponentTypeEnum } from '../component/interface';
-import type { IIndicatorTheme } from '../component/indicator/interface';
+import type { IArcMarkSpec, IAreaMarkSpec, ILineMarkSpec, IRectMarkSpec, ISymbolMarkSpec, ITextMarkSpec, IPathMarkSpec } from '../typings';
 import type { MarkTypeEnum } from '../mark/interface';
 import type { IThemeColorScheme } from './color-scheme/interface';
-import type { IColorLegendTheme, ISizeLegendTheme } from '../component/legend/continuous';
-import type { IMarkAreaTheme } from '../component/marker/mark-area/interface';
-import type { IPlayerTheme } from '../component/player';
-import type { IMarkPointTheme } from '../component/marker/mark-point/interface';
-import type { IBrushTheme } from '../component/brush/interface';
-import type { ITitleTheme } from '../component/title';
 import type { IGradientColor } from '@visactor/vrender';
+import type { IComponentTheme } from '../component/interface';
 export interface ITheme {
     name?: string;
     background?: string | IGradientColor;
     padding?: ILayoutPaddingSpec;
     fontFamily?: string;
-    mark?: IGlobalMarkTheme;
     colorScheme?: IThemeColorScheme;
+    mark?: IGlobalMarkThemeByType;
+    markByName?: IGlobalMarkThemeByName;
     series?: ISeriesTheme;
-    axis?: IAxisCommonTheme;
-    axisX?: ICartesianAxisCommonTheme;
-    axisY?: ICartesianAxisCommonTheme;
-    axisRadius?: IPolarAxisCommonTheme;
-    axisAngle?: IPolarAxisCommonTheme;
-    [ComponentTypeEnum.discreteLegend]?: IDiscreteLegendTheme;
-    [ComponentTypeEnum.colorLegend]?: IColorLegendTheme;
-    [ComponentTypeEnum.sizeLegend]?: ISizeLegendTheme;
-    [ComponentTypeEnum.markLine]?: IMarkLineTheme;
-    [ComponentTypeEnum.markArea]?: IMarkAreaTheme;
-    [ComponentTypeEnum.markPoint]?: IMarkPointTheme;
-    [ComponentTypeEnum.tooltip]?: ITooltipTheme;
-    [ComponentTypeEnum.crosshair]?: ICrosshairTheme;
-    [ComponentTypeEnum.dataZoom]?: IDataZoomTheme;
-    [ComponentTypeEnum.scrollBar]?: IScrollBarTheme;
-    [ComponentTypeEnum.indicator]?: IIndicatorTheme;
-    [ComponentTypeEnum.player]?: IPlayerTheme;
-    [ComponentTypeEnum.brush]?: IBrushTheme;
-    [ComponentTypeEnum.title]?: ITitleTheme;
+    component?: IComponentTheme;
 }
-export interface IGlobalMarkTheme {
+export interface IGlobalMarkThemeByType {
     [MarkTypeEnum.line]?: Partial<IMarkTheme<ILineMarkSpec>>;
     [MarkTypeEnum.symbol]?: Partial<IMarkTheme<ISymbolMarkSpec>>;
     [MarkTypeEnum.area]?: Partial<IMarkTheme<IAreaMarkSpec>>;
     [MarkTypeEnum.rect]?: Partial<IMarkTheme<IRectMarkSpec>>;
     [MarkTypeEnum.arc]?: Partial<IMarkTheme<IArcMarkSpec>>;
     [MarkTypeEnum.text]?: Partial<IMarkTheme<ITextMarkSpec>>;
+    [MarkTypeEnum.path]?: Partial<IMarkTheme<IPathMarkSpec>>;
+}
+export interface IGlobalMarkThemeByName {
+    line?: Partial<IMarkTheme<ILineMarkSpec>>;
+    point?: Partial<IMarkTheme<ISymbolMarkSpec>>;
+    area?: Partial<IMarkTheme<IAreaMarkSpec>>;
+    bar?: Partial<IMarkTheme<IRectMarkSpec>>;
+    label?: Partial<IMarkTheme<ITextMarkSpec>>;
+    [markName: string]: Partial<IMarkTheme<any>>;
+}
+export interface IThemeConstants {
+    FONT_FAMILY: string;
+    LABEL_FONT_SIZE: number;
+    MAP_LABEL_FONT_SIZE: number;
+    TITLE_FONT_SIZE: number;
+    AXIS_TICK_SIZE: number;
 }

package/esm/theme/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IAxisCommonTheme, ICommonAxisSpec } from './../component/axis/interface';\nimport type { ILayoutPaddingSpec } from '../model/interface';\nimport type { IDataZoomTheme, IScrollBarTheme } from '../component/data-zoom';\nimport type { ITooltipTheme } from '../component/tooltip/interface';\nimport type { IDiscreteLegendTheme } from '../component/legend/discrete/interface';\nimport type { IMarkLineTheme } from '../component/marker/mark-line/interface';\nimport type { ISeriesTheme } from '../series/interface';\nimport type { ICrosshairTheme } from '../component/crosshair/interface';\nimport type { IMarkTheme } from '../typings/spec';\nimport type {\n  IArcMarkSpec,\n  IAreaMarkSpec,\n  ILineMarkSpec,\n  IRectMarkSpec,\n  ISymbolMarkSpec,\n  ITextMarkSpec\n} from '../typings';\nimport type { ICartesianAxisCommonTheme } from '../component/axis/cartesian/interface';\nimport type { IPolarAxisCommonTheme } from '../component/axis/polar/interface';\nimport type { ComponentTypeEnum } from '../component/interface';\nimport type { IIndicatorTheme } from '../component/indicator/interface';\nimport type { MarkTypeEnum } from '../mark/interface';\nimport type { IThemeColorScheme } from './color-scheme/interface';\nimport type { IColorLegendTheme, ISizeLegendTheme } from '../component/legend/continuous';\nimport type { IMarkAreaTheme } from '../component/marker/mark-area/interface';\nimport type { IPlayerTheme } from '../component/player';\nimport type { IMarkPointTheme } from '../component/marker/mark-point/interface';\nimport type { IBrushTheme } from '../component/brush/interface';\nimport type { ITitleTheme } from '../component/title';\nimport type { IGradientColor } from '@visactor/vrender';\n\nexport interface ITheme {\n  /** 主题命名 */\n  name?: string;\n\n  /** 图表层级的样式属性，用于配置背景色 */\n  background?: string | IGradientColor;\n  /** 图表内边距 */\n  padding?: ILayoutPaddingSpec;\n  /** 图表字体配置 */\n  fontFamily?: string;\n\n  /** 全局 mark 样式属性 */\n  mark?: IGlobalMarkTheme;\n\n  /** 全局色板 */\n  colorScheme?: IThemeColorScheme;\n\n  /** 系列 */\n  series?: ISeriesTheme;\n\n  // 组件的配置\n  /**\n   * 通用坐标轴配置\n   */\n  axis?: IAxisCommonTheme;\n  /**\n   * 笛卡尔坐标系下 x 轴的配置\n   */\n  axisX?: ICartesianAxisCommonTheme;\n  /**\n   * 笛卡尔坐标系下 y 轴配置\n   */\n  axisY?: ICartesianAxisCommonTheme;\n  /**\n   * 极坐标系下半径轴配置\n   */\n  axisRadius?: IPolarAxisCommonTheme;\n  /**\n   * 极坐标系下角度轴配置\n   */\n  axisAngle?: IPolarAxisCommonTheme;\n  /**\n   * 离散图例配置\n   */\n  [ComponentTypeEnum.discreteLegend]?: IDiscreteLegendTheme;\n  /**\n   * 连续颜色图例配置\n   */\n  [ComponentTypeEnum.colorLegend]?: IColorLegendTheme;\n  /**\n   * 连续尺寸图例配置\n   */\n  [ComponentTypeEnum.sizeLegend]?: ISizeLegendTheme;\n  /**\n   * markLine 标记配置\n   */\n  [ComponentTypeEnum.markLine]?: IMarkLineTheme;\n  /**\n   * markArea 标记配置\n   */\n  [ComponentTypeEnum.markArea]?: IMarkAreaTheme;\n  /**\n   * markPoint 标记配置\n   */\n  [ComponentTypeEnum.markPoint]?: IMarkPointTheme;\n  /**\n   * tooltip 组件配置\n   */\n  [ComponentTypeEnum.tooltip]?: ITooltipTheme;\n  /**\n   * crosshair 配置\n   */\n  [ComponentTypeEnum.crosshair]?: ICrosshairTheme;\n  /**\n   * dataZoom 配置\n   */\n  [ComponentTypeEnum.dataZoom]?: IDataZoomTheme;\n  /**\n   * scrollbar 滚动条配置\n   */\n  [ComponentTypeEnum.scrollBar]?: IScrollBarTheme;\n  /**\n   * 指标卡组件配置\n   */\n  [ComponentTypeEnum.indicator]?: IIndicatorTheme;\n  /**\n   * 播放器配置\n   */\n  [ComponentTypeEnum.player]?: IPlayerTheme;\n  /**\n   * 框选配置\n   */\n  [ComponentTypeEnum.brush]?: IBrushTheme;\n  /**\n   * 图表标题配置\n   */\n  [ComponentTypeEnum.title]?: ITitleTheme;\n}\n\nexport interface IGlobalMarkTheme {\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}\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 { IThemeColorScheme } from './color-scheme/interface';\nimport type { IGradientColor } from '@visactor/vrender';\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;\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  /**\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  FONT_FAMILY: string;\n  LABEL_FONT_SIZE: number;\n  MAP_LABEL_FONT_SIZE: number;\n  TITLE_FONT_SIZE: number;\n  AXIS_TICK_SIZE: number;\n}\n"]}

package/esm/theme/theme-manager.d.ts

@@ -9,4 +9,5 @@ export declare class ThemeManager {
     static getDefaultTheme(): ITheme;
     static setCurrentTheme(name: string): void;
     static getCurrentTheme(): ITheme;
+    static getCurrentThemeName(): string;
 }

package/esm/theme/theme-manager.js

@@ -2,6 +2,8 @@ import { merge } from "@visactor/vutils";
 
 import { buildinThemeMap, defaultThemeName } from "./buildin-theme";
 
+import { InstanceManager } from "../core/instance-manager";
+
 export class ThemeManager {
     static registerTheme(name, theme) {
         name && ThemeManager.themes.set(name, merge({}, ThemeManager.getDefaultTheme(), theme));
@@ -19,11 +21,14 @@ export class ThemeManager {
         return ThemeManager.themes.get(defaultThemeName);
     }
     static setCurrentTheme(name) {
-        ThemeManager.themeExist(name) && (ThemeManager._currentThemeName = name);
+        ThemeManager.themeExist(name) && (ThemeManager._currentThemeName = name, InstanceManager.forEach((instance => null == instance ? void 0 : instance.setCurrentTheme(name))));
     }
     static getCurrentTheme() {
         return ThemeManager.getTheme(ThemeManager._currentThemeName);
     }
+    static getCurrentThemeName() {
+        return ThemeManager._currentThemeName;
+    }
 }
 
 ThemeManager.themes = new Map, ThemeManager._currentThemeName = defaultThemeName, 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/theme-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGpE,MAAM,OAAO,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,KAAK,CAAC,EAAE,EAAE,YAAY,CAAC,eAAe,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;IAClF,CAAC;IAOD,MAAM,CAAC,QAAQ,CAAC,IAAY;QAC1B,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,CAAC;IAC1C,CAAC;IAOD,MAAM,CAAC,UAAU,CAAC,IAAY;QAC5B,OAAO,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAGD,MAAM,CAAC,eAAe;QACpB,OAAO,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,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;IAExC,CAAC;IAGD,MAAM,CAAC,eAAe;QACpB,OAAO,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAC/D,CAAC;;AA9DM,mBAAM,GAAwB,IAAI,GAAG,EAAE,CAAC;AAEhC,8BAAiB,GAAW,gBAAgB,CAAC;AAgE9D,YAAY,CAAC,aAAa,CAAC,gBAAgB,EAAE,eAAe,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAEpF,eAAe,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IACtC,IAAI,IAAI,KAAK,gBAAgB,EAAE;QAC7B,YAAY,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;KACzC;AACH,CAAC,CAAC,CAAC","file":"theme-manager.js","sourcesContent":["import { merge } from '@visactor/vutils';\nimport { buildinThemeMap, defaultThemeName } from './buildin-theme';\nimport type { ITheme } from './interface';\n\nexport class ThemeManager {\n  /** 主题字典 */\n  static themes: Map<string, ITheme> = new Map();\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, merge({}, ThemeManager.getDefaultTheme(), theme));\n  }\n\n  /**\n   * 获取主题\n   * @param name 主题名称\n   * @returns\n   */\n  static getTheme(name: string) {\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);\n  }\n\n  /**\n   * 判断主题是否存在\n   * @param name 主题名称\n   * @returns 是否存在\n   */\n  static themeExist(name: string) {\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    //VChart.set\n  }\n\n  /** 获取当前主题（只能获取用户通过`setCurrentTheme`方法设置过的主题，默认值为默认主题） */\n  static getCurrentTheme(): ITheme {\n    return ThemeManager.getTheme(ThemeManager._currentThemeName);\n  }\n}\n\n// 先注册默认主题\nThemeManager.registerTheme(defaultThemeName, buildinThemeMap.get(defaultThemeName));\n// 再注册其他内置主题\nbuildinThemeMap.forEach((theme, name) => {\n  if (name !== defaultThemeName) {\n    ThemeManager.registerTheme(name, theme);\n  }\n});\n"]}
+{"version":3,"sources":["../src/theme/theme-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAG3D,MAAM,OAAO,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,KAAK,CAAC,EAAE,EAAE,YAAY,CAAC,eAAe,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;IAClF,CAAC;IAOD,MAAM,CAAC,QAAQ,CAAC,IAAY;QAC1B,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,CAAC;IAC1C,CAAC;IAOD,MAAM,CAAC,UAAU,CAAC,IAAY;QAC5B,OAAO,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAGD,MAAM,CAAC,eAAe;QACpB,OAAO,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,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,eAAe,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;;AAnEM,mBAAM,GAAwB,IAAI,GAAG,EAAE,CAAC;AAEhC,8BAAiB,GAAW,gBAAgB,CAAC;AAqE9D,YAAY,CAAC,aAAa,CAAC,gBAAgB,EAAE,eAAe,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAEpF,eAAe,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IACtC,IAAI,IAAI,KAAK,gBAAgB,EAAE;QAC7B,YAAY,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;KACzC;AACH,CAAC,CAAC,CAAC","file":"theme-manager.js","sourcesContent":["import { merge } from '@visactor/vutils';\nimport { buildinThemeMap, defaultThemeName } from './buildin-theme';\nimport type { ITheme } from './interface';\nimport { InstanceManager } from '../core/instance-manager';\nimport type { IVChart } from '../core/interface';\n\nexport class ThemeManager {\n  /** 主题字典 */\n  static themes: Map<string, ITheme> = new Map();\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, merge({}, ThemeManager.getDefaultTheme(), theme));\n  }\n\n  /**\n   * 获取主题\n   * @param name 主题名称\n   * @returns\n   */\n  static getTheme(name: string) {\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);\n  }\n\n  /**\n   * 判断主题是否存在\n   * @param name 主题名称\n   * @returns 是否存在\n   */\n  static themeExist(name: string) {\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\n// 先注册默认主题\nThemeManager.registerTheme(defaultThemeName, buildinThemeMap.get(defaultThemeName));\n// 再注册其他内置主题\nbuildinThemeMap.forEach((theme, name) => {\n  if (name !== defaultThemeName) {\n    ThemeManager.registerTheme(name, theme);\n  }\n});\n"]}

package/esm/typings/spec/chart.d.ts

@@ -20,7 +20,7 @@ import type { ICircularProgressChartSpec } from '../../chart/progress/circular/i
 import type { ILinearProgressChartSpec } from '../../chart/progress/linear/interface';
 import type { IWordCloudChartSpec } from '../../chart/word-cloud/interface';
 import type { IFunnelChartSpec } from '../../chart/funnel/interface';
-import type { IBoxPlotChartSpec } from '../../chart/boxplot/interface';
+import type { IBoxPlotChartSpec } from '../../chart/box-plot/interface';
 import type { ISunburstChartSpec } from '../../chart/sunburst/interface';
 import type { ICirclePackingChartSpec } from '../../chart/circle-packing/interface';
 export interface ChartSpecMap {

package/esm/typings/spec/chart.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/typings/spec/chart.ts"],"names":[],"mappings":"","file":"chart.js","sourcesContent":["import type { ICommonChartSpec } from '../../chart/common';\nimport type { IGaugeChartSpec } from '../../chart/gauge/interface';\nimport type { IHeatmapChartSpec } from '../../chart/heatmap';\nimport type { IRangeAreaChartSpec } from '../../chart/range-area';\nimport type { ISankeyChartSpec } from '../../chart/sankey';\nimport type { ITreemapChartSpec } from '../../chart/treemap';\nimport type { IWaterfallChartSpec } from '../../chart/waterfall';\nimport type { IAreaChartSpec } from '../../chart/area/interface';\nimport type { ILineChartSpec } from '../../chart/line/interface';\nimport type { IBarChartSpec } from '../../chart/bar/interface';\nimport type { IHistogramChartSpec } from '../../chart/histogram/interface';\nimport type { IRangeColumnChartSpec } from '../../chart/range-column/interface';\nimport type { IMapChartSpec } from '../../chart/map/interface';\nimport type { IPieChartSpec } from '../../chart/pie/interface';\nimport type { IRadarChartSpec } from '../../chart/radar/interface';\nimport type { IRoseChartSpec } from '../../chart/rose/interface';\nimport type { IScatterChartSpec } from '../../chart/scatter/interface';\nimport type { ISequenceChartSpec } from '../../chart/sequence/interface';\nimport type { ICircularProgressChartSpec } from '../../chart/progress/circular/interface';\nimport type { ILinearProgressChartSpec } from '../../chart/progress/linear/interface';\nimport type { IWordCloudChartSpec } from '../../chart/word-cloud/interface';\nimport type { IFunnelChartSpec } from '../../chart/funnel/interface';\nimport type { IBoxPlotChartSpec } from '../../chart/boxplot/interface';\nimport type { ISunburstChartSpec } from '../../chart/sunburst/interface';\nimport type { ICirclePackingChartSpec } from '../../chart/circle-packing/interface';\n\nexport interface ChartSpecMap {\n  readonly common: ICommonChartSpec;\n  readonly area: IAreaChartSpec;\n  readonly line: ILineChartSpec;\n  readonly bar: IBarChartSpec;\n  // readonly bar3d: IBar3DChartSpec;\n  readonly histogram: IHistogramChartSpec;\n  // readonly histogram3d: IHistogram3DChartSpec;\n  readonly rangeColumn: IRangeColumnChartSpec;\n  // readonly rangeColumn3d: IRangeColumn3DChartSpec;\n  readonly rangeArea: IRangeAreaChartSpec;\n  readonly map: IMapChartSpec;\n  readonly pie: IPieChartSpec;\n  // readonly pie3d: IPie3DChartSpec;\n  readonly radar: IRadarChartSpec;\n  readonly rose: IRoseChartSpec;\n  readonly scatter: IScatterChartSpec;\n  readonly sequence: ISequenceChartSpec;\n  readonly circleProgress: ICircularProgressChartSpec;\n  readonly linearProgress: ILinearProgressChartSpec;\n  readonly wordCloud: IWordCloudChartSpec;\n  // readonly wordCloud3d: IWordCloud3DChartSpec;\n  readonly funnel: IFunnelChartSpec;\n  // readonly funnel3d: IFunnel3DChartSpec;\n  readonly waterfall: IWaterfallChartSpec;\n  readonly boxplot: IBoxPlotChartSpec;\n  readonly gauge: IGaugeChartSpec;\n  readonly sankey: ISankeyChartSpec;\n  readonly treemap: ITreemapChartSpec;\n  readonly sunburst: ISunburstChartSpec;\n  readonly circlePacking: ICirclePackingChartSpec;\n  readonly heatmap: IHeatmapChartSpec;\n}\n\nexport type ISpec = ChartSpecMap[keyof ChartSpecMap];\n"]}
+{"version":3,"sources":["../src/typings/spec/chart.ts"],"names":[],"mappings":"","file":"chart.js","sourcesContent":["import type { ICommonChartSpec } from '../../chart/common';\nimport type { IGaugeChartSpec } from '../../chart/gauge/interface';\nimport type { IHeatmapChartSpec } from '../../chart/heatmap';\nimport type { IRangeAreaChartSpec } from '../../chart/range-area';\nimport type { ISankeyChartSpec } from '../../chart/sankey';\nimport type { ITreemapChartSpec } from '../../chart/treemap';\nimport type { IWaterfallChartSpec } from '../../chart/waterfall';\nimport type { IAreaChartSpec } from '../../chart/area/interface';\nimport type { ILineChartSpec } from '../../chart/line/interface';\nimport type { IBarChartSpec } from '../../chart/bar/interface';\nimport type { IHistogramChartSpec } from '../../chart/histogram/interface';\nimport type { IRangeColumnChartSpec } from '../../chart/range-column/interface';\nimport type { IMapChartSpec } from '../../chart/map/interface';\nimport type { IPieChartSpec } from '../../chart/pie/interface';\nimport type { IRadarChartSpec } from '../../chart/radar/interface';\nimport type { IRoseChartSpec } from '../../chart/rose/interface';\nimport type { IScatterChartSpec } from '../../chart/scatter/interface';\nimport type { ISequenceChartSpec } from '../../chart/sequence/interface';\nimport type { ICircularProgressChartSpec } from '../../chart/progress/circular/interface';\nimport type { ILinearProgressChartSpec } from '../../chart/progress/linear/interface';\nimport type { IWordCloudChartSpec } from '../../chart/word-cloud/interface';\nimport type { IFunnelChartSpec } from '../../chart/funnel/interface';\nimport type { IBoxPlotChartSpec } from '../../chart/box-plot/interface';\nimport type { ISunburstChartSpec } from '../../chart/sunburst/interface';\nimport type { ICirclePackingChartSpec } from '../../chart/circle-packing/interface';\n\nexport interface ChartSpecMap {\n  readonly common: ICommonChartSpec;\n  readonly area: IAreaChartSpec;\n  readonly line: ILineChartSpec;\n  readonly bar: IBarChartSpec;\n  // readonly bar3d: IBar3DChartSpec;\n  readonly histogram: IHistogramChartSpec;\n  // readonly histogram3d: IHistogram3DChartSpec;\n  readonly rangeColumn: IRangeColumnChartSpec;\n  // readonly rangeColumn3d: IRangeColumn3DChartSpec;\n  readonly rangeArea: IRangeAreaChartSpec;\n  readonly map: IMapChartSpec;\n  readonly pie: IPieChartSpec;\n  // readonly pie3d: IPie3DChartSpec;\n  readonly radar: IRadarChartSpec;\n  readonly rose: IRoseChartSpec;\n  readonly scatter: IScatterChartSpec;\n  readonly sequence: ISequenceChartSpec;\n  readonly circleProgress: ICircularProgressChartSpec;\n  readonly linearProgress: ILinearProgressChartSpec;\n  readonly wordCloud: IWordCloudChartSpec;\n  // readonly wordCloud3d: IWordCloud3DChartSpec;\n  readonly funnel: IFunnelChartSpec;\n  // readonly funnel3d: IFunnel3DChartSpec;\n  readonly waterfall: IWaterfallChartSpec;\n  readonly boxplot: IBoxPlotChartSpec;\n  readonly gauge: IGaugeChartSpec;\n  readonly sankey: ISankeyChartSpec;\n  readonly treemap: ITreemapChartSpec;\n  readonly sunburst: ISunburstChartSpec;\n  readonly circlePacking: ICirclePackingChartSpec;\n  readonly heatmap: IHeatmapChartSpec;\n}\n\nexport type ISpec = ChartSpecMap[keyof ChartSpecMap];\n"]}

package/esm/typings/visual.d.ts

@@ -7,6 +7,7 @@ import type { IPoint } from './coordinate';
 import type { IAttributeOpt, IModelMarkAttributeContext } from '../compile/mark';
 import type { Datum, StringOrNumber } from './common';
 import type { IPadding } from '@visactor/vutils';
+import type { IColorKey } from '../theme/color-scheme/interface';
 export interface IVisualSpecBase<D, T> {
     type: ScaleType;
     domain: D[];
@@ -41,7 +42,7 @@ export interface ICommonSpec {
     x?: number;
     y?: number;
     z?: number;
-    stroke?: string | IGradient;
+    stroke?: string | IGradient | IColorKey;
     strokeOpacity?: number;
     opacity?: number;
     lineWidth?: number;
@@ -83,7 +84,7 @@ export interface ICommonSpec {
     [key: string]: any;
 }
 export interface IFillMarkSpec extends ICommonSpec {
-    fill?: VisualType<string> | IGradient | false;
+    fill?: VisualType<string> | IGradient | false | IColorKey;
     fillOpacity?: number;
 }
 export interface ISymbolMarkSpec extends IFillMarkSpec {
@@ -157,11 +158,11 @@ export interface IBoxPlotMarkSpec extends ICommonSpec {
     shaftShape?: BoxPlotShaftShape;
     boxFill?: string;
     shaftFillOpacity?: number;
-    min: (datum: Datum) => number;
-    q1: (datum: Datum) => number;
-    median: (datum: Datum) => number;
-    q3: (datum: Datum) => number;
-    max: (datum: Datum) => number;
+    min?: (datum: Datum) => number;
+    q1?: (datum: Datum) => number;
+    median?: (datum: Datum) => number;
+    q3?: (datum: Datum) => number;
+    max?: (datum: Datum) => number;
 }
 export interface IOutlierMarkSpec {
     fill?: string;
@@ -178,11 +179,11 @@ export interface IPathMarkSpec extends IFillMarkSpec {
     smoothScale?: boolean;
 }
 export interface ILinkPathMarkSpec extends IFillMarkSpec {
-    x0: number;
-    y0: number;
-    x1: number;
-    y1: number;
-    thickness: number;
+    x0?: number;
+    y0?: number;
+    x1?: number;
+    y1?: number;
+    thickness?: number;
     curvature?: number;
     round?: boolean;
     ratio?: number;

package/esm/typings/visual.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/typings/visual.ts"],"names":[],"mappings":"","file":"visual.js","sourcesContent":["import 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';\n\n// 基础的visual 对应 scale 的属性\nexport interface IVisualSpecBase<D, T> {\n  type: ScaleType;\n  domain: D[];\n  range: T[];\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\nexport interface ICommonSpec {\n  visible?: boolean;\n  x?: number;\n  y?: number;\n  z?: number;\n  stroke?: string | IGradient;\n  strokeOpacity?: number;\n  opacity?: number;\n  lineWidth?: number;\n  lineDash?: number[];\n  lineDashOffset?: number;\n\n  cursor?: Cursor;\n  zIndex?: number;\n  borderSize?: number;\n  borderColor?: string;\n  borderSpacing?: number;\n  borderOpacity?: number;\n  angle?: number;\n  anchor?: [number, number];\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?: {\n    /**\n     * 间距\n     */\n    distance: number | string;\n    stroke?: string | IGradient;\n    strokeOpacity?: number;\n    lineWidth?: number;\n    lineDash?: number[];\n    lineDashOffset?: number;\n  };\n  /**\n   * 内边框\n   */\n  innerBorder?: {\n    /**\n     * 间距\n     */\n    distance: number | string;\n    stroke?: string | IGradient;\n    strokeOpacity?: number;\n    lineWidth?: number;\n    lineDash?: number[];\n    lineDashOffset?: number;\n  };\n\n  [key: string]: any;\n}\n\nexport interface IFillMarkSpec extends ICommonSpec {\n  fill?: VisualType<string> | IGradient | false;\n  fillOpacity?: number;\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  text?: StringOrNumber | string[]; // todo: text配置支持回调\n  dx?: number;\n  dy?: number;\n  fontSize?: number;\n  /** @deprecated 后续需要替换成 textAlign，暂时会兼容两种写法 */\n  align?: TextAlign;\n  textAlign?: TextAlign;\n  /** @deprecated 后续需要替换成 textBaseline，暂时会兼容两种写法 */\n  baseline?: TextBaseLine;\n  textBaseline?: TextBaseLine;\n  /** VRender 升级后，统一通过fontFamily声明，老的font配置不再支持 */\n  fontFamily?: string;\n  fontWeight?: FontWeight;\n  fontStyle?: FontStyle;\n  limit?: number;\n  ellipsis?: string;\n  // TODO: 这些不是常规的文字mark属性，待确认需求背景\n  lineBreak?: string;\n  underline?: boolean;\n  lineThrough?: boolean;\n  lineHeight?: number;\n}\n\nexport type IPositionedTextMarkSpec = Omit<ITextMarkSpec, 'align' | 'textAlign' | 'baseline' | 'textBaseline'>;\n\nexport interface IRectMarkSpec extends IFillMarkSpec {\n  /**\n   * @deprecated 后续需要替换成 borderRadius\n   */\n  cornerRadius?: number;\n  /**\n   * @deprecated 后续需要替换成 borderRadius\n   */\n  cornerRadiusTopLeft?: number;\n  /**\n   * @deprecated 后续需要替换成 borderRadius\n   */\n  cornerRadiusTopRight?: number;\n  /**\n   * @deprecated 后续需要替换成 borderRadius\n   */\n  cornerRadiusBottomLeft?: number;\n  /**\n   * @deprecated 后续需要替换成 borderRadius\n   */\n  cornerRadiusBottomRight?: number;\n\n  borderRadius?: number | number[];\n\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 IOutlierMarkSpec {\n  //异常点填充颜色\n  fill?: string;\n  //异常点大小\n  size?: number;\n}\n\nexport interface IPathMarkSpec extends IFillMarkSpec {\n  path?: string;\n  scaleX?: number;\n  scaleY?: number;\n  scaleCenter?: { x: number; y: number };\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 ICommonSpec, IFillMarkSpec {\n  clip?: boolean;\n  width?: number;\n  height?: number;\n  cornerRadius?: number;\n}\n\nexport interface IPolygonMarkSpec extends ICommonSpec, IFillMarkSpec {\n  points?: IPoint[];\n  borderRadius?: 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\n/**\n * text\n */\nexport type TextAlign = 'left' | 'right' | 'center';\nexport type TextBaseLine = 'top' | 'bottom' | 'middle' | 'alphabetic';\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 { 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';\n\n// 基础的visual 对应 scale 的属性\nexport interface IVisualSpecBase<D, T> {\n  type: ScaleType;\n  domain: D[];\n  range: T[];\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\nexport interface ICommonSpec {\n  visible?: boolean;\n  x?: number;\n  y?: number;\n  z?: number;\n  stroke?: string | IGradient | IColorKey;\n  strokeOpacity?: number;\n  opacity?: number;\n  lineWidth?: number;\n  lineDash?: number[];\n  lineDashOffset?: number;\n\n  cursor?: Cursor;\n  zIndex?: number;\n  borderSize?: number;\n  borderColor?: string;\n  borderSpacing?: number;\n  borderOpacity?: number;\n  angle?: number;\n  anchor?: [number, number];\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?: {\n    /**\n     * 间距\n     */\n    distance: number | string;\n    stroke?: string | IGradient;\n    strokeOpacity?: number;\n    lineWidth?: number;\n    lineDash?: number[];\n    lineDashOffset?: number;\n  };\n  /**\n   * 内边框\n   */\n  innerBorder?: {\n    /**\n     * 间距\n     */\n    distance: number | string;\n    stroke?: string | IGradient;\n    strokeOpacity?: number;\n    lineWidth?: number;\n    lineDash?: number[];\n    lineDashOffset?: number;\n  };\n\n  [key: string]: any;\n}\n\nexport interface IFillMarkSpec extends ICommonSpec {\n  fill?: VisualType<string> | IGradient | false | IColorKey;\n  fillOpacity?: number;\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  text?: StringOrNumber | string[]; // todo: text配置支持回调\n  dx?: number;\n  dy?: number;\n  fontSize?: number;\n  /** @deprecated 后续需要替换成 textAlign，暂时会兼容两种写法 */\n  align?: TextAlign;\n  textAlign?: TextAlign;\n  /** @deprecated 后续需要替换成 textBaseline，暂时会兼容两种写法 */\n  baseline?: TextBaseLine;\n  textBaseline?: TextBaseLine;\n  /** VRender 升级后，统一通过fontFamily声明，老的font配置不再支持 */\n  fontFamily?: string;\n  fontWeight?: FontWeight;\n  fontStyle?: FontStyle;\n  limit?: number;\n  ellipsis?: string;\n  // TODO: 这些不是常规的文字mark属性，待确认需求背景\n  lineBreak?: string;\n  underline?: boolean;\n  lineThrough?: boolean;\n  lineHeight?: number;\n}\n\nexport type IPositionedTextMarkSpec = Omit<ITextMarkSpec, 'align' | 'textAlign' | 'baseline' | 'textBaseline'>;\n\nexport interface IRectMarkSpec extends IFillMarkSpec {\n  /**\n   * @deprecated 后续需要替换成 borderRadius\n   */\n  cornerRadius?: number;\n  /**\n   * @deprecated 后续需要替换成 borderRadius\n   */\n  cornerRadiusTopLeft?: number;\n  /**\n   * @deprecated 后续需要替换成 borderRadius\n   */\n  cornerRadiusTopRight?: number;\n  /**\n   * @deprecated 后续需要替换成 borderRadius\n   */\n  cornerRadiusBottomLeft?: number;\n  /**\n   * @deprecated 后续需要替换成 borderRadius\n   */\n  cornerRadiusBottomRight?: number;\n\n  borderRadius?: number | number[];\n\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 IOutlierMarkSpec {\n  //异常点填充颜色\n  fill?: string;\n  //异常点大小\n  size?: number;\n}\n\nexport interface IPathMarkSpec extends IFillMarkSpec {\n  path?: string;\n  scaleX?: number;\n  scaleY?: number;\n  scaleCenter?: { x: number; y: number };\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 ICommonSpec, IFillMarkSpec {\n  clip?: boolean;\n  width?: number;\n  height?: number;\n  cornerRadius?: number;\n}\n\nexport interface IPolygonMarkSpec extends ICommonSpec, IFillMarkSpec {\n  points?: IPoint[];\n  borderRadius?: 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\n/**\n * text\n */\nexport type TextAlign = 'left' | 'right' | 'center';\nexport type TextBaseLine = 'top' | 'bottom' | 'middle' | 'alphabetic';\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/esm/util/color.d.ts

@@ -1,6 +1,3 @@
 import { ColorUtil } from '@visactor/vutils';
-import type { SeriesTypeEnum } from '../series/interface';
-import type { IThemeColorScheme } from '../theme/color-scheme/interface';
 declare const Color: typeof ColorUtil.Color;
 export { Color };
-export declare const getActualColor: (value: any, colorScheme?: IThemeColorScheme, seriesType?: SeriesTypeEnum) => any;

package/esm/util/color.js

@@ -1,16 +1,6 @@
 import { ColorUtil } from "@visactor/vutils";
 
-import { findColor, isColorKey } from "../theme/color-scheme/util";
-
 const {Color: Color} = ColorUtil;
 
 export { Color };
-
-export const getActualColor = (value, colorScheme, seriesType) => {
-    if (isColorKey(value) && colorScheme) {
-        const color = findColor(colorScheme, value, seriesType);
-        if (color) return color;
-    }
-    return value;
-};
 //# sourceMappingURL=color.js.map