echarts 4.0.1 → 4.1.0

package/lib/chart/sunburst/SunburstPiece.js

@@ -2,6 +2,24 @@ var zrUtil = require("zrender/lib/core/util");
 
 var graphic = 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 NodeHighlightPolicy = {
   NONE: 'none',
   // not downplay others
@@ -22,6 +40,7 @@ function SunburstPiece(node, seriesModel, ecModel) {
   var sector = new graphic.Sector({
     z2: DEFAULT_SECTOR_Z
   });
+  sector.seriesIndex = seriesModel.seriesIndex;
   var text = new graphic.Text({
     z2: DEFAULT_TEXT_Z,
     silent: node.getModel('label').get('silent')
@@ -52,6 +71,11 @@ SunburstPieceProto.updateData = function (firstCreate, node, state, seriesModel,
   sector.dataIndex = node.dataIndex;
   var itemModel = node.getModel();
   var layout = node.getLayout();
+
+  if (!layout) {
+    console.log(node.getLayout());
+  }
+
   var sectorShape = zrUtil.extend({}, layout);
   sectorShape.label = null;
   var visualColor = getNodeColor(node, seriesModel, ecModel);
@@ -79,6 +103,13 @@ SunburstPieceProto.updateData = function (firstCreate, node, state, seriesModel,
       }
     }, seriesModel, node.dataIndex);
     sector.useStyle(style);
+  } else if (typeof style.fill === 'object' && style.fill.type || typeof sector.style.fill === 'object' && sector.style.fill.type) {
+    // Disable animation for gradient since no interpolation method
+    // is supported for gradient
+    graphic.updateProps(sector, {
+      shape: sectorShape
+    }, seriesModel);
+    sector.useStyle(style);
   } else {
     graphic.updateProps(sector, {
       shape: sectorShape,
@@ -86,12 +117,7 @@ SunburstPieceProto.updateData = function (firstCreate, node, state, seriesModel,
     }, seriesModel);
   }
 
-  if (state === 'normal') {
-    sector.hoverStyle = itemModel.getModel('emphasis.itemStyle').getItemStyle();
-    graphic.setHoverStyle(this);
-  }
-
-  this._updateLabel(seriesModel, ecModel, visualColor);
+  this._updateLabel(seriesModel, visualColor, state);
 
   var cursorStyle = itemModel.getShallow('cursor');
   cursorStyle && sector.attr('cursor', cursorStyle);
@@ -137,30 +163,45 @@ SunburstPieceProto.onDownplay = function () {
   this.updateData(false, this.node, 'downplay');
 };
 
-SunburstPieceProto._updateLabel = function (seriesModel, ecModel, visualColor) {
+SunburstPieceProto._updateLabel = function (seriesModel, visualColor, state) {
   var itemModel = this.node.getModel();
-  var labelModel = itemModel.getModel('label');
-  var labelHoverModel = itemModel.getModel('label.emphasis');
+  var normalModel = itemModel.getModel('label');
+  var labelModel = state === 'normal' || state === 'emphasis' ? normalModel : itemModel.getModel(state + '.label');
+  var labelHoverModel = itemModel.getModel('emphasis.label');
   var text = zrUtil.retrieve(seriesModel.getFormattedLabel(this.node.dataIndex, 'normal', null, null, 'label'), this.node.name);
 
-  if (!labelModel.get('show')) {
+  if (getLabelAttr('show') === false) {
+    text = '';
+  }
+
+  var layout = this.node.getLayout();
+  var labelMinAngle = labelModel.get('minAngle');
+
+  if (labelMinAngle == null) {
+    labelMinAngle = normalModel.get('minAngle');
+  }
+
+  labelMinAngle = labelMinAngle / 180 * Math.PI;
+  var angle = layout.endAngle - layout.startAngle;
+
+  if (labelMinAngle != null && Math.abs(angle) < labelMinAngle) {
+    // Not displaying text when angle is too small
     text = '';
   }
 
   var label = this.childAt(1);
-  graphic.setLabelStyle(label.style, label.hoverStyle = {}, labelModel, labelHoverModel, {
+  graphic.setLabelStyle(label.style, label.hoverStyle || {}, normalModel, labelHoverModel, {
     defaultText: labelModel.getShallow('show') ? text : null,
     autoColor: visualColor,
     useInsideStyle: true
   });
-  var layout = this.node.getLayout();
   var midAngle = (layout.startAngle + layout.endAngle) / 2;
   var dx = Math.cos(midAngle);
   var dy = Math.sin(midAngle);
   var r;
-  var labelPosition = labelModel.get('position');
-  var labelPadding = labelModel.get('distance') || 0;
-  var textAlign = labelModel.get('align');
+  var labelPosition = getLabelAttr('position');
+  var labelPadding = getLabelAttr('distance') || 0;
+  var textAlign = getLabelAttr('align');
 
   if (labelPosition === 'outside') {
     r = layout.r + labelPadding;
@@ -187,13 +228,13 @@ SunburstPieceProto._updateLabel = function (seriesModel, ecModel, visualColor) {
   label.attr('style', {
     text: text,
     textAlign: textAlign,
-    textVerticalAlign: labelModel.get('verticalAlign') || 'middle',
-    opacity: labelModel.get('opacity')
+    textVerticalAlign: getLabelAttr('verticalAlign') || 'middle',
+    opacity: getLabelAttr('opacity')
   });
   var textX = r * dx + layout.cx;
   var textY = r * dy + layout.cy;
   label.attr('position', [textX, textY]);
-  var rotateType = labelModel.getShallow('rotate');
+  var rotateType = getLabelAttr('rotate');
   var rotate = 0;
 
   if (rotateType === 'radial') {
@@ -215,6 +256,16 @@ SunburstPieceProto._updateLabel = function (seriesModel, ecModel, visualColor) {
   }
 
   label.attr('rotation', rotate);
+
+  function getLabelAttr(name) {
+    var stateAttr = labelModel.get(name);
+
+    if (stateAttr == null) {
+      return normalModel.get(name);
+    } else {
+      return stateAttr;
+    }
+  }
 };
 
 SunburstPieceProto._initEvents = function (sector, node, seriesModel, highlightPolicy) {
@@ -257,7 +308,7 @@ function getNodeColor(node, seriesModel, ecModel) {
   var visualColor = node.getVisual('color');
   var visualMetaList = node.getVisual('visualMeta');
 
-  if (visualMetaList.length === 0) {
+  if (!visualMetaList || visualMetaList.length === 0) {
     // Use first-generation color if has no visualMap
     visualColor = null;
   } // Self color or level color

package/lib/chart/sunburst/SunburstSeries.js

@@ -8,6 +8,24 @@ var _treeHelper = require("../helper/treeHelper");
 
 var wrapTreePathInfo = _treeHelper.wrapTreePathInfo;
 
+/*
+* 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 = SeriesModel.extend({
   type: 'series.sunburst',
 

package/lib/chart/sunburst/SunburstView.js

@@ -6,6 +6,24 @@ var SunburstPiece = require("./SunburstPiece");
 
 var DataDiffer = require("../../data/DataDiffer");
 
+/*
+* 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 ROOT_TO_NODE_ACTION = 'sunburstRootToNode';
 var SunburstView = ChartView.extend({
   type: 'sunburst',
@@ -15,7 +33,8 @@ var SunburstView = ChartView.extend({
     this.seriesModel = seriesModel;
     this.api = api;
     this.ecModel = ecModel;
-    var virtualRoot = seriesModel.getData().tree.root;
+    var data = seriesModel.getData();
+    var virtualRoot = data.tree.root;
     var newRoot = seriesModel.getViewRoot();
     var group = this.group;
     var renderLabelForZeroData = seriesModel.get('renderLabelForZeroData');
@@ -31,7 +50,7 @@ var SunburstView = ChartView.extend({
       var highlightPolicy = seriesModel.getShallow('highlightPolicy');
       payload.highlight.piece.onEmphasis(highlightPolicy);
     } else if (payload && payload.unhighlight) {
-      var piece = virtualRoot.piece;
+      var piece = this.virtualPiece;
 
       if (!piece && virtualRoot.children.length) {
         piece = virtualRoot.children[0].piece;
@@ -74,7 +93,9 @@ var SunburstView = ChartView.extend({
         if (oldNode && oldNode.piece) {
           if (newNode) {
             // Update
-            oldNode.piece.updateData(false, newNode, 'normal', seriesModel, ecModel);
+            oldNode.piece.updateData(false, newNode, 'normal', seriesModel, ecModel); // For tooltip
+
+            data.setItemGraphicEl(newNode.dataIndex, oldNode.piece);
           } else {
             // Remove
             removeNode(oldNode);
@@ -82,7 +103,9 @@ var SunburstView = ChartView.extend({
         } else if (newNode) {
           // Add
           var piece = new SunburstPiece(newNode, seriesModel, ecModel);
-          group.add(piece);
+          group.add(piece); // For tooltip
+
+          data.setItemGraphicEl(newNode.dataIndex, piece);
         }
       }
     }
@@ -101,13 +124,13 @@ var SunburstView = ChartView.extend({
     function renderRollUp(virtualRoot, viewRoot) {
       if (viewRoot.depth > 0) {
         // Render
-        if (virtualRoot.piece) {
+        if (that.virtualPiece) {
           // Update
-          virtualRoot.piece.updateData(false, virtualRoot, 'normal', seriesModel, ecModel);
+          that.virtualPiece.updateData(false, virtualRoot, 'normal', seriesModel, ecModel);
         } else {
           // Add
-          virtualRoot.piece = new SunburstPiece(virtualRoot, seriesModel, ecModel);
-          group.add(virtualRoot.piece);
+          that.virtualPiece = new SunburstPiece(virtualRoot, seriesModel, ecModel);
+          group.add(that.virtualPiece);
         }
 
         if (viewRoot.piece._onclickEvent) {
@@ -119,11 +142,11 @@ var SunburstView = ChartView.extend({
         };
 
         viewRoot.piece._onclickEvent = event;
-        virtualRoot.piece.on('click', event);
-      } else if (virtualRoot.piece) {
+        that.virtualPiece.on('click', event);
+      } else if (that.virtualPiece) {
         // Remove
-        group.remove(virtualRoot.piece);
-        virtualRoot.piece = null;
+        group.remove(that.virtualPiece);
+        that.virtualPiece = null;
       }
     }
   },
@@ -136,25 +159,21 @@ var SunburstView = ChartView.extend({
     var that = this;
 
     var event = function (e) {
-      var nodeClick = that.seriesModel.get('nodeClick', true);
-
-      if (!nodeClick) {
-        return;
-      }
-
       var targetFound = false;
       var viewRoot = that.seriesModel.getViewRoot();
       viewRoot.eachNode(function (node) {
         if (!targetFound && node.piece && node.piece.childAt(0) === e.target) {
+          var nodeClick = node.getModel().get('nodeClick');
+
           if (nodeClick === 'rootToNode') {
             that._rootToNode(node);
           } else if (nodeClick === 'link') {
             var itemModel = node.getModel();
-            var link = itemModel.get('link', true);
+            var link = itemModel.get('link');
 
             if (link) {
               var linkTarget = itemModel.get('target', true) || '_blank';
-              link && window.open(link, linkTarget);
+              window.open(link, linkTarget);
             }
           }
 

package/lib/chart/sunburst/sunburstAction.js

@@ -2,6 +2,25 @@ var echarts = require("../../echarts");
 
 var helper = require("../helper/treeHelper");
 
+/*
+* 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.
+*/
+
 /**
  * @file Sunburst action
  */

package/lib/chart/sunburst/sunburstLayout.js

@@ -4,6 +4,24 @@ var parsePercent = _number.parsePercent;
 
 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.
+*/
 var PI2 = Math.PI * 2;
 var RADIAN = Math.PI / 180;
 

package/lib/chart/sunburst.js

@@ -14,6 +14,24 @@ var sunburstLayout = require("./sunburst/sunburstLayout");
 
 var dataFilter = require("../processor/dataFilter");
 
+/*
+* 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(zrUtil.curry(dataColor, 'sunburst'));
 echarts.registerLayout(zrUtil.curry(sunburstLayout, 'sunburst'));
 echarts.registerProcessor(zrUtil.curry(dataFilter, 'sunburst'));

package/lib/chart/themeRiver/ThemeRiverSeries.js

@@ -16,6 +16,25 @@ var encodeHTML = _format.encodeHTML;
 
 var nest = require("../../util/array/nest");
 
+/*
+* 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.
+*/
+
 /**
  * @file  Define the themeRiver view's series model
  * @author Deqing Li(annong035@gmail.com)
@@ -274,7 +293,6 @@ var ThemeRiverSeries = SeriesModel.extend({
     animationEasing: 'linear',
     label: {
       margin: 4,
-      textAlign: 'right',
       show: true,
       position: 'left',
       color: '#000',

package/lib/chart/themeRiver/ThemeRiverView.js

@@ -13,6 +13,25 @@ var extend = _util.extend;
 
 var DataDiffer = require("../../data/DataDiffer");
 
+/*
+* 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.
+*/
+
 /**
  * @file  The file used to draw themeRiver view
  * @author  Deqing Li(annong035@gmail.com)

package/lib/chart/themeRiver/themeRiverLayout.js

@@ -2,6 +2,25 @@ var zrUtil = require("zrender/lib/core/util");
 
 var numberUtil = require("../../util/number");
 
+/*
+* 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.
+*/
+
 /**
  * @file  Using layout algorithm transform the raw data to layout information.
  * @author Deqing Li(annong035@gmail.com)

package/lib/chart/themeRiver/themeRiverVisual.js

@@ -2,6 +2,25 @@ var _util = require("zrender/lib/core/util");
 
 var createHashMap = _util.createHashMap;
 
+/*
+* 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.
+*/
+
 /**
  * @file Visual encoding for themeRiver view
  * @author  Deqing Li(annong035@gmail.com)

package/lib/chart/themeRiver.js

@@ -12,6 +12,24 @@ var themeRiverVisual = require("./themeRiver/themeRiverVisual");
 
 var dataFilter = require("../processor/dataFilter");
 
+/*
+* 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.registerLayout(themeRiverLayout);
 echarts.registerVisual(themeRiverVisual);
 echarts.registerProcessor(dataFilter('themeRiver'));

package/lib/chart/tree/TreeSeries.js

@@ -6,6 +6,25 @@ var _format = require("../../util/format");
 
 var encodeHTML = _format.encodeHTML;
 
+/*
+* 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.
+*/
+
 /**
  * @file Create data struct and define tree view's series model
  */
@@ -40,12 +59,29 @@ var _default = SeriesModel.extend({
     var expandAndCollapse = option.expandAndCollapse;
     var expandTreeDepth = expandAndCollapse && option.initialTreeDepth >= 0 ? option.initialTreeDepth : treeDepth;
     tree.root.eachNode('preorder', function (node) {
-      var item = node.hostTree.data.getRawDataItem(node.dataIndex);
+      var item = node.hostTree.data.getRawDataItem(node.dataIndex); // add item.collapsed != null, because users can collapse node original in the series.data.
+
       node.isExpand = item && item.collapsed != null ? !item.collapsed : node.depth <= expandTreeDepth;
     });
     return tree.data;
   },
 
+  /**
+   * Make the configuration 'orient' backward compatibly, with 'horizontal = LR', 'vertical = TB'.
+   * @returns {string} orient
+   */
+  getOrient: function () {
+    var orient = this.get('orient');
+
+    if (orient === 'horizontal') {
+      orient = 'LR';
+    } else if (orient === 'vertical') {
+      orient = 'TB';
+    }
+
+    return orient;
+  },
+
   /**
    * @override
    * @param {number} dataIndex
@@ -74,8 +110,9 @@ var _default = SeriesModel.extend({
     bottom: '12%',
     // the layout of the tree, two value can be selected, 'orthogonal' or 'radial'
     layout: 'orthogonal',
-    // the orient of orthoginal layout, can be setted to 'horizontal' or 'vertical'
-    orient: 'horizontal',
+    // The orient of orthoginal layout, can be setted to 'LR', 'TB', 'RL', 'BT'.
+    // and the backward compatibility configuration 'horizontal = LR', 'vertical = TB'.
+    orient: 'LR',
     symbol: 'emptyCircle',
     symbolSize: 7,
     expandAndCollapse: true,