@visactor/vchart 1.7.0-alpha.0 → 1.7.0-alpha.2

package/esm/theme/builtin/common/component/scroll-bar.js

@@ -1,11 +1,24 @@
 export const scrollBar = {
-    slider: {
-        style: {
-            fill: {
-                type: "palette",
-                key: "scrollBarSliderColor"
-            },
-            fillOpacity: .5
+    horizontal: {
+        height: 10,
+        slider: {
+            style: {
+                fill: {
+                    type: "palette",
+                    key: "scrollBarSliderColor"
+                }
+            }
+        }
+    },
+    vertical: {
+        width: 10,
+        slider: {
+            style: {
+                fill: {
+                    type: "palette",
+                    key: "scrollBarSliderColor"
+                }
+            }
         }
     }
 };

package/esm/theme/builtin/common/component/scroll-bar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/component/scroll-bar.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,SAAS,GAAoB;IACxC,MAAM,EAAE;QACN,KAAK,EAAE;YACL,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,sBAAsB,EAAE;YACtD,WAAW,EAAE,GAAG;SACjB;KACF;CACF,CAAC","file":"scroll-bar.js","sourcesContent":["import type { IScrollBarTheme } from '../../../../component/data-zoom';\n\nexport const scrollBar: IScrollBarTheme = {\n  slider: {\n    style: {\n      fill: { type: 'palette', key: 'scrollBarSliderColor' },\n      fillOpacity: 0.5\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/common/component/scroll-bar.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,SAAS,GAAoB;IACxC,UAAU,EAAE;QACV,MAAM,EAAE,EAAE;QACV,MAAM,EAAE;YACN,KAAK,EAAE;gBACL,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,sBAAsB,EAAE;aACvD;SACF;KACF;IACD,QAAQ,EAAE;QACR,KAAK,EAAE,EAAE;QACT,MAAM,EAAE;YACN,KAAK,EAAE;gBACL,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,sBAAsB,EAAE;aACvD;SACF;KACF;CACF,CAAC","file":"scroll-bar.js","sourcesContent":["import type { IScrollBarTheme } from '../../../../component/data-zoom';\n\nexport const scrollBar: IScrollBarTheme = {\n  horizontal: {\n    height: 10,\n    slider: {\n      style: {\n        fill: { type: 'palette', key: 'scrollBarSliderColor' }\n      }\n    }\n  },\n  vertical: {\n    width: 10,\n    slider: {\n      style: {\n        fill: { type: 'palette', key: 'scrollBarSliderColor' }\n      }\n    }\n  }\n};\n"]}

package/esm/theme/builtin/common/component/title.js

@@ -18,7 +18,7 @@ export const title = {
         lineHeight: THEME_CONSTANTS.l4LineHeight,
         fill: {
             type: "palette",
-            key: "secondaryFontColor"
+            key: "tertiaryFontColor"
         }
     }
 };

package/esm/theme/builtin/common/component/title.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/component/title.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,MAAM,KAAK,GAAgB;IAChC,OAAO,EAAE;QACP,GAAG,EAAE,CAAC;QACN,MAAM,EAAE,EAAE;KACX;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,eAAe,CAAC,UAAU;QACpC,UAAU,EAAE,eAAe,CAAC,YAAmB;QAE/C,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;KACnD;IACD,YAAY,EAAE;QACZ,QAAQ,EAAE,eAAe,CAAC,UAAU;QACpC,UAAU,EAAE,eAAe,CAAC,YAAmB;QAE/C,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE;KACrD;CACF,CAAC","file":"title.js","sourcesContent":["import type { ITitleTheme } from '../../../../component/title/interface';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const title: ITitleTheme = {\n  padding: {\n    top: 4,\n    bottom: 20\n  },\n  textStyle: {\n    fontSize: THEME_CONSTANTS.l3FontSize,\n    lineHeight: THEME_CONSTANTS.l3LineHeight as any, // FIXME: vrender 支持行高字符串后删除 any\n\n    fill: { type: 'palette', key: 'primaryFontColor' }\n  },\n  subtextStyle: {\n    fontSize: THEME_CONSTANTS.l4FontSize,\n    lineHeight: THEME_CONSTANTS.l4LineHeight as any, // FIXME: vrender 支持行高字符串后删除 any\n\n    fill: { type: 'palette', key: 'secondaryFontColor' }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/common/component/title.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,MAAM,KAAK,GAAgB;IAChC,OAAO,EAAE;QACP,GAAG,EAAE,CAAC;QACN,MAAM,EAAE,EAAE;KACX;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,eAAe,CAAC,UAAU;QACpC,UAAU,EAAE,eAAe,CAAC,YAAmB;QAE/C,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;KACnD;IACD,YAAY,EAAE;QACZ,QAAQ,EAAE,eAAe,CAAC,UAAU;QACpC,UAAU,EAAE,eAAe,CAAC,YAAmB;QAE/C,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,mBAAmB,EAAE;KACpD;CACF,CAAC","file":"title.js","sourcesContent":["import type { ITitleTheme } from '../../../../component/title/interface';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const title: ITitleTheme = {\n  padding: {\n    top: 4,\n    bottom: 20\n  },\n  textStyle: {\n    fontSize: THEME_CONSTANTS.l3FontSize,\n    lineHeight: THEME_CONSTANTS.l3LineHeight as any, // FIXME: vrender 支持行高字符串后删除 any\n\n    fill: { type: 'palette', key: 'primaryFontColor' }\n  },\n  subtextStyle: {\n    fontSize: THEME_CONSTANTS.l4FontSize,\n    lineHeight: THEME_CONSTANTS.l4LineHeight as any, // FIXME: vrender 支持行高字符串后删除 any\n\n    fill: { type: 'palette', key: 'tertiaryFontColor' }\n  }\n};\n"]}

package/esm/theme/builtin/common/component/tooltip.d.ts

@@ -1,2 +1,3 @@
 import type { ITooltipTheme } from '../../../../component/tooltip/interface';
-export declare const tooltip: ITooltipTheme;
+import type { IColorKey } from '../../../color-scheme';
+export declare const tooltip: ITooltipTheme<string | IColorKey>;

package/esm/theme/builtin/common/component/tooltip.js

@@ -14,12 +14,12 @@ export const tooltip = {
         },
         backgroundColor: {
             type: "palette",
-            key: "tooltipBackgroundColor"
+            key: "popupBackgroundColor"
         },
         border: {
             color: {
                 type: "palette",
-                key: "tooltipBackgroundColor"
+                key: "popupBackgroundColor"
             },
             width: 0,
             radius: 3
@@ -31,8 +31,7 @@ export const tooltip = {
             spread: 0,
             color: {
                 type: "palette",
-                key: "shadowColor",
-                a: .1
+                key: "shadowColor"
             }
         }
     },

package/esm/theme/builtin/common/component/tooltip.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/component/tooltip.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,MAAM,OAAO,GAAkB;IACpC,MAAM,EAAE;QACN,CAAC,EAAE,EAAE;QACL,CAAC,EAAE,EAAE;KACN;IACD,KAAK,EAAE;QACL,OAAO,EAAE;YACP,GAAG,EAAE,EAAE;YACP,IAAI,EAAE,EAAE;YACR,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACX;QACD,eAAe,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,wBAAwB,EAAE;QACnE,MAAM,EAAE;YACN,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,wBAAwB,EAAE;YACzD,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;SACV;QACD,MAAM,EAAE;YACN,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;YACJ,IAAI,EAAE,EAAE;YACR,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,EAAE,GAAG,EAAE;SACvD;KACF;IACD,QAAQ,EAAE,CAAC;IACX,UAAU,EAAE;QACV,QAAQ,EAAE,eAAe,CAAC,UAAU;QACpC,UAAU,EAAE,eAAe,CAAC,YAAY;QAExC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;QACvD,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE,CAAC;KACX;IACD,KAAK,EAAE;QACL,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;KACX;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,eAAe,CAAC,UAAU;QACpC,UAAU,EAAE,eAAe,CAAC,YAAY;QAExC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE;QACzD,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE,EAAE;KACZ;IACD,UAAU,EAAE;QACV,QAAQ,EAAE,eAAe,CAAC,UAAU;QACpC,UAAU,EAAE,eAAe,CAAC,YAAY;QAExC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;QACvD,UAAU,EAAE,MAAM;QAClB,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE,CAAC;KACX;CACF,CAAC","file":"tooltip.js","sourcesContent":["import type { ITooltipTheme } from '../../../../component/tooltip/interface';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const tooltip: ITooltipTheme = {\n  offset: {\n    x: 10,\n    y: 10\n  },\n  panel: {\n    padding: {\n      top: 10,\n      left: 10,\n      right: 10,\n      bottom: 10\n    },\n    backgroundColor: { type: 'palette', key: 'tooltipBackgroundColor' },\n    border: {\n      color: { type: 'palette', key: 'tooltipBackgroundColor' },\n      width: 0,\n      radius: 3\n    },\n    shadow: {\n      x: 0,\n      y: 4,\n      blur: 12,\n      spread: 0,\n      color: { type: 'palette', key: 'shadowColor', a: 0.1 }\n    }\n  },\n  spaceRow: 6,\n  titleLabel: {\n    fontSize: THEME_CONSTANTS.l4FontSize,\n    lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n    fontColor: { type: 'palette', key: 'primaryFontColor' },\n    fontWeight: 'bold',\n    textAlign: 'left',\n    textBaseline: 'middle',\n    spacing: 0\n  },\n  shape: {\n    size: 8,\n    spacing: 6\n  },\n  keyLabel: {\n    fontSize: THEME_CONSTANTS.l4FontSize,\n    lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n    fontColor: { type: 'palette', key: 'secondaryFontColor' },\n    textAlign: 'left',\n    textBaseline: 'middle',\n    spacing: 26\n  },\n  valueLabel: {\n    fontSize: THEME_CONSTANTS.l4FontSize,\n    lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n    fontColor: { type: 'palette', key: 'primaryFontColor' },\n    fontWeight: 'bold',\n    textBaseline: 'middle',\n    spacing: 0\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/common/component/tooltip.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,MAAM,OAAO,GAAsC;IACxD,MAAM,EAAE;QACN,CAAC,EAAE,EAAE;QACL,CAAC,EAAE,EAAE;KACN;IACD,KAAK,EAAE;QACL,OAAO,EAAE;YACP,GAAG,EAAE,EAAE;YACP,IAAI,EAAE,EAAE;YACR,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACX;QACD,eAAe,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,sBAAsB,EAAE;QACjE,MAAM,EAAE;YACN,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,sBAAsB,EAAE;YACvD,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;SACV;QACD,MAAM,EAAE;YACN,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;YACJ,IAAI,EAAE,EAAE;YACR,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,EAAE;SAC/C;KACF;IACD,QAAQ,EAAE,CAAC;IACX,UAAU,EAAE;QACV,QAAQ,EAAE,eAAe,CAAC,UAAU;QACpC,UAAU,EAAE,eAAe,CAAC,YAAY;QAExC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;QACvD,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE,CAAC;KACX;IACD,KAAK,EAAE;QACL,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;KACX;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,eAAe,CAAC,UAAU;QACpC,UAAU,EAAE,eAAe,CAAC,YAAY;QAExC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE;QACzD,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE,EAAE;KACZ;IACD,UAAU,EAAE;QACV,QAAQ,EAAE,eAAe,CAAC,UAAU;QACpC,UAAU,EAAE,eAAe,CAAC,YAAY;QAExC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;QACvD,UAAU,EAAE,MAAM;QAClB,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE,CAAC;KACX;CACF,CAAC","file":"tooltip.js","sourcesContent":["import type { ITooltipTheme } from '../../../../component/tooltip/interface';\nimport type { IColorKey } from '../../../color-scheme';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const tooltip: ITooltipTheme<string | IColorKey> = {\n  offset: {\n    x: 10,\n    y: 10\n  },\n  panel: {\n    padding: {\n      top: 10,\n      left: 10,\n      right: 10,\n      bottom: 10\n    },\n    backgroundColor: { type: 'palette', key: 'popupBackgroundColor' },\n    border: {\n      color: { type: 'palette', key: 'popupBackgroundColor' },\n      width: 0,\n      radius: 3\n    },\n    shadow: {\n      x: 0,\n      y: 4,\n      blur: 12,\n      spread: 0,\n      color: { type: 'palette', key: 'shadowColor' }\n    }\n  },\n  spaceRow: 6,\n  titleLabel: {\n    fontSize: THEME_CONSTANTS.l4FontSize,\n    lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n    fontColor: { type: 'palette', key: 'primaryFontColor' },\n    fontWeight: 'bold',\n    textAlign: 'left',\n    textBaseline: 'middle',\n    spacing: 0\n  },\n  shape: {\n    size: 8,\n    spacing: 6\n  },\n  keyLabel: {\n    fontSize: THEME_CONSTANTS.l4FontSize,\n    lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n    fontColor: { type: 'palette', key: 'secondaryFontColor' },\n    textAlign: 'left',\n    textBaseline: 'middle',\n    spacing: 26\n  },\n  valueLabel: {\n    fontSize: THEME_CONSTANTS.l4FontSize,\n    lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n    fontColor: { type: 'palette', key: 'primaryFontColor' },\n    fontWeight: 'bold',\n    textBaseline: 'middle',\n    spacing: 0\n  }\n};\n"]}

package/esm/theme/builtin/common/component/total-label.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/component/total-label.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,MAAM,UAAU,GAAqB;IAC1C,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,CAAC;IACT,OAAO,EAAE;QACP,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,EAAE;KACb;IACD,WAAW,EAAE,KAAK;IAClB,SAAS,EAAE,KAAK;IAChB,KAAK,EAAE;QACL,QAAQ,EAAE,eAAe,CAAC,UAAU;QAGpC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;KACnD;CACF,CAAC","file":"total-label.js","sourcesContent":["import type { ITotalLabelTheme } from '../../../../component/label';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const totalLabel: ITotalLabelTheme = {\n  visible: false,\n  offset: 5,\n  overlap: {\n    clampForce: true,\n    strategy: []\n  },\n  smartInvert: false,\n  animation: false,\n  style: {\n    fontSize: THEME_CONSTANTS.l4FontSize,\n    // lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n    fill: { type: 'palette', key: 'primaryFontColor' }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/common/component/total-label.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,MAAM,UAAU,GAAqB;IAC1C,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,CAAC;IACT,OAAO,EAAE;QACP,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,EAAE;KACb;IACD,WAAW,EAAE,KAAK;IAClB,SAAS,EAAE,KAAK;IAChB,KAAK,EAAE;QACL,QAAQ,EAAE,eAAe,CAAC,UAAU;QACpC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;KACnD;CACF,CAAC","file":"total-label.js","sourcesContent":["import type { ITotalLabelTheme } from '../../../../component/label';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const totalLabel: ITotalLabelTheme = {\n  visible: false,\n  offset: 5,\n  overlap: {\n    clampForce: true,\n    strategy: []\n  },\n  smartInvert: false,\n  animation: false,\n  style: {\n    fontSize: THEME_CONSTANTS.l4FontSize,\n    fill: { type: 'palette', key: 'primaryFontColor' }\n  }\n};\n"]}

package/esm/theme/builtin/common/mark.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/mark.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,CAAC,MAAM,UAAU,GAA2B;IAChD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,UAAU,EAAE,eAAe,CAAC,YAAY;YAExC,UAAU,EAAE,QAAQ;YACpB,WAAW,EAAE,CAAC;SACf;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAA2B;IAChD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,QAAQ,EAAE,eAAe,CAAC,UAAU;YAGpC,UAAU,EAAE,QAAQ;YACpB,WAAW,EAAE,CAAC;SACf;KACF;IACD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,WAAW,EAAE,eAAe,CAAC,WAAW;SACzC;KACF;IACD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,OAAO;SAClB;KACF;IACD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;YACnD,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;SACf;KACF;IACD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,QAAQ,EAAE,IAAI;SACf;KACF;IACD,WAAW,EAAE;QACX,KAAK,EAAE;YACL,QAAQ,EAAE,IAAI;SACf;KACF;IACD,QAAQ,EAAE;QACR,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;SACpD;KACF;IACD,aAAa,EAAE;QACb,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;SACpD;KACF;IACD,QAAQ,EAAE;QACR,KAAK,EAAE;YACL,MAAM,EAAE,KAAK;SACd;KACF;IACD,aAAa,EAAE;QACb,OAAO,EAAE,KAAK;QACd,KAAK,EAAE;YACL,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC,EAAE,IAAI,EAAE;SAC5D;KACF;CACF,CAAC","file":"mark.js","sourcesContent":["import type { IGlobalMarkThemeByName, IGlobalMarkThemeByType } from '../../interface';\nimport { THEME_CONSTANTS } from './constants';\n\nexport const markByType: IGlobalMarkThemeByType = {\n  text: {\n    style: {\n      fontSize: THEME_CONSTANTS.l4FontSize,\n      lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n      fontWeight: 'normal',\n      fillOpacity: 1\n    }\n  }\n};\n\nexport const markByName: IGlobalMarkThemeByName = {\n  label: {\n    style: {\n      fontSize: THEME_CONSTANTS.l4FontSize,\n      // lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n      fontWeight: 'normal',\n      fillOpacity: 1\n    }\n  },\n  area: {\n    style: {\n      fillOpacity: THEME_CONSTANTS.areaOpacity\n    }\n  },\n  line: {\n    style: {\n      lineWidth: 2,\n      lineCap: 'round',\n      lineJoin: 'round'\n    }\n  },\n  point: {\n    style: {\n      size: 8,\n      stroke: { type: 'palette', key: 'backgroundColor' },\n      lineWidth: 1,\n      fillOpacity: 1\n    }\n  },\n  word: {\n    style: {\n      fontSize: null\n    }\n  },\n  fillingWord: {\n    style: {\n      fontSize: null\n    }\n  },\n  sunburst: {\n    style: {\n      lineWidth: 1,\n      stroke: { type: 'palette', key: 'backgroundColor' }\n    }\n  },\n  circlePacking: {\n    style: {\n      lineWidth: 1,\n      stroke: { type: 'palette', key: 'backgroundColor' }\n    }\n  },\n  funnel3d: {\n    style: {\n      stroke: false\n    }\n  },\n  barBackground: {\n    visible: false,\n    style: {\n      fill: { type: 'palette', key: 'primaryFontColor', a: 0.06 }\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/common/mark.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,CAAC,MAAM,UAAU,GAA2B;IAChD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,UAAU,EAAE,eAAe,CAAC,YAAY;YAExC,UAAU,EAAE,QAAQ;YACpB,WAAW,EAAE,CAAC;SACf;KACF;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAA2B;IAChD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,UAAU,EAAE,QAAQ;YACpB,WAAW,EAAE,CAAC;SACf;KACF;IACD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,WAAW,EAAE,eAAe,CAAC,WAAW;SACzC;KACF;IACD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,OAAO;SAClB;KACF;IACD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;YACnD,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;SACf;KACF;IACD,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,QAAQ,EAAE,IAAI;SACf;KACF;IACD,WAAW,EAAE;QACX,KAAK,EAAE;YACL,QAAQ,EAAE,IAAI;SACf;KACF;IACD,QAAQ,EAAE;QACR,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;SACpD;KACF;IACD,aAAa,EAAE;QACb,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;SACpD;KACF;IACD,QAAQ,EAAE;QACR,KAAK,EAAE;YACL,MAAM,EAAE,KAAK;SACd;KACF;IACD,aAAa,EAAE;QACb,OAAO,EAAE,KAAK;QACd,KAAK,EAAE;YACL,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC,EAAE,IAAI,EAAE;SAC5D;KACF;CACF,CAAC","file":"mark.js","sourcesContent":["import type { IGlobalMarkThemeByName, IGlobalMarkThemeByType } from '../../interface';\nimport { THEME_CONSTANTS } from './constants';\n\nexport const markByType: IGlobalMarkThemeByType = {\n  text: {\n    style: {\n      fontSize: THEME_CONSTANTS.l4FontSize,\n      lineHeight: THEME_CONSTANTS.l4LineHeight,\n\n      fontWeight: 'normal',\n      fillOpacity: 1\n    }\n  }\n};\n\nexport const markByName: IGlobalMarkThemeByName = {\n  label: {\n    style: {\n      fontSize: THEME_CONSTANTS.l4FontSize,\n      fontWeight: 'normal',\n      fillOpacity: 1\n    }\n  },\n  area: {\n    style: {\n      fillOpacity: THEME_CONSTANTS.areaOpacity\n    }\n  },\n  line: {\n    style: {\n      lineWidth: 2,\n      lineCap: 'round',\n      lineJoin: 'round'\n    }\n  },\n  point: {\n    style: {\n      size: 8,\n      stroke: { type: 'palette', key: 'backgroundColor' },\n      lineWidth: 1,\n      fillOpacity: 1\n    }\n  },\n  word: {\n    style: {\n      fontSize: null\n    }\n  },\n  fillingWord: {\n    style: {\n      fontSize: null\n    }\n  },\n  sunburst: {\n    style: {\n      lineWidth: 1,\n      stroke: { type: 'palette', key: 'backgroundColor' }\n    }\n  },\n  circlePacking: {\n    style: {\n      lineWidth: 1,\n      stroke: { type: 'palette', key: 'backgroundColor' }\n    }\n  },\n  funnel3d: {\n    style: {\n      stroke: false\n    }\n  },\n  barBackground: {\n    visible: false,\n    style: {\n      fill: { type: 'palette', key: 'primaryFontColor', a: 0.06 }\n    }\n  }\n};\n"]}

package/esm/theme/builtin/common/series/rangeColumn.js

@@ -8,7 +8,7 @@ export const rangeColumn = {
         style: {
             fill: {
                 type: "palette",
-                key: "labelReverseFontColor"
+                key: "axisMarkerFontColor"
             }
         },
         minLabel: {

package/esm/theme/builtin/common/series/rangeColumn.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/series/rangeColumn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAgC,MAAM,2CAA2C,CAAC;AAE7G,MAAM,CAAC,MAAM,WAAW,GAA4B;IAClD,KAAK,EAAE;QACL,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE;YACL,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,uBAAuB,EAAE;SACxD;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE,kBAAkB,CAAC,GAAG;SACjC;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE,kBAAkB,CAAC,KAAK;SACnC;KACF;CACF,CAAC","file":"rangeColumn.js","sourcesContent":["import { minMaxPositionEnum, type IRangeColumnSeriesTheme } from '../../../../series/range-column/interface';\n\nexport const rangeColumn: IRangeColumnSeriesTheme = {\n  label: {\n    visible: false,\n    offset: 5,\n    position: 'inside',\n    style: {\n      fill: { type: 'palette', key: 'labelReverseFontColor' }\n    },\n    minLabel: {\n      position: minMaxPositionEnum.end\n    },\n    maxLabel: {\n      position: minMaxPositionEnum.start\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/common/series/rangeColumn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAgC,MAAM,2CAA2C,CAAC;AAE7G,MAAM,CAAC,MAAM,WAAW,GAA4B;IAClD,KAAK,EAAE;QACL,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE;YACL,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,qBAAqB,EAAE;SACtD;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE,kBAAkB,CAAC,GAAG;SACjC;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE,kBAAkB,CAAC,KAAK;SACnC;KACF;CACF,CAAC","file":"rangeColumn.js","sourcesContent":["import { minMaxPositionEnum, type IRangeColumnSeriesTheme } from '../../../../series/range-column/interface';\n\nexport const rangeColumn: IRangeColumnSeriesTheme = {\n  label: {\n    visible: false,\n    offset: 5,\n    position: 'inside',\n    style: {\n      fill: { type: 'palette', key: 'axisMarkerFontColor' }\n    },\n    minLabel: {\n      position: minMaxPositionEnum.end\n    },\n    maxLabel: {\n      position: minMaxPositionEnum.start\n    }\n  }\n};\n"]}

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

@@ -6,22 +6,31 @@ export const colorScheme = {
         palette: {
             backgroundColor: "#202226",
             borderColor: "#404349",
-            shadowColor: "#000000",
+            shadowColor: "rgba(0,0,0,0.1)",
+            hoverBackgroundColor: "#404349",
+            sliderRailColor: "#404349",
+            sliderHandleColor: "#202226",
+            sliderTrackColor: "#4284FF",
+            popupBackgroundColor: "#404349",
             primaryFontColor: "#fdfdfd",
-            secondaryFontColor: "#888c93",
-            axisFontColor: "#bbbdc3",
+            secondaryFontColor: "#bbbdc3",
+            tertiaryFontColor: "#888c93",
+            axisLabelFontColor: "#888c93",
             disableFontColor: "#55595f",
-            labelReverseFontColor: "#202226",
+            axisMarkerFontColor: "#202226",
             axisGridColor: "#404349",
             axisDomainColor: "#4b4f54",
-            dataZoomHandlerStrokeColor: "#888c93",
-            dataZoomHandlerFillColor: "#202226",
-            dataZoomBackgroundColor: "#404349",
+            dataZoomHandleStrokeColor: "#bbbdc3",
             dataZoomChartColor: "#55595F",
-            dataZoomSelectedColor: "#4284FF",
-            scrollBarSliderColor: "#ffffff",
-            tooltipBackgroundColor: "#404349",
-            markLabelBackgroundColor: "#f0bd30"
+            playerControllerColor: "#4284FF",
+            scrollBarSliderColor: "rgba(255,255,255,0.3)",
+            axisMarkerBackgroundColor: "#fdfdfd",
+            markLabelBackgroundColor: "#404349",
+            markLineStrokeColor: "#bbbdc3",
+            dangerColor: "#eb4b4b",
+            warningColor: "#f0bd30",
+            successColor: "#14b267",
+            infoColor: "#4284ff"
         }
     }
 };

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/dark/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: '#202226',\n      /** 图表边框色 */\n      borderColor: '#404349',\n      /** 默认阴影颜色 */\n      shadowColor: '#000000',\n\n      /** 主要字色 */\n      primaryFontColor: '#fdfdfd',\n      /** 次要字色 */\n      secondaryFontColor: '#888c93',\n      /** 轴字色 */\n      axisFontColor: '#bbbdc3',\n      /** 禁用字色 */\n      disableFontColor: '#55595f',\n      /** 标签反转字色 */\n      labelReverseFontColor: '#202226',\n\n      /** 轴网格线颜色 */\n      axisGridColor: '#404349',\n      /** 轴线颜色 */\n      axisDomainColor: '#4b4f54',\n\n      /** 缩略轴滑块描边颜色 */\n      dataZoomHandlerStrokeColor: '#888c93',\n      /** 缩略轴滑块填充颜色 */\n      dataZoomHandlerFillColor: '#202226',\n      /** 缩略轴背景区域颜色 */\n      dataZoomBackgroundColor: '#404349',\n      /** 缩略轴图表区域颜色 */\n      dataZoomChartColor: '#55595F',\n      /** 缩略轴选择区域颜色 */\n      dataZoomSelectedColor: '#4284FF',\n\n      /** 滚动条滑块颜色 */\n      scrollBarSliderColor: '#ffffff',\n\n      /** 提示信息背景区域颜色 */\n      tooltipBackgroundColor: '#404349',\n\n      /** 标注标签背景颜色 */\n      markLabelBackgroundColor: '#f0bd30'\n    } as BuiltinColorPalette\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/dark/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,iBAAiB;YAE9B,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,uBAAuB;YAG7C,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: '#202226',\n      /** 图表边框色 */\n      borderColor: '#404349',\n      /** 默认阴影颜色 */\n      shadowColor: 'rgba(0,0,0,0.1)',\n      /** 鼠标 hover 项背景颜色 */\n      hoverBackgroundColor: '#404349',\n      /** 滑块类组件背景条填充颜色 */\n      sliderRailColor: '#404349',\n      /** 滑块类组件滑块填充颜色 */\n      sliderHandleColor: '#202226',\n      /** 滑块类组件已选范围填充颜色 */\n      sliderTrackColor: '#4284FF',\n      /** 浮层背景区域颜色 */\n      popupBackgroundColor: '#404349',\n\n      /** 主要字色 */\n      primaryFontColor: '#fdfdfd',\n      /** 次要字色 */\n      secondaryFontColor: '#bbbdc3',\n      /** 第三字色 */\n      tertiaryFontColor: '#888c93',\n      /** 轴标签字色 */\n      axisLabelFontColor: '#888c93',\n      /** 禁用字色 */\n      disableFontColor: '#55595f',\n      /** 轴高亮标记字色 */\n      axisMarkerFontColor: '#202226',\n\n      /** 轴网格线颜色 */\n      axisGridColor: '#404349',\n      /** 轴线颜色 */\n      axisDomainColor: '#4b4f54',\n\n      /** 缩略轴滑块描边颜色 */\n      dataZoomHandleStrokeColor: '#bbbdc3',\n      /** 缩略轴图表区域颜色 */\n      dataZoomChartColor: '#55595F',\n\n      /** 播放器控制器填充颜色 */\n      playerControllerColor: '#4284FF',\n\n      /** 滚动条滑块颜色 */\n      scrollBarSliderColor: 'rgba(255,255,255,0.3)',\n\n      /** 轴高亮标记背景色 */\n      axisMarkerBackgroundColor: '#fdfdfd',\n      /** 标注标签背景颜色 */\n      markLabelBackgroundColor: '#404349',\n      /** 标注线颜色 */\n      markLineStrokeColor: '#bbbdc3',\n\n      /** 危险色 */\n      dangerColor: '#eb4b4b',\n      /** 警告色 */\n      warningColor: '#f0bd30',\n      /** 成功色 */\n      successColor: '#14b267',\n      /** 信息色 */\n      infoColor: '#4284ff'\n    } as BuiltinColorPalette\n  }\n};\n"]}

package/esm/theme/builtin/index.d.ts

@@ -1,15 +1,13 @@
 export * from './light';
+export * from './dark';
 export * from './common/legacy';
-import type { IChartLevelTheme } from '../../core/interface';
 import type { ITheme } from '../interface';
 export declare const builtinThemes: Record<string, ITheme>;
-export declare const getDefaultThemeName: (type?: ITheme['type']) => string;
 export declare const defaultThemeName: string;
 export declare const themes: Map<string, ITheme>;
 export declare const hasThemeMerged: Map<string, boolean>;
 export declare const registerTheme: (name: string, theme: Partial<ITheme>) => void;
-export declare const getTheme: (name: string) => ITheme;
+export declare const getTheme: (name?: string, transformed?: boolean) => ITheme;
 export declare const removeTheme: (name: string) => boolean;
 export declare const themeExist: (name: any) => boolean;
 export declare const getMergedTheme: (theme: Partial<ITheme>) => ITheme;
-export declare const defaultChartLevelTheme: IChartLevelTheme;

package/esm/theme/builtin/index.js

@@ -1,58 +1,45 @@
 export * from "./light";
 
+export * from "./dark";
+
 export * from "./common/legacy";
 
 import { isString } from "@visactor/vutils";
 
 import { mergeTheme } from "../../util/spec/merge-theme";
 
-import { getActualColor } from "../color-scheme/util";
-
-import { darkTheme } from "./dark";
-
 import { lightTheme } from "./light";
 
-import { lightMobileTheme } from "./light-mobile";
-
-import { darkMobileTheme } from "./dark-mobile";
+import { preprocessTheme } from "../../util/spec/preprocess";
 
 export const builtinThemes = {
-    [lightTheme.name]: lightTheme,
-    [darkTheme.name]: darkTheme,
-    [lightMobileTheme.name]: lightMobileTheme,
-    [darkMobileTheme.name]: darkMobileTheme
+    [lightTheme.name]: lightTheme
 };
 
-export const getDefaultThemeName = type => "dark" === type ? darkTheme.name : lightTheme.name;
-
-export const defaultThemeName = getDefaultThemeName();
+export const defaultThemeName = lightTheme.name;
 
 export const themes = new Map(Object.keys(builtinThemes).map((key => [ key, builtinThemes[key] ])));
 
+const transformedThemes = new Map(Object.keys(builtinThemes).map((key => [ key, preprocessTheme(builtinThemes[key], builtinThemes[key].colorScheme) ])));
+
 export const hasThemeMerged = new Map(Object.keys(builtinThemes).map((key => [ key, key === defaultThemeName ])));
 
 export const registerTheme = (name, theme) => {
-    name && (themes.set(name, getMergedTheme(theme)), hasThemeMerged.set(name, !0));
+    if (!name) return;
+    const mergedTheme = getMergedTheme(theme);
+    themes.set(name, mergedTheme), transformedThemes.set(name, preprocessTheme(mergedTheme, mergedTheme.colorScheme)), 
+    hasThemeMerged.set(name, !0);
 };
 
-export const getTheme = name => (hasThemeMerged.has(name) && !hasThemeMerged.get(name) && registerTheme(name, themes.get(name)), 
-themes.get(name) || themes.get(defaultThemeName));
+export const getTheme = (name = defaultThemeName, transformed = !1) => (hasThemeMerged.has(name) && !hasThemeMerged.get(name) && registerTheme(name, themes.get(name)), 
+transformed ? transformedThemes.get(name) : themes.get(name));
 
-export const removeTheme = name => themes.delete(name) && hasThemeMerged.delete(name);
+export const removeTheme = name => themes.delete(name) && transformedThemes.delete(name) && hasThemeMerged.delete(name);
 
 export const themeExist = name => !!isString(name) && themes.has(name);
 
 export const getMergedTheme = theme => {
-    const baseThemeName = getDefaultThemeName(theme.type), baseTheme = (name = baseThemeName, 
-    hasThemeMerged.has(name) && !hasThemeMerged.get(name) && registerTheme(name, themes.get(name)), 
-    themes.get(name) || themes.get(defaultThemeName));
-    var name;
+    const baseTheme = getTheme(defaultThemeName);
     return mergeTheme({}, baseTheme, theme);
 };
-
-export const defaultChartLevelTheme = {
-    background: getActualColor(builtinThemes[defaultThemeName].background, builtinThemes[defaultThemeName].colorScheme),
-    fontFamily: builtinThemes[defaultThemeName].fontFamily,
-    colorScheme: builtinThemes[defaultThemeName].colorScheme
-};
 //# sourceMappingURL=index.js.map

package/esm/theme/builtin/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["export * from './light';\n/** 历史弃用主题 */\nexport * from './common/legacy';\n\nimport { isString } from '@visactor/vutils';\nimport type { IChartLevelTheme } from '../../core/interface';\nimport { mergeTheme } from '../../util/spec/merge-theme';\nimport { getActualColor } from '../color-scheme/util';\nimport type { ITheme } from '../interface';\nimport { darkTheme } from './dark';\nimport { lightTheme } from './light';\nimport { lightMobileTheme } from './light-mobile';\nimport { darkMobileTheme } from './dark-mobile';\n\n/** 声明内置主题 */\nexport const builtinThemes: Record<string, ITheme> = {\n  [lightTheme.name]: lightTheme,\n  [darkTheme.name]: darkTheme,\n  [lightMobileTheme.name]: lightMobileTheme,\n  [darkMobileTheme.name]: darkMobileTheme\n};\n\n/** 获取默认主题 */\nexport const getDefaultThemeName = (type?: ITheme['type']) => (type === 'dark' ? darkTheme.name : lightTheme.name);\nexport const defaultThemeName = getDefaultThemeName();\n\n/** 全局主题 map (包含用户新注册的主题) */\nexport const themes: Map<string, ITheme> = new Map(Object.keys(builtinThemes).map(key => [key, builtinThemes[key]]));\n/** 主题 map 中的元素是否 merge 过默认主题 (非默认主题的其他内置主题没有 merge 过默认主题) */\nexport const hasThemeMerged: Map<string, boolean> = new Map(\n  Object.keys(builtinThemes).map(key => [key, key === defaultThemeName])\n);\n\n/** 注册主题 */\nexport const registerTheme = (name: string, theme: Partial<ITheme>) => {\n  if (!name) {\n    return;\n  }\n  // 所有主题基于默认主题扩展，保证基础值\n  themes.set(name, getMergedTheme(theme));\n  hasThemeMerged.set(name, true);\n};\n\n/** 获取注册过的主题 */\nexport const getTheme = (name: string) => {\n  if (hasThemeMerged.has(name) && !hasThemeMerged.get(name)) {\n    // 重新 merge 默认主题\n    registerTheme(name, themes.get(name));\n  }\n  return themes.get(name) || themes.get(defaultThemeName);\n};\n\n/** 删除主题 */\nexport const removeTheme = (name: string): boolean => {\n  return themes.delete(name) && hasThemeMerged.delete(name);\n};\n\n/** 主题是否存在 */\nexport const themeExist = (name: any) => {\n  if (!isString(name)) {\n    return false;\n  }\n  return themes.has(name);\n};\n\n/** 使新主题基于默认主题扩展，保证基础值 */\nexport const getMergedTheme = (theme: Partial<ITheme>): ITheme => {\n  const baseThemeName = getDefaultThemeName(theme.type);\n  const baseTheme = getTheme(baseThemeName);\n  return mergeTheme({}, baseTheme, theme);\n};\n\nexport const defaultChartLevelTheme: IChartLevelTheme = {\n  background: getActualColor(builtinThemes[defaultThemeName].background, builtinThemes[defaultThemeName].colorScheme),\n  fontFamily: builtinThemes[defaultThemeName].fontFamily,\n  colorScheme: builtinThemes[defaultThemeName].colorScheme\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["export * from './light';\nexport * from './dark';\n/** 历史弃用主题 */\nexport * from './common/legacy';\n\nimport { isString } from '@visactor/vutils';\nimport { mergeTheme } from '../../util/spec/merge-theme';\nimport type { ITheme } from '../interface';\nimport { lightTheme } from './light';\n// import { darkTheme } from './dark';\nimport { preprocessTheme } from '../../util/spec/preprocess';\n\n/** 声明内置主题(含 token 未转换) */\nexport const builtinThemes: Record<string, ITheme> = {\n  [lightTheme.name]: lightTheme\n  // [darkTheme.name]: darkTheme\n};\n/** 默认主题名称 */\nexport const defaultThemeName = lightTheme.name;\n\n/** 全局主题 map (包含用户新注册的主题)(含 token 未转换) */\nexport const themes: Map<string, ITheme> = new Map(Object.keys(builtinThemes).map(key => [key, builtinThemes[key]]));\n\n/** 全局已将 token 转换的主题 map (包含用户新注册的主题) */\nconst transformedThemes: Map<string, ITheme> = new Map(\n  Object.keys(builtinThemes).map(key => [key, preprocessTheme(builtinThemes[key], builtinThemes[key].colorScheme)])\n);\n\n/** 主题 map 中的元素是否 merge 过默认主题 (非默认主题的其他内置主题没有 merge 过默认主题) */\nexport const hasThemeMerged: Map<string, boolean> = new Map(\n  Object.keys(builtinThemes).map(key => [key, key === defaultThemeName])\n);\n\n/** 注册主题 */\nexport const registerTheme = (name: string, theme: Partial<ITheme>) => {\n  if (!name) {\n    return;\n  }\n  // 所有主题基于默认主题扩展，保证基础值\n  const mergedTheme = getMergedTheme(theme);\n  themes.set(name, mergedTheme);\n  transformedThemes.set(name, preprocessTheme(mergedTheme, mergedTheme.colorScheme));\n  hasThemeMerged.set(name, true);\n};\n/**\n * 获取注册过的主题\n * @param name 主题名称\n * @param transformed 是否获取 token 转换后的主题\n * @returns 返回主题\n */\nexport const getTheme = (name: string = defaultThemeName, transformed: boolean = false) => {\n  if (hasThemeMerged.has(name) && !hasThemeMerged.get(name)) {\n    // 重新 merge 默认主题\n    registerTheme(name, themes.get(name));\n  }\n\n  if (transformed) {\n    return transformedThemes.get(name);\n  }\n\n  return themes.get(name);\n};\n\n/** 删除主题 */\nexport const removeTheme = (name: string): boolean => {\n  return themes.delete(name) && transformedThemes.delete(name) && hasThemeMerged.delete(name);\n};\n\n/** 主题是否存在 */\nexport const themeExist = (name: any) => {\n  if (!isString(name)) {\n    return false;\n  }\n  return themes.has(name);\n};\n\n/** 使新主题基于默认主题扩展，保证基础值 */\nexport const getMergedTheme = (theme: Partial<ITheme>): ITheme => {\n  const baseTheme = getTheme(defaultThemeName);\n  return mergeTheme({}, baseTheme, theme);\n};\n"]}

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

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

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,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"]}
+{"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,iBAAiB;YAGvC,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: 'rgba(0,0,0,0.3)',\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"]}

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

@@ -3,19 +3,28 @@ 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;
-    axisFontColor: string;
+    tertiaryFontColor: string;
+    axisLabelFontColor: string;
     disableFontColor: string;
-    labelReverseFontColor: string;
+    axisMarkerFontColor: string;
     axisGridColor: string;
     axisDomainColor: string;
-    dataZoomHandlerStrokeColor: string;
-    dataZoomHandlerFillColor: string;
-    dataZoomBackgroundColor: string;
+    dataZoomHandleStrokeColor: string;
     dataZoomChartColor: string;
-    dataZoomSelectedColor: string;
+    playerControllerColor: string;
     scrollBarSliderColor: string;
-    tooltipBackgroundColor: string;
+    axisMarkerBackgroundColor: 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\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"]}
+{"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"]}

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

@@ -1,11 +1,27 @@
 export const newTokenToLegacyToken = {
     primaryFontColor: "titleFontColor",
-    secondaryFontColor: "labelFontColor"
+    tertiaryFontColor: "labelFontColor",
+    axisLabelFontColor: "axisFontColor",
+    axisMarkerFontColor: "labelReverseFontColor",
+    dataZoomHandleStrokeColor: "dataZoomHandlerStrokeColor",
+    sliderHandleColor: "dataZoomHandlerFillColor",
+    sliderRailColor: "dataZoomBackgroundColor",
+    sliderTrackColor: "dataZoomSelectedColor",
+    playerControllerColor: "dataZoomSelectedColor",
+    popupBackgroundColor: "tooltipBackgroundColor",
+    hoverBackgroundColor: "axisGridColor"
 };
 
 export const legacyTokenToNewToken = {
     titleFontColor: "primaryFontColor",
-    labelFontColor: "secondaryFontColor"
+    labelFontColor: "tertiaryFontColor",
+    axisFontColor: "axisLabelFontColor",
+    labelReverseFontColor: "axisMarkerFontColor",
+    dataZoomHandlerStrokeColor: "dataZoomHandleStrokeColor",
+    dataZoomHandlerFillColor: "sliderHandleColor",
+    dataZoomBackgroundColor: "sliderRailColor",
+    dataZoomSelectedColor: "sliderTrackColor",
+    tooltipBackgroundColor: "popupBackgroundColor"
 };
 
 export function getUpgradedTokenValue(palette, key) {

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

@@ -1 +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"]}
+{"version":3,"sources":["../src/theme/color-scheme/legacy.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,qBAAqB,GAA8C;IAC9E,gBAAgB,EAAE,gBAAgB;IAClC,iBAAiB,EAAE,gBAAgB;IACnC,kBAAkB,EAAE,eAAe;IACnC,mBAAmB,EAAE,uBAAuB;IAC5C,yBAAyB,EAAE,4BAA4B;IACvD,iBAAiB,EAAE,0BAA0B;IAC7C,eAAe,EAAE,yBAAyB;IAC1C,gBAAgB,EAAE,uBAAuB;IACzC,qBAAqB,EAAE,uBAAuB;IAC9C,oBAAoB,EAAE,wBAAwB;IAC9C,oBAAoB,EAAE,eAAe;CAItC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAA8C;IAC9E,cAAc,EAAE,kBAAkB;IAClC,cAAc,EAAE,mBAAmB;IACnC,aAAa,EAAE,oBAAoB;IACnC,qBAAqB,EAAE,qBAAqB;IAC5C,0BAA0B,EAAE,2BAA2B;IACvD,wBAAwB,EAAE,mBAAmB;IAC7C,uBAAuB,EAAE,iBAAiB;IAC1C,qBAAqB,EAAE,kBAAkB;IACzC,sBAAsB,EAAE,sBAAsB;CAC/C,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  tertiaryFontColor: 'labelFontColor',\n  axisLabelFontColor: 'axisFontColor',\n  axisMarkerFontColor: 'labelReverseFontColor',\n  dataZoomHandleStrokeColor: 'dataZoomHandlerStrokeColor',\n  sliderHandleColor: 'dataZoomHandlerFillColor',\n  sliderRailColor: 'dataZoomBackgroundColor',\n  sliderTrackColor: 'dataZoomSelectedColor',\n  playerControllerColor: 'dataZoomSelectedColor',\n  popupBackgroundColor: 'tooltipBackgroundColor',\n  hoverBackgroundColor: 'axisGridColor'\n  // 以下两个新 token 不做兼容策略，因为其对应的 legacy token 仍在使用\n  // axisMarkerBackgroundColor: 'primaryFontColor',\n  // markLineStrokeColor: 'primaryFontColor',\n};\n\nexport const legacyTokenToNewToken: Record<string, keyof BuiltinColorPalette> = {\n  titleFontColor: 'primaryFontColor',\n  labelFontColor: 'tertiaryFontColor',\n  axisFontColor: 'axisLabelFontColor',\n  labelReverseFontColor: 'axisMarkerFontColor',\n  dataZoomHandlerStrokeColor: 'dataZoomHandleStrokeColor',\n  dataZoomHandlerFillColor: 'sliderHandleColor',\n  dataZoomBackgroundColor: 'sliderRailColor',\n  dataZoomSelectedColor: 'sliderTrackColor',\n  tooltipBackgroundColor: 'popupBackgroundColor'\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

@@ -43,7 +43,7 @@ export function queryColorFromColorScheme(colorScheme, colorKey, seriesSpec) {
 }
 
 export const getActualColor = (value, colorScheme, seriesSpec) => {
-    if (isColorKey(value) && colorScheme) {
+    if (colorScheme && isColorKey(value)) {
         const color = queryColorFromColorScheme(colorScheme, value, seriesSpec);
         if (color) return color;
     }
@@ -51,7 +51,7 @@ export const getActualColor = (value, colorScheme, seriesSpec) => {
 };
 
 export function isColorKey(obj) {
-    return isObject(obj) && "palette" === obj.type && !!obj.key;
+    return obj && "palette" === obj.type && !!obj.key;
 }
 
 export function isProgressiveDataColorScheme(obj) {

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, 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"]}
+{"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 (colorScheme && isColorKey(value)) {\n    const color = queryColorFromColorScheme(colorScheme, value, seriesSpec);\n    if (color) {\n      return color;\n    }\n  }\n  return value;\n};\n\nexport function isColorKey(obj: any): obj is IColorKey {\n  return 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/esm/theme/theme-manager.d.ts

@@ -3,7 +3,7 @@ export declare class ThemeManager {
     static readonly themes: Map<string, ITheme>;
     private static _currentThemeName;
     static registerTheme(name: string, theme: Partial<ITheme>): void;
-    static getTheme(name: string): ITheme;
+    static getTheme(name: string, transformed?: boolean): ITheme;
     static removeTheme(name: string): boolean;
     static themeExist(name: any): boolean;
     static getDefaultTheme(): ITheme;

package/esm/theme/theme-manager.js

@@ -6,8 +6,8 @@ export class ThemeManager {
     static registerTheme(name, theme) {
         registerTheme(name, theme);
     }
-    static getTheme(name) {
-        return getTheme(name);
+    static getTheme(name, transformed = !1) {
+        return getTheme(name, transformed);
     }
     static removeTheme(name) {
         return removeTheme(name);