@visactor/vchart 1.4.0-alpha.7 → 1.4.0-beta.2

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

@@ -1,3 +1,4 @@
+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';
@@ -34,16 +35,18 @@ export declare class BaseChart extends CompilableBase implements IChart {
     protected _viewRect: ILayoutRect;
     getViewRect(): ILayoutRect;
     protected _viewBox: IBoundsLike;
+    protected _layoutTag: boolean;
+    getLayoutTag(): boolean;
+    setLayoutTag(tag: boolean, morphConfig?: IMorphConfig, reLayout?: boolean): boolean;
     protected _modelOption: IModelOption;
     protected _globalScale: IGlobalScale;
     protected _idMap: Map<number, IModel | IMark>;
     protected _event: IEvent;
     getEvent(): IEvent;
     protected _dataSet: DataSet;
+    protected _chartData: ChartData;
+    get chartData(): ChartData;
     protected _option: IChartOption;
-    protected _layoutTag: boolean;
-    getLayoutTag(): boolean;
-    setLayoutTag(tag: boolean, morphConfig?: IMorphConfig, reLayout?: boolean): boolean;
     readonly state: ILayoutModelState;
     protected _stack: Stack;
     padding: IPadding;
@@ -99,7 +102,6 @@ export declare class BaseChart extends CompilableBase implements IChart {
     getModelByUserId(userId: StringOrNumber): IModel | undefined;
     getAllMarks(): IMark[];
     getMarkById(id: number): IMark | undefined;
-    updateParseData(id: string, data: Datum[], options?: IParserOptions): void;
     updateData(id: StringOrNumber, data: unknown, updateGlobalScale?: boolean, options?: IParserOptions): void;
     updateFullData(data: IDataValues | IDataValues[], updateGlobalScale?: boolean): void;
     onRender(option: IChartRenderOption): void;
@@ -118,6 +120,7 @@ export declare class BaseChart extends CompilableBase implements IChart {
         reSize: boolean;
         reCompile: boolean;
     };
+    updateChartConfig(result: IUpdateSpecResult, oldSpec: IChartSpec): void;
     updateDataSpec(result: IUpdateSpecResult): void;
     updateRegionSpec(result: IUpdateSpecResult): void;
     updateComponentSpec(result: IUpdateSpecResult): void;
@@ -125,7 +128,6 @@ export declare class BaseChart extends CompilableBase implements IChart {
     getCanvas(): HTMLCanvasElement;
     protected isValidSeries(seriesType: string): boolean;
     protected _getDefaultSeriesSpec(spec: any): any;
-    private _mergeUpdateResult;
     private _updateLayoutRect;
     getCurrentTheme(): ITheme;
     setCurrentTheme(theme: ITheme): void;

package/cjs/chart/base-chart.js

@@ -30,7 +30,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseChart = void 0;
 
-const 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"), initialize_1 = require("../data/initialize"), 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");
+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");
 
 class BaseChart extends compilable_base_1.CompilableBase {
     getSpec() {
@@ -48,9 +48,6 @@ class BaseChart extends compilable_base_1.CompilableBase {
     getViewRect() {
         return this._viewRect;
     }
-    getEvent() {
-        return this._event;
-    }
     getLayoutTag() {
         return this._layoutTag;
     }
@@ -59,8 +56,14 @@ class BaseChart extends compilable_base_1.CompilableBase {
         return this._layoutTag = tag, (null === (_a = this.getCompiler()) || void 0 === _a ? void 0 : _a.getVGrammarView()) && (this.getCompiler().getVGrammarView().updateLayoutTag(), 
         tag && reLayout && this.getCompiler().renderAsync(morphConfig)), this._layoutTag;
     }
+    getEvent() {
+        return this._event;
+    }
+    get chartData() {
+        return this._chartData;
+    }
     constructor(spec, option) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         super(option), this.type = "chart", this.id = (0, util_1.createID)(), this._regions = [], 
         this._series = [], this._components = [], this._layoutRect = {
             x: 0,
@@ -75,7 +78,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
             y1: 0,
             x2: base_1.DEFAULT_CHART_WIDTH,
             y2: base_1.DEFAULT_CHART_HEIGHT
-        }, this._idMap = new Map, this._layoutTag = !0, this.state = {
+        }, this._layoutTag = !0, this._idMap = new Map, this.state = {
             layoutUpdateRank: 1
         }, this.padding = {
             top: 0,
@@ -106,6 +109,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
             if (component) return component;
         }, this._theme = option.getTheme(), this._paddingSpec = (0, util_1.normalizeLayoutPaddingSpec)(null !== (_a = spec.padding) && void 0 !== _a ? _a : null === (_b = this._theme) || void 0 === _b ? void 0 : _b.padding), 
         this._event = new event_1.Event(option.eventDispatcher, option.mode), this._dataSet = option.dataSet, 
+        this._chartData = new data_1.ChartData(this._dataSet, null === (_c = this._option) || void 0 === _c ? void 0 : _c.onError), 
         this._modelOption = Object.assign(Object.assign({}, option), {
             mode: this._option.mode,
             map: this._idMap,
@@ -113,13 +117,13 @@ class BaseChart extends compilable_base_1.CompilableBase {
             getChartViewRect: () => this._viewRect,
             getChart: () => this,
             globalScale: this._globalScale,
-            onError: null === (_c = this._option) || void 0 === _c ? void 0 : _c.onError
+            onError: null === (_d = this._option) || void 0 === _d ? void 0 : _d.onError
         }), this._stack = new stack_1.Stack(this), this._spec = spec;
     }
     created() {
-        this.transformSpec(this._spec), 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.createBackground(this._spec.background), this.createLayout(), this.createRegion(this._spec.region), 
+        this.createSeries(this._spec.series), this.createComponent(this._spec);
     }
     transformSpec(spec) {
         spec.region && 0 !== spec.region.length || (spec.region = [ {} ]), (0, vutils_1.has)(spec, "tooltip") || (spec.tooltip = {});
@@ -172,12 +176,9 @@ class BaseChart extends compilable_base_1.CompilableBase {
     }
     createSeries(seriesSpec) {
         seriesSpec.forEach(((spec, index) => {
-            var _a;
             let region;
-            if (spec.data ? spec.data = (0, initialize_1.dataToDataView)(spec.data, this._dataSet, this._spec.data, {
-                onError: null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError
-            }) : spec.data = this.getSeriesData(spec.dataId, spec.dataIndex), !1 === this._option.animation && (spec.animation = !1), 
-            (0, util_1.isValid)(spec.regionId) ? region = this.getRegionsInUserId(spec.regionId) : (0, 
+            if (spec.data || (spec.data = this._chartData.getSeriesData(spec.dataId, spec.dataIndex)), 
+            !1 === this._option.animation && (spec.animation = !1), (0, util_1.isValid)(spec.regionId) ? region = this.getRegionsInUserId(spec.regionId) : (0, 
             util_1.isValid)(spec.regionIndex) && (region = this.getRegionsInIndex([ spec.regionIndex ])[0]), 
             region || (region = this._regions[0]), !region) return;
             const series = factory_1.Factory.createSeries(spec.type, spec, Object.assign(Object.assign({}, this._modelOption), {
@@ -186,7 +187,8 @@ class BaseChart extends compilable_base_1.CompilableBase {
                 specKey: "series",
                 getTheme: () => this._theme,
                 globalScale: this._globalScale,
-                getSeriesData: this.getSeriesData.bind(this)
+                getSeriesData: this._chartData.getSeriesData.bind(this._chartData),
+                sourceDataList: this._chartData.dataList
             }));
             series && (series.created(), this._series.push(series), region.addSeries(series));
         }));
@@ -316,26 +318,14 @@ class BaseChart extends compilable_base_1.CompilableBase {
         const mark = this._idMap.get(id);
         if (mark && mark instanceof base_mark_1.BaseMark) return mark;
     }
-    updateParseData(id, data, options) {
-        const dv = this._dataSet.getDataView(id);
-        dv && dv.updateRawData(data);
-    }
     updateData(id, data, updateGlobalScale = !0, options) {
         const dv = this._dataSet.getDataView(id);
-        dv && dv.parseNewData(data, options), updateGlobalScale && this.updateGlobalScaleDomain(), 
+        dv && (dv.markRunning(), dv.parseNewData(data, options)), updateGlobalScale && this.updateGlobalScaleDomain(), 
         this.getAllModels().forEach((model => model.onDataUpdate()));
     }
     updateFullData(data, updateGlobalScale = !0) {
-        const dvs = [];
-        (0, util_1.array)(data).forEach((d => {
-            const dv = this._dataSet.getDataView(d.id);
-            dv && (dvs.push({
-                d: d,
-                dv: dv
-            }), dv.markRunning());
-        })), dvs.forEach((({d: d, dv: dv}) => {
-            dv.setFields(d.fields), dv.parseNewData(d.values, d.parser);
-        })), updateGlobalScale && this.updateGlobalScaleDomain(), this.getAllModels().forEach((model => model.onDataUpdate()));
+        this._chartData.updateData(data), updateGlobalScale && this.updateGlobalScaleDomain(), 
+        this.getAllModels().forEach((model => model.onDataUpdate()));
     }
     onRender(option) {}
     setCanvasRect(width, height) {
@@ -349,16 +339,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
         this._canvasRect;
     }
     getSeriesData(id, index) {
-        var _a, _b, _c;
-        if (!this._spec.data) return null === (_a = this._option) || void 0 === _a || _a.onError("no data in spec!"), 
-        null;
-        if ("string" == typeof id) {
-            const metchData = this._spec.data.filter((data => data.name === id));
-            return metchData[0] ? metchData[0] : (null === (_b = this._option) || void 0 === _b || _b.onError(`no data matches dataId ${id}!`), 
-            null);
-        }
-        return "number" == typeof index ? this._spec.data[index] ? this._spec.data[index] : (null === (_c = this._option) || void 0 === _c || _c.onError(`no data matches dataIndex ${index}!`), 
-        null) : this._spec.data[0];
+        return this._chartData.getSeriesData(id, index);
     }
     _transformSpecScale() {
         var _a, _b, _c;
@@ -400,7 +381,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
         this._globalScale.updateScaleDomain(domain);
     }
     updateGlobalScale(result) {
-        this._mergeUpdateResult(result, this._globalScale.updateSpec(this._transformSpecScale()));
+        (0, util_3.mergeUpdateResult)(result, this._globalScale.updateSpec(this._transformSpecScale()));
     }
     updateGlobalScaleTheme() {
         var _a;
@@ -420,23 +401,26 @@ class BaseChart extends compilable_base_1.CompilableBase {
         result;
         this.transformSpec(spec);
         const currentKeys = Object.keys(this._spec).sort(), nextKeys = Object.keys(spec).sort();
-        return JSON.stringify(currentKeys) !== JSON.stringify(nextKeys) ? (result.reMake = !0, 
-        result) : (this._spec = spec, this.updateGlobalScale(result), result.reMake ? result : (this.updateRegionSpec(result), 
-        result.reMake ? result : (this.updateComponentSpec(result), result.reMake ? result : (this.updateSeriesSpec(result), 
-        result.reMake ? result : (this.updateDataSpec(result), result.reMake || this.updateGlobalScaleDomain(), 
-        result)))));
+        if (JSON.stringify(currentKeys) !== JSON.stringify(nextKeys)) return result.reMake = !0, 
+        result;
+        const oldSpec = this._spec;
+        return this._spec = spec, this.updateChartConfig(result, oldSpec), result.reMake ? result : (this.updateGlobalScale(result), 
+        result.reMake ? result : (this.updateRegionSpec(result), result.reMake ? result : (this.updateComponentSpec(result), 
+        result.reMake ? result : (this.updateSeriesSpec(result), result.reMake ? result : (this.updateDataSpec(result), 
+        result.reMake || this.updateGlobalScaleDomain(), result)))));
+    }
+    updateChartConfig(result, oldSpec) {
+        var _a, _b;
+        this._paddingSpec = (0, util_1.normalizeLayoutPaddingSpec)(null !== (_a = this._spec.padding) && void 0 !== _a ? _a : null === (_b = this._theme) || void 0 === _b ? void 0 : _b.padding), 
+        this._updateLayoutRect(this._viewBox), (0, vutils_1.isEqual)(this._spec.background, oldSpec.background) || (result.reMake = !0);
     }
     updateDataSpec(result) {
-        this._spec.data && (0, util_1.array)(this._spec.data).forEach(((d, i) => {
-            const dataView = this._dataSet.getDataView(d.id);
-            dataView ? (d.fields && dataView.setFields(d.fields), d.values ? dataView.parseNewData(d.values, d.parser) : d.latestData || dataView.updateRawData([])) : result.reMakeData = !0;
-        }));
+        this._spec.data && this._chartData.updateData(this._spec.data, !1, !0);
     }
     updateRegionSpec(result) {
         var _a;
         (null === (_a = this._spec) || void 0 === _a ? void 0 : _a.region) && (this._spec.region.length === this._regions.length ? this._regions.forEach((r => {
-            this._mergeUpdateResult(result, r.updateSpec(this._spec.region[r.getSpecIndex()])), 
-            r.reInit();
+            (0, util_3.mergeUpdateResult)(result, r.updateSpec(this._spec.region[r.getSpecIndex()]));
         })) : result.reMake = !0);
     }
     updateComponentSpec(result) {
@@ -447,8 +431,8 @@ class BaseChart extends compilable_base_1.CompilableBase {
             (0, util_1.isArray)(cmpSpec) ? (componentCache[c.specKey] = componentCache[c.specKey] || {
                 specCount: cmpSpec.length,
                 componentCount: 0
-            }, componentCache[c.specKey].componentCount++, this._mergeUpdateResult(result, c.updateSpec(cmpSpec[c.getSpecIndex()], cmpSpec))) : this._mergeUpdateResult(result, c.updateSpec(cmpSpec)), 
-            c.reInit();
+            }, componentCache[c.specKey].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)) {
             const element = componentCache[key];
@@ -457,15 +441,8 @@ class BaseChart extends compilable_base_1.CompilableBase {
     }
     updateSeriesSpec(result) {
         this._spec.series.length === this._series.length ? this._series.forEach((s => {
-            var _a;
             const spec = this._spec.series[s.getSpecIndex()];
-            if (result.reMakeData) {
-                let values;
-                values = spec.data ? spec.data.values : null === (_a = this.getSeriesData(spec.dataId, spec.dataIndex)) || void 0 === _a ? void 0 : _a.latestData, 
-                s.updateRawData(values);
-            }
-            const lastSpec = s.getSpec();
-            this._mergeUpdateResult(result, s.updateSpec(spec)), s.reInit(null, lastSpec);
+            (0, util_3.mergeUpdateResult)(result, s.updateSpec(spec));
         })) : result.reMake = !0;
     }
     getCanvas() {
@@ -476,16 +453,15 @@ class BaseChart extends compilable_base_1.CompilableBase {
         return !0;
     }
     _getDefaultSeriesSpec(spec) {
-        var _a, _b;
+        var _a;
         return {
-            data: null === (_a = spec.data) || void 0 === _a ? void 0 : _a[0],
             dataKey: spec.dataKey,
             hover: spec.hover,
             select: spec.select,
             label: spec.label,
             seriesStyle: spec.seriesStyle,
             animation: spec.animation,
-            animationThreshold: null !== (_b = spec.animationThreshold) && void 0 !== _b ? _b : this._theme.animationThreshold,
+            animationThreshold: null !== (_a = spec.animationThreshold) && void 0 !== _a ? _a : this._theme.animationThreshold,
             animationAppear: spec.animationAppear,
             animationDisappear: spec.animationDisappear,
             animationEnter: spec.animationEnter,
@@ -502,11 +478,6 @@ class BaseChart extends compilable_base_1.CompilableBase {
             seriesField: spec.seriesField
         };
     }
-    _mergeUpdateResult(resultA, resultB) {
-        resultA.change = resultA.change || resultB.change, resultA.reCompile = resultA.reCompile || resultB.reCompile, 
-        resultA.reMake = resultA.reMake || resultB.reMake, resultA.reRender = resultA.reRender || resultB.reRender, 
-        resultA.reSize = resultA.reSize || resultB.reSize;
-    }
     _updateLayoutRect(viewBox) {
         let viewRect = this.getCanvasRect();
         if (viewBox) {