echarts 4.0.1 → 4.1.0

package/lib/model/Global.js

@@ -32,6 +32,25 @@ var _sourceHelper = require("../data/helper/sourceHelper");
 
 var resetSourceDefaulter = _sourceHelper.resetSourceDefaulter;
 
+/*
+* 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 global model
  *
@@ -60,7 +79,6 @@ var OPTION_INNER_KEY = '\0_ec_inner';
  */
 
 var GlobalModel = Model.extend({
-  constructor: GlobalModel,
   init: function (option, parentModel, theme, optionManager) {
     theme = theme || {};
     this.option = null; // Mark as not initialized.
@@ -436,6 +454,9 @@ var GlobalModel = Model.extend({
   },
 
   /**
+   * Get series list before filtered by type.
+   * FIXME: rename to getRawSeriesByType?
+   *
    * @param {string} subType
    * @return {Array.<module:echarts/model/Series>}
    */
@@ -570,8 +591,15 @@ function isNotTargetSeries(seriesModel, payload) {
 
 
 function mergeTheme(option, theme) {
+  // PENDING
+  // NOT use `colorLayer` in theme if option has `color`
+  var notMergeColorLayer = option.color && !option.colorLayer;
   each(theme, function (themeItem, name) {
-    // 如果有 component model 则把具体的 merge 逻辑交给该 model 处理
+    if (name === 'colorLayer' && notMergeColorLayer) {
+      return;
+    } // 如果有 component model 则把具体的 merge 逻辑交给该 model 处理
+
+
     if (!ComponentModel.hasClass(name)) {
       if (typeof themeItem === 'object') {
         option[name] = !option[name] ? clone(themeItem) : merge(option[name], themeItem, false);

package/lib/model/Model.js

@@ -19,6 +19,25 @@ var textStyleMixin = require("./mixin/textStyle");
 
 var itemStyleMixin = require("./mixin/itemStyle");
 
+/*
+* 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.
+*/
+
 /**
  * @module echarts/model/Model
  */

package/lib/model/OptionManager.js

@@ -4,6 +4,25 @@ var modelUtil = require("../util/model");
 
 var ComponentModel = require("./Component");
 
+/*
+* 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 option manager
  *

package/lib/model/Series.js

@@ -38,6 +38,25 @@ var getSource = _sourceHelper.getSource;
 var _dataProvider = require("../data/helper/dataProvider");
 
 var retrieveRawValue = _dataProvider.retrieveRawValue;
+
+/*
+* 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 inner = modelUtil.makeInner();
 var SeriesModel = ComponentModel.extend({
   type: 'series.__base__',
@@ -161,7 +180,7 @@ var SeriesModel = ComponentModel.extend({
     // Default data label emphasis `show`
     // FIXME Tree structure data ?
     // FIXME Performance ?
-    if (data) {
+    if (data && !zrUtil.isTypedArray(data)) {
       var props = ['show'];
 
       for (var i = 0; i < data.length; i++) {
@@ -223,7 +242,7 @@ var SeriesModel = ComponentModel.extend({
     if (task) {
       var context = task.context; // Consider case: filter, data sample.
 
-      if (context.data !== data && task.isOverallFilter) {
+      if (context.data !== data && task.modifyOutputEnd) {
         task.setOutputEnd(data.count());
       }
 
@@ -335,8 +354,7 @@ var SeriesModel = ComponentModel.extend({
     var name = data.getName(dataIndex);
     var seriesName = this.name;
 
-    if (seriesName === modelUtil.DEFAULT_COMPONENT_NAME) {
-      // Not show '-'
+    if (!modelUtil.isNameSpecified(this)) {
       seriesName = '';
     }
 
@@ -451,7 +469,7 @@ function autoSeriesName(seriesModel) {
   // series can not be queried unexpectedly.
   var name = seriesModel.name;
 
-  if (modelUtil.DEFAULT_COMPONENT_NAME === name) {
+  if (!modelUtil.isNameSpecified(seriesModel)) {
     seriesModel.name = getSeriesAutoName(seriesModel) || name;
   }
 }

package/lib/model/globalDefault.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 platform = ''; // Navigator not exists in node
 
 if (typeof navigator !== 'undefined') {
@@ -5,19 +23,17 @@ if (typeof navigator !== 'undefined') {
 }
 
 var _default = {
-  // 全图默认背景
   // backgroundColor: 'rgba(0,0,0,0)',
   // https://dribbble.com/shots/1065960-Infographic-Pie-chart-visualization
   // color: ['#5793f3', '#d14a61', '#fd9c35', '#675bba', '#fec42c', '#dd4444', '#d4df5a', '#cd4870'],
-  // 浅色
+  // Light colors:
   // color: ['#bcd3bb', '#e88f70', '#edc1a5', '#9dc5c8', '#e1e8c8', '#7b7c68', '#e5b5b5', '#f0b489', '#928ea8', '#bda29a'],
   // color: ['#cc5664', '#9bd6ec', '#ea946e', '#8acaaa', '#f1ec64', '#ee8686', '#a48dc1', '#5da6bc', '#b9dcae'],
-  // 深色
+  // Dark colors:
   color: ['#c23531', '#2f4554', '#61a0a8', '#d48265', '#91c7ae', '#749f83', '#ca8622', '#bda29a', '#6e7074', '#546570', '#c4ccd3'],
   gradientColor: ['#f6efa6', '#d88273', '#bf444c'],
-  // 默认需要 Grid 配置项
+  // If xAxis and yAxis declared, grid is created by default.
   // grid: {},
-  // 主题，主题
   textStyle: {
     // color: '#000',
     // decoration: 'none',

package/lib/model/mixin/areaStyle.js

@@ -1,5 +1,23 @@
 var makeStyleMapper = require("./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 getAreaStyle = makeStyleMapper([['fill', 'color'], ['shadowBlur'], ['shadowOffsetX'], ['shadowOffsetY'], ['opacity'], ['shadowColor']]);
 var _default = {
   getAreaStyle: function (excludes, includes) {

package/lib/model/mixin/boxLayout.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 _default = {
   getBoxLayoutParams: function () {
     return {

package/lib/model/mixin/colorPalette.js

@@ -2,6 +2,25 @@ var _model = require("../../util/model");
 
 var makeInner = _model.makeInner;
 var normalizeToArray = _model.normalizeToArray;
+
+/*
+* 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 inner = makeInner();
 
 function getNearestColorPalette(colors, requestColorNum) {
@@ -21,6 +40,14 @@ var _default = {
     inner(this).colorIdx = 0;
     inner(this).colorNameMap = {};
   },
+
+  /**
+   * @param {string} name MUST NOT be null/undefined. Otherwise call this function
+   *                 twise with the same parameters will get different result.
+   * @param {Object} [scope=this]
+   * @param {Object} [requestColorNum]
+   * @return {string} color string.
+   */
   getColorFromPalette: function (name, scope, requestColorNum) {
     scope = scope || this;
     var scopeFields = inner(scope);

package/lib/model/mixin/dataFormat.js

@@ -6,6 +6,25 @@ var _format = require("../../util/format");
 
 var getTooltipMarker = _format.getTooltipMarker;
 var formatTpl = _format.formatTpl;
+
+/*
+* 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 DIMENSION_LABEL_REG = /\{@(.+?)\}/g; // PENDING A little ugly
 
 var _default = {
@@ -19,7 +38,7 @@ var _default = {
     var data = this.getData(dataType);
     var rawValue = this.getRawValue(dataIndex, dataType);
     var rawDataIndex = data.getRawIndex(dataIndex);
-    var name = data.getName(dataIndex, true);
+    var name = data.getName(dataIndex);
     var itemOpt = data.getRawDataItem(dataIndex);
     var color = data.getItemVisual(dataIndex, 'color');
     return {

package/lib/model/mixin/itemStyle.js

@@ -1,5 +1,23 @@
 var makeStyleMapper = require("./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 getItemStyle = makeStyleMapper([['fill', 'color'], ['stroke', 'borderColor'], ['lineWidth', 'borderWidth'], ['opacity'], ['shadowBlur'], ['shadowOffsetX'], ['shadowOffsetY'], ['shadowColor'], ['textPosition'], ['textAlign']]);
 var _default = {
   getItemStyle: function (excludes, includes) {

package/lib/model/mixin/lineStyle.js

@@ -1,5 +1,23 @@
 var makeStyleMapper = require("./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 getLineStyle = makeStyleMapper([['lineWidth', 'width'], ['stroke', 'color'], ['opacity'], ['shadowBlur'], ['shadowOffsetX'], ['shadowOffsetY'], ['shadowColor']]);
 var _default = {
   getLineStyle: function (excludes) {

package/lib/model/mixin/makeStyleMapper.js

@@ -1,5 +1,23 @@
 var zrUtil = require("zrender/lib/core/util");
 
+/*
+* 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.
+*/
 // TODO Parse shadow style
 // TODO Only shallow path support
 function _default(properties) {

package/lib/model/mixin/textStyle.js

@@ -2,6 +2,24 @@ var textContain = require("zrender/lib/contain/text");
 
 var graphicUtil = require("../../util/graphic");
 
+/*
+* 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 PATH_COLOR = ['textStyle', 'color'];
 var _default = {
   /**

package/lib/model/referHelper.js

@@ -8,6 +8,25 @@ var createHashMap = _util.createHashMap;
 var retrieve = _util.retrieve;
 var each = _util.each;
 
+/*
+* 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.
+*/
+
 /**
  * Helper for model references.
  * There are many manners to refer axis/coordSys.

package/lib/preprocessor/backwardCompat.js

@@ -10,6 +10,24 @@ var _model = require("../util/model");
 
 var normalizeToArray = _model.normalizeToArray;
 
+/*
+* 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.
+*/
 // Compatitable with 2.0
 function get(opt, path) {
   path = path.split(',');

package/lib/preprocessor/helper/compatStyle.js

@@ -2,6 +2,24 @@ var zrUtil = require("zrender/lib/core/util");
 
 var modelUtil = require("../../util/model");
 
+/*
+* 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;
 var isObject = zrUtil.isObject;
 var POSSIBLE_STYLES = ['areaStyle', 'lineStyle', 'nodeStyle', 'linkStyle', 'chordStyle', 'label', 'labelLine'];
@@ -44,13 +62,19 @@ function compatEC2ItemStyle(opt) {
   }
 }
 
-function convertNormalEmphasis(opt, optType) {
+function convertNormalEmphasis(opt, optType, useExtend) {
   if (opt && opt[optType] && (opt[optType].normal || opt[optType].emphasis)) {
     var normalOpt = opt[optType].normal;
     var emphasisOpt = opt[optType].emphasis;
 
     if (normalOpt) {
-      opt[optType] = normalOpt;
+      // Timeline controlStyle has other properties besides normal and emphasis
+      if (useExtend) {
+        opt[optType].normal = opt[optType].emphasis = null;
+        zrUtil.defaults(opt[optType], normalOpt);
+      } else {
+        opt[optType] = normalOpt;
+      }
     }
 
     if (emphasisOpt) {
@@ -72,15 +96,17 @@ function removeEC3NormalStatus(opt) {
   convertNormalEmphasis(opt, 'edgeLabel');
 }
 
-function compatTextStyle(labelOpt) {
-  var textStyle = isObject(labelOpt) && labelOpt.textStyle;
+function compatTextStyle(opt, propName) {
+  // Check whether is not object (string\null\undefined ...)
+  var labelOptSingle = isObject(opt) && opt[propName];
+  var textStyle = isObject(labelOptSingle) && labelOptSingle.textStyle;
 
   if (textStyle) {
     for (var i = 0, len = modelUtil.TEXT_STYLE_OPTIONS.length; i < len; i++) {
       var propName = modelUtil.TEXT_STYLE_OPTIONS[i];
 
       if (textStyle.hasOwnProperty(propName)) {
-        labelOpt[propName] = textStyle[propName];
+        labelOptSingle[propName] = textStyle[propName];
       }
     }
   }
@@ -89,8 +115,8 @@ function compatTextStyle(labelOpt) {
 function compatEC3CommonStyles(opt) {
   if (opt) {
     removeEC3NormalStatus(opt);
-    compatTextStyle(opt.label);
-    opt.emphasis && compatTextStyle(opt.emphasis.label);
+    compatTextStyle(opt, 'label');
+    opt.emphasis && compatTextStyle(opt.emphasis, 'label');
   }
 }
 
@@ -101,18 +127,18 @@ function processSeries(seriesOpt) {
 
   compatEC2ItemStyle(seriesOpt);
   removeEC3NormalStatus(seriesOpt);
-  compatTextStyle(seriesOpt.label); // treemap
+  compatTextStyle(seriesOpt, 'label'); // treemap
 
-  compatTextStyle(seriesOpt.upperLabel); // graph
+  compatTextStyle(seriesOpt, 'upperLabel'); // graph
 
-  compatTextStyle(seriesOpt.edgeLabel);
+  compatTextStyle(seriesOpt, 'edgeLabel');
 
   if (seriesOpt.emphasis) {
-    compatTextStyle(seriesOpt.emphasis.label); // treemap
+    compatTextStyle(seriesOpt.emphasis, 'label'); // treemap
 
-    compatTextStyle(seriesOpt.emphasis.upperLabel); // graph
+    compatTextStyle(seriesOpt.emphasis, 'upperLabel'); // graph
 
-    compatTextStyle(seriesOpt.emphasis.edgeLabel);
+    compatTextStyle(seriesOpt.emphasis, 'edgeLabel');
   }
 
   var markPoint = seriesOpt.markPoint;
@@ -196,6 +222,8 @@ function processSeries(seriesOpt) {
     zrUtil.each(seriesOpt.levels, function (opt) {
       removeEC3NormalStatus(opt);
     });
+  } else if (seriesOpt.type === 'tree') {
+    removeEC3NormalStatus(seriesOpt.leaves);
   } // sunburst starts from ec4, so it does not need to compat levels.
 
 }
@@ -249,8 +277,7 @@ function _default(option, isTheme) {
     compatEC3CommonStyles(timelineOpt);
     convertNormalEmphasis(timelineOpt, 'label');
     convertNormalEmphasis(timelineOpt, 'itemStyle');
-    convertNormalEmphasis(timelineOpt, 'controlStyle');
-    convertNormalEmphasis(timelineOpt, 'checkpointStyle');
+    convertNormalEmphasis(timelineOpt, 'controlStyle', true);
     var data = timelineOpt.data;
     zrUtil.isArray(data) && zrUtil.each(data, function (item) {
       if (zrUtil.isObject(item)) {

package/lib/processor/dataFilter.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.
+*/
 function _default(seriesType) {
   return {
     seriesType: seriesType,
@@ -21,7 +39,7 @@ function _default(seriesType) {
         }
 
         return true;
-      }, this);
+      });
     }
   };
 }