|
|
|
@ -1,8 +1,8 @@ |
|
|
|
diff --git a/node_modules/echarts/lib/component/dataZoom/DataZoomModel.js b/node_modules/echarts/lib/component/dataZoom/DataZoomModel.js
|
|
|
|
index 112ebe3..9afc9b7 100644
|
|
|
|
index d6c05f3..d09baed 100644
|
|
|
|
--- a/node_modules/echarts/lib/component/dataZoom/DataZoomModel.js
|
|
|
|
+++ b/node_modules/echarts/lib/component/dataZoom/DataZoomModel.js
|
|
|
|
@@ -422,7 +422,10 @@ function (_super) {
|
|
|
|
@@ -362,7 +362,10 @@ var DataZoomModel = /** @class */function (_super) {
|
|
|
|
return axisProxy.getDataValueWindow(); |
|
|
|
} |
|
|
|
} else { |
|
|
|
@ -14,32 +14,30 @@ index 112ebe3..9afc9b7 100644 |
|
|
|
} |
|
|
|
}; |
|
|
|
/** |
|
|
|
@@ -449,11 +452,11 @@ function (_super) {
|
|
|
|
@@ -381,10 +384,10 @@ var DataZoomModel = /** @class */function (_super) {
|
|
|
|
var axisInfo = this._targetAxisInfoMap.get(axisDim); |
|
|
|
for (var j = 0; j < axisInfo.indexList.length; j++) { |
|
|
|
var proxy = this.getAxisProxy(axisDim, axisInfo.indexList[j]); |
|
|
|
|
|
|
|
- if (proxy.hostedBy(this)) {
|
|
|
|
+ if (proxy && proxy.hostedBy(this)) {
|
|
|
|
return proxy; |
|
|
|
} |
|
|
|
|
|
|
|
- if (!firstProxy) {
|
|
|
|
+ if (proxy && !firstProxy) {
|
|
|
|
firstProxy = proxy; |
|
|
|
} |
|
|
|
} |
|
|
|
diff --git a/node_modules/echarts/lib/component/dataZoom/InsideZoomView.js b/node_modules/echarts/lib/component/dataZoom/InsideZoomView.js
|
|
|
|
index 7163279..c37f9c2 100644
|
|
|
|
index 06469b2..ccfbfa6 100644
|
|
|
|
--- a/node_modules/echarts/lib/component/dataZoom/InsideZoomView.js
|
|
|
|
+++ b/node_modules/echarts/lib/component/dataZoom/InsideZoomView.js
|
|
|
|
@@ -112,12 +112,15 @@ var getRangeHandlers = {
|
|
|
|
@@ -96,11 +96,14 @@ var getRangeHandlers = {
|
|
|
|
range[0] = (range[0] - percentPoint) * scale + percentPoint; |
|
|
|
range[1] = (range[1] - percentPoint) * scale + percentPoint; // Restrict range. |
|
|
|
|
|
|
|
range[1] = (range[1] - percentPoint) * scale + percentPoint; |
|
|
|
// Restrict range. |
|
|
|
- var minMaxSpan = this.dataZoomModel.findRepresentativeAxisProxy().getMinMaxSpan();
|
|
|
|
- sliderMove(0, range, [0, 100], 0, minMaxSpan.minSpan, minMaxSpan.maxSpan);
|
|
|
|
- this.range = range;
|
|
|
|
-
|
|
|
|
- if (lastRange[0] !== range[0] || lastRange[1] !== range[1]) {
|
|
|
|
- return range;
|
|
|
|
+ var proxy = this.dataZoomModel.findRepresentativeAxisProxy();
|
|
|
|
@ -47,7 +45,6 @@ index 7163279..c37f9c2 100644 |
|
|
|
+ var minMaxSpan = proxy.getMinMaxSpan();
|
|
|
|
+ sliderMove(0, range, [0, 100], 0, minMaxSpan.minSpan, minMaxSpan.maxSpan);
|
|
|
|
+ this.range = range;
|
|
|
|
+
|
|
|
|
+ if (lastRange[0] !== range[0] || lastRange[1] !== range[1]) {
|
|
|
|
+ return range;
|
|
|
|
+ }
|
|
|
|
@ -55,7 +52,7 @@ index 7163279..c37f9c2 100644 |
|
|
|
}, |
|
|
|
pan: makeMover(function (range, axisModel, coordSysInfo, coordSysMainType, controller, e) { |
|
|
|
diff --git a/node_modules/echarts/lib/component/dataZoom/SliderZoomView.js b/node_modules/echarts/lib/component/dataZoom/SliderZoomView.js
|
|
|
|
index 590ef51..aff8a0a 100644
|
|
|
|
index 98912e0..2e809af 100644
|
|
|
|
--- a/node_modules/echarts/lib/component/dataZoom/SliderZoomView.js
|
|
|
|
+++ b/node_modules/echarts/lib/component/dataZoom/SliderZoomView.js
|
|
|
|
@@ -64,7 +64,7 @@ var DEFAULT_MOVE_HANDLE_SIZE = 7;
|
|
|
|
@ -67,7 +64,7 @@ index 590ef51..aff8a0a 100644 |
|
|
|
var REALTIME_ANIMATION_CONFIG = { |
|
|
|
easing: 'cubicOut', |
|
|
|
duration: 100, |
|
|
|
@@ -406,34 +406,37 @@ function (_super) {
|
|
|
|
@@ -359,30 +359,33 @@ var SliderZoomView = /** @class */function (_super) {
|
|
|
|
var result; |
|
|
|
var ecModel = this.ecModel; |
|
|
|
dataZoomModel.eachTargetAxis(function (axisDim, axisIndex) { |
|
|
|
@ -76,20 +73,16 @@ index 590ef51..aff8a0a 100644 |
|
|
|
- if (result) {
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (showDataShadow !== true && indexOf(SHOW_DATA_SHADOW_SERIES_TYPE, seriesModel.get('type')) < 0) {
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- var thisAxis = ecModel.getComponent(getAxisMainType(axisDim), axisIndex).axis;
|
|
|
|
- var otherDim = getOtherDim(axisDim);
|
|
|
|
- var otherAxisInverse;
|
|
|
|
- var coordSys = seriesModel.coordinateSystem;
|
|
|
|
-
|
|
|
|
- if (otherDim != null && coordSys.getOtherAxis) {
|
|
|
|
- otherAxisInverse = coordSys.getOtherAxis(thisAxis).inverse;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- otherDim = seriesModel.getData().mapDimension(otherDim);
|
|
|
|
- result = {
|
|
|
|
- thisAxis: thisAxis,
|
|
|
|
@ -106,20 +99,16 @@ index 590ef51..aff8a0a 100644 |
|
|
|
+ if (result) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (showDataShadow !== true && indexOf(SHOW_DATA_SHADOW_SERIES_TYPE, seriesModel.get('type')) < 0) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ var thisAxis = ecModel.getComponent(getAxisMainType(axisDim), axisIndex).axis;
|
|
|
|
+ var otherDim = getOtherDim(axisDim);
|
|
|
|
+ var otherAxisInverse;
|
|
|
|
+ var coordSys = seriesModel.coordinateSystem;
|
|
|
|
+
|
|
|
|
+ if (otherDim != null && coordSys.getOtherAxis) {
|
|
|
|
+ otherAxisInverse = coordSys.getOtherAxis(thisAxis).inverse;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ otherDim = seriesModel.getData().mapDimension(otherDim);
|
|
|
|
+ result = {
|
|
|
|
+ thisAxis: thisAxis,
|
|
|
|
@ -133,10 +122,10 @@ index 590ef51..aff8a0a 100644 |
|
|
|
}, this); |
|
|
|
return result; |
|
|
|
}; |
|
|
|
@@ -595,12 +598,17 @@ function (_super) {
|
|
|
|
|
|
|
|
@@ -530,12 +533,17 @@ var SliderZoomView = /** @class */function (_super) {
|
|
|
|
var dataZoomModel = this.dataZoomModel; |
|
|
|
var handleEnds = this._handleEnds; |
|
|
|
var viewExtend = this._getViewExtent(); |
|
|
|
|
|
|
|
- var minMaxSpan = dataZoomModel.findRepresentativeAxisProxy().getMinMaxSpan();
|
|
|
|
- var percentExtent = [0, 100];
|
|
|
|
- sliderMove(delta, handleEnds, viewExtend, dataZoomModel.get('zoomLock') ? 'all' : handleIndex, minMaxSpan.minSpan != null ? linearMap(minMaxSpan.minSpan, percentExtent, viewExtend, true) : null, minMaxSpan.maxSpan != null ? linearMap(minMaxSpan.maxSpan, percentExtent, viewExtend, true) : null);
|
|
|
|
@ -155,13 +144,13 @@ index 590ef51..aff8a0a 100644 |
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
}; |
|
|
|
|
|
|
|
SliderZoomView.prototype._updateView = function (nonRealtime) { |
|
|
|
var displaybles = this._displayables; |
|
|
|
diff --git a/node_modules/echarts/lib/component/dataZoom/dataZoomProcessor.js b/node_modules/echarts/lib/component/dataZoom/dataZoomProcessor.js
|
|
|
|
index 3871784..9bab428 100644
|
|
|
|
index ce98fed..361b138 100644
|
|
|
|
--- a/node_modules/echarts/lib/component/dataZoom/dataZoomProcessor.js
|
|
|
|
+++ b/node_modules/echarts/lib/component/dataZoom/dataZoomProcessor.js
|
|
|
|
@@ -91,7 +91,10 @@ var dataZoomProcessor = {
|
|
|
|
@@ -90,7 +90,10 @@ var dataZoomProcessor = {
|
|
|
|
// init stage and not after action dispatch handler, because |
|
|
|
// reset should be called after seriesData.restoreData. |
|
|
|
dataZoomModel.eachTargetAxis(function (axisDim, axisIndex) { |
|
|
|
@ -170,12 +159,12 @@ index 3871784..9bab428 100644 |
|
|
|
+ if (axisProxy) {
|
|
|
|
+ axisProxy.reset(dataZoomModel);
|
|
|
|
+ }
|
|
|
|
}); // Caution: data zoom filtering is order sensitive when using |
|
|
|
}); |
|
|
|
// Caution: data zoom filtering is order sensitive when using |
|
|
|
// percent range and no min/max/scale set on axis. |
|
|
|
// For example, we have dataZoom definition: |
|
|
|
@@ -108,7 +111,10 @@ var dataZoomProcessor = {
|
|
|
|
@@ -107,7 +110,10 @@ var dataZoomProcessor = {
|
|
|
|
// So we should filter x-axis after reset x-axis immediately, |
|
|
|
// and then reset y-axis and filter y-axis. |
|
|
|
|
|
|
|
dataZoomModel.eachTargetAxis(function (axisDim, axisIndex) { |
|
|
|
- dataZoomModel.getAxisProxy(axisDim, axisIndex).filterData(dataZoomModel, api);
|
|
|
|
+ var axisProxy = dataZoomModel.getAxisProxy(axisDim, axisIndex);
|
|
|
|
@ -186,23 +175,22 @@ index 3871784..9bab428 100644 |
|
|
|
}); |
|
|
|
ecModel.eachComponent('dataZoom', function (dataZoomModel) { |
|
|
|
diff --git a/node_modules/echarts/lib/component/toolbox/feature/DataZoom.js b/node_modules/echarts/lib/component/toolbox/feature/DataZoom.js
|
|
|
|
index c5ee405..957ffd2 100644
|
|
|
|
index cf8d6bc..9b30ec1 100644
|
|
|
|
--- a/node_modules/echarts/lib/component/toolbox/feature/DataZoom.js
|
|
|
|
+++ b/node_modules/echarts/lib/component/toolbox/feature/DataZoom.js
|
|
|
|
@@ -129,10 +129,13 @@ function (_super) {
|
|
|
|
@@ -109,9 +109,12 @@ var DataZoomFeature = /** @class */function (_super) {
|
|
|
|
var axisModel = axis.model; |
|
|
|
var dataZoomModel = findDataZoom(dimName, axisModel, ecModel); // Restrict range. |
|
|
|
|
|
|
|
var dataZoomModel = findDataZoom(dimName, axisModel, ecModel); |
|
|
|
// Restrict range. |
|
|
|
- var minMaxSpan = dataZoomModel.findRepresentativeAxisProxy(axisModel).getMinMaxSpan();
|
|
|
|
- if (minMaxSpan.minValueSpan != null || minMaxSpan.maxValueSpan != null) {
|
|
|
|
- minMax = sliderMove(0, minMax.slice(), axis.scale.getExtent(), 0, minMaxSpan.minValueSpan, minMaxSpan.maxValueSpan);
|
|
|
|
+ var proxy = dataZoomModel.findRepresentativeAxisProxy(axisModel);
|
|
|
|
+ if (proxy) {
|
|
|
|
+ var minMaxSpan = proxy.getMinMaxSpan();
|
|
|
|
|
|
|
|
- if (minMaxSpan.minValueSpan != null || minMaxSpan.maxValueSpan != null) {
|
|
|
|
- minMax = sliderMove(0, minMax.slice(), axis.scale.getExtent(), 0, minMaxSpan.minValueSpan, minMaxSpan.maxValueSpan);
|
|
|
|
+ if (minMaxSpan.minValueSpan != null || minMaxSpan.maxValueSpan != null) {
|
|
|
|
+ minMax = sliderMove(0, minMax.slice(), axis.scale.getExtent(), 0, minMaxSpan.minValueSpan, minMaxSpan.maxValueSpan);
|
|
|
|
+ }
|
|
|
|
} |
|
|
|
|
|
|
|
dataZoomModel && (snapshot[dataZoomModel.id] = { |
|
|
|
dataZoomId: dataZoomModel.id, |
Igor Kulikov
3 years ago