@visactor/vchart 1.8.10-alpha.0 → 1.9.0-alpha.1

package/esm/core/vchart.js

@@ -38,7 +38,7 @@ import { RenderModeEnum } from "../typings/spec/common";
 
 import { ComponentTypeEnum } from "../component/interface/type";
 
-import { DataSet, dataViewParser, DataView } from "@visactor/vdataset";
+import { DataSet, dataViewParser } from "@visactor/vdataset";
 
 import { isString, isValid, isNil, array, debounce, functionTransform } from "../util";
 
@@ -289,7 +289,7 @@ export class VChart {
         this._dataSet && (this._dataSet.dataViewMap = {}, this._dataSet = null);
     }
     _bindVGrammarViewEvent() {
-        this._compiler && !this._compiler.isReleased && (this._compiler.getVGrammarView().addEventListener(VGRAMMAR_HOOK_EVENT.ALL_ANIMATION_END, (() => {
+        this._compiler && (this._compiler.getVGrammarView().addEventListener(VGRAMMAR_HOOK_EVENT.ALL_ANIMATION_END, (() => {
             this._event.emit(ChartEvent.animationFinished, {});
         })), this._compiler.getVGrammarView().addEventListener(VGRAMMAR_HOOK_EVENT.AFTER_VRENDER_NEXT_RENDER, (() => {
             this._event.emit(ChartEvent.renderFinished, {});
@@ -326,7 +326,7 @@ export class VChart {
         this._currentSize.width === width && this._currentSize.height === height || (this._currentSize = {
             width: width,
             height: height
-        }, this.resize(width, height));
+        }, this.resizeSync(width, height));
     }
     _initDataSet(dataSet) {
         this._dataSet = dataSet instanceof DataSet ? dataSet : new DataSet, registerDataSetInstanceParser(this._dataSet, "dataview", dataViewParser), 
@@ -343,7 +343,7 @@ export class VChart {
         return !!updateSpecResult && (this._reCompile(updateSpecResult), this._beforeRender(option));
     }
     _reCompile(updateResult, morphConfig) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e;
         if (updateResult.reMake) this._releaseData(), this._initDataSet(), this._chartSpecTransformer = null, 
         this._chart.release(), this._chart = null, null === (_a = this._compiler) || void 0 === _a || _a.releaseGrammar(!1 === (null === (_b = this._option) || void 0 === _b ? void 0 : _b.animation) || !1 === (null === (_c = this._spec) || void 0 === _c ? void 0 : _c.animation)), 
         this._userEvents.forEach((e => {
@@ -357,7 +357,7 @@ export class VChart {
             vChart: this
         }, {})), updateResult.reSize) {
             const {width: width, height: height} = this.getCurrentSize();
-            this._chart.onResize(width, height, !1), null === (_g = (_f = this._compiler).resize) || void 0 === _g || _g.call(_f, width, height, !1);
+            this._chart.onResize(width, height, !1), this._compiler.resize(width, height, !1);
         }
     }
     _beforeRender(option = {}) {
@@ -400,15 +400,12 @@ export class VChart {
     _renderSync(option = {}) {
         var _a;
         const self = this;
-        return this._beforeRender(option) ? (null === (_a = this._compiler) || void 0 === _a || _a.renderSync(option.morphConfig), 
+        return this._beforeRender(option) ? (null === (_a = this._compiler) || void 0 === _a || _a.render(option.morphConfig), 
         this._afterRender(), self) : self;
     }
     _renderAsync(option = {}) {
-        var _a;
         return __awaiter(this, void 0, void 0, (function*() {
-            const self = this;
-            return this._beforeRender(option) ? (yield null === (_a = this._compiler) || void 0 === _a ? void 0 : _a.renderAsync(option.morphConfig), 
-            this._afterRender(), self) : self;
+            return this._renderSync(option);
         }));
     }
     _updateAnimateState() {
@@ -432,50 +429,35 @@ export class VChart {
     }
     updateData(id, data, options) {
         return __awaiter(this, void 0, void 0, (function*() {
-            if (isNil(this._dataSet)) return this;
-            if (this._chart) return this._chart.updateData(id, data, !0, options), yield this._compiler.renderAsync(), 
-            this;
-            this._spec.data = array(this._spec.data);
-            const preDV = this._spec.data.find((dv => dv.name === id || dv.id === id));
-            return preDV ? preDV.id === id ? preDV.values = data : preDV.name === id && preDV.parse(data, options) : isArray(data) ? this._spec.data.push({
-                id: id,
-                values: data
-            }) : this._spec.data.push(data), this;
+            return this.updateDataSync(id, data, options);
         }));
     }
+    _updateDataById(id, data, options) {
+        const preDV = this._spec.data.find((dv => dv.name === id || dv.id === id));
+        preDV ? preDV.id === id ? preDV.values = data : preDV.name === id && preDV.parse(data, options) : isArray(data) ? this._spec.data.push({
+            id: id,
+            values: data
+        }) : this._spec.data.push(data);
+    }
     updateDataInBatches(list) {
         return __awaiter(this, void 0, void 0, (function*() {
             return this._chart ? (this._chart.updateFullData(list.map((({id: id, data: data, options: options}) => ({
                 id: id,
                 values: data,
                 parser: options
-            })))), this._chart.updateGlobalScaleDomain(), yield this._compiler.renderAsync(), 
-            this) : (list.forEach((({id: id, data: data, options: options}) => {
-                const preDV = this._spec.data.find((dv => dv.name === id));
-                if (preDV) preDV.parse(data, options); else {
-                    const dataView = new DataView(this._dataSet, {
-                        name: id
-                    });
-                    dataView.parse(data, options), this._spec.data.push(dataView);
-                }
+            })))), this._chart.updateGlobalScaleDomain(), this._compiler.render(), this) : (this._spec.data = array(this._spec.data), 
+            list.forEach((({id: id, data: data, options: options}) => {
+                this._updateDataById(id, data, options);
             })), this);
         }));
     }
     updateDataSync(id, data, options) {
-        if (isNil(this._dataSet)) return this;
-        if (this._chart) return this._chart.updateData(id, data, !0, options), this._compiler.renderSync(), 
-        this;
-        const preDV = this._spec.data.find((dv => dv.name === id));
-        if (preDV) preDV.parse(data, options); else {
-            const dataView = new DataView(this._dataSet, {
-                name: id
-            });
-            dataView.parse(data, options), this._spec.data.push(dataView);
-        }
-        return this;
+        return isNil(this._dataSet) ? this : this._chart ? (this._chart.updateData(id, data, !0, options), 
+        this._compiler.render(), this) : (this._spec.data = array(this._spec.data), this._updateDataById(id, data, options), 
+        this);
     }
     updateFullDataSync(data, reRender = !0) {
-        if (this._chart) return this._chart.updateFullData(data), reRender && this._compiler.renderSync(), 
+        if (this._chart) return this._chart.updateFullData(data), reRender && this._compiler.render(), 
         this;
         return array(data).forEach((d => {
             var _a;
@@ -490,18 +472,7 @@ export class VChart {
     }
     updateFullData(data, reRender = !0) {
         return __awaiter(this, void 0, void 0, (function*() {
-            if (this._chart) return this._chart.updateFullData(data), reRender && (yield this._compiler.renderAsync()), 
-            this;
-            return array(data).forEach((d => {
-                var _a;
-                const {id: id, values: values, parser: parser, fields: fields} = d, preDV = this._spec.data.find((dv => dv.name === id));
-                if (preDV) preDV.setFields(cloneDeep(fields)), preDV.parse(values, cloneDeep(parser)); else {
-                    const dataView = dataToDataView(d, this._dataSet, this._spec.data, {
-                        onError: null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError
-                    });
-                    this._spec.data.push(dataView);
-                }
-            })), this;
+            return this.updateFullDataSync(data, reRender);
         }));
     }
     updateSpec(spec, forceMerge = !1, morphConfig) {
@@ -573,22 +544,32 @@ export class VChart {
         });
     }
     resize(width, height) {
-        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, (function*() {
-            if (!this._chart || !this._compiler) return this;
-            const chartCanvasRect = this._chart.getCanvasRect();
-            return chartCanvasRect && chartCanvasRect.width === width && chartCanvasRect.height === height ? this : (this._chartPluginApply("onBeforeResize", width, height), 
-            null === (_b = null === (_a = this._option.performanceHook) || void 0 === _a ? void 0 : _a.beforeResizeWithUpdate) || void 0 === _b || _b.call(_a), 
-            this._chart.onResize(width, height, !1), null === (_d = null === (_c = this._option.performanceHook) || void 0 === _c ? void 0 : _c.afterResizeWithUpdate) || void 0 === _d || _d.call(_c), 
-            yield null === (_f = (_e = this._compiler).resize) || void 0 === _f ? void 0 : _f.call(_e, width, height), 
-            this._isReleased || this._event.emit(ChartEvent.afterResize, {
-                chart: this._chart
-            }), this);
+            return this.resizeSync(width, height);
         }));
     }
+    resizeSync(width, height) {
+        var _a, _b;
+        return this._beforeResize(width, height) ? (null === (_b = (_a = this._compiler).resize) || void 0 === _b || _b.call(_a, width, height), 
+        this._afterResize()) : this;
+    }
+    _beforeResize(width, height) {
+        var _a, _b, _c, _d;
+        if (!this._chart || !this._compiler) return !1;
+        const chartCanvasRect = this._chart.getCanvasRect();
+        return (!chartCanvasRect || chartCanvasRect.width !== width || chartCanvasRect.height !== height) && (this._chartPluginApply("onBeforeResize", width, height), 
+        null === (_b = null === (_a = this._option.performanceHook) || void 0 === _a ? void 0 : _a.beforeResizeWithUpdate) || void 0 === _b || _b.call(_a), 
+        this._chart.onResize(width, height, !1), null === (_d = null === (_c = this._option.performanceHook) || void 0 === _c ? void 0 : _c.afterResizeWithUpdate) || void 0 === _d || _d.call(_c), 
+        !0);
+    }
+    _afterResize() {
+        return this._isReleased || this._event.emit(ChartEvent.afterResize, {
+            chart: this._chart
+        }), this;
+    }
     updateViewBox(viewBox, reRender = !0, reLayout = !0) {
         return this._chart && this._compiler ? (this._viewBox = viewBox, this._chart.updateViewBox(viewBox, reLayout), 
-        reLayout && (this._compiler.renderSync(), this._chart.onEvaluateEnd()), this._compiler.updateViewBox(viewBox, reRender), 
+        reLayout && (this._compiler.render(), this._chart.onEvaluateEnd()), this._compiler.updateViewBox(viewBox, reRender), 
         this) : this;
     }
     on(eType, query, handler) {
@@ -676,7 +657,7 @@ export class VChart {
     }
     _getTooltipComponent() {
         var _a;
-        return null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getAllComponents().find((c => c.type === ComponentTypeEnum.tooltip));
+        return null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getComponentsByType(ComponentTypeEnum.tooltip)[0];
     }
     setTooltipHandler(tooltipHandler) {
         var _a, _b;
@@ -710,8 +691,8 @@ export class VChart {
     }
     getLegendDataByIndex(index = 0) {
         var _a;
-        const legends = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getAllComponents().filter((c => c.type === ComponentTypeEnum.discreteLegend));
-        return legends[index] ? legends[index].getLegendData() : [];
+        const legends = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getComponentsByType(ComponentTypeEnum.discreteLegend);
+        return legends && legends[index] ? legends[index].getLegendData() : [];
     }
     getLegendSelectedDataById(id) {
         var _a;
@@ -720,8 +701,8 @@ export class VChart {
     }
     getLegendSelectedDataByIndex(index = 0) {
         var _a;
-        const legends = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getAllComponents().filter((c => c.type === ComponentTypeEnum.discreteLegend));
-        return legends[index] ? legends[index].getSelectedData() : [];
+        const legends = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getComponentsByType(ComponentTypeEnum.discreteLegend);
+        return legends && legends[index] ? legends[index].getSelectedData() : [];
     }
     setLegendSelectedDataById(id, selectedData) {
         var _a;
@@ -730,8 +711,8 @@ export class VChart {
     }
     setLegendSelectedDataByIndex(index = 0, selectedData) {
         var _a;
-        const legends = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getAllComponents().filter((c => c.type === ComponentTypeEnum.discreteLegend));
-        legends[index] && legends[index].setSelectedData(selectedData);
+        const legends = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getComponentsByType(ComponentTypeEnum.discreteLegend);
+        legends && legends[index] && legends[index].setSelectedData(selectedData);
     }
     getDataURL() {
         var _a;