echarts 4.0.4 → 4.1.0

package/lib/chart/scatter.js

@@ -10,6 +10,24 @@ var layoutPoints = require("../layout/points");
 
 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.
+*/
 // import * as zrUtil from 'zrender/src/core/util';
 // In case developer forget to include grid component
 echarts.registerVisual(visualSymbol('scatter', 'circle'));

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);

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',
@@ -32,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;
@@ -106,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) {
@@ -124,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;
       }
     }
   },

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,

package/lib/chart/tree/TreeView.js

@@ -10,6 +10,25 @@ var radialCoordinate = _layoutHelper.radialCoordinate;
 
 var echarts = require("../../echarts");
 
+/*
+* 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  This file used to draw tree view
  */
@@ -52,7 +71,7 @@ var _default = echarts.extendChartView({
     var seriesScope = {
       expandAndCollapse: seriesModel.get('expandAndCollapse'),
       layout: layout,
-      orient: seriesModel.get('orient'),
+      orient: seriesModel.getOrient(),
       curvature: seriesModel.get('lineStyle.curveness'),
       symbolRotate: seriesModel.get('symbolRotate'),
       symbolOffset: seriesModel.get('symbolOffset'),
@@ -69,15 +88,22 @@ var _default = echarts.extendChartView({
       var symbolEl = oldData.getItemGraphicEl(oldIdx);
 
       if (!symbolNeedsDraw(data, newIdx)) {
-        symbolEl && removeNode(data, newIdx, symbolEl, group, seriesModel, seriesScope);
+        symbolEl && removeNode(oldData, oldIdx, symbolEl, group, seriesModel, seriesScope);
         return;
       } // update  node and edge
 
 
       updateNode(data, newIdx, symbolEl, group, seriesModel, seriesScope);
     }).remove(function (oldIdx) {
-      var symbolEl = oldData.getItemGraphicEl(oldIdx);
-      removeNode(data, oldIdx, symbolEl, group, seriesModel, seriesScope);
+      var symbolEl = oldData.getItemGraphicEl(oldIdx); // When remove a collapsed node of subtree, since the collapsed
+      // node haven't been initialized with a symbol element,
+      // you can't found it's symbol element through index.
+      // so if we want to remove the symbol element we should insure
+      // that the symbol element is not null.
+
+      if (symbolEl) {
+        removeNode(oldData, oldIdx, symbolEl, group, seriesModel, seriesScope);
+      }
     }).execute();
 
     if (seriesScope.expandAndCollapse === true) {
@@ -301,14 +327,14 @@ function getEdgeShape(seriesScope, sourceLayout, targetLayout) {
     var x2 = targetLayout.x;
     var y2 = targetLayout.y;
 
-    if (orient === 'horizontal') {
+    if (orient === 'LR' || orient === 'RL') {
       cpx1 = x1 + (x2 - x1) * seriesScope.curvature;
       cpy1 = y1;
       cpx2 = x2 + (x1 - x2) * seriesScope.curvature;
       cpy2 = y2;
     }
 
-    if (orient === 'vertical') {
+    if (orient === 'TB' || orient === 'BT') {
       cpx1 = x1;
       cpy1 = y1 + (y2 - y1) * seriesScope.curvature;
       cpx2 = x2;

package/lib/chart/tree/layoutHelper.js

@@ -1,5 +1,24 @@
 var layout = require("../../util/layout");
 
+/*
+* 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 layout algorithm of node-link tree diagrams. Here we using Reingold-Tilford algorithm to drawing
  *       the tree.

package/lib/chart/tree/traversalHelper.js

@@ -1,3 +1,22 @@
+/*
+* 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.
+*/
+
 /**
  * Traverse the tree from bottom to top and do something
  * @param  {module:echarts/data/Tree~TreeNode} root  The real root of the tree

package/lib/chart/tree/treeAction.js

@@ -1,5 +1,23 @@
 var echarts = require("../../echarts");
 
+/*
+* 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.registerAction({
   type: 'treeExpandAndCollapse',
   event: 'treeExpandAndCollapse',