提交 c4317adb 编写于 作者: P pissang

Merge branch 'master' of https://github.com/ecomfe/echarts

此差异已折叠。
此差异已折叠。
......@@ -447,13 +447,15 @@ function setMinMaxSpan(axisProxy) {
// minValueSpan and maxValueSpan has higher priority than minSpan and maxSpan
var valueSpan = dataZoomModel.get(minMax + 'ValueSpan');
if (valueSpan != null) {
minMaxSpan[minMax + 'ValueSpan'] = valueSpan;
valueSpan = axisProxy.getAxisModel().axis.scale.parse(valueSpan);
if (valueSpan != null) {
var dataExtent = axisProxy._dataExtent;
minMaxSpan[minMax + 'Span'] = numberUtil.linearMap(
valueSpan, axisProxy._dataExtent, [0, 100], true
dataExtent[0] + valueSpan, dataExtent, [0, 100], true
);
}
}
......
......@@ -133,6 +133,7 @@ var InsideZoomView = DataZoomView.extend({
// Restrict range.
var minMaxSpan = this.dataZoomModel.findRepresentativeAxisProxy().getMinMaxSpan();
sliderMove(0, range, [0, 100], 0, minMaxSpan.minSpan, minMaxSpan.maxSpan);
return (this._range = range);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册