@visactor/vchart 1.11.0-alpha.2 → 1.11.0-alpha.3

package/cjs/core/vchart.d.ts

@@ -6,8 +6,7 @@ import type { ISeriesConstructor } from '../series/interface';
 import type { DimensionIndexOption, IChart, IChartConstructor, IChartOption, IChartSpecInfo } from '../chart/interface';
 import type { IComponentConstructor } from '../component/interface';
 import type { EventCallback, EventParams, EventQuery, EventType } from '../event/interface';
-import type { IParserOptions } from '@visactor/vdataset';
-import type { Transform, DataView } from '@visactor/vdataset';
+import type { IParserOptions, Transform, DataView } from '@visactor/vdataset';
 import { DataSet } from '@visactor/vdataset';
 import type { Stage } from '@visactor/vrender-core';
 import type { GeoSourceType } from '../typings/geo';
@@ -169,6 +168,7 @@ export declare class VChart implements IVChart {
     getCanvas(): HTMLCanvasElement | undefined;
     getContainer(): Maybe<HTMLElement>;
     getComponents(): import("../component/interface").IComponent[];
+    getScale(scaleId: string): import("@visactor/vscale").IBaseScale;
     setDimensionIndex(value: StringOrNumber, opt?: DimensionIndexOption): void;
     stopAnimation(): void;
     pauseAnimation(): void;

package/cjs/core/vchart.js

@@ -38,7 +38,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerVChartCore = exports.VChart = void 0;
 
-const array_1 = require("../data/parser/array"), common_1 = require("../typings/spec/common"), type_1 = require("../component/interface/type"), vdataset_1 = require("@visactor/vdataset"), vrender_core_1 = require("@visactor/vrender-core"), util_1 = require("../util"), id_1 = require("../util/id"), space_1 = require("../util/space"), env_1 = require("../util/env"), debug_1 = require("../util/debug"), merge_spec_1 = require("../util/spec/merge-spec"), transform_1 = require("../util/spec/transform"), common_2 = require("../util/theme/common"), factory_1 = require("./factory"), event_1 = require("../event/event"), event_dispatcher_1 = require("../event/event-dispatcher"), geo_source_1 = require("../series/map/geo-source"), register_1 = require("../data/register"), initialize_1 = require("../data/initialize"), stack_split_1 = require("../data/transforms/stack-split"), copy_data_view_1 = require("../data/transforms/copy-data-view"), interface_1 = require("../animation/interface"), theme_manager_1 = require("../theme/theme-manager"), compiler_1 = require("../compile/compiler"), image_1 = require("../util/image"), constant_1 = require("../constant"), vutils_1 = require("@visactor/vutils"), instance_manager_1 = require("./instance-manager"), vrender_components_1 = require("@visactor/vrender-components"), util_2 = require("../chart/util"), region_1 = require("../region/region"), base_layout_1 = require("../layout/base-layout"), group_1 = require("../mark/group"), config_1 = require("../animation/config"), vgrammar_core_1 = require("@visactor/vgrammar-core"), util_3 = require("./util"), expression_function_1 = require("./expression-function"), env_2 = require("../env"), spec_1 = require("../util/spec"), builtin_1 = require("../theme/builtin"), plugin_service_1 = require("../plugin/chart/plugin-service"), interaction_1 = require("../interaction");
+const array_1 = require("../data/parser/array"), common_1 = require("../typings/spec/common"), type_1 = require("../component/interface/type"), vdataset_1 = require("@visactor/vdataset"), vrender_core_1 = require("@visactor/vrender-core"), util_1 = require("../util"), id_1 = require("../util/id"), space_1 = require("../util/space"), env_1 = require("../util/env"), debug_1 = require("../util/debug"), common_2 = require("../util/theme/common"), vutils_extension_1 = require("@visactor/vutils-extension"), factory_1 = require("./factory"), event_1 = require("../event/event"), event_dispatcher_1 = require("../event/event-dispatcher"), geo_source_1 = require("../series/map/geo-source"), register_1 = require("../data/register"), initialize_1 = require("../data/initialize"), stack_split_1 = require("../data/transforms/stack-split"), copy_data_view_1 = require("../data/transforms/copy-data-view"), interface_1 = require("../animation/interface"), theme_manager_1 = require("../theme/theme-manager"), compiler_1 = require("../compile/compiler"), image_1 = require("../util/image"), constant_1 = require("../constant"), vutils_1 = require("@visactor/vutils"), instance_manager_1 = require("./instance-manager"), vrender_components_1 = require("@visactor/vrender-components"), util_2 = require("../chart/util"), region_1 = require("../region/region"), base_layout_1 = require("../layout/base-layout"), group_1 = require("../mark/group"), config_1 = require("../animation/config"), vgrammar_core_1 = require("@visactor/vgrammar-core"), util_3 = require("./util"), expression_function_1 = require("./expression-function"), env_2 = require("../env"), theme_1 = require("../util/theme"), builtin_1 = require("../theme/builtin"), plugin_service_1 = require("../plugin/chart/plugin-service"), interaction_1 = require("../interaction");
 
 class VChart {
     static useRegisters(comps) {
@@ -152,12 +152,12 @@ class VChart {
     }
     _setNewSpec(spec, forceMerge) {
         return !!spec && ((0, util_1.isString)(spec) && (spec = JSON.parse(spec)), forceMerge && this._originalSpec && (spec = (0, 
-        merge_spec_1.mergeSpec)({}, this._originalSpec, spec)), this._originalSpec = spec, 
+        vutils_extension_1.mergeSpec)({}, this._originalSpec, spec)), this._originalSpec = spec, 
         this._spec = this._getSpecFromOriginalSpec(), !0);
     }
     _getSpecFromOriginalSpec() {
         var _a;
-        const spec = (0, transform_1.specTransform)(this._originalSpec);
+        const spec = (0, util_1.specTransform)(this._originalSpec);
         return spec.data = null !== (_a = spec.data) && void 0 !== _a ? _a : [], spec;
     }
     _initChartSpec(spec, actionSource) {
@@ -179,16 +179,25 @@ class VChart {
         if (this._chart) return void (null === (_b = this._option) || void 0 === _b || _b.onError("chart is already initialized"));
         const chart = factory_1.Factory.createChart(spec.type, spec, this._getChartOption(spec.type));
         chart ? (this._chart = chart, this._chart.setCanvasRect(this._currentSize.width, this._currentSize.height), 
-        this._chart.created(), this._chart.init(), this._event.emit(constant_1.ChartEvent.initialized, {})) : null === (_c = this._option) || void 0 === _c || _c.onError("init chart fail");
+        this._chart.created(), this._chart.init(), this._event.emit(constant_1.ChartEvent.initialized, {
+            chart: chart,
+            vchart: this
+        })) : null === (_c = this._option) || void 0 === _c || _c.onError("init chart fail");
     }
     _releaseData() {
         this._dataSet && (this._dataSet.dataViewMap = {}, this._dataSet = null);
     }
     _bindVGrammarViewEvent() {
         this._compiler && (this._compiler.getVGrammarView().addEventListener(constant_1.VGRAMMAR_HOOK_EVENT.ALL_ANIMATION_END, (() => {
-            this._event.emit(constant_1.ChartEvent.animationFinished, {});
+            this._event.emit(constant_1.ChartEvent.animationFinished, {
+                chart: this._chart,
+                vchart: this
+            });
         })), this._compiler.getVGrammarView().addEventListener(constant_1.VGRAMMAR_HOOK_EVENT.AFTER_VRENDER_NEXT_RENDER, (() => {
-            this._event.emit(constant_1.ChartEvent.renderFinished, {});
+            this._event.emit(constant_1.ChartEvent.renderFinished, {
+                chart: this._chart,
+                vchart: this
+            });
         })));
     }
     _bindResizeEvent() {
@@ -277,8 +286,10 @@ class VChart {
         !0);
     }
     _afterRender() {
-        return !this._isReleased && (this._updateAnimateState(), this._event.emit(constant_1.ChartEvent.rendered, {}), 
-        !0);
+        return !this._isReleased && (this._updateAnimateState(), this._event.emit(constant_1.ChartEvent.rendered, {
+            chart: this._chart,
+            vchart: this
+        }), !0);
     }
     renderSync(morphConfig) {
         return this._renderSync({
@@ -381,20 +392,20 @@ class VChart {
     updateSpec(spec, forceMerge = !1, morphConfig) {
         return __awaiter(this, void 0, void 0, (function*() {
             const result = this._updateSpec(spec, forceMerge);
-            return yield this.updateCustomConfigAndRerender(result, !1, {
+            return result ? (yield this.updateCustomConfigAndRerender(result, !1, {
                 morphConfig: morphConfig,
-                transformSpec: !0,
+                transformSpec: result.reTransformSpec,
                 actionSource: "updateSpec"
-            }), this;
+            }), this) : this;
         }));
     }
     updateSpecSync(spec, forceMerge = !1, morphConfig) {
         const result = this._updateSpec(spec, forceMerge);
-        return this.updateCustomConfigAndRerender(result, !0, {
+        return result ? (this.updateCustomConfigAndRerender(result, !0, {
             morphConfig: morphConfig,
-            transformSpec: !0,
+            transformSpec: result.reTransformSpec,
             actionSource: "updateSpec"
-        }), this;
+        }), this) : this;
     }
     updateSpecAndRecompile(spec, forceMerge = !1, option = {}) {
         const result = this._updateSpec(spec, forceMerge);
@@ -409,18 +420,25 @@ class VChart {
         (0, vutils_1.isEqual)(lastSpec.theme, this._spec.theme) || this._setCurrentTheme();
         const reSize = this._shouldChartResize(lastSpec);
         return null === (_b = null === (_a = this._compiler) || void 0 === _a ? void 0 : _a.getVGrammarView()) || void 0 === _b || _b.updateLayoutTag(), 
-        (0, util_2.mergeUpdateResult)(this._chart.updateSpec(this._spec), {
+        this._spec.type !== lastSpec.type ? {
+            reTransformSpec: !0,
+            change: !0,
+            reMake: !0,
+            reCompile: !1,
+            reSize: reSize
+        } : (this._initChartSpec(this._spec, "render"), (0, util_2.mergeUpdateResult)(this._chart.updateSpec(this._spec), {
+            reTransformSpec: !1,
             change: reSize,
             reMake: !1,
             reCompile: !1,
             reSize: reSize
-        });
+        }));
     }
     updateModelSpec(filter, spec, forceMerge = !1, morphConfig) {
         return __awaiter(this, void 0, void 0, (function*() {
             if (!spec || !this._spec) return this;
             if ((0, util_1.isString)(spec) && (spec = JSON.parse(spec)), (0, vutils_1.isFunction)(filter) || (0, 
-            merge_spec_1.mergeSpecWithFilter)(this._spec, filter, spec, forceMerge), this._chart) {
+            vutils_extension_1.mergeSpecWithFilter)(this._spec, filter, spec, forceMerge), this._chart) {
                 const model = this._chart.getModelInFilter(filter);
                 if (model) return this._updateModelSpec(model, spec, !1, forceMerge, morphConfig);
             }
@@ -430,14 +448,14 @@ class VChart {
     updateModelSpecSync(filter, spec, forceMerge = !1, morphConfig) {
         if (!spec || !this._spec) return this;
         if ((0, util_1.isString)(spec) && (spec = JSON.parse(spec)), (0, vutils_1.isFunction)(filter) || (0, 
-        merge_spec_1.mergeSpecWithFilter)(this._spec, filter, spec, forceMerge), this._chart) {
+        vutils_extension_1.mergeSpecWithFilter)(this._spec, filter, spec, forceMerge), this._chart) {
             const model = this._chart.getModelInFilter(filter);
             if (model) return this._updateModelSpec(model, spec, !0, forceMerge, morphConfig);
         }
         return this;
     }
     _updateModelSpec(model, spec, sync = !1, forceMerge = !1, morphConfig) {
-        forceMerge && (spec = (0, merge_spec_1.mergeSpec)({}, model.getSpec(), spec));
+        forceMerge && (spec = (0, vutils_extension_1.mergeSpec)({}, model.getSpec(), spec));
         const result = model.updateSpec(spec);
         return model.reInit(spec), (result.change || result.reCompile || result.reMake || result.reSize || result.reRender) && this._chart.reDataFlow(), 
         this.updateCustomConfigAndRerender(result, sync, {
@@ -509,13 +527,13 @@ class VChart {
         vutils_1.isEmpty)(specTheme)) this._currentTheme = (0, common_2.getThemeObject)(this._currentThemeName, !0); else if ((0, 
         util_1.isString)(optionTheme) && (!specTheme || (0, util_1.isString)(specTheme)) || (0, 
         util_1.isString)(specTheme) && (!optionTheme || (0, util_1.isString)(optionTheme))) {
-            const finalTheme = (0, spec_1.mergeTheme)({}, (0, common_2.getThemeObject)(this._currentThemeName, !0), (0, 
+            const finalTheme = (0, theme_1.mergeTheme)({}, (0, common_2.getThemeObject)(this._currentThemeName, !0), (0, 
             common_2.getThemeObject)(optionTheme, !0), (0, common_2.getThemeObject)(specTheme, !0));
             this._currentTheme = finalTheme;
         } else {
-            const finalTheme = (0, spec_1.mergeTheme)({}, (0, common_2.getThemeObject)(this._currentThemeName), (0, 
+            const finalTheme = (0, theme_1.mergeTheme)({}, (0, common_2.getThemeObject)(this._currentThemeName), (0, 
             common_2.getThemeObject)(optionTheme), (0, common_2.getThemeObject)(specTheme));
-            this._currentTheme = (0, spec_1.preprocessTheme)(finalTheme);
+            this._currentTheme = (0, theme_1.preprocessTheme)(finalTheme);
         }
         (0, vrender_components_1.setPoptipTheme)((0, vutils_1.get)(this._currentTheme, "component.poptip")), 
         null === (_b = this._compiler) || void 0 === _b || _b.setBackground(this._getBackground());
@@ -523,8 +541,8 @@ class VChart {
     _shouldChartResize(oldSpec) {
         var _a, _b;
         let resize = !1;
-        (0, util_1.isNil)(this._spec.width) ? this._spec.width = oldSpec.width : this._spec.width !== oldSpec.width && (resize = !0), 
-        (0, util_1.isNil)(this._spec.height) ? this._spec.height = oldSpec.height : this._spec.height !== oldSpec.height && (resize = !0);
+        (0, util_1.isNil)(this._spec.width) ? !(0, util_1.isNil)(oldSpec.width) && (this._spec.width = oldSpec.width) : this._spec.width !== oldSpec.width && (resize = !0), 
+        (0, util_1.isNil)(this._spec.height) ? !(0, util_1.isNil)(oldSpec.height) && (this._spec.height = oldSpec.height) : this._spec.height !== oldSpec.height && (resize = !0);
         const lasAutoSize = this._autoSize;
         return this._autoSize = !!(0, env_1.isTrueBrowser)(this._option.mode) && (null === (_b = null !== (_a = this._spec.autoFit) && void 0 !== _a ? _a : this._option.autoFit) || void 0 === _b || _b), 
         this._autoSize !== lasAutoSize && (resize = !0), resize;
@@ -694,6 +712,11 @@ class VChart {
     getComponents() {
         return this._chart.getAllComponents();
     }
+    getScale(scaleId) {
+        var _a;
+        const globalScale = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getGlobalScale();
+        return null == globalScale ? void 0 : globalScale.getScale(scaleId);
+    }
     setDimensionIndex(value, opt = {}) {
         var _a;
         return null === (_a = this._chart) || void 0 === _a ? void 0 : _a.setDimensionIndex(value, opt);