|
|
@ -253,7 +253,8 @@ |
|
|
|
|
|
|
|
|
|
|
|
// bar
|
|
|
|
// bar
|
|
|
|
var __bar_width = getConfig(['bar', 'width']), |
|
|
|
var __bar_width = getConfig(['bar', 'width']), |
|
|
|
__bar_width_ratio = getConfig(['bar', 'width', 'ratio'], 0.6); |
|
|
|
__bar_width_ratio = getConfig(['bar', 'width', 'ratio'], 0.6), |
|
|
|
|
|
|
|
__bar_zerobased = getConfig(['bar', 'zerobased'], true); |
|
|
|
|
|
|
|
|
|
|
|
// pie
|
|
|
|
// pie
|
|
|
|
var __pie_label_show = getConfig(['pie', 'label', 'show'], true), |
|
|
|
var __pie_label_show = getConfig(['pie', 'label', 'show'], true), |
|
|
@ -1258,6 +1259,7 @@ |
|
|
|
domainLength, padding, padding_top, padding_bottom, |
|
|
|
domainLength, padding, padding_top, padding_bottom, |
|
|
|
center = axisId === 'y2' ? __axis_y2_center : __axis_y_center, |
|
|
|
center = axisId === 'y2' ? __axis_y2_center : __axis_y_center, |
|
|
|
yDomainAbs, lengths, diff, ratio, isAllPositive, isAllNegative, |
|
|
|
yDomainAbs, lengths, diff, ratio, isAllPositive, isAllNegative, |
|
|
|
|
|
|
|
isZeroBased = (hasBarType(yTargets) && __bar_zerobased) || hasAreaType(yTargets), |
|
|
|
showHorizontalDataLabel = hasDataLabel() && __axis_rotated, |
|
|
|
showHorizontalDataLabel = hasDataLabel() && __axis_rotated, |
|
|
|
showVerticalDataLabel = hasDataLabel() && !__axis_rotated; |
|
|
|
showVerticalDataLabel = hasDataLabel() && !__axis_rotated; |
|
|
|
if (yTargets.length === 0) { // use current domain if target of axisId is none
|
|
|
|
if (yTargets.length === 0) { // use current domain if target of axisId is none
|
|
|
@ -1270,7 +1272,7 @@ |
|
|
|
isAllNegative = yDomainMin <= 0 && yDomainMax <= 0; |
|
|
|
isAllNegative = yDomainMin <= 0 && yDomainMax <= 0; |
|
|
|
|
|
|
|
|
|
|
|
// Bar/Area chart should be 0-based if all positive|negative
|
|
|
|
// Bar/Area chart should be 0-based if all positive|negative
|
|
|
|
if (hasBarType(yTargets) || hasAreaType(yTargets)) { |
|
|
|
if (isZeroBased) { |
|
|
|
if (isAllPositive) { yDomainMin = 0; } |
|
|
|
if (isAllPositive) { yDomainMin = 0; } |
|
|
|
if (isAllNegative) { yDomainMax = 0; } |
|
|
|
if (isAllNegative) { yDomainMax = 0; } |
|
|
|
} |
|
|
|
} |
|
|
@ -1304,7 +1306,7 @@ |
|
|
|
padding_bottom = getAxisPadding(__axis_y2_padding, 'bottom', padding, domainLength); |
|
|
|
padding_bottom = getAxisPadding(__axis_y2_padding, 'bottom', padding, domainLength); |
|
|
|
} |
|
|
|
} |
|
|
|
// Bar/Area chart should be 0-based if all positive|negative
|
|
|
|
// Bar/Area chart should be 0-based if all positive|negative
|
|
|
|
if (hasBarType(yTargets) || hasAreaType(yTargets)) { |
|
|
|
if (isZeroBased) { |
|
|
|
if (isAllPositive) { padding_bottom = yDomainMin; } |
|
|
|
if (isAllPositive) { padding_bottom = yDomainMin; } |
|
|
|
if (isAllNegative) { padding_top = -yDomainMax; } |
|
|
|
if (isAllNegative) { padding_top = -yDomainMax; } |
|
|
|
} |
|
|
|
} |
|
|
|