echarts 4.0.4 → 4.1.0

package/lib/chart/bar/PictorialBarSeries.js

@@ -1,5 +1,23 @@
 var BaseBarSeries = require("./BaseBarSeries");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var PictorialBarSeries = BaseBarSeries.extend({
   type: 'series.pictorialBar',
   dependencies: ['grid'],

package/lib/chart/bar/PictorialBarView.js

@@ -16,6 +16,25 @@ var isNumeric = _number.isNumeric;
 var _helper = require("./helper");
 
 var setLabel = _helper.setLabel;
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var BAR_BORDER_WIDTH_QUERY = ['itemStyle', 'borderWidth']; // index: +isHorizontal
 
 var LAYOUT_ATTRS = [{

package/lib/chart/bar/barItemStyle.js

@@ -1,5 +1,23 @@
 var makeStyleMapper = require("../../model/mixin/makeStyleMapper");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var getBarItemStyle = makeStyleMapper([['fill', 'color'], ['stroke', 'borderColor'], ['lineWidth', 'borderWidth'], // Compatitable with 2
 ['stroke', 'barBorderColor'], ['lineWidth', 'barBorderWidth'], ['opacity'], ['shadowBlur'], ['shadowOffsetX'], ['shadowOffsetY'], ['shadowColor']]);
 var _default = {

package/lib/chart/bar/helper.js

@@ -4,6 +4,24 @@ var _labelHelper = require("../helper/labelHelper");
 
 var getDefaultLabel = _labelHelper.getDefaultLabel;
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 function setLabel(normalStyle, hoverStyle, itemModel, color, seriesModel, dataIndex, labelPositionOutside) {
   var labelModel = itemModel.getModel('label');
   var hoverLabelModel = itemModel.getModel('emphasis.label');

package/lib/chart/bar.js

@@ -5,6 +5,7 @@ var zrUtil = require("zrender/lib/core/util");
 var _barGrid = require("../layout/barGrid");
 
 var layout = _barGrid.layout;
+var largeLayout = _barGrid.largeLayout;
 
 require("../coord/cartesian/Grid");
 
@@ -14,12 +15,32 @@ require("./bar/BarView");
 
 require("../component/gridSimple");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 // In case developer forget to include grid component
-echarts.registerLayout(zrUtil.curry(layout, 'bar')); // Visual coding for legend
-
-echarts.registerVisual(function (ecModel) {
-  ecModel.eachSeriesByType('bar', function (seriesModel) {
-    var data = seriesModel.getData();
-    data.setVisual('legendSymbol', 'roundRect');
-  });
+echarts.registerLayout(zrUtil.curry(layout, 'bar')); // Should after normal bar layout, otherwise it is blocked by normal bar layout.
+
+echarts.registerLayout(largeLayout);
+echarts.registerVisual({
+  seriesType: 'bar',
+  reset: function (seriesModel) {
+    // Visual coding for legend
+    seriesModel.getData().setVisual('legendSymbol', 'roundRect');
+  }
 });

package/lib/chart/boxplot/BoxplotSeries.js

@@ -5,6 +5,25 @@ var SeriesModel = require("../../model/Series");
 var _whiskerBoxCommon = require("../helper/whiskerBoxCommon");
 
 var seriesModelMixin = _whiskerBoxCommon.seriesModelMixin;
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var BoxplotSeries = SeriesModel.extend({
   type: 'series.boxplot',
   dependencies: ['xAxis', 'yAxis', 'grid'],
@@ -17,7 +36,22 @@ var BoxplotSeries = SeriesModel.extend({
    * and echarts do not need to know it.
    * @readOnly
    */
-  defaultValueDimensions: ['min', 'Q1', 'median', 'Q3', 'max'],
+  defaultValueDimensions: [{
+    name: 'min',
+    defaultTooltip: true
+  }, {
+    name: 'Q1',
+    defaultTooltip: true
+  }, {
+    name: 'median',
+    defaultTooltip: true
+  }, {
+    name: 'Q3',
+    defaultTooltip: true
+  }, {
+    name: 'max',
+    defaultTooltip: true
+  }],
 
   /**
    * @type {Array.<string>}

package/lib/chart/boxplot/BoxplotView.js

@@ -4,37 +4,144 @@ var ChartView = require("../../view/Chart");
 
 var graphic = require("../../util/graphic");
 
-var _whiskerBoxCommon = require("../helper/whiskerBoxCommon");
+var Path = require("zrender/lib/graphic/Path");
 
-var viewMixin = _whiskerBoxCommon.viewMixin;
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+// Update common properties
+var NORMAL_ITEM_STYLE_PATH = ['itemStyle'];
+var EMPHASIS_ITEM_STYLE_PATH = ['emphasis', 'itemStyle'];
 var BoxplotView = ChartView.extend({
   type: 'boxplot',
-  getStyleUpdater: function () {
-    return updateStyle;
+  render: function (seriesModel, ecModel, api) {
+    var data = seriesModel.getData();
+    var group = this.group;
+    var oldData = this._data; // There is no old data only when first rendering or switching from
+    // stream mode to normal mode, where previous elements should be removed.
+
+    if (!this._data) {
+      group.removeAll();
+    }
+
+    var constDim = seriesModel.get('layout') === 'horizontal' ? 1 : 0;
+    data.diff(oldData).add(function (newIdx) {
+      if (data.hasValue(newIdx)) {
+        var itemLayout = data.getItemLayout(newIdx);
+        var symbolEl = createNormalBox(itemLayout, data, newIdx, constDim, true);
+        data.setItemGraphicEl(newIdx, symbolEl);
+        group.add(symbolEl);
+      }
+    }).update(function (newIdx, oldIdx) {
+      var symbolEl = oldData.getItemGraphicEl(oldIdx); // Empty data
+
+      if (!data.hasValue(newIdx)) {
+        group.remove(symbolEl);
+        return;
+      }
+
+      var itemLayout = data.getItemLayout(newIdx);
+
+      if (!symbolEl) {
+        symbolEl = createNormalBox(itemLayout, data, newIdx, constDim);
+      } else {
+        updateNormalBoxData(itemLayout, symbolEl, data, newIdx);
+      }
+
+      group.add(symbolEl);
+      data.setItemGraphicEl(newIdx, symbolEl);
+    }).remove(function (oldIdx) {
+      var el = oldData.getItemGraphicEl(oldIdx);
+      el && group.remove(el);
+    }).execute();
+    this._data = data;
+  },
+  remove: function (ecModel) {
+    var group = this.group;
+    var data = this._data;
+    this._data = null;
+    data && data.eachItemGraphicEl(function (el) {
+      el && group.remove(el);
+    });
   },
   dispose: zrUtil.noop
 });
-zrUtil.mixin(BoxplotView, viewMixin, true); // Update common properties
+var BoxPath = Path.extend({
+  type: 'boxplotBoxPath',
+  shape: {},
+  buildPath: function (ctx, shape) {
+    var ends = shape.points;
+    var i = 0;
+    ctx.moveTo(ends[i][0], ends[i][1]);
+    i++;
 
-var normalStyleAccessPath = ['itemStyle'];
-var emphasisStyleAccessPath = ['emphasis', 'itemStyle'];
+    for (; i < 4; i++) {
+      ctx.lineTo(ends[i][0], ends[i][1]);
+    }
 
-function updateStyle(itemGroup, data, idx) {
-  var itemModel = data.getItemModel(idx);
-  var normalItemStyleModel = itemModel.getModel(normalStyleAccessPath);
-  var borderColor = data.getItemVisual(idx, 'color'); // Exclude borderColor.
+    ctx.closePath();
+
+    for (; i < ends.length; i++) {
+      ctx.moveTo(ends[i][0], ends[i][1]);
+      i++;
+      ctx.lineTo(ends[i][0], ends[i][1]);
+    }
+  }
+});
+
+function createNormalBox(itemLayout, data, dataIndex, constDim, isInit) {
+  var ends = itemLayout.ends;
+  var el = new BoxPath({
+    shape: {
+      points: isInit ? transInit(ends, constDim, itemLayout) : ends
+    }
+  });
+  updateNormalBoxData(itemLayout, el, data, dataIndex, isInit);
+  return el;
+}
+
+function updateNormalBoxData(itemLayout, el, data, dataIndex, isInit) {
+  var seriesModel = data.hostModel;
+  var updateMethod = graphic[isInit ? 'initProps' : 'updateProps'];
+  updateMethod(el, {
+    shape: {
+      points: itemLayout.ends
+    }
+  }, seriesModel, dataIndex);
+  var itemModel = data.getItemModel(dataIndex);
+  var normalItemStyleModel = itemModel.getModel(NORMAL_ITEM_STYLE_PATH);
+  var borderColor = data.getItemVisual(dataIndex, 'color'); // Exclude borderColor.
 
   var itemStyle = normalItemStyleModel.getItemStyle(['borderColor']);
-  var whiskerEl = itemGroup.childAt(itemGroup.whiskerIndex);
-  whiskerEl.style.set(itemStyle);
-  whiskerEl.style.stroke = borderColor;
-  whiskerEl.dirty();
-  var bodyEl = itemGroup.childAt(itemGroup.bodyIndex);
-  bodyEl.style.set(itemStyle);
-  bodyEl.style.stroke = borderColor;
-  bodyEl.dirty();
-  var hoverStyle = itemModel.getModel(emphasisStyleAccessPath).getItemStyle();
-  graphic.setHoverStyle(itemGroup, hoverStyle);
+  itemStyle.stroke = borderColor;
+  itemStyle.strokeNoScale = true;
+  el.useStyle(itemStyle);
+  el.z2 = 100;
+  var hoverStyle = itemModel.getModel(EMPHASIS_ITEM_STYLE_PATH).getItemStyle();
+  graphic.setHoverStyle(el, hoverStyle);
+}
+
+function transInit(points, dim, itemLayout) {
+  return zrUtil.map(points, function (point) {
+    point = point.slice();
+    point[dim] = itemLayout.initBaseline;
+    return point;
+  });
 }
 
 var _default = BoxplotView;

package/lib/chart/boxplot/boxplotLayout.js

@@ -3,6 +3,25 @@ var zrUtil = require("zrender/lib/core/util");
 var _number = require("../../util/number");
 
 var parsePercent = _number.parsePercent;
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var each = zrUtil.each;
 
 function _default(ecModel) {
@@ -98,80 +117,68 @@ function layoutSingleSeries(seriesModel, offset, boxWidth) {
   var coordSys = seriesModel.coordinateSystem;
   var data = seriesModel.getData();
   var halfWidth = boxWidth / 2;
-  var chartLayout = seriesModel.get('layout');
-  var variableDim = chartLayout === 'horizontal' ? 0 : 1;
-  var constDim = 1 - variableDim;
+  var cDimIdx = seriesModel.get('layout') === 'horizontal' ? 0 : 1;
+  var vDimIdx = 1 - cDimIdx;
   var coordDims = ['x', 'y'];
-  var vDims = [];
-  var cDim;
-  zrUtil.each(data.dimensions, function (dimName) {
-    var dimInfo = data.getDimensionInfo(dimName);
-    var coordDim = dimInfo.coordDim;
-
-    if (coordDim === coordDims[constDim]) {
-      vDims.push(dimName);
-    } else if (coordDim === coordDims[variableDim]) {
-      cDim = dimName;
-    }
-  });
+  var cDim = data.mapDimension(coordDims[cDimIdx]);
+  var vDims = data.mapDimension(coordDims[vDimIdx], true);
 
   if (cDim == null || vDims.length < 5) {
     return;
   }
 
-  data.each([cDim].concat(vDims), function () {
-    var args = arguments;
-    var axisDimVal = args[0];
-    var idx = args[vDims.length + 1];
-    var median = getPoint(args[3]);
-    var end1 = getPoint(args[1]);
-    var end5 = getPoint(args[5]);
-    var whiskerEnds = [[end1, getPoint(args[2])], [end5, getPoint(args[4])]];
-    layEndLine(end1);
-    layEndLine(end5);
-    layEndLine(median);
-    var bodyEnds = [];
-    addBodyEnd(whiskerEnds[0][1], 0);
-    addBodyEnd(whiskerEnds[1][1], 1);
-    data.setItemLayout(idx, {
-      chartLayout: chartLayout,
-      initBaseline: median[constDim],
-      median: median,
-      bodyEnds: bodyEnds,
-      whiskerEnds: whiskerEnds
+  for (var dataIndex = 0; dataIndex < data.count(); dataIndex++) {
+    var axisDimVal = data.get(cDim, dataIndex);
+    var median = getPoint(axisDimVal, vDims[2], dataIndex);
+    var end1 = getPoint(axisDimVal, vDims[0], dataIndex);
+    var end2 = getPoint(axisDimVal, vDims[1], dataIndex);
+    var end4 = getPoint(axisDimVal, vDims[3], dataIndex);
+    var end5 = getPoint(axisDimVal, vDims[4], dataIndex);
+    var ends = [];
+    addBodyEnd(ends, end2, 0);
+    addBodyEnd(ends, end4, 1);
+    ends.push(end1, end2, end5, end4);
+    layEndLine(ends, end1);
+    layEndLine(ends, end5);
+    layEndLine(ends, median);
+    data.setItemLayout(dataIndex, {
+      initBaseline: median[vDimIdx],
+      ends: ends
     });
+  }
 
-    function getPoint(val) {
-      var p = [];
-      p[variableDim] = axisDimVal;
-      p[constDim] = val;
-      var point;
-
-      if (isNaN(axisDimVal) || isNaN(val)) {
-        point = [NaN, NaN];
-      } else {
-        point = coordSys.dataToPoint(p);
-        point[variableDim] += offset;
-      }
-
-      return point;
+  function getPoint(axisDimVal, dimIdx, dataIndex) {
+    var val = data.get(dimIdx, dataIndex);
+    var p = [];
+    p[cDimIdx] = axisDimVal;
+    p[vDimIdx] = val;
+    var point;
+
+    if (isNaN(axisDimVal) || isNaN(val)) {
+      point = [NaN, NaN];
+    } else {
+      point = coordSys.dataToPoint(p);
+      point[cDimIdx] += offset;
     }
 
-    function addBodyEnd(point, start) {
-      var point1 = point.slice();
-      var point2 = point.slice();
-      point1[variableDim] += halfWidth;
-      point2[variableDim] -= halfWidth;
-      start ? bodyEnds.push(point1, point2) : bodyEnds.push(point2, point1);
-    }
+    return point;
+  }
 
-    function layEndLine(endCenter) {
-      var line = [endCenter.slice(), endCenter.slice()];
-      line[0][variableDim] -= halfWidth;
-      line[1][variableDim] += halfWidth;
-      whiskerEnds.push(line);
-    }
-  });
+  function addBodyEnd(ends, point, start) {
+    var point1 = point.slice();
+    var point2 = point.slice();
+    point1[cDimIdx] += halfWidth;
+    point2[cDimIdx] -= halfWidth;
+    start ? ends.push(point1, point2) : ends.push(point2, point1);
+  }
+
+  function layEndLine(ends, endCenter) {
+    var from = endCenter.slice();
+    var to = endCenter.slice();
+    from[cDimIdx] -= halfWidth;
+    to[cDimIdx] += halfWidth;
+    ends.push(from, to);
+  }
 }
 
 module.exports = _default;

package/lib/chart/boxplot/boxplotVisual.js

@@ -1,3 +1,21 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var borderColorQuery = ['itemStyle', 'borderColor'];
 
 function _default(ecModel, api) {

package/lib/chart/boxplot.js

@@ -8,5 +8,23 @@ var boxplotVisual = require("./boxplot/boxplotVisual");
 
 var boxplotLayout = require("./boxplot/boxplotLayout");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 echarts.registerVisual(boxplotVisual);
 echarts.registerLayout(boxplotLayout);

package/lib/chart/candlestick/CandlestickSeries.js

@@ -5,6 +5,25 @@ var SeriesModel = require("../../model/Series");
 var _whiskerBoxCommon = require("../helper/whiskerBoxCommon");
 
 var seriesModelMixin = _whiskerBoxCommon.seriesModelMixin;
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var CandlestickSeries = SeriesModel.extend({
   type: 'series.candlestick',
   dependencies: ['xAxis', 'yAxis', 'grid'],
@@ -12,7 +31,19 @@ var CandlestickSeries = SeriesModel.extend({
   /**
    * @readOnly
    */
-  defaultValueDimensions: ['open', 'close', 'lowest', 'highest'],
+  defaultValueDimensions: [{
+    name: 'open',
+    defaultTooltip: true
+  }, {
+    name: 'close',
+    defaultTooltip: true
+  }, {
+    name: 'lowest',
+    defaultTooltip: true
+  }, {
+    name: 'highest',
+    defaultTooltip: true
+  }],
 
   /**
    * @type {Array.<string>}
@@ -25,9 +56,7 @@ var CandlestickSeries = SeriesModel.extend({
    */
   defaultOption: {
     zlevel: 0,
-    // 一级层叠
     z: 2,
-    // 二级层叠
     coordinateSystem: 'cartesian2d',
     legendHoverLink: true,
     hoverAnimation: true,
@@ -54,6 +83,11 @@ var CandlestickSeries = SeriesModel.extend({
     barMaxWidth: null,
     barMinWidth: null,
     barWidth: null,
+    large: true,
+    largeThreshold: 600,
+    progressive: 5e3,
+    progressiveThreshold: 1e4,
+    progressiveChunkMode: 'mod',
     animationUpdate: false,
     animationEasing: 'linear',
     animationDuration: 300
@@ -68,7 +102,7 @@ var CandlestickSeries = SeriesModel.extend({
   },
   brushSelector: function (dataIndex, data, selectors) {
     var itemLayout = data.getItemLayout(dataIndex);
-    return selectors.rect(itemLayout.brushRect);
+    return itemLayout && selectors.rect(itemLayout.brushRect);
   }
 });
 zrUtil.mixin(CandlestickSeries, seriesModelMixin, true);