提交 3fbc2df8 编写于 作者: P pah100

update datazoom, do not set start end to axis

上级 710824ff
...@@ -208,10 +208,6 @@ define(function(require) { ...@@ -208,10 +208,6 @@ define(function(require) {
startValue = [endValue, endValue = startValue][0]; startValue = [endValue, endValue = startValue][0];
} }
// Set to axis and dataZoom
zrUtil.each(axisModels, function (axisModel) {
axisModel.setDataZoomRange(startValue, endValue);
});
thisOption[dimItem.start] = startValue; thisOption[dimItem.start] = startValue;
thisOption[dimItem.end] = endValue; thisOption[dimItem.end] = endValue;
}, this); }, this);
......
...@@ -32,7 +32,7 @@ define(function (require) { ...@@ -32,7 +32,7 @@ define(function (require) {
var isCategoryFilter = axisModel.get('type') === 'category'; var isCategoryFilter = axisModel.get('type') === 'category';
var seriesModels = dataZoomModel.getTargetSeriesModels(dimNames.dim, axisIndex); var seriesModels = dataZoomModel.getTargetSeriesModels(dimNames.dim, axisIndex);
var dataExtent = calculateDataExtent(dimNames, axisModel, seriesModels); var dataExtent = calculateDataExtent(dimNames, axisModel, seriesModels);
var dataWindow = calculateDataWindow(axisModel, dataExtent, isCategoryFilter); var dataWindow = calculateDataWindow(axisModel, dataZoomModel, dataExtent, isCategoryFilter);
if (isCategoryFilter) { if (isCategoryFilter) {
var axisData = axisModel.getData(); var axisData = axisModel.getData();
...@@ -98,14 +98,13 @@ define(function (require) { ...@@ -98,14 +98,13 @@ define(function (require) {
return dataExtent; return dataExtent;
} }
function calculateDataWindow(axisModel, dataExtent, isCategoryFilter) { function calculateDataWindow(axisModel, dataZoomModel, dataExtent, isCategoryFilter) {
var dataZoomStart = axisModel.get('dataZoomStart'); var dataZoomRange = dataZoomModel.getRange();
var dataZoomEnd = axisModel.get('dataZoomEnd');
var percentExtent = [0, 100]; var percentExtent = [0, 100];
var result = [ var result = [
linearMap(dataZoomStart, percentExtent, dataExtent, true), linearMap(dataZoomRange.start, percentExtent, dataExtent, true),
linearMap(dataZoomEnd, percentExtent, dataExtent, true) linearMap(dataZoomRange.end, percentExtent, dataExtent, true)
]; ];
if (isCategoryFilter) { if (isCategoryFilter) {
result = [Math.floor(result[0]), Math.ceil(result[1])]; result = [Math.floor(result[0]), Math.ceil(result[1])];
......
...@@ -49,17 +49,6 @@ define(function(require) { ...@@ -49,17 +49,6 @@ define(function(require) {
return this.get('data'); return this.get('data');
}, },
/**
* @public
* @param {number} start 0-100, null means remain current value.
* @param {number} end 0-100, null means remain current value.
*/
setDataZoomRange: function (start, end) {
var option = this.option;
start != null && (option.dataZoomStart = start);
end != null && (option.dataZoomEnd = end);
},
/** /**
* @override * @override
*/ */
......
...@@ -47,17 +47,6 @@ define(function(require) { ...@@ -47,17 +47,6 @@ define(function(require) {
return this.get('data'); return this.get('data');
}, },
/**
* @public
* @param {number} start 0-100, null means remain current value.
* @param {number} end 0-100, null means remain current value.
*/
setDataZoomRange: function (start, end) {
var option = this.option;
start != null && (option.dataZoomStart = start);
end != null && (option.dataZoomEnd = end);
},
/** /**
* @override * @override
*/ */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册