diff --git a/node_modules/echarts/lib/component/dataZoom/DataZoomModel.js b/node_modules/echarts/lib/component/dataZoom/DataZoomModel.js
index 112ebe3..9afc9b7 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) {
         return axisProxy.getDataValueWindow();
       }
     } else {
-      return this.getAxisProxy(axisDim, axisIndex).getDataValueWindow();
+      var axisProxy = this.getAxisProxy(axisDim, axisIndex);
+      if (axisProxy) {
+        return axisProxy.getDataValueWindow();
+      }
     }
   };
   /**
@@ -449,11 +452,11 @@ function (_super) {
       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
--- a/node_modules/echarts/lib/component/dataZoom/InsideZoomView.js
+++ b/node_modules/echarts/lib/component/dataZoom/InsideZoomView.js
@@ -112,12 +112,15 @@ var getRangeHandlers = {
     range[0] = (range[0] - percentPoint) * scale + percentPoint;
     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();
+    if (proxy) {
+      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;
+      }
     }
   },
   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
--- 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;
 var HORIZONTAL = 'horizontal';
 var VERTICAL = 'vertical';
 var LABEL_GAP = 5;
-var SHOW_DATA_SHADOW_SERIES_TYPE = ['line', 'bar', 'candlestick', 'scatter'];
+var SHOW_DATA_SHADOW_SERIES_TYPE = ['line', 'bar', 'candlestick', 'scatter', 'custom'];
 var REALTIME_ANIMATION_CONFIG = {
   easing: 'cubicOut',
   duration: 100,
@@ -406,34 +406,37 @@ function (_super) {
     var result;
     var ecModel = this.ecModel;
     dataZoomModel.eachTargetAxis(function (axisDim, axisIndex) {
-      var seriesModels = dataZoomModel.getAxisProxy(axisDim, axisIndex).getTargetSeriesModels();
-      each(seriesModels, function (seriesModel) {
-        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,
-          series: seriesModel,
-          thisDim: axisDim,
-          otherDim: otherDim,
-          otherAxisInverse: otherAxisInverse
-        };
-      }, this);
+      var axisProxy = dataZoomModel.getAxisProxy(axisDim, axisIndex);
+      if (axisProxy) {
+        var seriesModels = axisProxy.getTargetSeriesModels();
+        each(seriesModels, function (seriesModel) {
+          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,
+            series: seriesModel,
+            thisDim: axisDim,
+            otherDim: otherDim,
+            otherAxisInverse: otherAxisInverse
+          };
+        }, this);
+      }
     }, this);
     return result;
   };
@@ -595,12 +598,17 @@ function (_super) {
 
     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);
-    var lastRange = this._range;
-    var range = this._range = asc([linearMap(handleEnds[0], viewExtend, percentExtent, true), linearMap(handleEnds[1], viewExtend, percentExtent, true)]);
-    return !lastRange || lastRange[0] !== range[0] || lastRange[1] !== range[1];
+    var proxy = dataZoomModel.findRepresentativeAxisProxy();
+    if (proxy) {
+      var minMaxSpan = proxy.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);
+      var lastRange = this._range;
+      var range = this._range = asc([linearMap(handleEnds[0], viewExtend, percentExtent, true), linearMap(handleEnds[1], viewExtend, percentExtent, true)]);
+      return !lastRange || lastRange[0] !== range[0] || lastRange[1] !== range[1];
+    } else {
+      return false;
+    }
   };
 
   SliderZoomView.prototype._updateView = function (nonRealtime) {
diff --git a/node_modules/echarts/lib/component/dataZoom/dataZoomProcessor.js b/node_modules/echarts/lib/component/dataZoom/dataZoomProcessor.js
index 3871784..9bab428 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 = {
       // init stage and not after action dispatch handler, because
       // reset should be called after seriesData.restoreData.
       dataZoomModel.eachTargetAxis(function (axisDim, axisIndex) {
-        dataZoomModel.getAxisProxy(axisDim, axisIndex).reset(dataZoomModel);
+        var axisProxy = dataZoomModel.getAxisProxy(axisDim, axisIndex);
+        if (axisProxy) {
+          axisProxy.reset(dataZoomModel);
+        }
       }); // 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 = {
       // 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);
+        if (axisProxy) {
+          axisProxy.filterData(dataZoomModel, api);
+        }
       });
     });
     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
--- 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) {
       var axisModel = axis.model;
       var dataZoomModel = findDataZoom(dimName, axisModel, ecModel); // Restrict range.
 
-      var minMaxSpan = dataZoomModel.findRepresentativeAxisProxy(axisModel).getMinMaxSpan();
+      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] = {