echarts 4.5.0 → 4.9.0

package/lib/component/helper/BrushController.js

@@ -153,12 +153,6 @@ function BrushController(zr) {
    */
 
   this._dragging;
-  /**
-   * @private
-   * @type {Object}
-   */
-
-  this._lastMouseMovePoint = {};
   /**
    * @private
    * @type {Array}
@@ -200,7 +194,7 @@ function BrushController(zr) {
    */
 
   this._handlers = {};
-  each(mouseHandlers, function (handler, eventName) {
+  each(pointerHandlers, function (handler, eventName) {
     this._handlers[eventName] = zrUtil.bind(handler, this);
   }, this);
 }
@@ -351,9 +345,7 @@ function doEnableBrush(controller, brushOption) {
     interactionMutex.take(zr, MUTEX_RESOURCE_KEY, controller._uid);
   }
 
-  each(controller._handlers, function (handler, eventName) {
-    zr.on(eventName, handler);
-  });
+  mountHandlers(zr, controller._handlers);
   controller._brushType = brushOption.brushType;
   controller._brushOption = zrUtil.merge(zrUtil.clone(DEFAULT_BRUSH_OPT), brushOption, true);
 }
@@ -361,10 +353,20 @@ function doEnableBrush(controller, brushOption) {
 function doDisableBrush(controller) {
   var zr = controller._zr;
   interactionMutex.release(zr, MUTEX_RESOURCE_KEY, controller._uid);
-  each(controller._handlers, function (handler, eventName) {
+  unmountHandlers(zr, controller._handlers);
+  controller._brushType = controller._brushOption = null;
+}
+
+function mountHandlers(zr, handlers) {
+  each(handlers, function (handler, eventName) {
+    zr.on(eventName, handler);
+  });
+}
+
+function unmountHandlers(zr, handlers) {
+  each(handlers, function (handler, eventName) {
     zr.off(eventName, handler);
   });
-  controller._brushType = controller._brushOption = null;
 }
 
 function createCover(controller, brushOption) {
@@ -667,8 +669,11 @@ function pointsToRect(points) {
 }
 
 function resetCursor(controller, e, localCursorPoint) {
-  // Check active
-  if (!controller._brushType) {
+  if ( // Check active
+  !controller._brushType // resetCursor should be always called when mouse is in zr area,
+  // but not called when mouse is out of zr area to avoid bad influence
+  // if `mousemove`, `mouseup` are triggered from `document` event.
+  || isOutsideZrArea(controller, e)) {
     return;
   }
 
@@ -758,7 +763,7 @@ function determineBrushType(brushType, panel) {
   return brushType;
 }
 
-var mouseHandlers = {
+var pointerHandlers = {
   mousedown: function (e) {
     if (this._dragging) {
       // In case some browser do not support globalOut,
@@ -777,10 +782,9 @@ var mouseHandlers = {
     }
   },
   mousemove: function (e) {
-    var lastPoint = this._lastMouseMovePoint;
-    lastPoint.x = e.offsetX;
-    lastPoint.y = e.offsetY;
-    var localCursorPoint = this.group.transformCoordToLocal(lastPoint.x, lastPoint.y);
+    var x = e.offsetX;
+    var y = e.offsetY;
+    var localCursorPoint = this.group.transformCoordToLocal(x, y);
     resetCursor(this, e, localCursorPoint);
 
     if (this._dragging) {
@@ -791,34 +795,15 @@ var mouseHandlers = {
   },
   mouseup: function (e) {
     handleDragEnd(this, e);
-  },
-  globalout: function (e) {
-    handleDragEnd(this, e, true);
   }
 };
 
-function handleDragEnd(controller, e, isGlobalOut) {
+function handleDragEnd(controller, e) {
   if (controller._dragging) {
-    // Just be worried about bring some side effect to the world
-    // out of echarts, we do not `preventDefault` for globalout.
-    !isGlobalOut && preventDefault(e);
-    var pointerX = e.offsetX;
-    var pointerY = e.offsetY;
-    var lastPoint = controller._lastMouseMovePoint;
-
-    if (isGlobalOut) {
-      pointerX = lastPoint.x;
-      pointerY = lastPoint.y;
-    }
-
-    var localCursorPoint = controller.group.transformCoordToLocal(pointerX, pointerY); // FIXME
-    // Here `e` is used only in `onIrrelevantElement` finally. And it's OK
-    // that pass the `e` of `globalout` to `onIrrelevantElement`. But it is
-    // not a good design of these interfaces. However, we do not refactor
-    // these code now because the implementation of `onIrrelevantElement`
-    // need to be discussed and probably be changed in future, becuase it
-    // slows down the performance of zrender in some cases.
-
+    preventDefault(e);
+    var x = e.offsetX;
+    var y = e.offsetY;
+    var localCursorPoint = controller.group.transformCoordToLocal(x, y);
     var eventParams = updateCoverByMouse(controller, e, localCursorPoint, true);
     controller._dragging = false;
     controller._track = [];
@@ -827,6 +812,11 @@ function handleDragEnd(controller, e, isGlobalOut) {
     eventParams && trigger(controller, eventParams);
   }
 }
+
+function isOutsideZrArea(controller, x, y) {
+  var zr = controller._zr;
+  return x < 0 || x > zr.getWidth() || y < 0 || y > zr.getHeight();
+}
 /**
  * key: brushType
  * @type {Object}

package/lib/component/helper/MapDraw.js

@@ -36,6 +36,8 @@ var _component = require("../../util/component");
 
 var getUID = _component.getUID;
 
+var Transformable = require("zrender/lib/mixin/Transformable");
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -206,14 +208,29 @@ MapDraw.prototype = {
 
     var regionsGroup = this._regionsGroup;
     var group = this.group;
+    var transformInfo = geo.getTransformInfo(); // No animation when first draw or in action
+
+    var isFirstDraw = !regionsGroup.childAt(0) || payload;
+    var targetScale;
 
-    if (geo._roamTransformable.transform) {
-      group.transform = geo._roamTransformable.transform.slice();
+    if (isFirstDraw) {
+      group.transform = transformInfo.roamTransform;
       group.decomposeTransform();
+      group.dirty();
+    } else {
+      var target = new Transformable();
+      target.transform = transformInfo.roamTransform;
+      target.decomposeTransform();
+      var props = {
+        scale: target.scale,
+        position: target.position
+      };
+      targetScale = target.scale;
+      graphic.updateProps(group, props, mapOrGeoModel);
     }
 
-    var scale = geo._rawTransformable.scale;
-    var position = geo._rawTransformable.position;
+    var scale = transformInfo.rawScale;
+    var position = transformInfo.rawPosition;
     regionsGroup.removeAll();
     var itemStyleAccessPath = ['itemStyle'];
     var hoverItemStyleAccessPath = ['emphasis', 'itemStyle'];
@@ -333,6 +350,15 @@ MapDraw.prototype = {
           textAlign: 'center',
           textVerticalAlign: 'middle'
         });
+
+        if (!isFirstDraw) {
+          // Text animation
+          var textScale = [1 / targetScale[0], 1 / targetScale[1]];
+          graphic.updateProps(textEl, {
+            scale: textScale
+          }, mapOrGeoModel);
+        }
+
         regionGroup.add(textEl);
       } // setItemGraphicEl, setHoverStyle after all polygons and labels
       // are added to the rigionGroup

package/lib/component/legend/LegendModel.js

@@ -131,9 +131,9 @@ var LegendModel = echarts.extendComponentModel({
       availableNames.push(seriesName);
       var isPotential;
 
-      if (seriesModel.legendDataProvider) {
-        var data = seriesModel.legendDataProvider();
-        var names = data.mapArray(data.getName);
+      if (seriesModel.legendVisualProvider) {
+        var provider = seriesModel.legendVisualProvider;
+        var names = provider.getAllNames();
 
         if (!ecModel.isSeriesFiltered(seriesModel)) {
           availableNames = availableNames.concat(names);

package/lib/component/legend/LegendView.js

@@ -191,7 +191,7 @@ var _default = echarts.extendComponentView({
       if (legendDrawnMap.get(name)) {
         // Have been drawed
         return;
-      } // Series legend
+      } // Legend to control series.
 
 
       if (seriesModel) {
@@ -216,32 +216,32 @@ var _default = echarts.extendComponentView({
 
         var itemGroup = this._createItem(name, dataIndex, itemModel, legendModel, legendSymbolType, symbolType, itemAlign, color, borderColor, selectMode);
 
-        itemGroup.on('click', curry(dispatchSelectAction, name, api)).on('mouseover', curry(dispatchHighlightAction, seriesModel.name, null, api, excludeSeriesId)).on('mouseout', curry(dispatchDownplayAction, seriesModel.name, null, api, excludeSeriesId));
+        itemGroup.on('click', curry(dispatchSelectAction, name, null, api, excludeSeriesId)).on('mouseover', curry(dispatchHighlightAction, seriesModel.name, null, api, excludeSeriesId)).on('mouseout', curry(dispatchDownplayAction, seriesModel.name, null, api, excludeSeriesId));
         legendDrawnMap.set(name, true);
       } else {
-        // Data legend of pie, funnel
+        // Legend to control data. In pie and funnel.
         ecModel.eachRawSeries(function (seriesModel) {
           // In case multiple series has same data name
           if (legendDrawnMap.get(name)) {
             return;
           }
 
-          if (seriesModel.legendDataProvider) {
-            var data = seriesModel.legendDataProvider();
-            var idx = data.indexOfName(name);
+          if (seriesModel.legendVisualProvider) {
+            var provider = seriesModel.legendVisualProvider;
 
-            if (idx < 0) {
+            if (!provider.containName(name)) {
               return;
             }
 
-            var color = data.getItemVisual(idx, 'color');
-            var borderColor = data.getItemVisual(idx, 'borderColor');
+            var idx = provider.indexOfName(name);
+            var color = provider.getItemVisual(idx, 'color');
+            var borderColor = provider.getItemVisual(idx, 'borderColor');
             var legendSymbolType = 'roundRect';
 
             var itemGroup = this._createItem(name, dataIndex, itemModel, legendModel, legendSymbolType, null, itemAlign, color, borderColor, selectMode); // FIXME: consider different series has items with the same name.
 
 
-            itemGroup.on('click', curry(dispatchSelectAction, name, api)) // Should not specify the series name, consider legend controls
+            itemGroup.on('click', curry(dispatchSelectAction, null, name, api, excludeSeriesId)) // Should not specify the series name, consider legend controls
             // more than one pie series.
             .on('mouseover', curry(dispatchHighlightAction, null, name, api, excludeSeriesId)).on('mouseout', curry(dispatchDownplayAction, null, name, api, excludeSeriesId));
             legendDrawnMap.set(name, true);
@@ -442,11 +442,15 @@ function setSymbolStyle(symbol, symbolType, legendModelItemStyle, borderColor, i
   return symbol.setStyle(itemStyle);
 }
 
-function dispatchSelectAction(name, api) {
+function dispatchSelectAction(seriesName, dataName, api, excludeSeriesId) {
+  // downplay before unselect
+  dispatchDownplayAction(seriesName, dataName, api, excludeSeriesId);
   api.dispatchAction({
     type: 'legendToggleSelect',
-    name: name
-  });
+    name: seriesName != null ? seriesName : dataName
+  }); // highlight after select
+
+  dispatchHighlightAction(seriesName, dataName, api, excludeSeriesId);
 }
 
 function dispatchHighlightAction(seriesName, dataName, api, excludeSeriesId) {

package/lib/component/legend/ScrollableLegendView.js

@@ -418,28 +418,28 @@ var ScrollableLegendView = LegendView.extend({
     }
   },
   _findTargetItemIndex: function (targetDataIndex) {
+    if (!this._showController) {
+      return 0;
+    }
+
     var index;
     var contentGroup = this.getContentGroup();
     var defaultIndex;
+    contentGroup.eachChild(function (child, idx) {
+      var legendDataIdx = child.__legendDataIndex; // FIXME
+      // If the given targetDataIndex (from model) is illegal,
+      // we use defaultIndex. But the index on the legend model and
+      // action payload is still illegal. That case will not be
+      // changed until some scenario requires.
+
+      if (defaultIndex == null && legendDataIdx != null) {
+        defaultIndex = idx;
+      }
 
-    if (this._showController) {
-      contentGroup.eachChild(function (child, idx) {
-        var legendDataIdx = child.__legendDataIndex; // FIXME
-        // If the given targetDataIndex (from model) is illegal,
-        // we use defualtIndex. But the index on the legend model and
-        // action payload is still illegal. That case will not be
-        // changed until some scenario requires.
-
-        if (defaultIndex == null && legendDataIdx != null) {
-          defaultIndex = idx;
-        }
-
-        if (legendDataIdx === targetDataIndex) {
-          index = idx;
-        }
-      });
-    }
-
+      if (legendDataIdx === targetDataIndex) {
+        index = idx;
+      }
+    });
     return index != null ? index : defaultIndex;
   }
 });

package/lib/component/marker/MarkAreaView.js

@@ -212,32 +212,70 @@ MarkerView.extend({
 
     areaData.each(function (idx) {
       // Layout
-      areaData.setItemLayout(idx, zrUtil.map(dimPermutations, function (dim) {
+      var points = zrUtil.map(dimPermutations, function (dim) {
         return getSingleMarkerEndPoint(areaData, idx, dim, seriesModel, api);
-      })); // Visual
+      }); // If none of the area is inside coordSys, allClipped is set to be true
+      // in layout so that label will not be displayed. See #12591
+
+      var allClipped = true;
+      zrUtil.each(dimPermutations, function (dim) {
+        if (!allClipped) {
+          return;
+        }
+
+        var xValue = areaData.get(dim[0], idx);
+        var yValue = areaData.get(dim[1], idx); // If is infinity, the axis should be considered not clipped
+
+        if ((isInifinity(xValue) || coordSys.getAxis('x').containData(xValue)) && (isInifinity(yValue) || coordSys.getAxis('y').containData(yValue))) {
+          allClipped = false;
+        }
+      });
+      areaData.setItemLayout(idx, {
+        points: points,
+        allClipped: allClipped
+      }); // Visual
 
       areaData.setItemVisual(idx, {
         color: seriesData.getVisual('color')
       });
     });
     areaData.diff(polygonGroup.__data).add(function (idx) {
-      var polygon = new graphic.Polygon({
-        shape: {
-          points: areaData.getItemLayout(idx)
-        }
-      });
-      areaData.setItemGraphicEl(idx, polygon);
-      polygonGroup.group.add(polygon);
+      var layout = areaData.getItemLayout(idx);
+
+      if (!layout.allClipped) {
+        var polygon = new graphic.Polygon({
+          shape: {
+            points: layout.points
+          }
+        });
+        areaData.setItemGraphicEl(idx, polygon);
+        polygonGroup.group.add(polygon);
+      }
     }).update(function (newIdx, oldIdx) {
       var polygon = polygonGroup.__data.getItemGraphicEl(oldIdx);
 
-      graphic.updateProps(polygon, {
-        shape: {
-          points: areaData.getItemLayout(newIdx)
+      var layout = areaData.getItemLayout(newIdx);
+
+      if (!layout.allClipped) {
+        if (polygon) {
+          graphic.updateProps(polygon, {
+            shape: {
+              points: layout.points
+            }
+          }, maModel, newIdx);
+        } else {
+          polygon = new graphic.Polygon({
+            shape: {
+              points: layout.points
+            }
+          });
         }
-      }, maModel, newIdx);
-      polygonGroup.group.add(polygon);
-      areaData.setItemGraphicEl(newIdx, polygon);
+
+        areaData.setItemGraphicEl(newIdx, polygon);
+        polygonGroup.group.add(polygon);
+      } else if (polygon) {
+        polygonGroup.group.remove(polygon);
+      }
     }).remove(function (idx) {
       var polygon = polygonGroup.__data.getItemGraphicEl(idx);
 

package/lib/component/marker/MarkLineModel.js

@@ -52,7 +52,8 @@ var _default = MarkerModel.extend({
     },
     label: {
       show: true,
-      position: 'end'
+      position: 'end',
+      distance: 5
     },
     lineStyle: {
       type: 'dashed'

package/lib/component/marker/MarkLineView.js

@@ -278,8 +278,10 @@ var _default = MarkerView.extend({
       });
       lineData.setItemLayout(idx, [fromData.getItemLayout(idx), toData.getItemLayout(idx)]);
       lineData.setItemVisual(idx, {
+        'fromSymbolRotate': fromData.getItemVisual(idx, 'symbolRotate'),
         'fromSymbolSize': fromData.getItemVisual(idx, 'symbolSize'),
         'fromSymbol': fromData.getItemVisual(idx, 'symbol'),
+        'toSymbolRotate': toData.getItemVisual(idx, 'symbolRotate'),
         'toSymbolSize': toData.getItemVisual(idx, 'symbolSize'),
         'toSymbol': toData.getItemVisual(idx, 'symbol')
       });
@@ -297,6 +299,7 @@ var _default = MarkerView.extend({
       var itemModel = data.getItemModel(idx);
       updateSingleMarkerEndLayout(data, idx, isFrom, seriesModel, api);
       data.setItemVisual(idx, {
+        symbolRotate: itemModel.get('symbolRotate'),
         symbolSize: itemModel.get('symbolSize') || symbolSize[isFrom ? 0 : 1],
         symbol: itemModel.get('symbol', true) || symbolType[isFrom ? 0 : 1],
         color: itemModel.get('itemStyle.color') || seriesData.getVisual('color')

package/lib/component/marker/MarkPointView.js

@@ -116,10 +116,12 @@ var _default = MarkerView.extend({
       var itemModel = mpData.getItemModel(idx);
       var symbol = itemModel.getShallow('symbol');
       var symbolSize = itemModel.getShallow('symbolSize');
+      var symbolRotate = itemModel.getShallow('symbolRotate');
       var isFnSymbol = zrUtil.isFunction(symbol);
       var isFnSymbolSize = zrUtil.isFunction(symbolSize);
+      var isFnSymbolRotate = zrUtil.isFunction(symbolRotate);
 
-      if (isFnSymbol || isFnSymbolSize) {
+      if (isFnSymbol || isFnSymbolSize || isFnSymbolRotate) {
         var rawIdx = mpModel.getRawValue(idx);
         var dataParams = mpModel.getDataParams(idx);
 
@@ -131,11 +133,16 @@ var _default = MarkerView.extend({
           // FIXME 这里不兼容 ECharts 2.x，2.x 貌似参数是整个数据？
           symbolSize = symbolSize(rawIdx, dataParams);
         }
+
+        if (isFnSymbolRotate) {
+          symbolRotate = symbolRotate(rawIdx, dataParams);
+        }
       }
 
       mpData.setItemVisual(idx, {
         symbol: symbol,
         symbolSize: symbolSize,
+        symbolRotate: symbolRotate,
         color: itemModel.get('itemStyle.color') || seriesData.getVisual('color')
       });
     }); // TODO Text are wrong

package/lib/component/marker/MarkerModel.js

@@ -136,15 +136,16 @@ var MarkerModel = echarts.extendComponentModel({
       }, this);
     }
   },
-  formatTooltip: function (dataIndex) {
+  formatTooltip: function (dataIndex, multipleSeries, dataType, renderMode) {
     var data = this.getData();
     var value = this.getRawValue(dataIndex);
     var formattedValue = zrUtil.isArray(value) ? zrUtil.map(value, addCommas).join(', ') : addCommas(value);
     var name = data.getName(dataIndex);
     var html = encodeHTML(this.name);
+    var newLine = renderMode === 'html' ? '<br/>' : '\n';
 
     if (value != null || name) {
-      html += '<br />';
+      html += newLine;
     }
 
     if (name) {

package/lib/component/marker/markerHelper.js

@@ -85,7 +85,8 @@ function markerTypeCalculatorWithExtent(mlType, data, otherDataDim, targetDataDi
   var value = numCalculate(data, calcDataDim, mlType);
   var dataIndex = data.indicesOfNearest(calcDataDim, value)[0];
   coordArr[otherCoordIndex] = data.get(otherDataDim, dataIndex);
-  coordArr[targetCoordIndex] = data.get(targetDataDim, dataIndex); // Make it simple, do not visit all stacked value to count precision.
+  coordArr[targetCoordIndex] = data.get(calcDataDim, dataIndex);
+  var coordArrValue = data.get(targetDataDim, dataIndex); // Make it simple, do not visit all stacked value to count precision.
 
   var precision = numberUtil.getPrecision(data.get(targetDataDim, dataIndex));
   precision = Math.min(precision, 20);
@@ -94,7 +95,7 @@ function markerTypeCalculatorWithExtent(mlType, data, otherDataDim, targetDataDi
     coordArr[targetCoordIndex] = +coordArr[targetCoordIndex].toFixed(precision);
   }
 
-  return coordArr;
+  return [coordArr, coordArrValue];
 }
 
 var curry = zrUtil.curry; // TODO Specified percent
@@ -151,9 +152,11 @@ function dataTransform(seriesModel, item) {
     if (item.type && markerTypeCalculator[item.type] && axisInfo.baseAxis && axisInfo.valueAxis) {
       var otherCoordIndex = indexOf(dims, axisInfo.baseAxis.dim);
       var targetCoordIndex = indexOf(dims, axisInfo.valueAxis.dim);
-      item.coord = markerTypeCalculator[item.type](data, axisInfo.baseDataDim, axisInfo.valueDataDim, otherCoordIndex, targetCoordIndex); // Force to use the value of calculated value.
+      var coordInfo = markerTypeCalculator[item.type](data, axisInfo.baseDataDim, axisInfo.valueDataDim, otherCoordIndex, targetCoordIndex);
+      item.coord = coordInfo[0]; // Force to use the value of calculated value.
+      // let item use the value without stack.
 
-      item.value = item.coord[targetCoordIndex];
+      item.value = coordInfo[1];
     } else {
       // FIXME Only has one of xAxis and yAxis.
       var coord = [item.xAxis != null ? item.xAxis : item.radiusAxis, item.yAxis != null ? item.yAxis : item.angleAxis]; // Each coord support max, min, average

package/lib/component/timeline/SliderTimelineView.js

@@ -571,7 +571,13 @@ function getViewRect(model, api) {
 }
 
 function makeIcon(timelineModel, objPath, rect, opts) {
-  var icon = graphic.makePath(timelineModel.get(objPath).replace(/^path:\/\//, ''), zrUtil.clone(opts || {}), new BoundingRect(rect[0], rect[1], rect[2], rect[3]), 'center');
+  var style = opts.style;
+  var icon = graphic.createIcon(timelineModel.get(objPath), opts || {}, new BoundingRect(rect[0], rect[1], rect[2], rect[3])); // TODO createIcon won't use style in opt.
+
+  if (style) {
+    icon.setStyle(style);
+  }
+
   return icon;
 }
 /**

package/lib/component/title.js

@@ -28,6 +28,10 @@ var _layout = require("../util/layout");
 
 var getLayoutRect = _layout.getLayoutRect;
 
+var _format = require("../util/format");
+
+var windowOpen = _format.windowOpen;
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -150,13 +154,13 @@ echarts.extendComponentView({
 
     if (link) {
       textEl.on('click', function () {
-        window.open(link, '_' + titleModel.get('target'));
+        windowOpen(link, '_' + titleModel.get('target'));
       });
     }
 
     if (sublink) {
       subTextEl.on('click', function () {
-        window.open(sublink, '_' + titleModel.get('subtarget'));
+        windowOpen(sublink, '_' + titleModel.get('subtarget'));
       });
     }
 

package/lib/component/toolbox/ToolboxView.js

@@ -78,7 +78,11 @@ var _default = echarts.extendComponentView({
       var oldName = featureNames[oldIndex];
       var featureOpt = featureOpts[featureName];
       var featureModel = new Model(featureOpt, toolboxModel, toolboxModel.ecModel);
-      var feature;
+      var feature; // FIX#11236, merge feature title from MagicType newOption. TODO: consider seriesIndex ?
+
+      if (payload && payload.newTitle != null && payload.featureName === featureName) {
+        featureOpt.title = payload.newTitle;
+      }
 
       if (featureName && !oldName) {
         // Create

package/lib/component/toolbox/feature/DataView.js

@@ -116,7 +116,8 @@ function assembleSeriesWithCategoryAxis(series) {
     }));
     var columns = [categoryAxis.model.getCategories()];
     zrUtil.each(group.series, function (series) {
-      columns.push(series.getRawData().mapArray(valueAxisDim, function (val) {
+      var rawData = series.getRawData();
+      columns.push(series.getRawData().mapArray(rawData.mapDimension(valueAxisDim), function (val) {
         return val;
       }));
     }); // Assemble table content
@@ -242,7 +243,15 @@ function parseListContents(str) {
   var data = [];
 
   for (var i = 0; i < lines.length; i++) {
-    var items = trim(lines[i]).split(itemSplitRegex);
+    // if line is empty, ignore it.
+    // there is a case that a user forgot to delete `\n`.
+    var line = trim(lines[i]);
+
+    if (!line) {
+      continue;
+    }
+
+    var items = line.split(itemSplitRegex);
     var name = '';
     var value;
     var hasName = false;
@@ -449,14 +458,20 @@ function tryMergeDataOption(newData, originalData) {
     var original = originalData && originalData[idx];
 
     if (zrUtil.isObject(original) && !zrUtil.isArray(original)) {
-      if (zrUtil.isObject(newVal) && !zrUtil.isArray(newVal)) {
-        newVal = newVal.value;
-      } // Original data has option
+      var newValIsObject = zrUtil.isObject(newVal) && !zrUtil.isArray(newVal);
 
+      if (!newValIsObject) {
+        newVal = {
+          value: newVal
+        };
+      } // original data has name but new data has no name
 
-      return zrUtil.defaults({
-        value: newVal
-      }, original);
+
+      var shouldDeleteName = original.name != null && newVal.name == null; // Original data has option
+
+      newVal = zrUtil.defaults(newVal, original);
+      shouldDeleteName && delete newVal.name;
+      return newVal;
     } else {
       return newVal;
     }