@visactor/vchart 1.5.2 → 1.5.3

package/cjs/util/spec/preprocess.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/spec/preprocess.ts"],"names":[],"mappings":";;;AAAA,6CAAmG;AACnG,sDAAgF;AAEhF,qCAAqD;AACrD,wDAA2E;AAC3E,oCAAsD;AAUtD,SAAgB,qBAAqB,CACnC,IAAmD,EACnD,GAAQ,EACR,WAA+B,EAC/B,UAA2B;IAE3B,IAAI,IAAA,gBAAO,EAAC,GAAG,CAAC,EAAE;QAChB,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACvB,IAAI,IAAA,iBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,IAAA,mBAAU,EAAC,OAAO,CAAC,EAAE;gBAC7C,OAAO,qBAAqB,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;aACtE;YACD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;KACJ;IAED,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC7B,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QAEvB,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACxB,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACpB,OAAO;SACR;QACD,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;YAEnB,IAAI,IAAA,mBAAU,EAAC,KAAK,CAAC,IAAI,IAAA,mBAAU,EAAC,KAAK,CAAC,IAAI,IAAA,sBAAa,EAAC,KAAK,CAAC,EAAE;gBAClE,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACpB,OAAO;aACR;YACD,IAAI,IAAA,iBAAU,EAAC,KAAK,CAAC,EAAE;gBAErB,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,qBAAc,EAAC,KAAK,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;aAC9D;iBAAM;gBACL,MAAM,CAAC,GAAG,CAAC,GAAG,qBAAqB,CACjC,6BAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,EACxF,KAAK,EACL,WAAW,EACX,UAAU,CACX,CAAC;aACH;SACF;aAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,GAAG,KAAK,SAAS,EAAE;YAEtD,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,kCAA0B,EAAC,KAAK,CAAC,CAAC;SACjD;aAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,GAAG,KAAK,YAAY,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;YAChH,IAAI,IAAA,gBAAO,EAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;gBAGzB,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;gBAC5E,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC;gBACtC,IAAI,IAAA,sBAAa,EAAC,QAAQ,CAAC,EAAE;oBAC3B,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;iBACxB;aACF;SAEF;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SACrB;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AA5DD,sDA4DC","file":"preprocess.js","sourcesContent":["import { isArray, isFunction, isObject, isString, isValid, isValidNumber } from '@visactor/vutils';\nimport { seriesMarkNameSet, type SeriesTypeEnum } from '../../series/interface';\nimport type { IThemeColorScheme } from '../../theme/color-scheme/interface';\nimport { isDataView, isHTMLElement } from './common';\nimport { getActualColor, isColorKey } from '../../theme/color-scheme/util';\nimport { normalizeLayoutPaddingSpec } from '../space';\n\n/**\n * 对 spec 或者类 spec 配置（如 theme）进行预处理，如进行语义化颜色的转换等\n * @param type 需要转换的对象类型（spec 或者 theme）\n * @param obj 需要转换的对象\n * @param colorScheme 主题色板\n * @param seriesType 当前系列类型\n * @returns\n */\nexport function preprocessSpecOrTheme(\n  type: 'spec' | 'theme' | 'mark-spec' | 'mark-theme',\n  obj: any,\n  colorScheme?: IThemeColorScheme,\n  seriesType?: SeriesTypeEnum\n): any {\n  if (isArray(obj)) {\n    return obj.map(element => {\n      if (isObject(element) && !isFunction(element)) {\n        return preprocessSpecOrTheme(type, element, colorScheme, seriesType);\n      }\n      return element;\n    });\n  }\n\n  const newObj = {};\n  Object.keys(obj).forEach(key => {\n    const value = obj[key];\n    // 绕过数据\n    if (key.includes('data')) {\n      newObj[key] = value;\n      return;\n    }\n    if (isObject(value)) {\n      // 绕过不可深拷贝的对象\n      if (isFunction(value) || isDataView(value) || isHTMLElement(value)) {\n        newObj[key] = value;\n        return;\n      }\n      if (isColorKey(value)) {\n        // 查询、替换语义化颜色\n        newObj[key] = getActualColor(value, colorScheme, seriesType);\n      } else {\n        newObj[key] = preprocessSpecOrTheme(\n          seriesMarkNameSet.has(key) ? (type.includes('spec') ? 'mark-spec' : 'mark-theme') : type,\n          value,\n          colorScheme,\n          seriesType\n        );\n      }\n    } else if (!type.includes('mark') && key === 'padding') {\n      // 标准化 padding\n      newObj[key] = normalizeLayoutPaddingSpec(value);\n    } else if (!type.includes('theme') && key === 'lineHeight' && isString(value) && value[value.length - 1] === '%') {\n      if (isValid(obj.fontSize)) {\n        // 处理 lineHeight 的比例值\n        // FIXME: vrender 支持行高字符串后删掉这段逻辑\n        const scale = Number.parseFloat(value.substring(0, value.length - 1)) / 100;\n        const newValue = obj.fontSize * scale;\n        if (isValidNumber(newValue)) {\n          newObj[key] = newValue;\n        }\n      }\n      // 如果 spec 同级里没有 fontSize 配置，lineHeight 比例值失效\n    } else {\n      newObj[key] = value;\n    }\n  });\n\n  return newObj;\n}\n"]}
+{"version":3,"sources":["../src/util/spec/preprocess.ts"],"names":[],"mappings":"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","file":"preprocess.js","sourcesContent":["import { isArray, isFunction, isNil, isObject, isString, isValid, isValidNumber } from '@visactor/vutils';\nimport { seriesMarkNameSet, type SeriesTypeEnum } from '../../series/interface';\nimport type { IThemeColorScheme } from '../../theme/color-scheme/interface';\nimport { isDataView, isHTMLElement } from './common';\nimport { getActualColor, isColorKey } from '../../theme/color-scheme/util';\nimport { normalizeLayoutPaddingSpec } from '../space';\n\n/**\n * 对 spec 或者类 spec 配置（如 theme）进行预处理，如进行语义化颜色的转换等\n * @param type 需要转换的对象类型（spec 或者 theme）\n * @param obj 需要转换的对象\n * @param colorScheme 主题色板\n * @param seriesType 当前系列类型\n * @returns\n */\nexport function preprocessSpecOrTheme(\n  type: 'spec' | 'theme' | 'mark-spec' | 'mark-theme',\n  obj: any,\n  colorScheme?: IThemeColorScheme,\n  seriesType?: SeriesTypeEnum\n): any {\n  if (isNil(obj)) {\n    return obj;\n  }\n  if (isArray(obj)) {\n    return obj.map(element => {\n      if (isObject(element) && !isFunction(element)) {\n        return preprocessSpecOrTheme(type, element, colorScheme, seriesType);\n      }\n      return element;\n    });\n  }\n\n  const newObj = {};\n  Object.keys(obj).forEach(key => {\n    const value = obj[key];\n    // 绕过数据\n    if (key.includes('data')) {\n      newObj[key] = value;\n      return;\n    }\n    if (isObject(value)) {\n      // 绕过不可深拷贝的对象\n      if (isFunction(value) || isDataView(value) || isHTMLElement(value)) {\n        newObj[key] = value;\n        return;\n      }\n      if (isColorKey(value)) {\n        // 查询、替换语义化颜色\n        newObj[key] = getActualColor(value, colorScheme, seriesType);\n      } else {\n        newObj[key] = preprocessSpecOrTheme(\n          seriesMarkNameSet.has(key) ? (type.includes('spec') ? 'mark-spec' : 'mark-theme') : type,\n          value,\n          colorScheme,\n          seriesType\n        );\n      }\n    } else if (!type.includes('mark') && key === 'padding') {\n      // 标准化 padding\n      newObj[key] = normalizeLayoutPaddingSpec(value);\n    } else if (!type.includes('theme') && key === 'lineHeight' && isString(value) && value[value.length - 1] === '%') {\n      if (isValid(obj.fontSize)) {\n        // 处理 lineHeight 的比例值\n        // FIXME: vrender 支持行高字符串后删掉这段逻辑\n        const scale = Number.parseFloat(value.substring(0, value.length - 1)) / 100;\n        const newValue = obj.fontSize * scale;\n        if (isValidNumber(newValue)) {\n          newObj[key] = newValue;\n        }\n      }\n      // 如果 spec 同级里没有 fontSize 配置，lineHeight 比例值失效\n    } else {\n      newObj[key] = value;\n    }\n  });\n\n  return newObj;\n}\n"]}

package/esm/chart/base-chart.d.ts

@@ -11,7 +11,6 @@ import type { IEvent } from '../event/interface';
 import type { DataView } from '@visactor/vdataset';
 import type { DataSet } from '@visactor/vdataset/es/data-set';
 import { Stack } from './stack';
-import type { ITheme } from '../theme/interface';
 import type { IParserOptions } from '@visactor/vdataset/es/parser';
 import type { IBoundsLike } from '@visactor/vutils';
 import type { IRunningConfig as IMorphConfig, IMark as IVGrammarMark, IView } from '@visactor/vgrammar-core';
@@ -25,7 +24,6 @@ export declare class BaseChart extends CompilableBase implements IChart {
     getSpec(): any;
     setSpec(s: any): void;
     getOption(): IChartOption;
-    protected _theme: ITheme;
     protected _regions: IRegion[];
     protected _series: ISeries[];
     protected _components: IComponent[];
@@ -129,11 +127,10 @@ export declare class BaseChart extends CompilableBase implements IChart {
     protected isValidSeries(seriesType: string): boolean;
     protected _getDefaultSeriesSpec(spec: any): any;
     private _updateLayoutRect;
-    getCurrentTheme(): ITheme;
-    setCurrentTheme(theme: ITheme, reInit?: boolean): void;
+    setCurrentTheme(reInit?: boolean): void;
     protected setRegionTheme(reInit?: boolean): void;
-    protected setComponentTheme(theme: ITheme, reInit?: boolean): void;
-    protected setSeriesTheme(theme: ITheme, reInit?: boolean): void;
+    protected setComponentTheme(reInit?: boolean): void;
+    protected setSeriesTheme(reInit?: boolean): void;
     clear(): void;
     compile(): void;
     afterCompile(): void;
@@ -153,4 +150,5 @@ export declare class BaseChart extends CompilableBase implements IChart {
     protected _disableMarkAnimation(states: string | string[]): void;
     protected _setStateInDatum(stateKey: string, checkReverse: boolean, datum: MaybeArray<Datum> | null, filter?: (series: ISeries, mark: IMark) => boolean, region?: IRegionQuerier): void;
     setDimensionIndex(value: StringOrNumber, opt: DimensionIndexOption): void;
+    getColorScheme(): import("../theme/color-scheme/interface").IThemeColorScheme;
 }

package/esm/chart/base-chart.js

@@ -64,6 +64,10 @@ import { isDiscrete } from "@visactor/vscale";
 
 import { updateDataViewInData } from "../data/initialize";
 
+import { getThemeFromOption } from "../theme/util";
+
+import { defaultChartLevelTheme } from "../theme";
+
 export class BaseChart extends CompilableBase {
     getSpec() {
         return this._spec;
@@ -95,7 +99,7 @@ export class BaseChart extends CompilableBase {
         return this._chartData;
     }
     constructor(spec, option) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         super(option), this.type = "chart", this.id = createID(), this._regions = [], this._series = [], 
         this._components = [], this._layoutRect = {
             x: 0,
@@ -138,9 +142,9 @@ export class BaseChart extends CompilableBase {
         this.getComponentByUserId = userId => {
             const component = this._components.find((s => s.userId === userId));
             if (component) return component;
-        }, this._theme = option.getTheme(), this._paddingSpec = normalizeLayoutPaddingSpec(null !== (_a = spec.padding) && void 0 !== _a ? _a : null === (_b = this._theme) || void 0 === _b ? void 0 : _b.padding), 
+        }, this._paddingSpec = normalizeLayoutPaddingSpec(null !== (_a = spec.padding) && void 0 !== _a ? _a : getThemeFromOption("padding", this._option)), 
         this._event = new Event(option.eventDispatcher, option.mode), this._dataSet = option.dataSet, 
-        this._chartData = new ChartData(this._dataSet, null === (_c = this._option) || void 0 === _c ? void 0 : _c.onError), 
+        this._chartData = new ChartData(this._dataSet, null === (_b = this._option) || void 0 === _b ? void 0 : _b.onError), 
         this._modelOption = Object.assign(Object.assign({}, option), {
             mode: this._option.mode,
             map: this._idMap,
@@ -148,7 +152,7 @@ export class BaseChart extends CompilableBase {
             getChartViewRect: () => this._viewRect,
             getChart: () => this,
             globalScale: this._globalScale,
-            onError: null === (_d = this._option) || void 0 === _d ? void 0 : _d.onError
+            onError: null === (_c = this._option) || void 0 === _c ? void 0 : _c.onError
         }), this._stack = new Stack(this), this._spec = spec;
     }
     created() {
@@ -216,7 +220,6 @@ export class BaseChart extends CompilableBase {
                 region: region,
                 specIndex: index,
                 specKey: "series",
-                getTheme: () => this._theme,
                 globalScale: this._globalScale,
                 getSeriesData: this._chartData.getSeriesData.bind(this._chartData),
                 sourceDataList: this._chartData.dataList
@@ -236,7 +239,6 @@ export class BaseChart extends CompilableBase {
             getRegionsInIndex: this.getRegionsInIndex,
             getRegionsInIds: this.getRegionsInIds,
             getRegionsInUserIdOrIndex: this.getRegionsInUserIdOrIndex,
-            getTheme: () => this._theme,
             getAllSeries: this.getAllSeries,
             getSeriesInIndex: this.getSeriesInIndex,
             getSeriesInIds: this.getSeriesInIds,
@@ -297,10 +299,13 @@ export class BaseChart extends CompilableBase {
         if (this._layoutFunc = this._option.layout, !this._layoutFunc) {
             let use3dLayout = !1;
             (this._spec.zField || this._spec.series && this._spec.series.some((s => s.zField))) && (use3dLayout = !0);
-            const layout = new (Factory.getLayoutInKey(null !== (_b = null === (_a = this._spec.layout) || void 0 === _a ? void 0 : _a.type) && void 0 !== _b ? _b : use3dLayout ? "layout3d" : "base"))(this._spec.layout, {
-                onError: null === (_c = this._option) || void 0 === _c ? void 0 : _c.onError
-            });
-            this._layoutFunc = layout.layoutItems.bind(layout);
+            const constructor = Factory.getLayoutInKey(null !== (_b = null === (_a = this._spec.layout) || void 0 === _a ? void 0 : _a.type) && void 0 !== _b ? _b : use3dLayout ? "layout3d" : "base");
+            if (constructor) {
+                const layout = new constructor(this._spec.layout, {
+                    onError: null === (_c = this._option) || void 0 === _c ? void 0 : _c.onError
+                });
+                this._layoutFunc = layout.layoutItems.bind(layout);
+            }
         }
     }
     layout(params) {
@@ -379,9 +384,10 @@ export class BaseChart extends CompilableBase {
         return this._chartData.getSeriesData(id, index);
     }
     _transformSpecScale() {
-        var _a, _b, _c;
+        var _a, _b;
         const scales = null !== (_a = this._spec.scales) && void 0 !== _a ? _a : [];
         let colorScaleSpec = scales.find((s => "color" === s.id));
+        const colorScheme = this.getColorScheme();
         if (!colorScaleSpec && (colorScaleSpec = {
             type: "ordinal",
             id: "color",
@@ -389,21 +395,16 @@ export class BaseChart extends CompilableBase {
             range: null
         }, scales.push(colorScaleSpec), this._spec.color)) {
             const colorSpec = this._spec.color;
-            if (isArray(colorSpec)) colorScaleSpec.range = colorSpec.map((color => {
-                var _a;
-                return getActualColor(color, null === (_a = this._theme) || void 0 === _a ? void 0 : _a.colorScheme);
-            })); else {
+            if (isArray(colorSpec)) colorScaleSpec.range = colorSpec.map((color => getActualColor(color, colorScheme))); else {
                 const tempSpec = colorSpec;
-                tempSpec.range && (tempSpec.range = tempSpec.range.map((color => {
-                    var _a;
-                    return getActualColor(color, null === (_a = this._theme) || void 0 === _a ? void 0 : _a.colorScheme);
-                }))), Object.prototype.hasOwnProperty.call(tempSpec, "type") && (colorScaleSpec.type = tempSpec.type), 
+                tempSpec.range && (tempSpec.range = tempSpec.range.map((color => getActualColor(color, colorScheme)))), 
+                Object.prototype.hasOwnProperty.call(tempSpec, "type") && (colorScaleSpec.type = tempSpec.type), 
                 Object.prototype.hasOwnProperty.call(tempSpec, "domain") && (colorScaleSpec.domain = tempSpec.domain), 
                 Object.prototype.hasOwnProperty.call(tempSpec, "range") && (colorScaleSpec.range = tempSpec.range), 
                 Object.prototype.hasOwnProperty.call(tempSpec, "specified") && (colorScaleSpec.specified = tempSpec.specified);
             }
         }
-        return (null === (_b = colorScaleSpec.range) || void 0 === _b ? void 0 : _b.length) || (colorScaleSpec.range = getDataScheme(null === (_c = this._theme) || void 0 === _c ? void 0 : _c.colorScheme), 
+        return (null === (_b = colorScaleSpec.range) || void 0 === _b ? void 0 : _b.length) || (colorScaleSpec.range = getDataScheme(colorScheme), 
         colorScaleSpec.rangeTheme = !0), scales;
     }
     createGlobalScale() {
@@ -422,10 +423,8 @@ export class BaseChart extends CompilableBase {
         mergeUpdateResult(result, this._globalScale.updateSpec(this._transformSpecScale()));
     }
     updateGlobalScaleTheme() {
-        var _a;
-        const colorSpec = this._globalScale.getScaleSpec("color");
-        colorSpec.rangeTheme && (colorSpec.range = getDataScheme(null === (_a = this._theme) || void 0 === _a ? void 0 : _a.colorScheme), 
-        this._globalScale.getScale("color").range(colorSpec.range));
+        const colorSpec = this._globalScale.getScaleSpec("color"), colorScheme = this.getColorScheme();
+        colorSpec.rangeTheme && (colorSpec.range = getDataScheme(colorScheme), this._globalScale.getScale("color").range(colorSpec.range));
     }
     updateSpec(spec, morphConfig) {
         const result = {
@@ -448,8 +447,8 @@ export class BaseChart extends CompilableBase {
         result.reMake || this.updateGlobalScaleDomain(), result)))));
     }
     updateChartConfig(result, oldSpec) {
-        var _a, _b;
-        this._paddingSpec = normalizeLayoutPaddingSpec(null !== (_a = this._spec.padding) && void 0 !== _a ? _a : null === (_b = this._theme) || void 0 === _b ? void 0 : _b.padding), 
+        var _a;
+        this._paddingSpec = normalizeLayoutPaddingSpec(null !== (_a = this._spec.padding) && void 0 !== _a ? _a : getThemeFromOption("padding", this._option)), 
         this._updateLayoutRect(this._viewBox), isEqual(this._spec.background, oldSpec.background) || (result.reMake = !0);
     }
     updateDataSpec(result) {
@@ -498,7 +497,7 @@ export class BaseChart extends CompilableBase {
             label: spec.label,
             seriesStyle: spec.seriesStyle,
             animation: spec.animation,
-            animationThreshold: null !== (_a = spec.animationThreshold) && void 0 !== _a ? _a : this._theme.animationThreshold,
+            animationThreshold: null !== (_a = spec.animationThreshold) && void 0 !== _a ? _a : getThemeFromOption("animationThreshold", this._option),
             animationAppear: spec.animationAppear,
             animationDisappear: spec.animationDisappear,
             animationEnter: spec.animationEnter,
@@ -535,26 +534,23 @@ export class BaseChart extends CompilableBase {
         this._layoutRect.height = viewRect.height - this.padding.top - this.padding.bottom, 
         this._layoutRect.x = this.padding.left, this._layoutRect.y = this.padding.top, this._event.emit(ChartEvent.layoutRectUpdate, {});
     }
-    getCurrentTheme() {
-        return this._theme;
-    }
-    setCurrentTheme(theme, reInit = !0) {
-        this._theme = theme, this.setLayoutTag(!0), this.transformSpec(this._spec), this.updateGlobalScaleTheme(), 
-        this.setRegionTheme(reInit), this.setComponentTheme(theme, reInit), this.setSeriesTheme(theme, reInit);
+    setCurrentTheme(reInit = !0) {
+        this.setLayoutTag(!0), this.transformSpec(this._spec), this.updateGlobalScaleTheme(), 
+        this.setRegionTheme(reInit), this.setComponentTheme(reInit), this.setSeriesTheme(reInit);
     }
     setRegionTheme(reInit = !0) {
-        this._regions.forEach((r => {
-            reInit ? r.reInit() : r.setTheme();
-        }));
+        this._regions.forEach((r => __awaiter(this, void 0, void 0, (function*() {
+            yield r.setCurrentTheme(reInit);
+        }))));
     }
-    setComponentTheme(theme, reInit = !0) {
-        this._components.forEach((c => {
-            reInit ? c.setCurrentTheme(theme.component[c.type], !0) : c.setTheme(theme.component[c.type]);
-        }));
+    setComponentTheme(reInit = !0) {
+        this._components.forEach((c => __awaiter(this, void 0, void 0, (function*() {
+            yield c.setCurrentTheme(reInit);
+        }))));
     }
-    setSeriesTheme(theme, reInit = !0) {
+    setSeriesTheme(reInit = !0) {
         this._series.forEach((s => __awaiter(this, void 0, void 0, (function*() {
-            reInit ? yield s.setCurrentTheme(theme.series[s.type], !0) : s.setTheme(theme.series[s.type]);
+            yield s.setCurrentTheme(reInit);
         }))));
     }
     clear() {
@@ -745,5 +741,9 @@ export class BaseChart extends CompilableBase {
             })));
         }
     }
+    getColorScheme() {
+        var _a, _b, _c;
+        return (null !== (_c = null === (_b = (_a = this._option).getThemeConfig) || void 0 === _b ? void 0 : _b.call(_a).chartLevelTheme) && void 0 !== _c ? _c : defaultChartLevelTheme).colorScheme;
+    }
 }
 //# sourceMappingURL=base-chart.js.map