echarts 4.0.4 → 4.1.0

package/lib/chart/tree/treeLayout.js

@@ -0,0 +1,137 @@
+var _traversalHelper = require("./traversalHelper");
+
+var eachAfter = _traversalHelper.eachAfter;
+var eachBefore = _traversalHelper.eachBefore;
+
+var _layoutHelper = require("./layoutHelper");
+
+var init = _layoutHelper.init;
+var firstWalk = _layoutHelper.firstWalk;
+var secondWalk = _layoutHelper.secondWalk;
+var sep = _layoutHelper.separation;
+var radialCoordinate = _layoutHelper.radialCoordinate;
+var getViewRect = _layoutHelper.getViewRect;
+
+/*
+* 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(ecModel, api) {
+  ecModel.eachSeriesByType('tree', function (seriesModel) {
+    commonLayout(seriesModel, api);
+  });
+}
+
+function commonLayout(seriesModel, api) {
+  var layoutInfo = getViewRect(seriesModel, api);
+  seriesModel.layoutInfo = layoutInfo;
+  var layout = seriesModel.get('layout');
+  var width = 0;
+  var height = 0;
+  var separation = null;
+
+  if (layout === 'radial') {
+    width = 2 * Math.PI;
+    height = Math.min(layoutInfo.height, layoutInfo.width) / 2;
+    separation = sep(function (node1, node2) {
+      return (node1.parentNode === node2.parentNode ? 1 : 2) / node1.depth;
+    });
+  } else {
+    width = layoutInfo.width;
+    height = layoutInfo.height;
+    separation = sep();
+  }
+
+  var virtualRoot = seriesModel.getData().tree.root;
+  var realRoot = virtualRoot.children[0];
+
+  if (realRoot) {
+    init(virtualRoot);
+    eachAfter(realRoot, firstWalk, separation);
+    virtualRoot.hierNode.modifier = -realRoot.hierNode.prelim;
+    eachBefore(realRoot, secondWalk);
+    var left = realRoot;
+    var right = realRoot;
+    var bottom = realRoot;
+    eachBefore(realRoot, function (node) {
+      var x = node.getLayout().x;
+
+      if (x < left.getLayout().x) {
+        left = node;
+      }
+
+      if (x > right.getLayout().x) {
+        right = node;
+      }
+
+      if (node.depth > bottom.depth) {
+        bottom = node;
+      }
+    });
+    var delta = left === right ? 1 : separation(left, right) / 2;
+    var tx = delta - left.getLayout().x;
+    var kx = 0;
+    var ky = 0;
+    var coorX = 0;
+    var coorY = 0;
+
+    if (layout === 'radial') {
+      kx = width / (right.getLayout().x + delta + tx); // here we use (node.depth - 1), bucause the real root's depth is 1
+
+      ky = height / (bottom.depth - 1 || 1);
+      eachBefore(realRoot, function (node) {
+        coorX = (node.getLayout().x + tx) * kx;
+        coorY = (node.depth - 1) * ky;
+        var finalCoor = radialCoordinate(coorX, coorY);
+        node.setLayout({
+          x: finalCoor.x,
+          y: finalCoor.y,
+          rawX: coorX,
+          rawY: coorY
+        }, true);
+      });
+    } else {
+      var orient = seriesModel.getOrient();
+
+      if (orient === 'RL' || orient === 'LR') {
+        ky = height / (right.getLayout().x + delta + tx);
+        kx = width / (bottom.depth - 1 || 1);
+        eachBefore(realRoot, function (node) {
+          coorY = (node.getLayout().x + tx) * ky;
+          coorX = orient === 'LR' ? (node.depth - 1) * kx : width - (node.depth - 1) * kx;
+          node.setLayout({
+            x: coorX,
+            y: coorY
+          }, true);
+        });
+      } else if (orient === 'TB' || orient === 'BT') {
+        kx = width / (right.getLayout().x + delta + tx);
+        ky = height / (bottom.depth - 1 || 1);
+        eachBefore(realRoot, function (node) {
+          coorX = (node.getLayout().x + tx) * kx;
+          coorY = orient === 'TB' ? (node.depth - 1) * ky : height - (node.depth - 1) * ky;
+          node.setLayout({
+            x: coorX,
+            y: coorY
+          }, true);
+        });
+      }
+    }
+  }
+}
+
+module.exports = _default;

package/lib/chart/tree.js

@@ -8,10 +8,25 @@ require("./tree/treeAction");
 
 var visualSymbol = require("../visual/symbol");
 
-var orthogonalLayout = require("./tree/orthogonalLayout");
-
-var radialLayout = require("./tree/radialLayout");
+var treeLayout = require("./tree/treeLayout");
 
+/*
+* 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(visualSymbol('tree', 'circle'));
-echarts.registerLayout(orthogonalLayout);
-echarts.registerLayout(radialLayout);
+echarts.registerLayout(treeLayout);

package/lib/chart/treemap/Breadcrumb.js

@@ -7,6 +7,25 @@ var zrUtil = require("zrender/lib/core/util");
 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 TEXT_PADDING = 8;
 var ITEM_GAP = 8;
 var ARRAY_LENGTH = 5;

package/lib/chart/treemap/TreemapSeries.js

@@ -15,6 +15,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.treemap',
   layoutMode: 'box',

package/lib/chart/treemap/TreemapView.js

@@ -20,6 +20,24 @@ var animationUtil = require("../../util/animation");
 
 var makeStyleMapper = require("../../model/mixin/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 bind = zrUtil.bind;
 var Group = graphic.Group;
 var Rect = graphic.Rect;

package/lib/chart/treemap/helper.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.
+*/
 function retrieveTargetInfo(payload, seriesModel) {
   if (payload && (payload.type === 'treemapZoomToNode' || payload.type === 'treemapRootToNode')) {
     var root = seriesModel.getData().tree.root;

package/lib/chart/treemap/treemapAction.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 Treemap action
  */

package/lib/chart/treemap/treemapLayout.js

@@ -11,6 +11,24 @@ var layout = require("../../util/layout");
 
 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.
+*/
 var mathMax = Math.max;
 var mathMin = Math.min;
 var retrieveValue = zrUtil.retrieve;

package/lib/chart/treemap/treemapVisual.js

@@ -4,6 +4,24 @@ var zrColor = require("zrender/lib/tool/color");
 
 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 isArray = zrUtil.isArray;
 var ITEM_STYLE_NORMAL = 'itemStyle';
 var _default = {

package/lib/chart/treemap.js

@@ -10,5 +10,23 @@ var treemapVisual = require("./treemap/treemapVisual");
 
 var treemapLayout = require("./treemap/treemapLayout");
 
+/*
+* 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(treemapVisual);
 echarts.registerLayout(treemapLayout);

package/lib/component/axis/AngleAxisView.js

@@ -6,6 +6,24 @@ var Model = require("../../model/Model");
 
 var AxisView = require("./AxisView");
 
+/*
+* 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 elementList = ['axisLine', 'axisLabel', 'axisTick', 'splitLine', 'splitArea'];
 
 function getAxisLineShape(polar, rExtent, angle) {
@@ -23,6 +41,16 @@ function getAxisLineShape(polar, rExtent, angle) {
 function getRadiusIdx(polar) {
   var radiusAxis = polar.getRadiusAxis();
   return radiusAxis.inverse ? 0 : 1;
+} // Remove the last tick which will overlap the first tick
+
+
+function fixAngleOverlap(list) {
+  var firstItem = list[0];
+  var lastItem = list[list.length - 1];
+
+  if (firstItem && lastItem && Math.abs(Math.abs(firstItem.coord - lastItem.coord) - 360) < 1e-4) {
+    list.pop();
+  }
 }
 
 var _default = AxisView.extend({
@@ -39,15 +67,16 @@ var _default = AxisView.extend({
     var polar = angleAxis.polar;
     var radiusExtent = polar.getRadiusAxis().getExtent();
     var ticksAngles = angleAxis.getTicksCoords();
-
-    if (angleAxis.type !== 'category') {
-      // Remove the last tick which will overlap the first tick
-      ticksAngles.pop();
-    }
-
+    var labels = zrUtil.map(angleAxis.getViewLabels(), function (labelItem) {
+      var labelItem = zrUtil.clone(labelItem);
+      labelItem.coord = angleAxis.dataToCoord(labelItem.tickValue);
+      return labelItem;
+    });
+    fixAngleOverlap(labels);
+    fixAngleOverlap(ticksAngles);
     zrUtil.each(elementList, function (name) {
       if (angleAxisModel.get(name + '.show') && (!angleAxis.scale.isBlank() || name === 'axisLine')) {
-        this['_' + name](angleAxisModel, polar, ticksAngles, radiusExtent);
+        this['_' + name](angleAxisModel, polar, ticksAngles, radiusExtent, labels);
       }
     }, this);
   },
@@ -78,9 +107,9 @@ var _default = AxisView.extend({
     var tickModel = angleAxisModel.getModel('axisTick');
     var tickLen = (tickModel.get('inside') ? -1 : 1) * tickModel.get('length');
     var radius = radiusExtent[getRadiusIdx(polar)];
-    var lines = zrUtil.map(ticksAngles, function (tickAngle) {
+    var lines = zrUtil.map(ticksAngles, function (tickAngleItem) {
       return new graphic.Line({
-        shape: getAxisLineShape(polar, [radius, radius + tickLen], tickAngle)
+        shape: getAxisLineShape(polar, [radius, radius + tickLen], tickAngleItem.coord)
       });
     });
     this.group.add(graphic.mergePath(lines, {
@@ -93,24 +122,23 @@ var _default = AxisView.extend({
   /**
    * @private
    */
-  _axisLabel: function (angleAxisModel, polar, ticksAngles, radiusExtent) {
-    var axis = angleAxisModel.axis;
-    var categoryData = angleAxisModel.getCategories();
-    var labelModel = angleAxisModel.getModel('axisLabel');
-    var labels = angleAxisModel.getFormattedLabels();
-    var labelMargin = labelModel.get('margin');
-    var labelsAngles = axis.getLabelsCoords(); // Use length of ticksAngles because it may remove the last tick to avoid overlapping
-
-    for (var i = 0; i < ticksAngles.length; i++) {
+  _axisLabel: function (angleAxisModel, polar, ticksAngles, radiusExtent, labels) {
+    var rawCategoryData = angleAxisModel.getCategories(true);
+    var commonLabelModel = angleAxisModel.getModel('axisLabel');
+    var labelMargin = commonLabelModel.get('margin'); // Use length of ticksAngles because it may remove the last tick to avoid overlapping
+
+    zrUtil.each(labels, function (labelItem, idx) {
+      var labelModel = commonLabelModel;
+      var tickValue = labelItem.tickValue;
       var r = radiusExtent[getRadiusIdx(polar)];
-      var p = polar.coordToPoint([r + labelMargin, labelsAngles[i]]);
+      var p = polar.coordToPoint([r + labelMargin, labelItem.coord]);
       var cx = polar.cx;
       var cy = polar.cy;
       var labelTextAlign = Math.abs(p[0] - cx) / r < 0.3 ? 'center' : p[0] > cx ? 'left' : 'right';
       var labelTextVerticalAlign = Math.abs(p[1] - cy) / r < 0.3 ? 'middle' : p[1] > cy ? 'top' : 'bottom';
 
-      if (categoryData && categoryData[i] && categoryData[i].textStyle) {
-        labelModel = new Model(categoryData[i].textStyle, labelModel, labelModel.ecModel);
+      if (rawCategoryData && rawCategoryData[tickValue] && rawCategoryData[tickValue].textStyle) {
+        labelModel = new Model(rawCategoryData[tickValue].textStyle, commonLabelModel, commonLabelModel.ecModel);
       }
 
       var textEl = new graphic.Text({
@@ -121,11 +149,11 @@ var _default = AxisView.extend({
         x: p[0],
         y: p[1],
         textFill: labelModel.getTextColor() || angleAxisModel.get('axisLine.lineStyle.color'),
-        text: labels[i],
+        text: labelItem.formattedLabel,
         textAlign: labelTextAlign,
         textVerticalAlign: labelTextVerticalAlign
       });
-    }
+    }, this);
   },
 
   /**
@@ -143,7 +171,7 @@ var _default = AxisView.extend({
       var colorIndex = lineCount++ % lineColors.length;
       splitLines[colorIndex] = splitLines[colorIndex] || [];
       splitLines[colorIndex].push(new graphic.Line({
-        shape: getAxisLineShape(polar, radiusExtent, ticksAngles[i])
+        shape: getAxisLineShape(polar, radiusExtent, ticksAngles[i].coord)
       }));
     } // Simple optimization
     // Batching the lines if color are the same
@@ -164,6 +192,10 @@ var _default = AxisView.extend({
    * @private
    */
   _splitArea: function (angleAxisModel, polar, ticksAngles, radiusExtent) {
+    if (!ticksAngles.length) {
+      return;
+    }
+
     var splitAreaModel = angleAxisModel.getModel('splitArea');
     var areaStyleModel = splitAreaModel.getModel('areaStyle');
     var areaColors = areaStyleModel.get('color');
@@ -171,7 +203,7 @@ var _default = AxisView.extend({
     areaColors = areaColors instanceof Array ? areaColors : [areaColors];
     var splitAreas = [];
     var RADIAN = Math.PI / 180;
-    var prevAngle = -ticksAngles[0] * RADIAN;
+    var prevAngle = -ticksAngles[0].coord * RADIAN;
     var r0 = Math.min(radiusExtent[0], radiusExtent[1]);
     var r1 = Math.max(radiusExtent[0], radiusExtent[1]);
     var clockwise = angleAxisModel.get('clockwise');
@@ -186,12 +218,12 @@ var _default = AxisView.extend({
           r0: r0,
           r: r1,
           startAngle: prevAngle,
-          endAngle: -ticksAngles[i] * RADIAN,
+          endAngle: -ticksAngles[i].coord * RADIAN,
           clockwise: clockwise
         },
         silent: true
       }));
-      prevAngle = -ticksAngles[i] * RADIAN;
+      prevAngle = -ticksAngles[i].coord * RADIAN;
     } // Simple optimization
     // Batching the lines if color are the same