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

package/build/index.es.js

@@ -61784,10 +61784,13 @@ class VChart {
         (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setLayout(layout);
     }
     reLayout() {
-        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();
+        if (!this._chart || !this._compiler || this._isReleased) {
+            return;
+        }
+        this._chart.resetLayoutItemTag();
+        this._chart.setLayoutTag(true, null, false);
+        this._compiler.render();
+        this._chart.onEvaluateEnd();
     }
     getCompiler() {
         return this._compiler;
@@ -66087,9 +66090,7 @@ function getDatumByValue(data, value, startField, endField) {
         if (record) {
             const startValue = record[startField];
             const endValue = record[endField || startField];
-            const min = Math.min(startValue, endValue);
-            const max = Math.max(startValue, endValue);
-            if (min <= value && max >= value) {
+            if (startValue <= value && endValue >= value) {
                 return record;
             }
         }
@@ -71860,17 +71861,15 @@ const layoutByValue$1 = (stateByField, series, layoutStartPoint, enableRemain =
                     const field2 = field === 'xField' ? series.fieldX2 : series.fieldY2;
                     const datum = getDatumByValue(series.getViewData().latestData, +value, field1, field2);
                     if (datum) {
-                        const posStart = field === 'xField' ? series.dataToPositionX(datum) : series.dataToPositionY(datum);
+                        const startX = field === 'xField' ? series.dataToPositionX(datum) : series.dataToPositionY(datum);
                         if (field2) {
-                            const posEnd = field === 'xField' ? series.dataToPositionX1(datum) : series.dataToPositionY1(datum);
-                            bandSize = Math.abs(posStart - posEnd);
-                            coord = Math.min(posStart, posEnd);
+                            bandSize = Math.abs(startX - (field === 'xField' ? series.dataToPositionX1(datum) : series.dataToPositionY1(datum)));
                             value = `${datum[field1]} ~ ${datum[field2]}`;
                         }
                         else {
                             bandSize = 1;
-                            coord = posStart;
                         }
+                        coord = startX;
                     }
                     niceLabelFormatter = axis.niceLabelFormatter;
                 }
@@ -74027,45 +74026,55 @@ class ScatterSeries extends CartesianSeries {
             }, STATE_VALUE_ENUM.STATE_NORMAL, AttributeLevel.Series);
         }
     }
-    handleZoom(e) {
-        var _a, _b, _c, _d;
-        this.getMarksWithoutRoot().forEach(mark => {
-            if (!mark) {
-                return;
-            }
-            const graphics = mark.getGraphics();
-            if (!graphics || !graphics.length) {
-                return;
+    _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
+                });
             }
-            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();
+    }
+    _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 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);
+        return labelGraphic;
+    }
+    handleZoom(e) {
+        const { scale, scaleCenter } = e;
+        if (scale === 1) {
+            return;
         }
-        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);
+        this._updateSymbolGraphicPosition();
+        const labelGraphic = this._ensureLabelGraphicPostMatrix();
+        if (labelGraphic) {
+            labelGraphic.scale(scale, scale, scaleCenter);
         }
     }
     handlePan(e) {
-        this.handleZoom(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]);
+        }
     }
     getDefaultShapeType() {
         return 'circle';
@@ -75324,7 +75333,7 @@ class MapSeries extends GeoSeries {
         this._mapViewData = null;
     }
     handleZoom(e) {
-        var _a, _b, _c, _d;
+        var _a;
         const { scale, scaleCenter } = e;
         if (scale === 1) {
             return;
@@ -75338,26 +75347,13 @@ class MapSeries extends GeoSeries {
             }
             pathGroup.scale(scale, scale, scaleCenter);
         }
-        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);
+        const vgrammarLabel = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+        if (vgrammarLabel) {
+            vgrammarLabel.renderInner();
         }
     }
     handlePan(e) {
-        var _a, _b, _c, _d;
+        var _a;
         const { delta } = e;
         if (delta[0] === 0 && delta[1] === 0) {
             return;
@@ -75371,22 +75367,9 @@ class MapSeries extends GeoSeries {
             }
             pathGroup.translate(delta[0], delta[1]);
         }
-        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]);
+        const vgrammarLabel = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+        if (vgrammarLabel) {
+            vgrammarLabel.renderInner();
         }
     }
     getDatumCenter(datum) {

package/build/index.js

@@ -61790,10 +61790,13 @@
             (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setLayout(layout);
         }
         reLayout() {
-            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();
+            if (!this._chart || !this._compiler || this._isReleased) {
+                return;
+            }
+            this._chart.resetLayoutItemTag();
+            this._chart.setLayoutTag(true, null, false);
+            this._compiler.render();
+            this._chart.onEvaluateEnd();
         }
         getCompiler() {
             return this._compiler;
@@ -66093,9 +66096,7 @@
             if (record) {
                 const startValue = record[startField];
                 const endValue = record[endField || startField];
-                const min = Math.min(startValue, endValue);
-                const max = Math.max(startValue, endValue);
-                if (min <= value && max >= value) {
+                if (startValue <= value && endValue >= value) {
                     return record;
                 }
             }
@@ -71866,17 +71867,15 @@
                         const field2 = field === 'xField' ? series.fieldX2 : series.fieldY2;
                         const datum = getDatumByValue(series.getViewData().latestData, +value, field1, field2);
                         if (datum) {
-                            const posStart = field === 'xField' ? series.dataToPositionX(datum) : series.dataToPositionY(datum);
+                            const startX = field === 'xField' ? series.dataToPositionX(datum) : series.dataToPositionY(datum);
                             if (field2) {
-                                const posEnd = field === 'xField' ? series.dataToPositionX1(datum) : series.dataToPositionY1(datum);
-                                bandSize = Math.abs(posStart - posEnd);
-                                coord = Math.min(posStart, posEnd);
+                                bandSize = Math.abs(startX - (field === 'xField' ? series.dataToPositionX1(datum) : series.dataToPositionY1(datum)));
                                 value = `${datum[field1]} ~ ${datum[field2]}`;
                             }
                             else {
                                 bandSize = 1;
-                                coord = posStart;
                             }
+                            coord = startX;
                         }
                         niceLabelFormatter = axis.niceLabelFormatter;
                     }
@@ -74033,45 +74032,55 @@
                 }, exports.STATE_VALUE_ENUM.STATE_NORMAL, exports.AttributeLevel.Series);
             }
         }
