@visactor/vchart 1.11.1-alpha.0 → 1.11.1-alpha.2

package/build/index.js

@@ -60686,7 +60686,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return spec;
         }
         _initChartSpec(spec, actionSource) {
-            var _a;
+            var _a, _b;
             if (VChart.getFunctionList() && VChart.getFunctionList().length) {
                 spec = functionTransform(spec, VChart);
             }
@@ -60694,9 +60694,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             if (!this._chartSpecTransformer) {
                 this._chartSpecTransformer = Factory.createChartSpecTransformer(this._spec.type, this._getChartOption(this._spec.type));
             }
-            this._chartSpecTransformer.transformSpec(this._spec);
+            (_a = this._chartSpecTransformer) === null || _a === void 0 ? void 0 : _a.transformSpec(this._spec);
             this._chartPluginApply('onAfterChartSpecTransform', this._spec, actionSource);
-            this._specInfo = (_a = this._chartSpecTransformer) === null || _a === void 0 ? void 0 : _a.transformModelSpec(this._spec);
+            this._specInfo = (_b = this._chartSpecTransformer) === null || _b === void 0 ? void 0 : _b.transformModelSpec(this._spec);
             this._chartPluginApply('onAfterModelSpecTransform', this._spec, this._specInfo, actionSource);
         }
         _updateSpecInfo() {
@@ -60833,14 +60833,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return this._beforeRender(option);
         }
         _reCompile(updateResult, morphConfig) {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f;
             if (updateResult.reMake) {
                 this._releaseData();
                 this._initDataSet();
                 this._chartSpecTransformer = null;
-                this._chart.release();
+                (_a = this._chart) === null || _a === void 0 ? void 0 : _a.release();
                 this._chart = null;
-                (_a = this._compiler) === null || _a === void 0 ? void 0 : _a.releaseGrammar(((_b = this._option) === null || _b === void 0 ? void 0 : _b.animation) === false || ((_c = this._spec) === null || _c === void 0 ? void 0 : _c.animation) === false);
+                (_b = this._compiler) === null || _b === void 0 ? void 0 : _b.releaseGrammar(((_c = this._option) === null || _c === void 0 ? void 0 : _c.animation) === false || ((_d = this._spec) === null || _d === void 0 ? void 0 : _d.animation) === false);
                 this._userEvents.forEach(e => { var _a; return (_a = this._event) === null || _a === void 0 ? void 0 : _a.on(e.eType, e.query, e.handler); });
                 if (updateResult.reSize) {
                     this._doResize();
@@ -60848,8 +60848,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             else {
                 if (updateResult.reCompile) {
-                    (_d = this._compiler) === null || _d === void 0 ? void 0 : _d.clear({ chart: this._chart, vChart: this }, !this._option.animation || !this._spec.animation);
-                    (_e = this._compiler) === null || _e === void 0 ? void 0 : _e.compile({ chart: this._chart, vChart: this }, {});
+                    (_e = this._compiler) === null || _e === void 0 ? void 0 : _e.clear({ chart: this._chart, vChart: this }, !this._option.animation || !this._spec.animation);
+                    (_f = this._compiler) === null || _f === void 0 ? void 0 : _f.compile({ chart: this._chart, vChart: this }, {});
                 }
                 if (updateResult.reSize) {
                     const { width, height } = this.getCurrentSize();
@@ -61031,20 +61031,30 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 }
                 return this;
             }
+            const prevData = array(this._spec.data);
             const list = array(data);
             list.forEach(d => {
                 var _a;
                 const { id, values, parser, fields } = d;
-                const preDV = this._spec.data.find(dv => dv.name === id);
+                const preDV = prevData.find(dv => dv.name === id);
                 if (preDV) {
-                    preDV.setFields(cloneDeep(fields));
-                    preDV.parse(values, cloneDeep(parser));
+                    if (preDV instanceof DataView) {
+                        preDV.setFields(cloneDeep(fields));
+                        preDV.parse(values, cloneDeep(parser));
+                    }
+                    else {
+                        preDV.values = values;
+                        isValid$3(parser) && (preDV.parser = parser);
+                        isValid$3(fields) && (preDV.fields = fields);
+                    }
                 }
                 else {
-                    const dataView = dataToDataView(d, this._dataSet, this._spec.data, {
+                    const dataView = dataToDataView(d, this._dataSet, prevData, {
                         onError: (_a = this._option) === null || _a === void 0 ? void 0 : _a.onError
                     });
-                    this._spec.data.push(dataView);
+                    if (isArray$3(this._spec.data)) {
+                        this._spec.data.push(dataView);
+                    }
                 }
             });
             return this;
@@ -66009,7 +66019,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         registerComponentPlugin(CanvasTooltipHandler);
     };
 
-    const version = "1.11.1-alpha.0";
+    const version = "1.11.1-alpha.2";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -87023,11 +87033,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         valueToPositionX(value) {
             const node = this.valueToNode(value);
-            return node.x0;
+            return node === null || node === void 0 ? void 0 : node.x0;
         }
         valueToPositionY(value) {
             const node = this.valueToNode(value);
-            return node.y0;
+            return node === null || node === void 0 ? void 0 : node.y0;
         }
         initMarkStyle() {
             this._initNodeMarkStyle();
@@ -97036,6 +97046,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             super.onLayoutStart(layoutRect, chartViewRect, ctx);
         }
+        _compareSpec(spec, prevSpec) {
+            const result = super._compareSpec(spec, prevSpec);
+            if (!isEqual$1(prevSpec, spec)) {
+                result.reRender = true;
+                result.reMake = true;
+                result.change = true;
+            }
+            return result;
+        }
     }
 
     function markerRegression(_data, opt) {
@@ -97125,8 +97144,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             const markLine = this._newMarkLineComponent(markLineAttrs);
             return markLine;
         }
-        _markerLayout() {
-            var _a, _b, _c, _d, _e;
+        _getUpdateMarkerAttrs() {
+            var _a, _b, _c, _d;
             const spec = this._spec;
             const data = this._markerData;
             const startRelativeSeries = this._startRelativeSeries;
@@ -97153,7 +97172,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             const labelAttrs = Object.assign(Object.assign({}, markerComponentAttr.label), { text: this._spec.label.formatMethod
                     ? this._spec.label.formatMethod(dataPoints, seriesData)
                     : (_d = markerComponentAttr.label) === null || _d === void 0 ? void 0 : _d.text });
-            (_e = this._markerComponent) === null || _e === void 0 ? void 0 : _e.setAttributes(Object.assign(Object.assign({}, pointsAttr), { label: labelAttrs, limitRect, dx: this._layoutOffsetX, dy: this._layoutOffsetY }));
+            return Object.assign(Object.assign({}, pointsAttr), { label: labelAttrs, limitRect, dx: this._layoutOffsetX, dy: this._layoutOffsetY });
+        }
+        _markerLayout() {
+            var _a;
+            const updateAttrs = this._getUpdateMarkerAttrs();
+            (_a = this._markerComponent) === null || _a === void 0 ? void 0 : _a.setAttributes(updateAttrs);
         }
         _initDataView() {
             const spec = this._spec;
@@ -97249,35 +97273,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return { points };
         }
         _markerLayout() {
-            var _a, _b, _c, _d, _e, _f;
-            super._markerLayout();
-            const spec = this._spec;
-            const data = this._markerData;
-            const startRelativeSeries = this._startRelativeSeries;
-            const endRelativeSeries = this._endRelativeSeries;
-            const relativeSeries = this._relativeSeries;
-            const { points } = this._computePointsAttr();
-            const seriesData = this._relativeSeries.getViewData().latestData;
-            const dataPoints = data.latestData[0] && data.latestData[0].latestData ? data.latestData[0].latestData : data.latestData;
-            let limitRect;
-            if (spec.clip || ((_a = spec.label) === null || _a === void 0 ? void 0 : _a.confine)) {
-                const { minX, maxX, minY, maxY } = computeClipRange([
-                    startRelativeSeries.getRegion(),
-                    endRelativeSeries.getRegion(),
-                    relativeSeries.getRegion()
-                ]);
-                limitRect = {
-                    x: minX,
-                    y: minY,
-                    width: maxX - minX,
-                    height: maxY - minY
-                };
-            }
-            const markerComponentAttr = (_c = (_b = this._markerComponent) === null || _b === void 0 ? void 0 : _b.attribute) !== null && _c !== void 0 ? _c : {};
-            const labelAttrs = Object.assign(Object.assign({}, markerComponentAttr.label), { text: this._spec.label.formatMethod
-                    ? this._spec.label.formatMethod(dataPoints, seriesData)
-                    : (_d = markerComponentAttr.label) === null || _d === void 0 ? void 0 : _d.text });
+            var _a, _b, _c, _d;
+            const updateAttrs = this._getUpdateMarkerAttrs();
             if (this._spec.type === 'type-step') {
+                const startRelativeSeries = this._startRelativeSeries;
+                const endRelativeSeries = this._endRelativeSeries;
                 const { multiSegment, mainSegmentIndex } = this._spec.line || {};
                 const { connectDirection, expandDistance = 0 } = this._spec;
                 let expandDistanceValue;
@@ -97300,6 +97300,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 else {
                     expandDistanceValue = expandDistance;
                 }
+                const { points, label, limitRect } = updateAttrs;
                 const joinPoints = getInsertPoints(points[0], points[1], connectDirection, expandDistanceValue);
                 let labelPositionAttrs;
                 if (multiSegment && isValid$3(mainSegmentIndex)) {
@@ -97313,7 +97314,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 else {
                     labelPositionAttrs = Object.assign(Object.assign({ position: 'start', autoRotate: false }, getTextOffset(points[0], points[1], connectDirection, expandDistanceValue)), { refX: 0, refY: 0 });
                 }
-                (_e = this._markerComponent) === null || _e === void 0 ? void 0 : _e.setAttributes({
+                const markerComponentAttr = (_b = (_a = this._markerComponent) === null || _a === void 0 ? void 0 : _a.attribute) !== null && _b !== void 0 ? _b : {};
+                (_c = this._markerComponent) === null || _c === void 0 ? void 0 : _c.setAttributes({
                     points: multiSegment
                         ? [
                             [joinPoints[0], joinPoints[1]],
@@ -97321,7 +97323,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                             [joinPoints[2], joinPoints[3]]
                         ]
                         : joinPoints,
-                    label: Object.assign(Object.assign(Object.assign({}, labelAttrs), labelPositionAttrs), { textStyle: Object.assign(Object.assign({}, markerComponentAttr.label.textStyle), { textAlign: 'center', textBaseline: 'middle' }) }),
+                    label: Object.assign(Object.assign(Object.assign({}, label), labelPositionAttrs), { textStyle: Object.assign(Object.assign({}, markerComponentAttr.label.textStyle), { textAlign: 'center', textBaseline: 'middle' }) }),
                     limitRect,
                     multiSegment,
                     mainSegmentIndex,
@@ -97330,13 +97332,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 });
             }
             else {
-                (_f = this._markerComponent) === null || _f === void 0 ? void 0 : _f.setAttributes({
-                    points,
-                    label: labelAttrs,
-                    limitRect,
-                    dx: this._layoutOffsetX,
-                    dy: this._layoutOffsetY
-                });
+                (_d = this._markerComponent) === null || _d === void 0 ? void 0 : _d.setAttributes(updateAttrs);
             }
         }
         _computeOptions() {