fix(scale): fixed bug of first record with null

antvis · Dec 5, 2017 · f94cf37 · f94cf37
1 parent 00f32bc
commit f94cf37
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/chart/assist/scale.js b/src/chart/assist/scale.js
@@ -95,8 +95,12 @@ class ScaleAssist {
       return scale;
     }
     const firstObj = data[0];
+    let firstValue = firstObj[field];
+    if (firstValue === null) {
+      firstValue = Util.Array.firstValue(data, field);
+    }
 
-    if (Util.isNumber(field) || (Util.isNil(firstObj[field])) && !def) {
+    if (Util.isNumber(field) || (Util.isNil(firstValue)) && !def) {
       scale = Scale.identity({
         value: field,
         field: field.toString(),

diff --git a/test/unit/geom/geom-spec.js b/test/unit/geom/geom-spec.js
@@ -432,6 +432,16 @@ describe('test geom line', function() {
     geom.paint();
   });
 
+  it('first null line', function() {
+    clearCanvas(canvas);
+    const data = [{ a: 1, b: null, c: '1' }, { a: 4, b: null, c: '1' }, { a: 2, b: 2, c: '2' }, { a: 3, b: 4, c: '1' }, { a: 2.5, b: 3.5, c: '1' }];
+    geom.reset();
+    geom.set('data', data);
+    geom.position('a*b');
+    geom.init();
+    geom.paint();
+  });
+
   it('destroy & reset', function() {
     geom.destroy();
     expect(geom.destroyed).equal(true);