提交 3269c46d 编写于 作者: L lang

tweak

上级 6cdd3ace
......@@ -26,6 +26,8 @@ define(function(require) {
xAxisIndex: 0,
yAxisIndex: 0,
polarIndex: 0,
label: {
normal: {
// show: false,
......
......@@ -92,7 +92,7 @@ define(function (require) {
}
}, defaultOption);
var valueAxis = zrUtil.merge({
var valueAxis = zrUtil.defaults({
// 数值起始和结束两端空白策略
boundaryGap: [0, 0],
// 最小值, 设置成 'dataMin' 则从数据中计算最小值
......@@ -106,12 +106,12 @@ define(function (require) {
}, defaultOption);
// FIXME
var timeAxis = zrUtil.merge({
var timeAxis = zrUtil.defaults({
scale: true,
min: 'dataMin',
max: 'dataMax'
}, valueAxis);
var logAxis = zrUtil.merge({}, valueAxis);
var logAxis = zrUtil.defaults({}, valueAxis);
logAxis.scale = true;
return {
......
......@@ -218,13 +218,11 @@ define(function(require, factory) {
// onZero can not be used in these two situations
// 1. When other axis is a category axis
// 2. When other axis not across 0 point
if (xAxis.type === 'category'
|| !ifAxisCrossZero(xAxis)
if (xAxis.type === 'category' || !ifAxisCrossZero(xAxis)
) {
yAxis.onZero = false;
}
if (yAxis.type === 'category'
|| !ifAxisCrossZero(yAxis)
if (yAxis.type === 'category' || !ifAxisCrossZero(yAxis)
) {
xAxis.onZero = false;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册