-        handleZoom(e) {
-            var _a, _b, _c, _d;
-            this.getMarksWithoutRoot().forEach(mark => {
-                if (!mark) {
-                    return;
-                }
-                const graphics = mark.getGraphics();
-                if (!graphics || !graphics.length) {
-                    return;
+        _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
+                    });
                 }
-                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();
+        }
+        _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 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);
+            return labelGraphic;
+        }
+        handleZoom(e) {
+            const { scale, scaleCenter } = e;
+            if (scale === 1) {
+                return;
             }
-            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);
+            this._updateSymbolGraphicPosition();
+            const labelGraphic = this._ensureLabelGraphicPostMatrix();
+            if (labelGraphic) {
+                labelGraphic.scale(scale, scale, scaleCenter);
             }
         }
         handlePan(e) {
-            this.handleZoom(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]);
+            }
         }
         getDefaultShapeType() {
             return 'circle';
@@ -75330,7 +75339,7 @@
             this._mapViewData = null;
         }
         handleZoom(e) {
-            var _a, _b, _c, _d;
+            var _a;
             const { scale, scaleCenter } = e;
             if (scale === 1) {
                 return;
@@ -75344,26 +75353,13 @@
                 }
                 pathGroup.scale(scale, scale, scaleCenter);
             }
-            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);
+            const vgrammarLabel = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+            if (vgrammarLabel) {
+                vgrammarLabel.renderInner();
             }
         }
         handlePan(e) {
-            var _a, _b, _c, _d;
+            var _a;
             const { delta } = e;
             if (delta[0] === 0 && delta[1] === 0) {
                 return;
@@ -75377,22 +75373,9 @@
                 }
                 pathGroup.translate(delta[0], delta[1]);
             }
-            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]);
+            const vgrammarLabel = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+            if (vgrammarLabel) {
+                vgrammarLabel.renderInner();
             }
         }
         getDatumCenter(datum) {