Series#mergeOption merge before getInitialData

src/chart/treemap/TreemapSeries.js

@@ -95,7 +95,7 @@ define(function(require) {
         getInitialData: function (option, ecModel) {
             var data = option.data || [];
             var rootName = option.name;
-            rootName == null && (rootName = this.option.name);
+            rootName == null && (rootName = option.name);
 
             // Create a virtual root.
             var root = {name: rootName, children: option.data};
@@ -104,7 +104,7 @@ define(function(require) {
 
             // FIXME
             // sereis.mergeOption 的 getInitData是否放在merge后，从而能直接获取merege后的结果而非手动判断。
-            var levels = option.levels || (this.option || {}).levels || [];
+            var levels = option.levels || [];
 
             // Make sure always a new tree is created when setOption,
             // in TreemapView, we check whether oldTree === newTree

src/model/Series.js

@@ -60,14 +60,14 @@ define(function(require) {
         },
 
         mergeOption: function (newSeriesOption, ecModel) {
+            newSeriesOption = zrUtil.merge(this.option, newSeriesOption, true);
+
             var data = this.getInitialData(newSeriesOption, ecModel);
             // TODO Merge data?
             if (data) {
                 this._data = data;
                 this._dataBeforeProcessed = data.cloneShallow();
             }
-
-            zrUtil.merge(this.option, newSeriesOption, true);
         },
 
         /**