Merge pull request #1021 from antvis/chore-group-draw

chore: group和canvas的drawInner统一到container里
antvis · Sep 3, 2020 · 58f2481 · 58f2481
2 parents 1c52736 + c94804f
commit 58f2481
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/src/graphic/canvas.js b/src/graphic/canvas.js
@@ -148,11 +148,7 @@ class Canvas extends EventEmit {
       self.beforeDraw();
       try {
         const context = self._attrs.context;
-        const children = self._attrs.children;
-        for (let i = 0, len = children.length; i < len; i++) {
-          const child = children[i];
-          child.draw(context);
-        }
+        self.drawInner(context);
 
         // 支付宝，微信小程序，需要调context.draw才能完成绘制， 所以这里直接判断是否有.draw方法
         if (context.draw) {

diff --git a/src/graphic/container.js b/src/graphic/container.js
@@ -66,6 +66,15 @@ export default {
     return this;
   },
 
+  drawInner(context) {
+    const children = this.get('children');
+    for (let i = 0, len = children.length; i < len; i++) {
+      const child = children[i];
+      child.draw(context);
+    }
+    return this;
+  },
+
   clear() {
     const children = this.get('children');
 

diff --git a/src/graphic/group.js b/src/graphic/group.js
@@ -14,15 +14,6 @@ class Group extends Element {
     };
   }
 
-  drawInner(context) {
-    const children = this.get('children');
-    for (let i = 0, len = children.length; i < len; i++) {
-      const child = children[i];
-      child.draw(context);
-    }
-    return this;
-  }
-
   getBBox() {
     const self = this;
     let minX = Infinity;