@visactor/vchart 2.1.2-alpha.9 → 2.1.2

package/build/index.es.js

@@ -19952,14 +19952,14 @@ class DefaultWindow extends EventListenerManager {
   get dpr() {
     return this._handler.getDpr();
   }
-  constructor(global = application.global, handlerFactory = defaultWindowHandlerFactory) {
+  constructor(vRenderGlobal = application.global, handlerFactory = defaultWindowHandlerFactory) {
     super(), this.handlerFactory = handlerFactory, this.hooks = {
       onChange: new SyncHook(["x", "y", "width", "height"])
     }, this.active = () => {
-      const global = this.global;
-      if (!global.env || this.actived) return;
-      this.handlerFactory(global.env).configure(this, global), this.actived = !0;
-    }, this._uid = Generator.GenAutoIncrementId(), this.global = global, this.postInit();
+      const vRenderGlobal = this.global;
+      if (!vRenderGlobal.env || this.actived) return;
+      this.handlerFactory(vRenderGlobal.env).configure(this, vRenderGlobal), this.actived = !0;
+    }, this._uid = Generator.GenAutoIncrementId(), this.global = vRenderGlobal, this.postInit();
   }
   _nativeAddEventListener(type, listener, options) {
     return this._handler.addEventListener(type, listener, options);
@@ -34244,7 +34244,8 @@ class BrowserWindowHandlerContribution extends BaseWindowHandlerContribution {
     params.canvas ? this.createWindowByCanvas(params) : this.createWindowByConfig(params), this.postInit();
   }
   postInit() {
-    if (this.global.optimizeVisible) try {
+    var _a;
+    if (null === (_a = this.global) || void 0 === _a ? void 0 : _a.optimizeVisible) try {
       this.observerCanvas();
     } catch (err) {
       console.error("发生错误，该环境不存在IntersectionObserver");
@@ -34285,10 +34286,10 @@ class BrowserWindowHandlerContribution extends BaseWindowHandlerContribution {
     this.canvas = new BrowserCanvas(options);
   }
   createWindowByCanvas(params) {
-    var _a, _b;
+    var _a, _b, _c;
     let canvas;
     if ("string" == typeof params.canvas) {
-      if (canvas = this.global.getElementById(params.canvas), canvas || "undefined" == typeof document || (canvas = document.getElementById(params.canvas)), !canvas) throw new Error("canvasId 参数不正确，请确认canvas存在并插入dom");
+      if (canvas = null === (_a = this.global) || void 0 === _a ? void 0 : _a.getElementById(params.canvas), canvas || "undefined" == typeof document || (canvas = document.getElementById(params.canvas)), !canvas) throw new Error("canvasId 参数不正确，请确认canvas存在并插入dom");
     } else canvas = params.canvas;
     if (!canvas) throw new Error("发生错误，传入的canvas不正确");
     let width = params.width,
@@ -34299,14 +34300,14 @@ class BrowserWindowHandlerContribution extends BaseWindowHandlerContribution {
     }
     let dpr = params.dpr;
     if (null == dpr) {
-      dpr = null !== (_a = canvas.getContext("2d").pixelRatio) && void 0 !== _a ? _a : canvas.width / width;
+      dpr = null !== (_b = canvas.getContext("2d").pixelRatio) && void 0 !== _b ? _b : canvas.width / width;
     }
     this.canvas = new BrowserCanvas({
       width: width,
       height: height,
       dpr: dpr,
       nativeCanvas: canvas,
-      canvasControled: null !== (_b = params.canvasControled) && void 0 !== _b && _b
+      canvasControled: null !== (_c = params.canvasControled) && void 0 !== _c && _c
     });
   }
   releaseWindow() {
@@ -41628,6 +41629,20 @@ class BaseMark extends GrammarItem {
     _hasDiffAttrs(g) {
         return !!g.context.diffAttrs && Object.keys(g.context.diffAttrs).length > 0;
     }
+    _commitPreventedAnimationStaticAttrs(g, attrs) {
+        var _a, _b;
+        if (!attrs || !Object.keys(attrs).length) {
+            return;
+        }
+        const graphic = g;
+        (_a = graphic.setFinalAttributes) === null || _a === void 0 ? void 0 : _a.call(graphic, attrs);
+        if (graphic._commitAnimationStaticAttributes) {
+            graphic._commitAnimationStaticAttributes(attrs);
+        }
+        else {
+            (_b = graphic.commitInternalBaseAttributes) === null || _b === void 0 ? void 0 : _b.call(graphic, attrs);
+        }
+    }
     _runApplyGraphic(graphics) {
         const hasAnimation = this.hasAnimation();
         graphics.forEach((g, index) => {
@@ -41665,7 +41680,13 @@ class BaseMark extends GrammarItem {
                     g.context.reusing = false;
                 }
                 else if (!hasStateAnimation) {
-                    hasAnimation ? g.setAttributesAndPreventAnimate(diffAttrs) : g.setAttributes(diffAttrs);
+                    if (hasAnimation) {
+                        g.setAttributesAndPreventAnimate(diffAttrs);
+                        this._commitPreventedAnimationStaticAttrs(g, diffAttrs);
+                    }
+                    else {
+                        g.setAttributes(diffAttrs);
+                    }
                 }
                 if (!((_b = this.renderContext) === null || _b === void 0 ? void 0 : _b.progressive) && this._product && g.parent !== this._product) {
                     this._product.appendChild(g);
@@ -42141,7 +42162,13 @@ class GroupMark extends BaseMark {
             const diffAttrs = getDiffAttributesOfGraphic(this._product, newAttrs);
             this._product.context.diffAttrs = diffAttrs;
             if (!this.hasAnimationByState(this._product.context.animationState)) {
-                hasAnimation ? this._product.setAttributesAndPreventAnimate(diffAttrs) : this._product.setAttributes(diffAttrs);
+                if (hasAnimation) {
+                    this._product.setAttributesAndPreventAnimate(diffAttrs);
+                    this._commitPreventedAnimationStaticAttrs(this._product, diffAttrs);
+                }
+                else {
+                    this._product.setAttributes(diffAttrs);
+                }
             }
         }
         else {
@@ -49194,7 +49221,7 @@ const lookup = (data, opt) => {
     });
 };
 
-const version = "2.1.1";
+const version = "2.1.2";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();

package/build/index.js

@@ -19958,14 +19958,14 @@
       get dpr() {
         return this._handler.getDpr();
       }
-      constructor(global = application.global, handlerFactory = defaultWindowHandlerFactory) {
+      constructor(vRenderGlobal = application.global, handlerFactory = defaultWindowHandlerFactory) {
         super(), this.handlerFactory = handlerFactory, this.hooks = {
           onChange: new SyncHook(["x", "y", "width", "height"])
         }, this.active = () => {
-          const global = this.global;
-          if (!global.env || this.actived) return;
-          this.handlerFactory(global.env).configure(this, global), this.actived = !0;
-        }, this._uid = Generator.GenAutoIncrementId(), this.global = global, this.postInit();
+          const vRenderGlobal = this.global;
+          if (!vRenderGlobal.env || this.actived) return;
+          this.handlerFactory(vRenderGlobal.env).configure(this, vRenderGlobal), this.actived = !0;
+        }, this._uid = Generator.GenAutoIncrementId(), this.global = vRenderGlobal, this.postInit();
       }
       _nativeAddEventListener(type, listener, options) {
         return this._handler.addEventListener(type, listener, options);
@@ -34250,7 +34250,8 @@
         params.canvas ? this.createWindowByCanvas(params) : this.createWindowByConfig(params), this.postInit();
       }
       postInit() {
-        if (this.global.optimizeVisible) try {
+        var _a;
+        if (null === (_a = this.global) || void 0 === _a ? void 0 : _a.optimizeVisible) try {
           this.observerCanvas();
         } catch (err) {
           console.error("发生错误，该环境不存在IntersectionObserver");
@@ -34291,10 +34292,10 @@
         this.canvas = new BrowserCanvas(options);
       }
       createWindowByCanvas(params) {
-        var _a, _b;
+        var _a, _b, _c;
         let canvas;
         if ("string" == typeof params.canvas) {
-          if (canvas = this.global.getElementById(params.canvas), canvas || "undefined" == typeof document || (canvas = document.getElementById(params.canvas)), !canvas) throw new Error("canvasId 参数不正确，请确认canvas存在并插入dom");
+          if (canvas = null === (_a = this.global) || void 0 === _a ? void 0 : _a.getElementById(params.canvas), canvas || "undefined" == typeof document || (canvas = document.getElementById(params.canvas)), !canvas) throw new Error("canvasId 参数不正确，请确认canvas存在并插入dom");
         } else canvas = params.canvas;
         if (!canvas) throw new Error("发生错误，传入的canvas不正确");
         let width = params.width,
@@ -34305,14 +34306,14 @@
         }
         let dpr = params.dpr;
         if (null == dpr) {
-          dpr = null !== (_a = canvas.getContext("2d").pixelRatio) && void 0 !== _a ? _a : canvas.width / width;
+          dpr = null !== (_b = canvas.getContext("2d").pixelRatio) && void 0 !== _b ? _b : canvas.width / width;
         }
         this.canvas = new BrowserCanvas({
           width: width,
           height: height,
           dpr: dpr,
           nativeCanvas: canvas,
-          canvasControled: null !== (_b = params.canvasControled) && void 0 !== _b && _b
+          canvasControled: null !== (_c = params.canvasControled) && void 0 !== _c && _c
         });
       }
       releaseWindow() {
@@ -41634,6 +41635,20 @@
         _hasDiffAttrs(g) {
             return !!g.context.diffAttrs && Object.keys(g.context.diffAttrs).length > 0;
         }
+        _commitPreventedAnimationStaticAttrs(g, attrs) {
+            var _a, _b;
+            if (!attrs || !Object.keys(attrs).length) {
+                return;
+            }
+            const graphic = g;
+            (_a = graphic.setFinalAttributes) === null || _a === void 0 ? void 0 : _a.call(graphic, attrs);
+            if (graphic._commitAnimationStaticAttributes) {
+                graphic._commitAnimationStaticAttributes(attrs);
+            }
+            else {
+                (_b = graphic.commitInternalBaseAttributes) === null || _b === void 0 ? void 0 : _b.call(graphic, attrs);
+            }
+        }
         _runApplyGraphic(graphics) {
             const hasAnimation = this.hasAnimation();
             graphics.forEach((g, index) => {
@@ -41671,7 +41686,13 @@
                         g.context.reusing = false;
                     }
                     else if (!hasStateAnimation) {
-                        hasAnimation ? g.setAttributesAndPreventAnimate(diffAttrs) : g.setAttributes(diffAttrs);
+                        if (hasAnimation) {
+                            g.setAttributesAndPreventAnimate(diffAttrs);
+                            this._commitPreventedAnimationStaticAttrs(g, diffAttrs);
+                        }
+                        else {
+                            g.setAttributes(diffAttrs);
+                        }
                     }
                     if (!((_b = this.renderContext) === null || _b === void 0 ? void 0 : _b.progressive) && this._product && g.parent !== this._product) {
                         this._product.appendChild(g);
@@ -42147,7 +42168,13 @@
                 const diffAttrs = getDiffAttributesOfGraphic(this._product, newAttrs);
                 this._product.context.diffAttrs = diffAttrs;
                 if (!this.hasAnimationByState(this._product.context.animationState)) {
-                    hasAnimation ? this._product.setAttributesAndPreventAnimate(diffAttrs) : this._product.setAttributes(diffAttrs);
+                    if (hasAnimation) {
+                        this._product.setAttributesAndPreventAnimate(diffAttrs);
+                        this._commitPreventedAnimationStaticAttrs(this._product, diffAttrs);
+                    }
+                    else {
+                        this._product.setAttributes(diffAttrs);
+                    }
                 }
             }
             else {
@@ -49200,7 +49227,7 @@
         });
     };
 
-    const version = "2.1.1";
+    const version = "2.1.2";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();