Fix drawing nod if nod.scl === 0

goessner · Dec 20, 2020 · f382cd8 · f382cd8
1 parent 212013a
commit f382cd8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/dist/g2.chart.html.js b/dist/g2.chart.html.js
@@ -1666,7 +1666,7 @@ g2.prototype.nod.prototype = g2.mix(g2.prototype.cir.prototype, {
     lbloc: 'se',
     g2() {      // in contrast to `g2.prototype.cir.prototype`, `g2()` is called always !
         return g2()
-            .cir({ ...g2.flatten(this), r: this.r * (this.scl || 1) })
+            .cir({ ...g2.flatten(this), r: this.r * (this.scl !== undefined ? this.scl  : 1) })
             .ins((g) => this.label && this.drawLabel(g))
     }
 });
@@ -2977,7 +2977,7 @@ class G2ChartElement extends HTMLElement {
                     funcs[itr].fn = (() => Function('"use strict"; return (' + a[4] + ')')())();
                     itr++;
                 }
-                this.funcs = [funcs];          
+                this.funcs = funcs;          
             }
         }
         catch (e) {

diff --git a/dist/g2.full.js b/dist/g2.full.js
@@ -1575,7 +1575,7 @@ g2.prototype.nod.prototype = g2.mix(g2.prototype.cir.prototype, {
     lbloc: 'se',
     g2() {      // in contrast to `g2.prototype.cir.prototype`, `g2()` is called always !
         return g2()
-            .cir({ ...g2.flatten(this), r: this.r * (this.scl || 1) })
+            .cir({ ...g2.flatten(this), r: this.r * (this.scl !== undefined ? this.scl  : 1) })
             .ins((g) => this.label && this.drawLabel(g))
     }
 });

diff --git a/dist/g2.html.js b/dist/g2.html.js
@@ -1666,7 +1666,7 @@ g2.prototype.nod.prototype = g2.mix(g2.prototype.cir.prototype, {
     lbloc: 'se',
     g2() {      // in contrast to `g2.prototype.cir.prototype`, `g2()` is called always !
         return g2()
-            .cir({ ...g2.flatten(this), r: this.r * (this.scl || 1) })
+            .cir({ ...g2.flatten(this), r: this.r * (this.scl !== undefined ? this.scl  : 1) })
             .ins((g) => this.label && this.drawLabel(g))
     }
 });

diff --git a/dist/g2.js b/dist/g2.js
diff --git a/src/g2.chart.element.js b/src/g2.chart.element.js
@@ -73,7 +73,7 @@ class G2ChartElement extends HTMLElement {
                     funcs[itr].fn = (() => Function('"use strict"; return (' + a[4] + ')')())();
                     itr++;
                 }
-                this.funcs = [funcs];          
+                this.funcs = funcs;          
             }
         }
         catch (e) {

diff --git a/src/g2.ext.js b/src/g2.ext.js
@@ -346,7 +346,7 @@ g2.prototype.nod.prototype = g2.mix(g2.prototype.cir.prototype, {
     lbloc: 'se',
     g2() {      // in contrast to `g2.prototype.cir.prototype`, `g2()` is called always !
         return g2()
-            .cir({ ...g2.flatten(this), r: this.r * (this.scl || 1) })
+            .cir({ ...g2.flatten(this), r: this.r * (this.scl !== undefined ? this.scl  : 1) })
             .ins((g) => this.label && this.drawLabel(g))
     }
 });