@visactor/vchart 2.1.0-alpha.5 → 2.1.0-alpha.7

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

@@ -130,11 +130,13 @@ export declare class BaseChart<T extends IChartSpec> extends CompilableBase impl
     private _canChangeMarkerComponentsWithoutRemake;
     private _canAddMarkerComponentsWithoutRemake;
     private _isMarkerAdditionSpecSafeWithoutRemake;
+    private _isAutoRangeMarkerSpec;
     private _canRemoveMarkerComponentsWithoutRemake;
     private _isOnlyMarkerComponentsRemoved;
     private _isComponentSpecKey;
     private _isOnlyComponentSpecsChanged;
     private _isOnlySeriesSpecsChanged;
+    private _isOnlyComponentOrSeriesSpecsChanged;
     private _canSkipChartDataStages;
     private _isComponentScaleDomainOnlyUpdate;
     private _reRunStackDataFlow;

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

@@ -19,17 +19,10 @@ const data_1 = require("../chart-meta/data"), global_scale_1 = require("../../sc
     [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
 };
@@ -121,8 +114,12 @@ 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._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._isMarkerAdditionSpecSafeWithoutRemake = spec => {
+            if (!spec || "object" != typeof spec) return !1;
+            const markerSpec = spec;
+            return !1 !== markerSpec.visible && !Object.keys(MARKER_ADDITION_REMAKE_SPEC_KEYS).some((key => !(0, 
+            vutils_1.isNil)(markerSpec[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,
@@ -462,7 +459,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
             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);
+        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), onlyComponentOrSeriesSpecsChanged = !(!onlyComponentSpecsChanged && !onlySeriesSpecsChanged) || this._isOnlyComponentOrSeriesSpecsChanged(this._spec, spec, currentKeys);
         if (this._spec = spec, onlyMarkerComponentsRemoved) return this._removeMarkerComponentsForEmptySpecs(result), 
         result;
         if (this.updateChartConfig(result, oldSpec), result.reMake) return this.setLayoutTag(!0, null, !1), 
@@ -478,7 +475,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
             component.reInit(component.getSpec());
         })), (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(), 
+        onlyComponentOrSeriesSpecsChanged && this._canSkipChartDataStages(result) || (this.updateDataSpec(), 
         this.reDataFlow(), this._reRunStackDataFlow(), this.getAllModels().forEach((model => model.onDataUpdate())))), 
         result));
     }
@@ -554,6 +551,9 @@ class BaseChart extends compilable_base_1.CompilableBase {
         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));
     }
+    _isAutoRangeMarkerSpec(spec) {
+        return !!spec && "object" == typeof spec && !0 === spec.autoRange;
+    }
     _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;
@@ -582,6 +582,14 @@ class BaseChart extends compilable_base_1.CompilableBase {
         !0)));
         return hasSeriesSpecChange && onlySeriesSpecChange;
     }
+    _isOnlyComponentOrSeriesSpecsChanged(currentSpec, nextSpec, specKeys) {
+        var _a, _b;
+        let hasComponentOrSeriesSpecChange = !1;
+        const currentSpecRecord = currentSpec, nextSpecRecord = nextSpec, seriesRelatedSpecKeys = null !== (_b = null === (_a = this._specTransformer) || void 0 === _a ? void 0 : _a.getSeriesRelatedSpecKeys()) && void 0 !== _b ? _b : {}, onlyComponentOrSeriesSpecChange = specKeys.every((key => !!(0, 
+        vutils_1.isEqual)(currentSpecRecord[key], nextSpecRecord[key]) || !(!this._isComponentSpecKey(key) && !seriesRelatedSpecKeys[key]) && (hasComponentOrSeriesSpecChange = !0, 
+        !0)));
+        return hasComponentOrSeriesSpecChange && onlyComponentOrSeriesSpecChange;
+    }
     _canSkipChartDataStages(result) {
         const effects = result.effects;
         return !(!(null == effects ? void 0 : effects.series) || effects.remake || effects.data || effects.scaleDomain || result.reMake);
@@ -611,14 +619,18 @@ class BaseChart extends compilable_base_1.CompilableBase {
     }
     _createMissingMarkerComponentsForSpecs(result, componentCache) {
         var _a;
-        let createdCount = 0;
+        let createdCount = 0, hasAutoRangeMarker = !1;
         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,
+            componentCache[compSpecKey] && componentCache[compSpecKey].componentCount++, createdCount++, 
+            hasAutoRangeMarker = hasAutoRangeMarker || this._isAutoRangeMarkerSpec(specInfo.spec)) : result.reMake = !0);
+        }), this._option.getSpecInfo()), createdCount && (result.change = !0, result.effects = Object.assign(Object.assign(Object.assign(Object.assign({}, result.effects), {
+            component: !0
+        }), hasAutoRangeMarker ? {
+            scaleDomain: !0
+        } : null), {
             layout: !0,
             render: !0
         }));