@visactor/vchart 2.1.0-alpha.3 → 2.1.0-alpha.4

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

@@ -127,6 +127,9 @@ export declare class BaseChart<T extends IChartSpec> extends CompilableBase impl
         componentOnlyUpdatedComponents: IComponent[];
         hasNonComponentOnlyUpdate: boolean;
     };
+    private _canChangeMarkerComponentsWithoutRemake;
+    private _canAddMarkerComponentsWithoutRemake;
+    private _isMarkerAdditionSpecSafeWithoutRemake;
     private _canRemoveMarkerComponentsWithoutRemake;
     private _isOnlyMarkerComponentsRemoved;
     private _isComponentSpecKey;
@@ -134,6 +137,10 @@ export declare class BaseChart<T extends IChartSpec> extends CompilableBase impl
     private _isOnlySeriesSpecsChanged;
     private _canSkipChartDataStages;
     private _isComponentScaleDomainOnlyUpdate;
+    private _reRunStackDataFlow;
+    private _getModelSpecIndex;
+    private _hasComponentForSpecInfo;
+    private _createMissingMarkerComponentsForSpecs;
     private _removeMarkerComponentsForEmptySpecs;
     private _removeComponent;
     updateSeriesSpec(result: IUpdateSpecResult): void;

package/cjs/chart/base/base-chart.js

@@ -18,6 +18,20 @@ const data_1 = require("../chart-meta/data"), global_scale_1 = require("../../sc
     [interface_1.ComponentTypeEnum.markPoint]: !0,
     [interface_1.ComponentTypeEnum.markLine]: !0,
     [interface_1.ComponentTypeEnum.markArea]: !0
+}, MARKER_ADDITION_REMAKE_SPEC_KEYS = {
+    autoRange: !0,
+    regionId: !0,
+    regionIndex: !0,
+    seriesId: !0,
+    seriesIndex: !0,
+    relativeSeriesId: !0,
+    relativeSeriesIndex: !0,
+    startRelativeSeriesId: !0,
+    startRelativeSeriesIndex: !0,
+    endRelativeSeriesId: !0,
+    endRelativeSeriesIndex: !0,
+    specifiedDataSeriesId: !0,
+    specifiedDataSeriesIndex: !0
 };
 
 class BaseChart extends compilable_base_1.CompilableBase {
@@ -107,7 +121,8 @@ class BaseChart extends compilable_base_1.CompilableBase {
             const component = this._components.find((s => s.userId === userId));
             if (component) return component;
         }, this.getComponentsByType = type => this._components.filter((c => c.type === type)), 
-        this._paddingSpec = (0, util_1.normalizeLayoutPaddingSpec)(null !== (_a = spec.padding) && void 0 !== _a ? _a : option.getTheme("padding")), 
+        this._isMarkerAdditionSpecSafeWithoutRemake = spec => !(!spec || "object" != typeof spec || !1 === spec.visible) && !Object.keys(MARKER_ADDITION_REMAKE_SPEC_KEYS).some((key => !(0, 
+        vutils_1.isNil)(spec[key]))), 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), this._modelOption = Object.assign(Object.assign({}, option), {
             mode: this._option.mode,
@@ -429,7 +444,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
         return Object.keys(spec).filter((key => !ignoreKeys[key])).sort();
     }
     updateSpec(spec) {
-        var _a;
+        var _a, _b;
         const result = {
             change: !1,
             reMake: !1,
@@ -444,7 +459,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
         result;
         for (let i = 0; i < currentKeys.length; i++) {
             const key = currentKeys[i], currentSpec = this._spec[key], nextSpec = spec[key];
-            if ((0, util_1.isArray)(currentSpec) && currentSpec.length !== (0, util_1.array)(nextSpec).length && !this._canRemoveMarkerComponentsWithoutRemake(key, currentSpec, nextSpec)) return result.reMake = !0, 
+            if ((0, util_1.isArray)(currentSpec) && currentSpec.length !== (0, util_1.array)(nextSpec).length && !this._canChangeMarkerComponentsWithoutRemake(key, currentSpec, nextSpec)) return result.reMake = !0, 
             this.setLayoutTag(!0, null, !1), result;
         }
         const oldSpec = this._spec, onlyMarkerComponentsRemoved = this._isOnlyMarkerComponentsRemoved(this._spec, spec, currentKeys), onlyComponentSpecsChanged = this._isOnlyComponentSpecsChanged(this._spec, spec, currentKeys), onlySeriesSpecsChanged = this._isOnlySeriesSpecsChanged(this._spec, spec, currentKeys);
@@ -457,13 +472,15 @@ class BaseChart extends compilable_base_1.CompilableBase {
         if (this.updateRegionSpec(result), result.reMake) return this.setLayoutTag(!0, null, !1), 
         result;
         const componentUpdateResult = this.updateComponentSpec(result);
-        return result.reMake ? (this.setLayoutTag(!0, null, !1), result) : (0, util_3.isUpdateSpecResultLocalOnly)(result) ? result : onlyComponentSpecsChanged && !componentUpdateResult.hasNonComponentOnlyUpdate && ((0, 
+        return result.reMake ? (this.setLayoutTag(!0, null, !1), result) : (!onlyComponentSpecsChanged && (null === (_a = result.effects) || void 0 === _a ? void 0 : _a.localOnly) && delete result.effects.localOnly, 
+        (0, util_3.isUpdateSpecResultLocalOnly)(result) ? result : onlyComponentSpecsChanged && !componentUpdateResult.hasNonComponentOnlyUpdate && ((0, 
         util_3.isUpdateSpecResultComponentOnly)(result) || this._isComponentScaleDomainOnlyUpdate(result)) ? (componentUpdateResult.componentOnlyUpdatedComponents.forEach((component => {
             component.reInit(component.getSpec());
-        })), (null === (_a = result.effects) || void 0 === _a ? void 0 : _a.layout) && this.setLayoutTag(!0, null, !1), 
+        })), (null === (_b = result.effects) || void 0 === _b ? void 0 : _b.layout) && this.setLayoutTag(!0, null, !1), 
         result) : (this.setLayoutTag(!0, null, !1), this.updateSeriesSpec(result), result.reMake || (this.reInit(), 
         onlySeriesSpecsChanged && this._canSkipChartDataStages(result) || (this.updateDataSpec(), 
-        this.updateGlobalScaleDomain())), result);
+        this.reDataFlow(), this._reRunStackDataFlow(), this.getAllModels().forEach((model => model.onDataUpdate())))), 
+        result));
     }
     updateChartConfig(result, oldSpec) {
         var _a, _b;
@@ -508,7 +525,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
                 vutils_1.isEqual)(previousComponentSpec, cmpSpec) || (hasNonComponentOnlyUpdate = !0), 
                 (0, util_3.mergeUpdateResult)(result, componentResult);
             }
