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

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

@@ -1,5 +1,3 @@
-import { THEME_CONSTANTS } from "../constants";
-
 export const dot = {
     dot: {
         style: {
@@ -16,16 +14,28 @@ export const dot = {
         style: {
             textAlign: "left",
             textBaseline: "middle",
-            fontSize: THEME_CONSTANTS.l5FontSize,
-            lineHeight: THEME_CONSTANTS.l5LineHeight
+            fontSize: {
+                type: "token",
+                key: "l5FontSize"
+            },
+            lineHeight: {
+                type: "token",
+                key: "l5LineHeight"
+            }
         }
     },
     subTitle: {
         style: {
             textAlign: "left",
             textBaseline: "top",
-            fontSize: THEME_CONSTANTS.l5FontSize,
-            lineHeight: THEME_CONSTANTS.l5LineHeight
+            fontSize: {
+                type: "token",
+                key: "l5FontSize"
+            },
+            lineHeight: {
+                type: "token",
+                key: "l5LineHeight"
+            }
         }
     }
 };

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/series/dot.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,MAAM,GAAG,GAAoB;IAClC,GAAG,EAAE;QACH,KAAK,EAAE;YACL,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,CAAC;SACf;KACF;IACD,MAAM,EAAE;QACN,KAAK,EAAE;YACL,IAAI,EAAE,EAAE;SACT;KACF;IACD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,SAAS,EAAE,MAAM;YACjB,YAAY,EAAE,QAAQ;YACtB,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,UAAU,EAAE,eAAe,CAAC,YAAY;SACzC;KACF;IACD,QAAQ,EAAE;QACR,KAAK,EAAE;YACL,SAAS,EAAE,MAAM;YACjB,YAAY,EAAE,KAAK;YACnB,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,UAAU,EAAE,eAAe,CAAC,YAAY;SACzC;KACF;CACF,CAAC","file":"dot.js","sourcesContent":["import type { IDotSeriesTheme } from '../../../../series/dot/interface';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const dot: IDotSeriesTheme = {\n  dot: {\n    style: {\n      size: 10,\n      fillOpacity: 1\n    }\n  },\n  symbol: {\n    style: {\n      size: 10\n    }\n  },\n  title: {\n    style: {\n      textAlign: 'left',\n      textBaseline: 'middle',\n      fontSize: THEME_CONSTANTS.l5FontSize,\n      lineHeight: THEME_CONSTANTS.l5LineHeight\n    }\n  },\n  subTitle: {\n    style: {\n      textAlign: 'left',\n      textBaseline: 'top',\n      fontSize: THEME_CONSTANTS.l5FontSize,\n      lineHeight: THEME_CONSTANTS.l5LineHeight\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/common/series/dot.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,GAAG,GAAoB;IAClC,GAAG,EAAE;QACH,KAAK,EAAE;YACL,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,CAAC;SACf;KACF;IACD,MAAM,EAAE;QACN,KAAK,EAAE;YACL,IAAI,EAAE,EAAE;SACT;KACF;IACD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,SAAS,EAAE,MAAM;YACjB,YAAY,EAAE,QAAQ;YACtB,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE;YAC9C,UAAU,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE;SACnD;KACF;IACD,QAAQ,EAAE;QACR,KAAK,EAAE;YACL,SAAS,EAAE,MAAM;YACjB,YAAY,EAAE,KAAK;YACnB,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE;YAC9C,UAAU,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE;SACnD;KACF;CACF,CAAC","file":"dot.js","sourcesContent":["import type { IDotSeriesTheme } from '../../../../series/dot/interface';\n\nexport const dot: IDotSeriesTheme = {\n  dot: {\n    style: {\n      size: 10,\n      fillOpacity: 1\n    }\n  },\n  symbol: {\n    style: {\n      size: 10\n    }\n  },\n  title: {\n    style: {\n      textAlign: 'left',\n      textBaseline: 'middle',\n      fontSize: { type: 'token', key: 'l5FontSize' },\n      lineHeight: { type: 'token', key: 'l5LineHeight' }\n    }\n  },\n  subTitle: {\n    style: {\n      textAlign: 'left',\n      textBaseline: 'top',\n      fontSize: { type: 'token', key: 'l5FontSize' },\n      lineHeight: { type: 'token', key: 'l5LineHeight' }\n    }\n  }\n};\n"]}

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

@@ -1,5 +1,3 @@
-import { THEME_CONSTANTS } from "../constants";
-
 export const funnel = {
     transform: {
         style: {
@@ -18,7 +16,10 @@ export const funnel = {
     },
     outerLabel: {
         style: {
-            fontSize: THEME_CONSTANTS.l4FontSize,
+            fontSize: {
+                type: "token",
+                key: "l4FontSize"
+            },
             fill: {
                 type: "palette",
                 key: "secondaryFontColor"
@@ -35,7 +36,10 @@ export const funnel = {
     },
     transformLabel: {
         style: {
-            fontSize: THEME_CONSTANTS.l4FontSize,
+            fontSize: {
+                type: "token",
+                key: "l4FontSize"
+            },
             fill: {
                 type: "palette",
                 key: "secondaryFontColor"

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/series/funnel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,MAAM,MAAM,GAAuB;IACxC,SAAS,EAAE;QACT,KAAK,EAAE;YACL,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe,EAAE;SAChD;KACF;IACD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,YAAY,EAAE,QAAQ;YACtB,SAAS,EAAE,CAAC;SACb;KACF;IACD,UAAU,EAAE;QACV,KAAK,EAAE;YACL,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE;SACrD;QACD,IAAI,EAAE;YACJ,KAAK,EAAE;gBACL,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;aACpD;SACF;KACF;IACD,cAAc,EAAE;QACd,KAAK,EAAE;YACL,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE;YACpD,YAAY,EAAE,QAAQ;SACvB;KACF;CACF,CAAC","file":"funnel.js","sourcesContent":["import type { IFunnelSeriesTheme } from '../../../../series/funnel/interface';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const funnel: IFunnelSeriesTheme = {\n  transform: {\n    style: {\n      fill: { type: 'palette', key: 'axisGridColor' }\n    }\n  },\n  label: {\n    style: {\n      fill: 'white',\n      textBaseline: 'middle',\n      lineWidth: 2\n    }\n  },\n  outerLabel: {\n    style: {\n      fontSize: THEME_CONSTANTS.l4FontSize,\n      fill: { type: 'palette', key: 'secondaryFontColor' }\n    },\n    line: {\n      style: {\n        stroke: { type: 'palette', key: 'axisDomainColor' }\n      }\n    }\n  },\n  transformLabel: {\n    style: {\n      fontSize: THEME_CONSTANTS.l4FontSize,\n      fill: { type: 'palette', key: 'secondaryFontColor' },\n      textBaseline: 'middle'\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/common/series/funnel.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,MAAM,GAAuB;IACxC,SAAS,EAAE;QACT,KAAK,EAAE;YACL,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe,EAAE;SAChD;KACF;IACD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,YAAY,EAAE,QAAQ;YACtB,SAAS,EAAE,CAAC;SACb;KACF;IACD,UAAU,EAAE;QACV,KAAK,EAAE;YACL,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE;YAC9C,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE;SACrD;QACD,IAAI,EAAE;YACJ,KAAK,EAAE;gBACL,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;aACpD;SACF;KACF;IACD,cAAc,EAAE;QACd,KAAK,EAAE;YACL,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE;YAC9C,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE;YACpD,YAAY,EAAE,QAAQ;SACvB;KACF;CACF,CAAC","file":"funnel.js","sourcesContent":["import type { IFunnelSeriesTheme } from '../../../../series/funnel/interface';\n\nexport const funnel: IFunnelSeriesTheme = {\n  transform: {\n    style: {\n      fill: { type: 'palette', key: 'axisGridColor' }\n    }\n  },\n  label: {\n    style: {\n      fill: 'white',\n      textBaseline: 'middle',\n      lineWidth: 2\n    }\n  },\n  outerLabel: {\n    style: {\n      fontSize: { type: 'token', key: 'l4FontSize' },\n      fill: { type: 'palette', key: 'secondaryFontColor' }\n    },\n    line: {\n      style: {\n        stroke: { type: 'palette', key: 'axisDomainColor' }\n      }\n    }\n  },\n  transformLabel: {\n    style: {\n      fontSize: { type: 'token', key: 'l4FontSize' },\n      fill: { type: 'palette', key: 'secondaryFontColor' },\n      textBaseline: 'middle'\n    }\n  }\n};\n"]}

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

@@ -1,5 +1,3 @@
-import { THEME_CONSTANTS } from "../constants";
-
 export const funnel3d = {
     transform3d: {
         style: {
@@ -15,7 +13,10 @@ export const funnel3d = {
     },
     outerLabel: {
         style: {
-            fontSize: THEME_CONSTANTS.l4FontSize,
+            fontSize: {
+                type: "token",
+                key: "l4FontSize"
+            },
             fill: "#707070"
         },
         line: {
@@ -29,7 +30,10 @@ export const funnel3d = {
     },
     transformLabel: {
         style: {
-            fontSize: THEME_CONSTANTS.l4FontSize,
+            fontSize: {
+                type: "token",
+                key: "l4FontSize"
+            },
             fill: "#707070",
             textBaseline: "middle"
         }

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/series/funnel3d.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,MAAM,QAAQ,GAAyB;IAC5C,WAAW,EAAE;QACX,KAAK,EAAE;YACL,IAAI,EAAE,SAAS;SAChB;KACF;IACD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,YAAY,EAAE,QAAQ;YACtB,SAAS,EAAE,CAAC;SACb;KACF;IACD,UAAU,EAAE;QACV,KAAK,EAAE;YACL,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,IAAI,EAAE,SAAS;SAChB;QACD,IAAI,EAAE;YACJ,KAAK,EAAE;gBACL,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;aACpD;SACF;KACF;IACD,cAAc,EAAE;QACd,KAAK,EAAE;YACL,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,IAAI,EAAE,SAAS;YACf,YAAY,EAAE,QAAQ;SACvB;KACF;CACF,CAAC","file":"funnel3d.js","sourcesContent":["import type { IFunnel3dSeriesTheme } from '../../../../series/funnel/interface';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const funnel3d: IFunnel3dSeriesTheme = {\n  transform3d: {\n    style: {\n      fill: '#f5f5f5'\n    }\n  },\n  label: {\n    style: {\n      fill: 'white',\n      textBaseline: 'middle',\n      lineWidth: 2\n    }\n  },\n  outerLabel: {\n    style: {\n      fontSize: THEME_CONSTANTS.l4FontSize,\n      fill: '#707070'\n    },\n    line: {\n      style: {\n        stroke: { type: 'palette', key: 'axisDomainColor' }\n      }\n    }\n  },\n  transformLabel: {\n    style: {\n      fontSize: THEME_CONSTANTS.l4FontSize,\n      fill: '#707070',\n      textBaseline: 'middle'\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/common/series/funnel3d.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,QAAQ,GAAyB;IAC5C,WAAW,EAAE;QACX,KAAK,EAAE;YACL,IAAI,EAAE,SAAS;SAChB;KACF;IACD,KAAK,EAAE;QACL,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,YAAY,EAAE,QAAQ;YACtB,SAAS,EAAE,CAAC;SACb;KACF;IACD,UAAU,EAAE;QACV,KAAK,EAAE;YACL,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE;YAC9C,IAAI,EAAE,SAAS;SAChB;QACD,IAAI,EAAE;YACJ,KAAK,EAAE;gBACL,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;aACpD;SACF;KACF;IACD,cAAc,EAAE;QACd,KAAK,EAAE;YACL,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE;YAC9C,IAAI,EAAE,SAAS;YACf,YAAY,EAAE,QAAQ;SACvB;KACF;CACF,CAAC","file":"funnel3d.js","sourcesContent":["import type { IFunnel3dSeriesTheme } from '../../../../series/funnel/interface';\n\nexport const funnel3d: IFunnel3dSeriesTheme = {\n  transform3d: {\n    style: {\n      fill: '#f5f5f5'\n    }\n  },\n  label: {\n    style: {\n      fill: 'white',\n      textBaseline: 'middle',\n      lineWidth: 2\n    }\n  },\n  outerLabel: {\n    style: {\n      fontSize: { type: 'token', key: 'l4FontSize' },\n      fill: '#707070'\n    },\n    line: {\n      style: {\n        stroke: { type: 'palette', key: 'axisDomainColor' }\n      }\n    }\n  },\n  transformLabel: {\n    style: {\n      fontSize: { type: 'token', key: 'l4FontSize' },\n      fill: '#707070',\n      textBaseline: 'middle'\n    }\n  }\n};\n"]}

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

@@ -1,5 +1,3 @@
-import { THEME_CONSTANTS } from "../constants";
-
 export const map = {
     defaultFillColor: "#f3f3f3",
     area: {
@@ -13,8 +11,14 @@ export const map = {
     label: {
         interactive: !1,
         style: {
-            fontSize: THEME_CONSTANTS.l6FontSize,
-            lineHeight: THEME_CONSTANTS.l6LineHeight,
+            fontSize: {
+                type: "token",
+                key: "l6FontSize"
+            },
+            lineHeight: {
+                type: "token",
+                key: "l6LineHeight"
+            },
             textBaseline: "middle",
             fill: {
                 type: "palette",

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/series/map.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,MAAM,GAAG,GAAoB;IAClC,gBAAgB,EAAE,SAAS;IAC3B,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,SAAS,EAAE,GAAG;YACd,aAAa,EAAE,CAAC;YAChB,MAAM,EAAE,OAAO;YACf,WAAW,EAAE,CAAC;SACf;KACF;IACD,KAAK,EAAE;QACL,WAAW,EAAE,KAAK;QAClB,KAAK,EAAE;YACL,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,UAAU,EAAE,eAAe,CAAC,YAAY;YACxC,YAAY,EAAE,QAAQ;YACtB,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE,OAAO,EAAE,SAAS,EAAE;YACxE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;SACpD;KACF;CACF,CAAC","file":"map.js","sourcesContent":["import type { IMapSeriesTheme } from '../../../../series/map/interface';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const map: IMapSeriesTheme = {\n  defaultFillColor: '#f3f3f3',\n  area: {\n    style: {\n      lineWidth: 0.5,\n      strokeOpacity: 1,\n      stroke: 'black',\n      fillOpacity: 1\n    }\n  },\n  label: {\n    interactive: false,\n    style: {\n      fontSize: THEME_CONSTANTS.l6FontSize,\n      lineHeight: THEME_CONSTANTS.l6LineHeight,\n      textBaseline: 'middle',\n      fill: { type: 'palette', key: 'secondaryFontColor', default: '#89909d' },\n      stroke: { type: 'palette', key: 'backgroundColor' }\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/common/series/map.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,GAAG,GAAoB;IAClC,gBAAgB,EAAE,SAAS;IAC3B,IAAI,EAAE;QACJ,KAAK,EAAE;YACL,SAAS,EAAE,GAAG;YACd,aAAa,EAAE,CAAC;YAChB,MAAM,EAAE,OAAO;YACf,WAAW,EAAE,CAAC;SACf;KACF;IACD,KAAK,EAAE;QACL,WAAW,EAAE,KAAK;QAClB,KAAK,EAAE;YACL,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE;YAC9C,UAAU,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE;YAClD,YAAY,EAAE,QAAQ;YACtB,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE,OAAO,EAAE,SAAS,EAAE;YACxE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;SACpD;KACF;CACF,CAAC","file":"map.js","sourcesContent":["import type { IMapSeriesTheme } from '../../../../series/map/interface';\n\nexport const map: IMapSeriesTheme = {\n  defaultFillColor: '#f3f3f3',\n  area: {\n    style: {\n      lineWidth: 0.5,\n      strokeOpacity: 1,\n      stroke: 'black',\n      fillOpacity: 1\n    }\n  },\n  label: {\n    interactive: false,\n    style: {\n      fontSize: { type: 'token', key: 'l6FontSize' },\n      lineHeight: { type: 'token', key: 'l6LineHeight' },\n      textBaseline: 'middle',\n      fill: { type: 'palette', key: 'secondaryFontColor', default: '#89909d' },\n      stroke: { type: 'palette', key: 'backgroundColor' }\n    }\n  }\n};\n"]}

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

@@ -4,6 +4,7 @@ export const rangeColumn = {
         offset: 5,
         position: "inside",
         style: {
+            lineWidth: 2,
             fill: {
                 type: "palette",
                 key: "axisMarkerFontColor"

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/series/rangeColumn.ts"],"names":[],"mappings":"AAIA,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,OAAwB;SACjC;QACD,QAAQ,EAAE;YACR,QAAQ,SAA0B;SACnC;KACF;CACF,CAAC","file":"rangeColumn.js","sourcesContent":["import type { IRangeColumnSeriesTheme } from '../../../../series/range-column/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { minMaxPositionEnum } 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"]}
+{"version":3,"sources":["../src/theme/builtin/common/series/rangeColumn.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,WAAW,GAA4B;IAClD,KAAK,EAAE;QACL,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,CAAC;QACT,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,qBAAqB,EAAE;SACtD;QACD,QAAQ,EAAE;YACR,QAAQ,OAAwB;SACjC;QACD,QAAQ,EAAE;YACR,QAAQ,SAA0B;SACnC;KACF;CACF,CAAC","file":"rangeColumn.js","sourcesContent":["import type { IRangeColumnSeriesTheme } from '../../../../series/range-column/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { minMaxPositionEnum } from '../../../../series/range-column/interface';\n\nexport const rangeColumn: IRangeColumnSeriesTheme = {\n  label: {\n    visible: false,\n    offset: 5,\n    position: 'inside',\n    style: {\n      lineWidth: 2,\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/common/series/sunburst.js

@@ -1,7 +1,5 @@
 import { POLAR_END_ANGLE, POLAR_START_ANGLE } from "../../../../constant";
 
-import { THEME_CONSTANTS } from "../constants";
-
 export const sunburst = {
     innerRadius: 0,
     outerRadius: 1,
@@ -31,8 +29,14 @@ export const sunburst = {
                 type: "palette",
                 key: "primaryFontColor"
             },
-            fontSize: THEME_CONSTANTS.l5FontSize,
-            lineHeight: THEME_CONSTANTS.l5LineHeight
+            fontSize: {
+                type: "token",
+                key: "l5FontSize"
+            },
+            lineHeight: {
+                type: "token",
+                key: "l5LineHeight"
+            }
         }
     }
 };

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/series/sunburst.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,MAAM,QAAQ,GAAyB;IAC5C,WAAW,EAAE,CAAC;IACd,WAAW,EAAE,CAAC;IACd,UAAU,EAAE,iBAAiB;IAC7B,QAAQ,EAAE,eAAe;IACzB,GAAG,EAAE,CAAC;IACN,WAAW,EAAE;QACX,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,QAAQ;KACjB;IACD,QAAQ,EAAE;QACR,KAAK,EAAE;YACL,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;YACnD,WAAW,EAAE,CAAC;YACd,MAAM,EAAE,SAAS;SAClB;KACF;IACD,KAAK,EAAE;QACL,OAAO,EAAE,IAAI;QACb,KAAK,EAAE;YACL,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;YAClD,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,UAAU,EAAE,eAAe,CAAC,YAAY;SACzC;KACF;CACF,CAAC","file":"sunburst.js","sourcesContent":["import { POLAR_END_ANGLE, POLAR_START_ANGLE } from '../../../../constant';\nimport type { ISunburstSeriesTheme } from '../../../../series/sunburst/interface';\nimport { THEME_CONSTANTS } from '../constants';\n\nexport const sunburst: ISunburstSeriesTheme = {\n  innerRadius: 0,\n  outerRadius: 1,\n  startAngle: POLAR_START_ANGLE,\n  endAngle: POLAR_END_ANGLE,\n  gap: 0,\n  labelLayout: {\n    align: 'center',\n    offset: 0,\n    rotate: 'radial'\n  },\n  sunburst: {\n    style: {\n      stroke: { type: 'palette', key: 'backgroundColor' },\n      fillOpacity: 1,\n      cursor: 'pointer'\n    }\n  },\n  label: {\n    visible: true,\n    style: {\n      cursor: 'pointer',\n      fill: { type: 'palette', key: 'primaryFontColor' },\n      fontSize: THEME_CONSTANTS.l5FontSize,\n      lineHeight: THEME_CONSTANTS.l5LineHeight\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/common/series/sunburst.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,CAAC,MAAM,QAAQ,GAAyB;IAC5C,WAAW,EAAE,CAAC;IACd,WAAW,EAAE,CAAC;IACd,UAAU,EAAE,iBAAiB;IAC7B,QAAQ,EAAE,eAAe;IACzB,GAAG,EAAE,CAAC;IACN,WAAW,EAAE;QACX,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,QAAQ;KACjB;IACD,QAAQ,EAAE;QACR,KAAK,EAAE;YACL,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;YACnD,WAAW,EAAE,CAAC;YACd,MAAM,EAAE,SAAS;SAClB;KACF;IACD,KAAK,EAAE;QACL,OAAO,EAAE,IAAI;QACb,KAAK,EAAE;YACL,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAE;YAClD,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE;YAC9C,UAAU,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE;SACnD;KACF;CACF,CAAC","file":"sunburst.js","sourcesContent":["import { POLAR_END_ANGLE, POLAR_START_ANGLE } from '../../../../constant';\nimport type { ISunburstSeriesTheme } from '../../../../series/sunburst/interface';\n\nexport const sunburst: ISunburstSeriesTheme = {\n  innerRadius: 0,\n  outerRadius: 1,\n  startAngle: POLAR_START_ANGLE,\n  endAngle: POLAR_END_ANGLE,\n  gap: 0,\n  labelLayout: {\n    align: 'center',\n    offset: 0,\n    rotate: 'radial'\n  },\n  sunburst: {\n    style: {\n      stroke: { type: 'palette', key: 'backgroundColor' },\n      fillOpacity: 1,\n      cursor: 'pointer'\n    }\n  },\n  label: {\n    visible: true,\n    style: {\n      cursor: 'pointer',\n      fill: { type: 'palette', key: 'primaryFontColor' },\n      fontSize: { type: 'token', key: 'l5FontSize' },\n      lineHeight: { type: 'token', key: 'l5LineHeight' }\n    }\n  }\n};\n"]}

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

@@ -1,5 +1,3 @@
-import { THEME_CONSTANTS } from "../constants";
-
 export const treemap = {
     gapWidth: 1,
     nodePadding: [ 5 ],
@@ -14,12 +12,18 @@ export const treemap = {
             fill: "white",
             textBaseline: "middle",
             textAlign: "center",
-            fontSize: THEME_CONSTANTS.l5FontSize,
-            lineHeight: THEME_CONSTANTS.l5LineHeight
+            fontSize: {
+                type: "token",
+                key: "l5FontSize"
+            },
+            lineHeight: {
+                type: "token",
+                key: "l5LineHeight"
+            }
         }
     },
     nonLeafLabel: {
-        padding: 2 * THEME_CONSTANTS.l5FontSize,
+        padding: 24,
         style: {
             fill: "black",
             stroke: {
@@ -27,8 +31,14 @@ export const treemap = {
                 key: "backgroundColor"
             },
             lineWidth: 2,
-            fontSize: THEME_CONSTANTS.l5FontSize,
-            lineHeight: THEME_CONSTANTS.l5LineHeight,
+            fontSize: {
+                type: "token",
+                key: "l5FontSize"
+            },
+            lineHeight: {
+                type: "token",
+                key: "l5LineHeight"
+            },
             textBaseline: "middle",
             textAlign: "center"
         }

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/series/treemap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,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,IAAI,EAAE,OAAO;YACb,YAAY,EAAE,QAAQ;YACtB,SAAS,EAAE,QAAQ;YACnB,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,UAAU,EAAE,eAAe,CAAC,YAAY;SACzC;KACF;IACD,YAAY,EAAE;QACZ,OAAO,EAAE,eAAe,CAAC,UAAU,GAAG,CAAC;QACvC,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;YACnD,SAAS,EAAE,CAAC;YACZ,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,UAAU,EAAE,eAAe,CAAC,YAAY;YACxC,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\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      fill: 'white',\n      textBaseline: 'middle',\n      textAlign: 'center',\n      fontSize: THEME_CONSTANTS.l5FontSize,\n      lineHeight: THEME_CONSTANTS.l5LineHeight\n    }\n  },\n  nonLeafLabel: {\n    padding: THEME_CONSTANTS.l5FontSize * 2,\n    style: {\n      fill: 'black',\n      stroke: { type: 'palette', key: 'backgroundColor' },\n      lineWidth: 2,\n      fontSize: THEME_CONSTANTS.l5FontSize,\n      lineHeight: THEME_CONSTANTS.l5LineHeight,\n      textBaseline: 'middle',\n      textAlign: 'center'\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/common/series/treemap.ts"],"names":[],"mappings":"AAEA,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,IAAI,EAAE,OAAO;YACb,YAAY,EAAE,QAAQ;YACtB,SAAS,EAAE,QAAQ;YACnB,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE;YAC9C,UAAU,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE;SACnD;KACF;IACD,YAAY,EAAE;QACZ,OAAO,EAAE,EAAE;QACX,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;YACnD,SAAS,EAAE,CAAC;YACZ,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE;YAC9C,UAAU,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE;YAClD,YAAY,EAAE,QAAQ;YACtB,SAAS,EAAE,QAAQ;SACpB;KACF;CACF,CAAC","file":"treemap.js","sourcesContent":["import type { ITreemapSeriesTheme } from '../../../../series/treemap/interface';\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      fill: 'white',\n      textBaseline: 'middle',\n      textAlign: 'center',\n      fontSize: { type: 'token', key: 'l5FontSize' },\n      lineHeight: { type: 'token', key: 'l5LineHeight' }\n    }\n  },\n  nonLeafLabel: {\n    padding: 24,\n    style: {\n      fill: 'black',\n      stroke: { type: 'palette', key: 'backgroundColor' },\n      lineWidth: 2,\n      fontSize: { type: 'token', key: 'l5FontSize' },\n      lineHeight: { type: 'token', key: 'l5LineHeight' },\n      textBaseline: 'middle',\n      textAlign: 'center'\n    }\n  }\n};\n"]}

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

@@ -1,5 +1,3 @@
-import { THEME_CONSTANTS } from "../constants";
-
 export const waterfall = {
     seriesFieldName: {
         total: "total",
@@ -19,13 +17,19 @@ export const waterfall = {
         position: "withChange",
         style: {
             fill: "black",
-            fontSize: THEME_CONSTANTS.l4FontSize
+            fontSize: {
+                type: "token",
+                key: "l4FontSize"
+            }
         }
     },
     label: {
         visible: !1,
         offset: 12,
-        position: "inside"
+        position: "inside",
+        style: {
+            lineWidth: 2
+        }
     }
 };
 //# sourceMappingURL=waterfall.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/series/waterfall.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,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,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,YAAY;QACtB,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,eAAe,CAAC,UAAU;SACrC;KACF;IACD,KAAK,EAAE;QACL,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,QAAQ;KACnB;CACF,CAAC","file":"waterfall.js","sourcesContent":["import type { IWaterfallSeriesTheme } from '../../../../series/waterfall/interface';\nimport { THEME_CONSTANTS } from '../constants';\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    visible: true,\n    offset: 12,\n    position: 'withChange',\n    style: {\n      fill: 'black',\n      fontSize: THEME_CONSTANTS.l4FontSize\n    }\n  },\n  label: {\n    visible: false,\n    offset: 12,\n    position: 'inside'\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/common/series/waterfall.ts"],"names":[],"mappings":"AAEA,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,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,YAAY;QACtB,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE;SAC/C;KACF;IACD,KAAK,EAAE;QACL,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;SACb;KACF;CACF,CAAC","file":"waterfall.js","sourcesContent":["import type { IWaterfallSeriesTheme } from '../../../../series/waterfall/interface';\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    visible: true,\n    offset: 12,\n    position: 'withChange',\n    style: {\n      fill: 'black',\n      fontSize: { type: 'token', key: 'l4FontSize' }\n    }\n  },\n  label: {\n    visible: false,\n    offset: 12,\n    position: 'inside',\n    style: {\n      lineWidth: 2\n    }\n  }\n};\n"]}

package/esm/theme/builtin/index.js

@@ -4,11 +4,11 @@ export * from "./dark";
 
 import { isString } from "@visactor/vutils";
 
-import { mergeTheme } from "../../util/spec/merge-theme";
+import { mergeTheme } from "../../util/theme/merge-theme";
 
 import { lightTheme } from "./light";
 
-import { preprocessTheme } from "../../util/spec/preprocess";
+import { preprocessTheme } from "../../util/theme/preprocess";
 
 export const builtinThemes = {
     [lightTheme.name]: lightTheme
@@ -18,14 +18,14 @@ 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) ])));
+const transformedThemes = new Map(Object.keys(builtinThemes).map((key => [ key, preprocessTheme(builtinThemes[key]) ])));
 
 export const hasThemeMerged = new Map(Object.keys(builtinThemes).map((key => [ key, key === defaultThemeName ])));
 
 export const registerTheme = (name, theme) => {
     if (!name) return;
     const mergedTheme = getMergedTheme(theme);
-    themes.set(name, mergedTheme), transformedThemes.set(name, preprocessTheme(mergedTheme, mergedTheme.colorScheme)), 
+    themes.set(name, mergedTheme), transformedThemes.set(name, preprocessTheme(mergedTheme)), 
     hasThemeMerged.set(name, !0);
 };
 

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';\nexport * from './dark';\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 baseThemeName = theme.type ?? defaultThemeName;\n  const baseTheme = getTheme(baseThemeName);\n  return mergeTheme({}, baseTheme, theme);\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\nimport { isString } from '@visactor/vutils';\nimport { mergeTheme } from '../../util/theme/merge-theme';\nimport type { ITheme } from '../interface';\nimport { lightTheme } from './light';\n// import { darkTheme } from './dark';\nimport { preprocessTheme } from '../../util/theme/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])] as [string, ITheme])\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));\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 baseThemeName = theme.type ?? defaultThemeName;\n  const baseTheme = getTheme(baseThemeName);\n  return mergeTheme({}, baseTheme, theme);\n};\n"]}

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

@@ -4,10 +4,10 @@ import { series } from "../common/series";
 
 import { markByName, markByType } from "../common/mark";
 
-import { THEME_CONSTANTS } from "../common/constants";
-
 import { component } from "../common/component";
 
+import { tokenMap } from "../../token";
+
 export const lightTheme = {
     name: "light",
     background: {
@@ -15,8 +15,12 @@ export const lightTheme = {
         key: "backgroundColor"
     },
     padding: 20,
-    fontFamily: THEME_CONSTANTS.defaultFontFamily,
+    fontFamily: {
+        type: "token",
+        key: "defaultFontFamily"
+    },
     colorScheme: colorScheme,
+    tokenMap: tokenMap,
     mark: markByType,
     markByName: markByName,
     series: series,

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/light/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,MAAM,CAAC,MAAM,UAAU,GAAW;IAChC,IAAI,EAAE,OAAO;IACb,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;IACvD,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,eAAe,CAAC,iBAAiB;IAC7C,WAAW;IACX,IAAI,EAAE,UAAU;IAChB,UAAU;IACV,MAAM;IACN,SAAS;IACT,kBAAkB,EAAE,IAAI;CACzB,CAAC","file":"index.js","sourcesContent":["/**\n * 主题的命名，不要使用类似 arco，default 等字段，应该要以主题的特征来，颜色/场景特征（light, dark）\n *\n * 1. 对除了 color 外的一些主题设置，应该要有专门的设计，**不要直接复制**\n * 2. 原则上来讲，默认值尽量都放主题中，但是也可根据情况自行判断\n * 3. 目前主题只到系列，不到系列的 mark，对于这个分界没有太清楚，后续根据需求再做开放\n */\nimport type { ITheme } from '../../interface';\nimport { colorScheme } from './color-scheme';\nimport { series } from '../common/series';\nimport { markByName, markByType } from '../common/mark';\nimport { THEME_CONSTANTS } from '../common/constants';\nimport { component } from '../common/component';\n\nexport const lightTheme: ITheme = {\n  name: 'light',\n  background: { type: 'palette', key: 'backgroundColor' },\n  padding: 20,\n  fontFamily: THEME_CONSTANTS.defaultFontFamily,\n  colorScheme,\n  mark: markByType,\n  markByName,\n  series,\n  component,\n  animationThreshold: 2000\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/light/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,MAAM,CAAC,MAAM,UAAU,GAAW;IAChC,IAAI,EAAE,OAAO;IACb,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;IACvD,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,mBAAmB,EAAE;IACvD,WAAW;IACX,QAAQ;IACR,IAAI,EAAE,UAAU;IAChB,UAAU;IACV,MAAM;IACN,SAAS;IACT,kBAAkB,EAAE,IAAI;CACzB,CAAC","file":"index.js","sourcesContent":["/**\n * 主题的命名，不要使用类似 arco，default 等字段，应该要以主题的特征来，颜色/场景特征（light, dark）\n *\n * 1. 对除了 color 外的一些主题设置，应该要有专门的设计，**不要直接复制**\n * 2. 原则上来讲，默认值尽量都放主题中，但是也可根据情况自行判断\n * 3. 目前主题只到系列，不到系列的 mark，对于这个分界没有太清楚，后续根据需求再做开放\n */\nimport type { ITheme } from '../../interface';\nimport { colorScheme } from './color-scheme';\nimport { series } from '../common/series';\nimport { markByName, markByType } from '../common/mark';\nimport { component } from '../common/component';\nimport { tokenMap } from '../../token';\n\nexport const lightTheme: ITheme = {\n  name: 'light',\n  background: { type: 'palette', key: 'backgroundColor' },\n  padding: 20,\n  fontFamily: { type: 'token', key: 'defaultFontFamily' },\n  colorScheme,\n  tokenMap,\n  mark: markByType,\n  markByName,\n  series,\n  component,\n  animationThreshold: 2000\n};\n"]}

package/esm/theme/interface.d.ts

@@ -5,13 +5,15 @@ import type { MarkTypeEnum } from '../mark/interface';
 import type { IColorKey, IThemeColorScheme } from './color-scheme/interface';
 import type { IGradientColor } from '@visactor/vrender-core';
 import type { IComponentTheme } from '../component/interface';
+import type { ITokenKey, TokenMap } from './token';
 export interface ITheme {
     name?: string;
     description?: string;
     type?: 'light' | 'dark';
     background?: string | IGradientColor | IColorKey;
     padding?: ILayoutPaddingSpec;
-    fontFamily?: string;
+    fontFamily?: string | ITokenKey;
+    tokenMap?: TokenMap;
     colorScheme?: IThemeColorScheme;
     mark?: IGlobalMarkThemeByType;
     markByName?: IGlobalMarkThemeByName;
@@ -36,21 +38,3 @@ export interface IGlobalMarkThemeByName {
     label?: Partial<IMarkTheme<ITextMarkSpec>>;
     [markName: string]: Partial<IMarkTheme<any>>;
 }
-export interface IThemeConstants {
-    defaultFontFamily: string;
-    defaultFontSize: number;
-    l1FontSize: number;
-    l1LineHeight: number | string;
-    l2FontSize: number;
-    l2LineHeight: number | string;
-    l3FontSize: number;
-    l3LineHeight: number | string;
-    l4FontSize: number;
-    l4LineHeight: number | string;
-    l5FontSize: number;
-    l5LineHeight: number | string;
-    l6FontSize: number;
-    l6LineHeight: number | string;
-    axisTickSize: number;
-    areaOpacity: number;
-}

package/esm/theme/interface.js.map

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

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

@@ -8,6 +8,6 @@ export declare class ThemeManager {
     static themeExist(name: any): boolean;
     static getDefaultTheme(): ITheme;
     static setCurrentTheme(name: string): void;
-    static getCurrentTheme(): ITheme;
+    static getCurrentTheme(transformed?: boolean): ITheme;
     static getCurrentThemeName(): string;
 }

package/esm/theme/theme-manager.js

@@ -21,8 +21,8 @@ export class ThemeManager {
     static setCurrentTheme(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 getCurrentTheme(transformed = !1) {
+        return ThemeManager.getTheme(ThemeManager._currentThemeName, transformed);
     }
     static getCurrentThemeName() {
         return ThemeManager._currentThemeName;

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/theme-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEvG,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAG3D,MAAM,OAAO,YAAY;IAYvB,MAAM,CAAC,aAAa,CAAC,IAAY,EAAE,KAAsB;QACvD,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC;IAOD,MAAM,CAAC,QAAQ,CAAC,IAAY,EAAE,cAAuB,KAAK;QACxD,OAAO,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IACrC,CAAC;IAOD,MAAM,CAAC,WAAW,CAAC,IAAY;QAC7B,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAOD,MAAM,CAAC,UAAU,CAAC,IAAS;QACzB,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1B,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;;AA/De,mBAAM,GAAG,MAAM,CAAC;AAEjB,8BAAiB,GAAW,gBAAgB,CAAC","file":"theme-manager.js","sourcesContent":["import { defaultThemeName, getTheme, registerTheme, removeTheme, themeExist, themes } from './builtin';\nimport type { ITheme } from './interface';\nimport { InstanceManager } from '../core/instance-manager';\nimport type { IVChart } from '../core/interface';\n\nexport class ThemeManager {\n  /** 主题字典 */\n  static readonly themes = themes;\n\n  private static _currentThemeName: string = defaultThemeName; // 设置缺省为默认主题\n\n  /**\n   * 注册主题\n   * @param name 主题名称\n   * @param theme 主题配置\n   * @returns\n   */\n  static registerTheme(name: string, theme: Partial<ITheme>) {\n    registerTheme(name, theme);\n  }\n\n  /**\n   * 获取主题\n   * @param name 主题名称\n   * @returns\n   */\n  static getTheme(name: string, transformed: boolean = false) {\n    return getTheme(name, transformed);\n  }\n\n  /**\n   * 移除主题\n   * @param name 主题名称\n   * @returns 是否移除成功\n   */\n  static removeTheme(name: string): boolean {\n    return removeTheme(name);\n  }\n\n  /**\n   * 判断主题是否存在\n   * @param name 主题名称\n   * @returns 是否存在\n   */\n  static themeExist(name: any) {\n    return themeExist(name);\n  }\n\n  /** 获取图表默认主题（非用户配置） */\n  static getDefaultTheme(): ITheme {\n    return ThemeManager.themes.get(defaultThemeName);\n  }\n\n  /** 设置当前主题（所有实例生效） */\n  static setCurrentTheme(name: string) {\n    if (!ThemeManager.themeExist(name)) {\n      return;\n    }\n    ThemeManager._currentThemeName = name;\n    InstanceManager.forEach((instance: IVChart) => instance?.setCurrentTheme(name));\n  }\n\n  /** 获取当前主题（只能获取用户通过`setCurrentTheme`方法设置过的主题，默认值为默认主题） */\n  static getCurrentTheme(): ITheme {\n    return ThemeManager.getTheme(ThemeManager._currentThemeName);\n  }\n\n  /** 获取当前主题名称（只能获取用户通过`setCurrentTheme`方法设置过的主题，默认值为默认主题） */\n  static getCurrentThemeName(): string {\n    return ThemeManager._currentThemeName;\n  }\n}\n"]}
+{"version":3,"sources":["../src/theme/theme-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEvG,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAG3D,MAAM,OAAO,YAAY;IAYvB,MAAM,CAAC,aAAa,CAAC,IAAY,EAAE,KAAsB;QACvD,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC;IAOD,MAAM,CAAC,QAAQ,CAAC,IAAY,EAAE,cAAuB,KAAK;QACxD,OAAO,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IACrC,CAAC;IAOD,MAAM,CAAC,WAAW,CAAC,IAAY;QAC7B,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAOD,MAAM,CAAC,UAAU,CAAC,IAAS;QACzB,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1B,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,CAAC,cAAuB,KAAK;QACjD,OAAO,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAC5E,CAAC;IAGD,MAAM,CAAC,mBAAmB;QACxB,OAAO,YAAY,CAAC,iBAAiB,CAAC;IACxC,CAAC;;AA/De,mBAAM,GAAG,MAAM,CAAC;AAEjB,8BAAiB,GAAW,gBAAgB,CAAC","file":"theme-manager.js","sourcesContent":["import { defaultThemeName, getTheme, registerTheme, removeTheme, themeExist, themes } from './builtin';\nimport type { ITheme } from './interface';\nimport { InstanceManager } from '../core/instance-manager';\nimport type { IVChart } from '../core/interface';\n\nexport class ThemeManager {\n  /** 主题字典 */\n  static readonly themes = themes;\n\n  private static _currentThemeName: string = defaultThemeName; // 设置缺省为默认主题\n\n  /**\n   * 注册主题\n   * @param name 主题名称\n   * @param theme 主题配置\n   * @returns\n   */\n  static registerTheme(name: string, theme: Partial<ITheme>) {\n    registerTheme(name, theme);\n  }\n\n  /**\n   * 获取主题\n   * @param name 主题名称\n   * @returns\n   */\n  static getTheme(name: string, transformed: boolean = false) {\n    return getTheme(name, transformed);\n  }\n\n  /**\n   * 移除主题\n   * @param name 主题名称\n   * @returns 是否移除成功\n   */\n  static removeTheme(name: string): boolean {\n    return removeTheme(name);\n  }\n\n  /**\n   * 判断主题是否存在\n   * @param name 主题名称\n   * @returns 是否存在\n   */\n  static themeExist(name: any) {\n    return themeExist(name);\n  }\n\n  /** 获取图表默认主题（非用户配置） */\n  static getDefaultTheme(): ITheme {\n    return ThemeManager.themes.get(defaultThemeName);\n  }\n\n  /** 设置当前主题（所有实例生效） */\n  static setCurrentTheme(name: string) {\n    if (!ThemeManager.themeExist(name)) {\n      return;\n    }\n    ThemeManager._currentThemeName = name;\n    InstanceManager.forEach((instance: IVChart) => instance?.setCurrentTheme(name));\n  }\n\n  /** 获取当前主题（只能获取用户通过`setCurrentTheme`方法设置过的主题，默认值为默认主题） */\n  static getCurrentTheme(transformed: boolean = false): ITheme {\n    return ThemeManager.getTheme(ThemeManager._currentThemeName, transformed);\n  }\n\n  /** 获取当前主题名称（只能获取用户通过`setCurrentTheme`方法设置过的主题，默认值为默认主题） */\n  static getCurrentThemeName(): string {\n    return ThemeManager._currentThemeName;\n  }\n}\n"]}

package/esm/theme/token/builtin/default.d.ts

@@ -0,0 +1,2 @@
+import type { BuiltinTokenMap } from './interface';
+export declare const tokenMap: BuiltinTokenMap;

package/esm/theme/{builtin/common/constants.js → token/builtin/default.js}

@@ -1,4 +1,4 @@
-export const THEME_CONSTANTS = {
+export const tokenMap = {
     defaultFontFamily: "PingFang SC,Helvetica Neue,Microsoft Yahei,system-ui,-apple-system,segoe ui,Roboto,Helvetica,Arial,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol",
     defaultFontSize: 14,
     l1FontSize: 32,
@@ -12,8 +12,6 @@ export const THEME_CONSTANTS = {
     l5FontSize: 12,
     l5LineHeight: "130%",
     l6FontSize: 10,
-    l6LineHeight: "120%",
-    axisTickSize: 4,
-    areaOpacity: .2
+    l6LineHeight: "120%"
 };
-//# sourceMappingURL=constants.js.map
+//# sourceMappingURL=default.js.map

package/esm/theme/token/builtin/default.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/theme/token/builtin/default.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,QAAQ,GAAoB;IACvC,iBAAiB,EAEf,gKAAgK;IAClK,eAAe,EAAE,EAAE;IAEnB,UAAU,EAAE,EAAE;IACd,YAAY,EAAE,MAAM;IAEpB,UAAU,EAAE,EAAE;IACd,YAAY,EAAE,MAAM;IAEpB,UAAU,EAAE,EAAE;IACd,YAAY,EAAE,MAAM;IAEpB,UAAU,EAAE,EAAE;IACd,YAAY,EAAE,MAAM;IAEpB,UAAU,EAAE,EAAE;IACd,YAAY,EAAE,MAAM;IAEpB,UAAU,EAAE,EAAE;IACd,YAAY,EAAE,MAAM;CACrB,CAAC","file":"default.js","sourcesContent":["import type { BuiltinTokenMap } from './interface';\n\n/** 标准色板 */\nexport const tokenMap: BuiltinTokenMap = {\n  defaultFontFamily:\n    // eslint-disable-next-line max-len\n    'PingFang SC,Helvetica Neue,Microsoft Yahei,system-ui,-apple-system,segoe ui,Roboto,Helvetica,Arial,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol',\n  defaultFontSize: 14,\n\n  l1FontSize: 32,\n  l1LineHeight: '150%',\n\n  l2FontSize: 20,\n  l2LineHeight: '140%',\n\n  l3FontSize: 16,\n  l3LineHeight: '150%',\n\n  l4FontSize: 14,\n  l4LineHeight: '150%',\n\n  l5FontSize: 12,\n  l5LineHeight: '130%',\n\n  l6FontSize: 10,\n  l6LineHeight: '120%'\n};\n"]}

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

@@ -0,0 +1,2 @@
+export * from './default';
+export * from './interface';

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

@@ -0,0 +1,4 @@
+export * from "./default";
+
+export * from "./interface";
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/theme/token/builtin/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC","file":"index.js","sourcesContent":["export * from './default';\nexport * from './interface';\n"]}

package/esm/theme/token/builtin/interface.d.ts

@@ -0,0 +1,17 @@
+import type { TokenMap } from '../interface';
+export type BuiltinTokenMap = TokenMap & {
+    defaultFontFamily: string;
+    defaultFontSize: number;
+    l1FontSize: number;
+    l1LineHeight: number | string;
+    l2FontSize: number;
+    l2LineHeight: number | string;
+    l3FontSize: number;
+    l3LineHeight: number | string;
+    l4FontSize: number;
+    l4LineHeight: number | string;
+    l5FontSize: number;
+    l5LineHeight: number | string;
+    l6FontSize: number;
+    l6LineHeight: number | string;
+};

package/esm/theme/token/builtin/interface.js

@@ -0,0 +1,2 @@
+export { };
+//# sourceMappingURL=interface.js.map

package/esm/theme/token/builtin/interface.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/theme/token/builtin/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { TokenMap } from '../interface';\n\nexport type BuiltinTokenMap = TokenMap & {\n  /** 默认字体 */\n  defaultFontFamily: string;\n  /** 默认字号 */\n  defaultFontSize: number;\n\n  /** 1级字阶字号，用于：环形图中间数值 / 展示型数值 */\n  l1FontSize: number;\n  /** 1级字阶行高 */\n  l1LineHeight: number | string;\n\n  /** 2级字阶字号，用于：展示型文字 / 指标卡数值 */\n  l2FontSize: number;\n  /** 2级字阶行高 */\n  l2LineHeight: number | string;\n\n  /** 3级字阶字号，用于：图表标题 */\n  l3FontSize: number;\n  /** 3级字阶行高 */\n  l3LineHeight: number | string;\n\n  /** 4级字阶字号，用于：数据标签、tooltip */\n  l4FontSize: number;\n  /** 4级字阶行高 */\n  l4LineHeight: number | string;\n\n  /** 5级字阶字号，用于：坐标轴标题、轴标签、图例文字 */\n  l5FontSize: number;\n  /** 5级字阶行高 */\n  l5LineHeight: number | string;\n\n  /** 6级字阶字号，用于：地图标签 */\n  l6FontSize: number;\n  /** 6级字阶行高 */\n  l6LineHeight: number | string;\n};\n"]}

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

@@ -0,0 +1,3 @@
+export * from './interface';
+export * from './util';
+export * from './builtin';

package/esm/theme/token/index.js

@@ -0,0 +1,6 @@
+export * from "./interface";
+
+export * from "./util";
+
+export * from "./builtin";
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/theme/token/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC","file":"index.js","sourcesContent":["export * from './interface';\nexport * from './util';\nexport * from './builtin';\n"]}

package/esm/theme/token/interface.d.ts

@@ -0,0 +1,6 @@
+export interface ITokenKey<T = any> {
+    type: 'token';
+    key: string;
+    default?: T;
+}
+export type TokenMap = Record<string, any>;