@visactor/vchart 1.6.7 → 1.7.0-alpha.1

package/cjs/animation/utils.d.ts

@@ -9,9 +9,9 @@ export declare const AnimationStates: string[];
 export declare function animationConfig<Preset extends string>(defaultConfig?: MarkAnimationSpec, userConfig?: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>, params?: {
     dataIndex: (datum: any) => number;
 }): MarkAnimationSpec;
-export declare function userAnimationConfig<M extends string, Preset extends string>(markName: SeriesMarkNameEnum | string, spec: IAnimationSpec<M, Preset>, ctx: ISeriesMarkAttributeContext): Partial<Record<"none" | "state" | "normal" | "update" | "appear" | "enter" | "exit" | "disappear", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<string>>>;
+export declare function userAnimationConfig<M extends string, Preset extends string>(markName: SeriesMarkNameEnum | string, spec: IAnimationSpec<M, Preset>, ctx: ISeriesMarkAttributeContext): Partial<Record<"none" | "normal" | "state" | "update" | "appear" | "enter" | "exit" | "disappear", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<string>>>;
 export declare function shouldMarkDoMorph(spec: ISeriesSpec & IAnimationSpec<string, string>, markName: string): boolean;
 export declare function isTimeLineAnimation(animationConfig: IAnimationConfig): boolean;
 export declare function isChannelAnimation(animationConfig: IAnimationConfig): boolean;
-export declare function uniformAnimationConfig<Preset extends string>(config: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>, ctx: ISeriesMarkAttributeContext): Partial<Record<"none" | "state" | "normal" | "update" | "appear" | "enter" | "exit" | "disappear", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<Preset>>>;
+export declare function uniformAnimationConfig<Preset extends string>(config: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>, ctx: ISeriesMarkAttributeContext): Partial<Record<"none" | "normal" | "state" | "update" | "appear" | "enter" | "exit" | "disappear", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<Preset>>>;
 export declare function isAnimationEnabledForSeries(series: ISeries): boolean;

package/cjs/chart/area/area.js

