From 3897375da599b00735f07bbaf6dbbab1a4e6a4b6 Mon Sep 17 00:00:00 2001 From: lang Date: Mon, 12 Oct 2015 19:41:58 +0800 Subject: [PATCH] Grid including zero bug fix --- src/coord/cartesian/Grid.js | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/coord/cartesian/Grid.js b/src/coord/cartesian/Grid.js index c9dee1e1d..8e91e9d56 100644 --- a/src/coord/cartesian/Grid.js +++ b/src/coord/cartesian/Grid.js @@ -59,6 +59,16 @@ define(function(require, factory) { && axis.type !== CATEGORY_AXIS_TYPE } + function niceScaleExent(axis, model) { + if (axis.scale.type === 'ordinal') { + return; + } + var min = model.get('min'); + var max = model.get('max'); + axis.scale.setExtent(min, max); + axis.scale.niceExtent(model.get('splitNumber'), !!min, !!max); + } + function Grid(gridModel, ecModel, api) { /** @@ -233,7 +243,6 @@ define(function(require, factory) { this._updateCartesianFromSeries(ecModel, gridModel); - // Fix configuration zrUtil.each(axesMap.x, function (xAxis) { zrUtil.each(axesMap.y, function (yAxis) { @@ -253,9 +262,13 @@ define(function(require, factory) { if (ifAxisNeedsCrossZero(yAxis, xAxis)) { yAxis.scale.unionExtent([0, 0]); + + niceScaleExent(yAxis, yAxis.model); } if (ifAxisNeedsCrossZero(xAxis, yAxis)) { xAxis.scale.unionExtent([0, 0]); + + niceScaleExent(xAxis, xAxis.model); } }, this); @@ -337,16 +350,6 @@ define(function(require, factory) { } } }, this); - - function niceScaleExent(axis, model) { - if (axis.scale.type === 'ordinal') { - return; - } - var min = model.get('min'); - var max = model.get('max'); - axis.scale.setExtent(min, max); - axis.scale.niceExtent(model.get('splitNumber'), !!min, !!max); - } } }; -- GitLab