fix: hidden point draw error.

antvis · Mar 5, 2018 · 06bdef1 · 06bdef1
1 parent 6c9efc8
commit 06bdef1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/src/geom/area.js b/src/geom/area.js
@@ -38,9 +38,11 @@ class Area extends Geom {
       });
       cfg.points = points;
       const gShape = shapeFactory.drawShape(cfg.shape, cfg, container);
-      Util.each([].concat(gShape), s => {
-        s.set('origin', data[0]); // todo
-      });
+      if (gShape) {
+        Util.each([].concat(gShape), s => {
+          s.set('origin', data[0]); // todo
+        });
+      }
     });
   }
 }

diff --git a/src/geom/base.js b/src/geom/base.js
@@ -487,9 +487,11 @@ class Geom extends Base {
       const cfg = self.getDrawCfg(obj);
       const shape = obj.shape;
       const gShape = shapeFactory.drawShape(shape, cfg, container);
-      Util.each([].concat(gShape), s => {
-        s.set('origin', obj); // todo
-      });
+      if (gShape) {
+        Util.each([].concat(gShape), s => {
+          s.set('origin', obj); // todo
+        });
+      }
     });
   }
 

diff --git a/src/geom/path.js b/src/geom/path.js
@@ -35,9 +35,11 @@ class Path extends Geom {
       cfg.splitedIndex = splitedIndex; // 传入分割片段索引 用于生成id
       cfg.points = subData;
       const gShape = shapeFactory.drawShape(cfg.shape, cfg, container);
-      Util.each([].concat(gShape), s => {
-        s.set('origin', data[0]); // todo
-      });
+      if (gShape) {
+        Util.each([].concat(gShape), s => {
+          s.set('origin', data[0]); // todo
+        });
+      }
     });
   }
 }

diff --git a/src/graphic/animate/timeline.js b/src/graphic/animate/timeline.js
@@ -75,6 +75,12 @@ class Timeline {
       const duration = propertyAnim.endTime - propertyAnim.startTime;
       let t = duration ? (this.time - propertyAnim.startTime) / (duration) : 1;
       t = Math.max(0, Math.min(t, 1));
+
+      if (t === 1) {
+        this.anims.splice(i, 1);
+        i--;
+      }
+
       t = propertyAnim.easing(t);
 
       const value = diff(t);
@@ -105,10 +111,10 @@ class Timeline {
         }
       }
 
-      if (t === 1) {
-        this.anims.splice(i, 1);
-        i--;
-      }
+      // if (t === 1) {
+      //   this.anims.splice(i, 1);
+      //   i--;
+      // }
     }
   }
 }