@visactor/vchart 2.0.23-alpha.2 → 2.0.23-alpha.3

package/build/index.es.js

@@ -61784,13 +61784,10 @@ class VChart {
         (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setLayout(layout);
     }
     reLayout() {
-        if (!this._chart || !this._compiler || this._isReleased) {
-            return;
-        }
-        this._chart.resetLayoutItemTag();
-        this._chart.setLayoutTag(true, null, false);
-        this._compiler.render();
-        this._chart.onEvaluateEnd();
+        var _a, _b, _c;
+        (_a = this._chart) === null || _a === void 0 ? void 0 : _a.resetLayoutItemTag();
+        (_b = this._chart) === null || _b === void 0 ? void 0 : _b.setLayoutTag(true, null, false);
+        (_c = this._compiler) === null || _c === void 0 ? void 0 : _c.render();
     }
     getCompiler() {
         return this._compiler;
@@ -74026,55 +74023,45 @@ class ScatterSeries extends CartesianSeries {
             }, STATE_VALUE_ENUM.STATE_NORMAL, AttributeLevel.Series);
         }
     }
-    _updateSymbolGraphicPosition() {
-        var _a;
-        const graphics = (_a = this._symbolMark) === null || _a === void 0 ? void 0 : _a.getGraphics();
-        if (!graphics || !graphics.length) {
-            return;
-        }
-        graphics.forEach((graphicItem) => {
-            var _a, _b;
-            const datum = (_b = (_a = graphicItem === null || graphicItem === void 0 ? void 0 : graphicItem.context) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b[0];
-            const newPosition = this.dataToPosition(datum);
-            if (newPosition && graphicItem) {
-                graphicItem.setAttributes({
-                    x: newPosition.x,
-                    y: newPosition.y
-                });
+    handleZoom(e) {
+        var _a, _b, _c, _d;
+        this.getMarksWithoutRoot().forEach(mark => {
+            if (!mark) {
+                return;
             }
-        });
-    }
-    _ensureLabelGraphicPostMatrix() {
-        var _a, _b;
-        const labelGraphic = (_b = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent()) === null || _b === void 0 ? void 0 : _b.getComponent();
-        if (labelGraphic && !labelGraphic.attribute.postMatrix) {
-            labelGraphic.setAttributes({
-                postMatrix: new Matrix()
+            const graphics = mark.getGraphics();
+            if (!graphics || !graphics.length) {
+                return;
+            }
+            graphics.forEach((graphicItem, i) => {
+                var _a, _b;
+                const datum = (_b = (_a = graphicItem === null || graphicItem === void 0 ? void 0 : graphicItem.context) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b[0];
+                const newPosition = this.dataToPosition(datum);
+                if (newPosition && graphicItem) {
+                    graphicItem.translateTo(newPosition.x, newPosition.y);
+                }
             });
+        });
+        const labelComponent = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+        if (labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.renderInner) {
+            labelComponent.renderInner();
         }
-        return labelGraphic;
-    }
-    handleZoom(e) {
-        const { scale, scaleCenter } = e;
-        if (scale === 1) {
-            return;
+        const vgrammarLabel = (_b = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getComponent) === null || _b === void 0 ? void 0 : _b.call(labelComponent);
+        if (vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.evaluate) {
+            vgrammarLabel.evaluate(null, null);
         }
-        this._updateSymbolGraphicPosition();
-        const labelGraphic = this._ensureLabelGraphicPostMatrix();
-        if (labelGraphic) {
-            labelGraphic.scale(scale, scale, scaleCenter);
+        const labelGroup = (_c = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getProduct) === null || _c === void 0 ? void 0 : _c.call(labelComponent);
+        if (labelGroup && (e === null || e === void 0 ? void 0 : e.scale) && (e === null || e === void 0 ? void 0 : e.scaleCenter)) {
+            if (!((_d = labelGroup.attribute) === null || _d === void 0 ? void 0 : _d.postMatrix)) {
+                labelGroup.setAttributes({
+                    postMatrix: new Matrix()
+                });
+            }
+            labelGroup.scale(e.scale, e.scale, e.scaleCenter);
         }
     }
     handlePan(e) {
-        const { delta } = e;
-        if ((delta === null || delta === void 0 ? void 0 : delta[0]) === 0 && (delta === null || delta === void 0 ? void 0 : delta[1]) === 0) {
-            return;
-        }
-        this._updateSymbolGraphicPosition();
-        const labelGraphic = this._ensureLabelGraphicPostMatrix();
-        if (labelGraphic) {
-            labelGraphic.translate(delta[0], delta[1]);
-        }
+        this.handleZoom(e);
     }
     getDefaultShapeType() {
         return 'circle';
@@ -75333,7 +75320,7 @@ class MapSeries extends GeoSeries {
         this._mapViewData = null;
     }
     handleZoom(e) {
-        var _a;
+        var _a, _b, _c, _d;
         const { scale, scaleCenter } = e;
         if (scale === 1) {
             return;
@@ -75347,13 +75334,26 @@ class MapSeries extends GeoSeries {
             }
             pathGroup.scale(scale, scale, scaleCenter);
         }
-        const vgrammarLabel = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
-        if (vgrammarLabel) {
-            vgrammarLabel.renderInner();
+        const labelComponent = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+        if (labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.renderInner) {
+            labelComponent.renderInner();
+        }
+        const vgrammarLabel = (_b = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getComponent) === null || _b === void 0 ? void 0 : _b.call(labelComponent);
+        if (vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.evaluate) {
+            vgrammarLabel.evaluate(null, null);
+        }
+        const labelGroup = (_c = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getProduct) === null || _c === void 0 ? void 0 : _c.call(labelComponent);
+        if (labelGroup && scale && scaleCenter) {
+            if (!((_d = labelGroup.attribute) === null || _d === void 0 ? void 0 : _d.postMatrix)) {
+                labelGroup.setAttributes({
+                    postMatrix: new Matrix()
+                });
+            }
+            labelGroup.scale(scale, scale, scaleCenter);
         }
     }
     handlePan(e) {
-        var _a;
+        var _a, _b, _c, _d;
         const { delta } = e;
         if (delta[0] === 0 && delta[1] === 0) {
             return;
@@ -75367,9 +75367,22 @@ class MapSeries extends GeoSeries {
             }
             pathGroup.translate(delta[0], delta[1]);
         }
-        const vgrammarLabel = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
-        if (vgrammarLabel) {
-            vgrammarLabel.renderInner();
+        const labelComponent = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+        if (labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.renderInner) {
+            labelComponent.renderInner();
+        }
+        const vgrammarLabel = (_b = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getComponent) === null || _b === void 0 ? void 0 : _b.call(labelComponent);
+        if (vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.evaluate) {
+            vgrammarLabel.evaluate(null, null);
+        }
+        const labelGroup = (_c = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getProduct) === null || _c === void 0 ? void 0 : _c.call(labelComponent);
+        if (labelGroup && delta) {
+            if (!((_d = labelGroup.attribute) === null || _d === void 0 ? void 0 : _d.postMatrix)) {
+                labelGroup.setAttributes({
+                    postMatrix: new Matrix()
+                });
+            }
+            labelGroup.translate(delta[0], delta[1]);
         }
     }
     getDatumCenter(datum) {
@@ -95590,6 +95603,7 @@ class BaseLegend extends BaseComponent {
     }
     clear() {
         super.clear();
+        this._legendComponent = null;
         this._cacheAttrs = null;
         this._preSelectedData = null;
     }

package/build/index.js

@@ -61790,13 +61790,10 @@
             (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setLayout(layout);
         }
         reLayout() {
-            if (!this._chart || !this._compiler || this._isReleased) {
-                return;
-            }
-            this._chart.resetLayoutItemTag();
-            this._chart.setLayoutTag(true, null, false);
-            this._compiler.render();
-            this._chart.onEvaluateEnd();
+            var _a, _b, _c;
+            (_a = this._chart) === null || _a === void 0 ? void 0 : _a.resetLayoutItemTag();
+            (_b = this._chart) === null || _b === void 0 ? void 0 : _b.setLayoutTag(true, null, false);
+            (_c = this._compiler) === null || _c === void 0 ? void 0 : _c.render();
         }
         getCompiler() {
             return this._compiler;
@@ -74032,55 +74029,45 @@
                 }, exports.STATE_VALUE_ENUM.STATE_NORMAL, exports.AttributeLevel.Series);
             }
         }
-        _updateSymbolGraphicPosition() {
-            var _a;
-            const graphics = (_a = this._symbolMark) === null || _a === void 0 ? void 0 : _a.getGraphics();
-            if (!graphics || !graphics.length) {
-                return;
-            }
-            graphics.forEach((graphicItem) => {
-                var _a, _b;
-                const datum = (_b = (_a = graphicItem === null || graphicItem === void 0 ? void 0 : graphicItem.context) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b[0];
-                const newPosition = this.dataToPosition(datum);
-                if (newPosition && graphicItem) {
-                    graphicItem.setAttributes({
-                        x: newPosition.x,
-                        y: newPosition.y
-                    });
+        handleZoom(e) {
+            var _a, _b, _c, _d;
+            this.getMarksWithoutRoot().forEach(mark => {
+                if (!mark) {
+                    return;
                 }
-            });
-        }
-        _ensureLabelGraphicPostMatrix() {
-            var _a, _b;
-            const labelGraphic = (_b = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent()) === null || _b === void 0 ? void 0 : _b.getComponent();
-            if (labelGraphic && !labelGraphic.attribute.postMatrix) {
-                labelGraphic.setAttributes({
-                    postMatrix: new Matrix()
+                const graphics = mark.getGraphics();
+                if (!graphics || !graphics.length) {
+                    return;
+                }
+                graphics.forEach((graphicItem, i) => {
+                    var _a, _b;
+                    const datum = (_b = (_a = graphicItem === null || graphicItem === void 0 ? void 0 : graphicItem.context) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b[0];
+                    const newPosition = this.dataToPosition(datum);
+                    if (newPosition && graphicItem) {
+                        graphicItem.translateTo(newPosition.x, newPosition.y);
+                    }
                 });
+            });
+            const labelComponent = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+            if (labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.renderInner) {
+                labelComponent.renderInner();
             }
-            return labelGraphic;
-        }
-        handleZoom(e) {
-            const { scale, scaleCenter } = e;
-            if (scale === 1) {
-                return;
+            const vgrammarLabel = (_b = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getComponent) === null || _b === void 0 ? void 0 : _b.call(labelComponent);
+            if (vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.evaluate) {
+                vgrammarLabel.evaluate(null, null);
             }
-            this._updateSymbolGraphicPosition();
-            const labelGraphic = this._ensureLabelGraphicPostMatrix();
-            if (labelGraphic) {
-                labelGraphic.scale(scale, scale, scaleCenter);
+            const labelGroup = (_c = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getProduct) === null || _c === void 0 ? void 0 : _c.call(labelComponent);
+            if (labelGroup && (e === null || e === void 0 ? void 0 : e.scale) && (e === null || e === void 0 ? void 0 : e.scaleCenter)) {
+                if (!((_d = labelGroup.attribute) === null || _d === void 0 ? void 0 : _d.postMatrix)) {
+                    labelGroup.setAttributes({
+                        postMatrix: new Matrix()
+                    });
+                }
+                labelGroup.scale(e.scale, e.scale, e.scaleCenter);
             }
         }
         handlePan(e) {
-            const { delta } = e;
-            if ((delta === null || delta === void 0 ? void 0 : delta[0]) === 0 && (delta === null || delta === void 0 ? void 0 : delta[1]) === 0) {
-                return;
-            }
-            this._updateSymbolGraphicPosition();
-            const labelGraphic = this._ensureLabelGraphicPostMatrix();
-            if (labelGraphic) {
-                labelGraphic.translate(delta[0], delta[1]);
-            }
+            this.handleZoom(e);
         }
         getDefaultShapeType() {
             return 'circle';
@@ -75339,7 +75326,7 @@
             this._mapViewData = null;
         }
         handleZoom(e) {
-            var _a;
+            var _a, _b, _c, _d;
             const { scale, scaleCenter } = e;
             if (scale === 1) {
                 return;
@@ -75353,13 +75340,26 @@
                 }
                 pathGroup.scale(scale, scale, scaleCenter);
             }
-            const vgrammarLabel = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
-            if (vgrammarLabel) {
-                vgrammarLabel.renderInner();
+            const labelComponent = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+            if (labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.renderInner) {
+                labelComponent.renderInner();
+            }
+            const vgrammarLabel = (_b = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getComponent) === null || _b === void 0 ? void 0 : _b.call(labelComponent);
+            if (vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.evaluate) {
+                vgrammarLabel.evaluate(null, null);
+            }
+            const labelGroup = (_c = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getProduct) === null || _c === void 0 ? void 0 : _c.call(labelComponent);
+            if (labelGroup && scale && scaleCenter) {
+                if (!((_d = labelGroup.attribute) === null || _d === void 0 ? void 0 : _d.postMatrix)) {
+                    labelGroup.setAttributes({
+                        postMatrix: new Matrix()
+                    });
+                }
+                labelGroup.scale(scale, scale, scaleCenter);
             }
         }
         handlePan(e) {
-            var _a;
+            var _a, _b, _c, _d;
             const { delta } = e;
             if (delta[0] === 0 && delta[1] === 0) {
                 return;
@@ -75373,9 +75373,22 @@
                 }
                 pathGroup.translate(delta[0], delta[1]);
             }
-            const vgrammarLabel = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
-            if (vgrammarLabel) {
-                vgrammarLabel.renderInner();
+            const labelComponent = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+            if (labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.renderInner) {
+                labelComponent.renderInner();
+            }
+            const vgrammarLabel = (_b = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getComponent) === null || _b === void 0 ? void 0 : _b.call(labelComponent);
+            if (vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.evaluate) {
+                vgrammarLabel.evaluate(null, null);
+            }
+            const labelGroup = (_c = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getProduct) === null || _c === void 0 ? void 0 : _c.call(labelComponent);
+            if (labelGroup && delta) {
+                if (!((_d = labelGroup.attribute) === null || _d === void 0 ? void 0 : _d.postMatrix)) {
+                    labelGroup.setAttributes({
+                        postMatrix: new Matrix()
+                    });
+                }
+                labelGroup.translate(delta[0], delta[1]);
             }
         }
         getDatumCenter(datum) {
@@ -95596,6 +95609,7 @@
         }
         clear() {
             super.clear();
+            this._legendComponent = null;
             this._cacheAttrs = null;
             this._preSelectedData = null;
         }