@@ -23,7 +23,8 @@ class AreaChart extends cartesian_1.CartesianChart {
             samplingFactor: spec.samplingFactor,
             pointDis: spec.pointDis,
             pointDisMul: spec.pointDisMul,
-            markOverlap: spec.markOverlap
+            markOverlap: spec.markOverlap,
+            areaLabel: spec.areaLabel
         });
     }
     transformSpec(spec) {

package/cjs/chart/area/area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/chart/area/area.ts"],"names":[],"mappings":";;;AAAA,iDAA4D;AAC5D,sDAA6D;AAC7D,sDAAwD;AACxD,4CAAkD;AAElD,kCAA+D;AAC/D,gDAA6C;AAE7C,MAAa,SAAU,SAAQ,0BAAc;IAA7C;;QAGW,SAAI,GAAW,oBAAa,CAAC,IAAI,CAAC;QAClC,eAAU,GAAW,qBAAc,CAAC,IAAI,CAAC;QACxC,cAAS,GAAY,IAAI,CAAC;IAsBtC,CAAC;IApBW,qBAAqB,CAAC,IAAoB;;QAClD,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,UAAU,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,MAAM,EACrC,WAAW,EAAE,IAAI,CAAC,WAAW,EAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,cAAc,EAAE,IAAI,CAAC,cAAc,EACnC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,WAAW,EAAE,IAAI,CAAC,WAAW,EAC7B,WAAW,EAAE,IAAI,CAAC,WAAW,IAC7B;IACJ,CAAC;IAED,aAAa,CAAC,IAAS;QACrB,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAA,2CAAoC,EAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;;AA1BH,8BA2BC;AA1BiB,cAAI,GAAW,oBAAa,CAAC,IAAI,CAAC;AAClC,cAAI,GAAW,eAAe,CAAC;AA2B1C,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,IAAA,yBAAkB,GAAE,CAAC;IACrB,iBAAO,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AACnD,CAAC,CAAC;AAHW,QAAA,iBAAiB,qBAG5B","file":"area.js","sourcesContent":["import { registerAreaSeries } from '../../series/area/area';\nimport { SeriesTypeEnum } from '../../series/interface/type';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface/type';\nimport type { IAreaChartSpec } from './interface';\nimport { setDefaultCrosshairForCartesianChart } from '../util';\nimport { Factory } from '../../core/factory';\n\nexport class AreaChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.area;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.area;\n  readonly seriesType: string = SeriesTypeEnum.area;\n  protected _canStack: boolean = true;\n\n  protected _getDefaultSeriesSpec(spec: IAreaChartSpec): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      point: spec.point,\n      line: spec.line,\n      area: spec.area,\n      seriesMark: spec.seriesMark ?? 'area',\n      activePoint: spec.activePoint,\n      sampling: spec.sampling,\n      samplingFactor: spec.samplingFactor,\n      pointDis: spec.pointDis,\n      pointDisMul: spec.pointDisMul,\n      markOverlap: spec.markOverlap\n    };\n  }\n\n  transformSpec(spec: any): void {\n    super.transformSpec(spec);\n    setDefaultCrosshairForCartesianChart(spec);\n  }\n}\n\nexport const registerAreaChart = () => {\n  registerAreaSeries();\n  Factory.registerChart(AreaChart.type, AreaChart);\n};\n"]}
+{"version":3,"sources":["../src/chart/area/area.ts"],"names":[],"mappings":";;;AAAA,iDAA4D;AAC5D,sDAA6D;AAC7D,sDAAwD;AACxD,4CAAkD;AAElD,kCAA+D;AAC/D,gDAA6C;AAE7C,MAAa,SAAU,SAAQ,0BAAc;IAA7C;;QAGW,SAAI,GAAW,oBAAa,CAAC,IAAI,CAAC;QAClC,eAAU,GAAW,qBAAc,CAAC,IAAI,CAAC;QACxC,cAAS,GAAY,IAAI,CAAC;IAuBtC,CAAC;IArBW,qBAAqB,CAAC,IAAoB;;QAClD,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,UAAU,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,MAAM,EACrC,WAAW,EAAE,IAAI,CAAC,WAAW,EAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,cAAc,EAAE,IAAI,CAAC,cAAc,EACnC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,WAAW,EAAE,IAAI,CAAC,WAAW,EAC7B,WAAW,EAAE,IAAI,CAAC,WAAW,EAC7B,SAAS,EAAE,IAAI,CAAC,SAAS,IACzB;IACJ,CAAC;IAED,aAAa,CAAC,IAAS;QACrB,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAA,2CAAoC,EAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;;AA3BH,8BA4BC;AA3BiB,cAAI,GAAW,oBAAa,CAAC,IAAI,CAAC;AAClC,cAAI,GAAW,eAAe,CAAC;AA4B1C,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,IAAA,yBAAkB,GAAE,CAAC;IACrB,iBAAO,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AACnD,CAAC,CAAC;AAHW,QAAA,iBAAiB,qBAG5B","file":"area.js","sourcesContent":["import { registerAreaSeries } from '../../series/area/area';\nimport { SeriesTypeEnum } from '../../series/interface/type';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface/type';\nimport type { IAreaChartSpec } from './interface';\nimport { setDefaultCrosshairForCartesianChart } from '../util';\nimport { Factory } from '../../core/factory';\n\nexport class AreaChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.area;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.area;\n  readonly seriesType: string = SeriesTypeEnum.area;\n  protected _canStack: boolean = true;\n\n  protected _getDefaultSeriesSpec(spec: IAreaChartSpec): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      point: spec.point,\n      line: spec.line,\n      area: spec.area,\n      seriesMark: spec.seriesMark ?? 'area',\n      activePoint: spec.activePoint,\n      sampling: spec.sampling,\n      samplingFactor: spec.samplingFactor,\n      pointDis: spec.pointDis,\n      pointDisMul: spec.pointDisMul,\n      markOverlap: spec.markOverlap,\n      areaLabel: spec.areaLabel\n    };\n  }\n\n  transformSpec(spec: any): void {\n    super.transformSpec(spec);\n    setDefaultCrosshairForCartesianChart(spec);\n  }\n}\n\nexport const registerAreaChart = () => {\n  registerAreaSeries();\n  Factory.registerChart(AreaChart.type, AreaChart);\n};\n"]}

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

@@ -1,7 +1,7 @@
 import { ChartData } from './chart-meta/data';
-import type { ISeriesSpec, Datum, IMarkStateSpec, IRegionQuerier, MaybeArray, IPadding, IRect, StringOrNumber, IChartSpec, IDataValues } from '../typings';
-import type { LayoutCallBack } from '../layout/interface';
-import type { ILayoutModelState, ILayoutOrientPadding, ILayoutRect, IModel, IModelOption, IUpdateSpecResult } from '../model/interface';
+import type { ISeriesSpec, Datum, IMarkStateSpec, IRegionQuerier, MaybeArray, IPadding, IRect, StringOrNumber, IChartSpec, IDataValues, ILayoutRect, ILayoutOrientPadding } from '../typings';
+import type { ILayoutItem, LayoutCallBack } from '../layout/interface';
+import type { ILayoutModelState, IModel, IModelOption, IUpdateSpecResult } from '../model/interface';
 import type { IChart, IChartLayoutOption, IChartRenderOption, IChartOption, IChartEvaluateOption, ILayoutParams, DimensionIndexOption } from './interface';
 import type { ISeries } from '../series/interface';
 import type { IRegion } from '../region/interface';
@@ -55,34 +55,31 @@ export declare class BaseChart extends CompilableBase implements IChart {
     constructor(spec: any, option: IChartOption);
     created(): void;
     transformSpec(spec: any): void;
-    init(options?: any): void;
+    init(): void;
     reDataFlow(): void;
     onResize(width: number, height: number): void;
     updateViewBox(viewBox: IBoundsLike, reLayout: boolean): void;
-    createBackground(bg: IChartSpec['background']): void;
-    createRegion(regionSpec: any[]): void;
-    initRegion(): void;
-    createSeries(seriesSpec: ISeriesSpec[]): void;
-    initSeries(): void;
+    private _createBackground;
+    private _createRegion;
+    protected _createSeries(seriesSpec: ISeriesSpec[]): void;
     getAllSeries: () => ISeries[];
     getSeriesById(id: number): ISeries | undefined;
     private _createComponent;
-    createComponent(spec: any): void;
-    initComponent(): void;
+    private _createComponents;
     getAllComponents(): IComponent[];
     getAllModels(): IModel[];
     getModelInFilter(filter: string | {
         type: string;
         index: number;
     } | ((model: IModel) => boolean)): IModel;
-    createLayout(): void;
+    private _createLayout;
     setLayout(layout: LayoutCallBack): void;
     private _initLayoutFunc;
     layout(params: ILayoutParams): void;
     onLayoutStart(option: IChartLayoutOption): void;
     onLayoutEnd(option: IChartLayoutOption): void;
     onEvaluateEnd(option: IChartEvaluateOption): void;
-    getLayoutElements(): (IComponent | IRegion | ISeries)[];
+    getLayoutElements(): ILayoutItem[];
     getRegionsInIndex: (index?: number[]) => IRegion[];
     getAllRegions: () => IRegion[];
     getRegionsInIds: (ids: number[]) => IRegion[];
@@ -108,7 +105,7 @@ export declare class BaseChart extends CompilableBase implements IChart {
     getCanvasRect(): Omit<IRect, 'x' | 'y'>;
     getSeriesData(id: StringOrNumber | undefined, index: number | undefined): DataView | undefined;
     private _transformSpecScale;
-    createGlobalScale(): void;
+    private _createGlobalScale;
     updateGlobalScaleDomain(): void;
     updateGlobalScale(result: IUpdateSpecResult): void;
     updateGlobalScaleTheme(): void;
@@ -145,10 +142,10 @@ export declare class BaseChart extends CompilableBase implements IChart {
     updateState(state: Record<string, Omit<IMarkStateSpec<unknown>, 'style'>>, filter?: (series: ISeries, mark: IMark, stateKey: string) => boolean): void;
     setSelected(datum: MaybeArray<any> | null, filter?: (series: ISeries, mark: IMark) => boolean, region?: IRegionQuerier): void;
     setHovered(datum: MaybeArray<Datum> | null, filter?: (series: ISeries, mark: IMark) => boolean, region?: IRegionQuerier): void;
-    initEvent(): void;
+    private _initEvent;
     protected _enableMarkAnimation(states: string | string[]): void;
     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").IThemeColorScheme;
+    getColorScheme(): import("..").IThemeColorScheme;
 }

package/cjs/chart/base-chart.js

@@ -30,7 +30,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseChart = void 0;
 
-const data_1 = require("./chart-meta/data"), global_scale_1 = require("../scale/global-scale"), interface_1 = require("../component/interface"), interface_2 = require("../mark/interface"), factory_1 = require("../core/factory"), event_1 = require("../event/event"), util_1 = require("../util"), stack_1 = require("./stack"), base_model_1 = require("../model/base-model"), base_mark_1 = require("../mark/base/base-mark"), base_1 = require("../constant/base"), vutils_1 = require("@visactor/vutils"), util_2 = require("../theme/color-scheme/util"), compilable_base_1 = require("../compile/compilable-base"), interface_3 = require("../compile/mark/interface"), constant_1 = require("../constant"), dimension_1 = require("../event/events/dimension"), util_3 = require("./util"), vscale_1 = require("@visactor/vscale"), initialize_1 = require("../data/initialize"), util_4 = require("../theme/util"), theme_1 = require("../theme");
+const data_1 = require("./chart-meta/data"), global_scale_1 = require("../scale/global-scale"), interface_1 = require("../component/interface"), interface_2 = require("../mark/interface"), factory_1 = require("../core/factory"), event_1 = require("../event/event"), util_1 = require("../util"), stack_1 = require("./stack"), base_model_1 = require("../model/base-model"), base_mark_1 = require("../mark/base/base-mark"), base_1 = require("../constant/base"), vutils_1 = require("@visactor/vutils"), util_2 = require("../theme/color-scheme/util"), compilable_base_1 = require("../compile/compilable-base"), interface_3 = require("../compile/mark/interface"), constant_1 = require("../constant"), dimension_1 = require("../event/events/dimension"), util_3 = require("./util"), vscale_1 = require("@visactor/vscale"), initialize_1 = require("../data/initialize");
 
 class BaseChart extends compilable_base_1.CompilableBase {
     getSpec() {
@@ -101,15 +101,20 @@ class BaseChart extends compilable_base_1.CompilableBase {
             if (userId) return this._series.find((r => r.userId === userId));
         }, this.getSeriesInUserIdOrIndex = (user_ids, index) => this.getAllSeries().filter((s => (null == user_ids ? void 0 : user_ids.length) ? s.userId && user_ids.includes(s.userId) : !(null == index ? void 0 : index.length) || index.includes(s.getSpecIndex()))), 
         this.getComponentByIndex = (key, index) => {
-            const components = this._components.filter((c => c.specKey === key));
+            const components = this._components.filter((c => {
+                var _a;
+                return (null !== (_a = c.specKey) && void 0 !== _a ? _a : c.type) === key;
+            }));
             if (components && 0 !== components.length) return components[index];
-        }, this.getComponentsByKey = key => this._components.filter((c => c.specKey === key)), 
-        this.getComponentByUserId = userId => {
+        }, this.getComponentsByKey = key => this._components.filter((c => {
+            var _a;
+            return (null !== (_a = c.specKey) && void 0 !== _a ? _a : c.type) === key;
+        })), this.getComponentByUserId = userId => {
             const component = this._components.find((s => s.userId === userId));
             if (component) return component;
-        }, this._paddingSpec = (0, util_1.normalizeLayoutPaddingSpec)(null !== (_a = spec.padding) && void 0 !== _a ? _a : (0, 
-        util_4.getThemeFromOption)("padding", this._option)), this._event = new event_1.Event(option.eventDispatcher, option.mode), 
-        this._dataSet = option.dataSet, this._chartData = new data_1.ChartData(this._dataSet, null === (_b = this._option) || void 0 === _b ? void 0 : _b.onError), 
+        }, this._paddingSpec = (0, util_1.normalizeLayoutPaddingSpec)(null !== (_a = spec.padding) && void 0 !== _a ? _a : option.getTheme().padding), 
+        this._event = new event_1.Event(option.eventDispatcher, option.mode), this._dataSet = option.dataSet, 
+        this._chartData = new data_1.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,
@@ -121,16 +126,20 @@ class BaseChart extends compilable_base_1.CompilableBase {
         }), this._spec = spec;
     }
     created() {
-        this.transformSpec(this._spec), this._chartData.parseData(this._spec.data), this.createGlobalScale(), 
-        this.createBackground(this._spec.background), this.createLayout(), this.createRegion(this._spec.region), 
-        this.createSeries(this._spec.series), this.createComponent(this._spec);
+        this.transformSpec(this._spec), this._chartData.parseData(this._spec.data), this._createGlobalScale(), 
+        this._spec.background && "object" == typeof this._spec.background && this._createBackground(), 
+        this._createLayout(), this._spec.region && this._spec.region.length && this._createRegion(), 
+        this._createSeries(this._spec.series), this._createComponents(this._spec);
     }
     transformSpec(spec) {
         spec.region && 0 !== spec.region.length || (spec.region = [ {} ]), (0, vutils_1.has)(spec, "tooltip") || (spec.tooltip = {}), 
         (0, util_1.isValid)(spec.stackInverse) && spec.region.forEach((r => !(0, util_1.isValid)(r.stackInverse) && (r.stackInverse = spec.stackInverse)));
     }
-    init(options = {}) {
-        this.initRegion(), this.initSeries(), this.initComponent(), this.initEvent(), this._canStack && (this._stack = new stack_1.Stack(this), 
+    init() {
+        this._regions.forEach((r => r.init({}))), this._series.forEach((s => s.init({}))), 
+        this._components.forEach((c => c.init({
+            dataSet: this._dataSet
+        }))), this._initEvent(), this._canStack && (this._stack = new stack_1.Stack(this), 
         this._stack.init()), this.reDataFlow();
     }
     reDataFlow() {
@@ -149,33 +158,29 @@ class BaseChart extends compilable_base_1.CompilableBase {
     updateViewBox(viewBox, reLayout) {
         this._option.viewBox = viewBox, this._updateLayoutRect(viewBox), this.setLayoutTag(!0, null, reLayout);
     }
-    createBackground(bg) {
-        bg && "object" == typeof bg && (this._backgroundMark = factory_1.Factory.createMark(interface_2.MarkTypeEnum.group, "chart-background", {
+    _createBackground() {
+        const backgroundStyle = (0, util_1.convertBackgroundSpec)(this._spec.background);
+        backgroundStyle && (this._backgroundMark = factory_1.Factory.createMark(interface_2.MarkTypeEnum.group, "chart-background", {
             model: this,
             map: this._option.map,
             getCompiler: this.getCompiler,
             globalScale: this._globalScale
-        }), this._backgroundMark.created(), this._backgroundMark.setStyle((0, util_1.convertBackgroundSpec)(bg)), 
-        this._backgroundMark.setStyle({
+        }), this._backgroundMark.created(), this._backgroundMark.setStyle(Object.assign(Object.assign({}, backgroundStyle), {
             x: () => this._viewBox.x1,
             y: () => this._viewBox.y1,
             width: () => this._viewBox.x2 - this._viewBox.x1,
             height: () => this._viewBox.y2 - this._viewBox.y1
-        }));
+        })));
     }
-    createRegion(regionSpec) {
-        regionSpec && regionSpec.forEach(((s, i) => {
+    _createRegion() {
+        this._spec.region.forEach(((s, i) => {
             const region = factory_1.Factory.createRegion("region", s, Object.assign(Object.assign({}, this._modelOption), {
-                specIndex: i,
-                specKey: "region"
+                specIndex: i
             }));
             region && (region.created(), this._regions.push(region));
         }));
     }
-    initRegion() {
-        this._regions.forEach((r => r.init({})));
-    }
-    createSeries(seriesSpec) {
+    _createSeries(seriesSpec) {
         seriesSpec.forEach(((spec, index) => {
             let region;
             if (spec.data || (spec.data = this._chartData.getSeriesData(spec.dataId, spec.dataIndex)), 
@@ -185,7 +190,6 @@ class BaseChart extends compilable_base_1.CompilableBase {
             const series = factory_1.Factory.createSeries(spec.type, spec, Object.assign(Object.assign({}, this._modelOption), {
                 region: region,
                 specIndex: index,
-                specKey: "series",
                 globalScale: this._globalScale,
                 getSeriesData: this._chartData.getSeriesData.bind(this._chartData),
                 sourceDataList: this._chartData.dataList
@@ -193,9 +197,6 @@ class BaseChart extends compilable_base_1.CompilableBase {
             series && (series.created(), this._series.push(series), region.addSeries(series));
         }));
     }
-    initSeries() {
-        this._series.forEach((s => s.init({})));
-    }
     getSeriesById(id) {
         return this._series.find((x => x.id === id));
     }
@@ -214,28 +215,27 @@ class BaseChart extends compilable_base_1.CompilableBase {
             getComponentByUserId: this.getComponentByUserId,
             getComponentsByKey: this.getComponentsByKey
         }));
-        component && (0, util_1.array)(component).forEach((c => {
+        if (!component) return !1;
+        const components = (0, util_1.isArray)(component) ? component : [ component ];
+        return !!components.length && (components.forEach((c => {
             c.created(), this._components.push(c);
-        }));
+        })), !0);
     }
-    createComponent(spec) {
+    _createComponents(spec) {
+        var _a;
         const components = factory_1.Factory.getComponents();
-        let cartesianAxis, polarAxis;
+        let cartesianAxis, polarAxis, geoCoordinate;
         const noAxisComponents = [];
         for (let index = 0; index < components.length; index++) {
-            const component = components[index];
-            component.type.startsWith(interface_1.ComponentTypeEnum.cartesianAxis) ? cartesianAxis = component : component.type.startsWith(interface_1.ComponentTypeEnum.polarAxis) ? polarAxis = component : noAxisComponents.push(component);
+            const {cmp: cmp, alwaysCheck: alwaysCheck} = components[index];
+            cmp.type.startsWith(interface_1.ComponentTypeEnum.cartesianAxis) ? cartesianAxis = cmp : cmp.type.startsWith(interface_1.ComponentTypeEnum.polarAxis) ? polarAxis = cmp : cmp.type === interface_1.ComponentTypeEnum.geoCoordinate ? geoCoordinate = cmp : (alwaysCheck || spec[null !== (_a = cmp.specKey) && void 0 !== _a ? _a : cmp.type]) && noAxisComponents.push(cmp);
         }
-        cartesianAxis && this._createComponent(cartesianAxis, spec), polarAxis && this._createComponent(polarAxis, spec), 
-        noAxisComponents.forEach((C => {
+        let hasInitAxis = !1;
+        cartesianAxis && (hasInitAxis = this._createComponent(cartesianAxis, spec)), polarAxis && !hasInitAxis && (hasInitAxis = this._createComponent(polarAxis, spec)), 
+        geoCoordinate && !hasInitAxis && this._createComponent(geoCoordinate, spec), noAxisComponents.forEach((C => {
             this._createComponent(C, spec);
         }));
     }
-    initComponent() {
-        this._components.forEach((c => c.init({
-            dataSet: this._dataSet
-        })));
-    }
     getAllComponents() {
         return this._components;
     }
@@ -247,14 +247,15 @@ class BaseChart extends compilable_base_1.CompilableBase {
         if ((0, vutils_1.isFunction)(filter)) return this.getAllModels().find((m => filter(m)));
         let index = 0;
         return this.getAllModels().find((m => {
-            if (m.specKey === filter.type) {
+            var _a;
+            if ((null !== (_a = m.specKey) && void 0 !== _a ? _a : m.type) === filter.type) {
                 if (index === filter.index) return !0;
                 index++;
             }
             return !1;
         }));
     }
-    createLayout() {
+    _createLayout() {
         this._updateLayoutRect(this._option.viewBox), this._initLayoutFunc();
     }
     setLayout(layout) {
@@ -291,16 +292,16 @@ class BaseChart extends compilable_base_1.CompilableBase {
         null === (_d = null === (_c = this._option.performanceHook) || void 0 === _c ? void 0 : _c.afterLayoutWithSceneGraph) || void 0 === _d || _d.call(_c);
     }
     onLayoutStart(option) {
-        this.getLayoutElements().forEach((element => element.onLayoutStart(this._layoutRect, this._viewRect, option)));
+        this.getAllModels().forEach((element => element.onLayoutStart(this._layoutRect, this._viewRect, option)));
     }
     onLayoutEnd(option) {
-        this.getLayoutElements().forEach((element => element.onLayoutEnd(option)));
+        this.getAllModels().forEach((element => element.onLayoutEnd(option)));
     }
     onEvaluateEnd(option) {
-        this.getLayoutElements().forEach((element => element.onEvaluateEnd(option)));
+        [ ...this._components, ...this._regions, ...this._series ].forEach((element => element.onEvaluateEnd(option)));
     }
     getLayoutElements() {
-        return [ ...this._components, ...this._regions, ...this._series ];
+        return this.getAllModels().map((i => i.layout)).filter((i => !!i));
     }
     getModelById(id) {
         const model = this._idMap.get(id);
@@ -361,10 +362,8 @@ class BaseChart extends compilable_base_1.CompilableBase {
             range: null
         }, scales.push(colorScaleSpec), this._spec.color)) {
             const colorSpec = this._spec.color;
-            if ((0, util_1.isArray)(colorSpec)) colorScaleSpec.range = colorSpec.map((color => (0, 
-            util_2.getActualColor)(color, colorScheme))); else {
+            if ((0, util_1.isArray)(colorSpec)) colorScaleSpec.range = colorSpec; else {
                 const tempSpec = colorSpec;
-                tempSpec.range && (tempSpec.range = tempSpec.range.map((color => (0, util_2.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), 
@@ -374,7 +373,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
         return (null === (_b = colorScaleSpec.range) || void 0 === _b ? void 0 : _b.length) || (colorScaleSpec.range = (0, 
         util_2.getDataScheme)(colorScheme), colorScaleSpec.rangeTheme = !0), scales;
     }
-    createGlobalScale() {
+    _createGlobalScale() {
         this._globalScale = new global_scale_1.GlobalScale(this._transformSpecScale(), this), 
         this._modelOption.globalScale = this._globalScale;
     }
@@ -416,10 +415,9 @@ class BaseChart extends compilable_base_1.CompilableBase {
         result.reMake || this.updateGlobalScaleDomain(), result)))));
     }
     updateChartConfig(result, oldSpec) {
-        var _a;
-        this._paddingSpec = (0, util_1.normalizeLayoutPaddingSpec)(null !== (_a = this._spec.padding) && void 0 !== _a ? _a : (0, 
-        util_4.getThemeFromOption)("padding", this._option)), this._updateLayoutRect(this._viewBox), 
-        (0, vutils_1.isEqual)(this._spec.background, oldSpec.background) || (result.reMake = !0);
+        var _a, _b;
+        this._paddingSpec = (0, util_1.normalizeLayoutPaddingSpec)(null !== (_a = this._spec.padding) && void 0 !== _a ? _a : null === (_b = this._option) || void 0 === _b ? void 0 : _b.getTheme().padding), 
+        this._updateLayoutRect(this._viewBox), (0, vutils_1.isEqual)(this._spec.background, oldSpec.background) || (result.reMake = !0);
     }
     updateDataSpec(result) {
         this._spec.data && this._chartData.updateData(this._spec.data, !1, !0);
@@ -433,12 +431,12 @@ class BaseChart extends compilable_base_1.CompilableBase {
     updateComponentSpec(result) {
         const componentCache = {};
         this._components.forEach((c => {
-            var _a;
-            const cmpSpec = null !== (_a = this._spec[c.specKey]) && void 0 !== _a ? _a : {};
-            (0, util_1.isArray)(cmpSpec) ? (componentCache[c.specKey] = componentCache[c.specKey] || {
+            var _a, _b;
+            const compSpecKey = null !== (_a = c.specKey) && void 0 !== _a ? _a : c.type, cmpSpec = null !== (_b = this._spec[compSpecKey]) && void 0 !== _b ? _b : {};
+            (0, util_1.isArray)(cmpSpec) ? (componentCache[compSpecKey] = componentCache[compSpecKey] || {
                 specCount: cmpSpec.length,
                 componentCount: 0
-            }, componentCache[c.specKey].componentCount++, (0, util_3.mergeUpdateResult)(result, c.updateSpec(cmpSpec[c.getSpecIndex()], cmpSpec))) : (0, 
+            }, componentCache[compSpecKey].componentCount++, (0, util_3.mergeUpdateResult)(result, c.updateSpec(cmpSpec[c.getSpecIndex()], cmpSpec))) : (0, 
             util_3.mergeUpdateResult)(result, c.updateSpec(cmpSpec));
         }));
         for (const key in componentCache) if (Object.prototype.hasOwnProperty.call(componentCache, key)) {
@@ -460,7 +458,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
         return !0;
     }
     _getDefaultSeriesSpec(spec) {
-        var _a;
+        var _a, _b;
         return {
             dataKey: spec.dataKey,
             hover: spec.hover,
@@ -468,8 +466,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
             label: spec.label,
             seriesStyle: spec.seriesStyle,
             animation: spec.animation,
-            animationThreshold: null !== (_a = spec.animationThreshold) && void 0 !== _a ? _a : (0, 
-            util_4.getThemeFromOption)("animationThreshold", this._option),
+            animationThreshold: null !== (_a = spec.animationThreshold) && void 0 !== _a ? _a : null === (_b = this._option) || void 0 === _b ? void 0 : _b.getTheme().animationThreshold,
             animationAppear: spec.animationAppear,
             animationDisappear: spec.animationDisappear,
             animationEnter: spec.animationEnter,
@@ -507,7 +504,10 @@ class BaseChart extends compilable_base_1.CompilableBase {
         this._layoutRect.x = this.padding.left, this._layoutRect.y = this.padding.top, this._event.emit(constant_1.ChartEvent.layoutRectUpdate, {});
     }
     setCurrentTheme(reInit = !0) {
-        this.setLayoutTag(!0), this.transformSpec(this._spec), this.updateGlobalScaleTheme(), 
+        this.updateChartConfig({
+            change: !0,
+            reMake: !1
+        }, this._spec), this.setLayoutTag(!0), this.transformSpec(this._spec), this.updateGlobalScaleTheme(), 
         this.setRegionTheme(reInit), this.setComponentTheme(reInit), this.setSeriesTheme(reInit);
     }
     setRegionTheme(reInit = !0) {
@@ -526,7 +526,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
         }))));
     }
     clear() {
-        this.getLayoutElements().forEach((i => {
+        this.getAllModels().forEach((i => {
             var _a;
             return null === (_a = i.clear) || void 0 === _a ? void 0 : _a.call(i);
         }));
@@ -620,7 +620,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
     setHovered(datum, filter, region) {
         this._setStateInDatum(interface_3.STATE_VALUE_ENUM.STATE_HOVER, !0, datum, filter, region);
     }
-    initEvent() {
+    _initEvent() {
         [ constant_1.ChartEvent.dataZoomChange, constant_1.ChartEvent.scrollBarChange ].forEach((event => {
             this._event.on(event, (({value: value}) => {
                 if (!value.filterData) return;
@@ -708,8 +708,8 @@ class BaseChart extends compilable_base_1.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 : theme_1.defaultChartLevelTheme).colorScheme;
+        var _a, _b;
+        return null === (_b = (_a = this._option).getTheme) || void 0 === _b ? void 0 : _b.call(_a).colorScheme;
     }
 }