-        }));
+        })), result.reMake || this._createMissingMarkerComponentsForSpecs(result, componentCache);
         for (const key in componentCache) if (Object.prototype.hasOwnProperty.call(componentCache, key)) {
             const element = componentCache[key];
             element.componentCount !== element.specCount && (result.reMake = !0);
@@ -530,6 +547,13 @@ class BaseChart extends compilable_base_1.CompilableBase {
             hasNonComponentOnlyUpdate: hasNonComponentOnlyUpdate
         };
     }
+    _canChangeMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) {
+        return this._canRemoveMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) || this._canAddMarkerComponentsWithoutRemake(key, currentSpec, nextSpec);
+    }
+    _canAddMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) {
+        return !!(MARKER_COMPONENT_SPEC_KEYS[key] && (0, util_1.isArray)(currentSpec) && (0, 
+        util_1.isArray)(nextSpec)) && (!(nextSpec.length <= currentSpec.length) && nextSpec.slice(currentSpec.length).every(this._isMarkerAdditionSpecSafeWithoutRemake));
+    }
     _canRemoveMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) {
         return MARKER_COMPONENT_SPEC_KEYS[key] && (0, util_1.isArray)(currentSpec) && currentSpec.length > 0 && (0, 
         util_1.isArray)(nextSpec) && 0 === nextSpec.length;
@@ -541,7 +565,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
         return hasMarkerRemoval && onlyMarkerRemoval;
     }
     _isComponentSpecKey(key) {
-        return this._components.some((component => (component.specKey || component.type) === key));
+        return !!MARKER_COMPONENT_SPEC_KEYS[key] || this._components.some((component => (component.specKey || component.type) === key));
     }
     _isOnlyComponentSpecsChanged(currentSpec, nextSpec, specKeys) {
         let hasComponentSpecChange = !1;
@@ -566,6 +590,39 @@ class BaseChart extends compilable_base_1.CompilableBase {
         const effects = result.effects;
         return !(!(null == effects ? void 0 : effects.component) || !effects.scaleDomain || result.reMake || result.reCompile || result.reSize || effects.remake || effects.compile || effects.data || effects.series || effects.animation || result.reTransformSpec || result.reAnimate || result.changeTheme || result.changeBackground);
     }
+    _reRunStackDataFlow() {
+        var _a, _b;
+        this._series.some((series => {
+            var _a;
+            return null === (_a = series.getStack) || void 0 === _a ? void 0 : _a.call(series);
+        })) && (null === (_b = null === (_a = this._stack) || void 0 === _a ? void 0 : _a.stackAll) || void 0 === _b || _b.call(_a), 
+        this._series.forEach((series => {
+            series.getViewDataFilter() && series.reTransformViewData();
+        })));
+    }
+    _getModelSpecIndex(specInfo) {
+        var _a;
+        const specPath = null !== (_a = specInfo.specPath) && void 0 !== _a ? _a : [], specIndex = specPath[specPath.length - 1];
+        return "number" == typeof specIndex ? specIndex : 0;
+    }
+    _hasComponentForSpecInfo(key, specInfo) {
+        const specIndex = this._getModelSpecIndex(specInfo);
+        return this._components.some((component => (component.specKey || component.type) === key && component.getSpecIndex() === specIndex));
+    }
+    _createMissingMarkerComponentsForSpecs(result, componentCache) {
+        var _a;
+        let createdCount = 0;
+        null === (_a = this._specTransformer) || void 0 === _a || _a.forEachComponentInSpec(this._spec, ((constructor, specInfo) => {
+            if (result.reMake) return;
+            const compSpecKey = constructor.specKey || constructor.type;
+            MARKER_COMPONENT_SPEC_KEYS[compSpecKey] && !this._hasComponentForSpecInfo(compSpecKey, specInfo) && (this._isMarkerAdditionSpecSafeWithoutRemake(specInfo.spec) ? (this._createComponent(constructor, specInfo), 
+            componentCache[compSpecKey] && componentCache[compSpecKey].componentCount++, createdCount++) : result.reMake = !0);
+        }), this._option.getSpecInfo()), createdCount && (result.change = !0, result.effects = Object.assign(Object.assign({}, result.effects), {
+            component: !0,
+            layout: !0,
+            render: !0
+        }));
+    }
     _removeMarkerComponentsForEmptySpecs(result) {
         const removedComponents = this._components.filter((component => {
             var _a;