echarts 3.5.1 → 3.6.0

package/lib/chart/pie/pieLayout.js

@@ -1,5 +1,3 @@
-// TODO minAngle
-
 
 
     var numberUtil = require('../../util/number');
@@ -36,9 +34,14 @@
 
             var minAngle = seriesModel.get('minAngle') * RADIAN;
 
+            var validDataCount = 0;
+            data.each('value', function (value) {
+                !isNaN(value) && validDataCount++;
+            });
+
             var sum = data.getSum('value');
             // Sum may be 0
-            var unitRadian = Math.PI / (sum || data.count()) * 2;
+            var unitRadian = Math.PI / (sum || validDataCount) * 2;
 
             var clockwise = seriesModel.get('clockwise');
 
@@ -54,8 +57,8 @@
             var valueSumLargerThanMinAngle = 0;
 
             var currentAngle = startAngle;
-
             var dir = clockwise ? 1 : -1;
+
             data.each('value', function (value, idx) {
                 var angle;
                 if (isNaN(value)) {
@@ -80,7 +83,7 @@
                         ? unitRadian : (value * unitRadian);
                 }
                 else {
-                    angle = PI2 / (data.count() || 1);
+                    angle = PI2 / validDataCount;
                 }
 
                 if (angle < minAngle) {
@@ -110,27 +113,32 @@
 
             // Some sector is constrained by minAngle
             // Rest sectors needs recalculate angle
-            if (restAngle < PI2) {
+            if (restAngle < PI2 && validDataCount) {
                 // Average the angle if rest angle is not enough after all angles is
                 // Constrained by minAngle
                 if (restAngle <= 1e-3) {
-                    var angle = PI2 / data.count();
-                    data.each(function (idx) {
-                        var layout = data.getItemLayout(idx);
-                        layout.startAngle = startAngle + dir * idx * angle;
-                        layout.endAngle = startAngle + dir * (idx + 1) * angle;
+                    var angle = PI2 / validDataCount;
+                    data.each('value', function (value, idx) {
+                        if (!isNaN(value)) {
+                            var layout = data.getItemLayout(idx);
+                            layout.angle = angle;
+                            layout.startAngle = startAngle + dir * idx * angle;
+                            layout.endAngle = startAngle + dir * (idx + 1) * angle;
+                        }
                     });
                 }
                 else {
                     unitRadian = restAngle / valueSumLargerThanMinAngle;
                     currentAngle = startAngle;
                     data.each('value', function (value, idx) {
-                        var layout = data.getItemLayout(idx);
-                        var angle = layout.angle === minAngle
-                            ? minAngle : value * unitRadian;
-                        layout.startAngle = currentAngle;
-                        layout.endAngle = currentAngle + dir * angle;
-                        currentAngle += dir * angle;
+                        if (!isNaN(value)) {
+                            var layout = data.getItemLayout(idx);
+                            var angle = layout.angle === minAngle
+                                ? minAngle : value * unitRadian;
+                            layout.startAngle = currentAngle;
+                            layout.endAngle = currentAngle + dir * angle;
+                            currentAngle += dir * angle;
+                        }
                     });
                 }
             }

package/lib/chart/radar/RadarSeries.js

@@ -28,7 +28,7 @@
         getInitialData: function (option, ecModel) {
             var data = option.data || [];
             var dimensions = completeDimensions(
-                [], data, {extraPrefix: 'indicator_'}
+                [], data, {extraPrefix: 'indicator_', extraFromZero: true}
             );
             var list = new List(dimensions, this);
             list.initData(data);

package/lib/chart/sankey/sankeyLayout.js

@@ -29,7 +29,7 @@
 
             computeNodeValues(nodes);
 
-            var filteredNodes = nodes.filter(function (node) {
+            var filteredNodes = zrUtil.filter(nodes, function (node) {
                 return node.getLayout().value === 0;
             });
 

package/lib/chart/scatter/ScatterSeries.js

@@ -8,11 +8,10 @@
 
         type: 'series.scatter',
 
-        dependencies: ['grid', 'polar', 'geo', 'singleAxis'],
+        dependencies: ['grid', 'polar', 'geo', 'singleAxis', 'calendar'],
 
         getInitialData: function (option, ecModel) {
-            var list = createListFromArray(option.data, this, ecModel);
-            return list;
+            return createListFromArray(option.data, this, ecModel);
         },
 
         brushSelector: 'point',

package/lib/chart/themeRiver/ThemeRiverSeries.js

@@ -23,7 +23,7 @@
 
         /**
          * @readOnly
-         * @type {Object}
+         * @type {module:zrender/core/util#HashMap}
          */
         nameMap: null,
 
@@ -150,17 +150,18 @@
 
             var data = this.fixData(filterData || []);
             var nameList = [];
-            var nameMap = this.nameMap = {};
+            var nameMap = this.nameMap = zrUtil.createHashMap();
             var count = 0;
 
             for (var i = 0; i < data.length; ++i) {
                 nameList.push(data[i][DATA_NAME_INDEX]);
-                if (!nameMap[data[i][DATA_NAME_INDEX]]) {
-                    nameMap[data[i][DATA_NAME_INDEX]] = count++;
+                if (!nameMap.get(data[i][DATA_NAME_INDEX])) {
+                    nameMap.set(data[i][DATA_NAME_INDEX], count);
+                    count++;
                 }
             }
 
-            completeDimensions(dimensions, data);
+            dimensions = completeDimensions(dimensions, data);
 
             var list = new List(dimensions, this);
 

package/lib/chart/themeRiver/themeRiverVisual.js

@@ -12,7 +12,7 @@
 
             data.each(function (index) {
                 var name = data.getName(index);
-                var color = colorList[(seriesModel.nameMap[name] - 1) % colorList.length];
+                var color = colorList[(seriesModel.nameMap.get(name) - 1) % colorList.length];
                 rawData.setItemVisual(index, 'color', color);
             });
         });

package/lib/chart/treemap/TreemapSeries.js

@@ -237,7 +237,7 @@
             var idIndexMap = this._idIndexMap;
 
             if (!idIndexMap) {
-                idIndexMap = this._idIndexMap = {};
+                idIndexMap = this._idIndexMap = zrUtil.createHashMap();
                 /**
                  * @private
                  * @type {number}
@@ -245,9 +245,9 @@
                 this._idIndexMapCount = 0;
             }
 
-            var index = idIndexMap[id];
+            var index = idIndexMap.get(id);
             if (index == null) {
-                idIndexMap[id] = index = this._idIndexMapCount++;
+                idIndexMap.set(id, index = this._idIndexMapCount++);
             }
 
             return index;

package/lib/chart/treemap/TreemapView.js

@@ -375,7 +375,7 @@
             }
 
             var rect = new BoundingRect(0, 0, api.getWidth(), api.getHeight());
-            controller.setContainsPoint(function (x, y) {
+            controller.setPointerChecker(function (e, x, y) {
                 return rect.contain(x, y);
             });
         },

package/lib/chart/treemap/treemapLayout.js

@@ -301,8 +301,13 @@
     function sort(viewChildren, orderBy) {
         if (orderBy) {
             viewChildren.sort(function (a, b) {
-                return orderBy === 'asc'
+                var diff = orderBy === 'asc'
                     ?  a.getValue() - b.getValue() : b.getValue() - a.getValue();
+                return diff === 0
+                    ? (orderBy === 'asc'
+                        ? a.dataIndex - b.dataIndex : b.dataIndex - a.dataIndex
+                    )
+                    : diff;
             });
         }
         return viewChildren;

package/lib/component/axis/AxisBuilder.js

@@ -8,6 +8,7 @@
     var remRadian = numberUtil.remRadian;
     var isRadianAroundZero = numberUtil.isRadianAroundZero;
     var vec2 = require('zrender/lib/core/vector');
+    var matrix = require('zrender/lib/core/matrix');
     var v2ApplyTransform = vec2.applyTransform;
     var retrieve = zrUtil.retrieve;
 
@@ -59,6 +60,7 @@
      * @param {number} [opt.labelInterval] Default label interval when label
      *                                     interval from model is null or 'auto'.
      * @param {number} [opt.strokeContainThreshold] Default label interval when label
+     * @param {number} [opt.nameTruncateMaxWidth]
      */
     var AxisBuilder = function (axisModel, opt) {
 
@@ -334,33 +336,7 @@
 
             }, this);
 
-            function isTwoLabelOverlapped(current, next) {
-                var firstRect = current && current.getBoundingRect().clone();
-                var nextRect = next && next.getBoundingRect().clone();
-                if (firstRect && nextRect) {
-                    firstRect.applyTransform(current.getLocalTransform());
-                    nextRect.applyTransform(next.getLocalTransform());
-                    return firstRect.intersect(nextRect);
-                }
-            }
-
-            // If min or max are user set, we need to check
-            // If the tick on min(max) are overlap on their neighbour tick
-            // If they are overlapped, we need to hide the min(max) tick label
-            if (axisModel.getMin() != null) {
-                var firstLabel = textEls[0];
-                var nextLabel = textEls[1];
-                if (isTwoLabelOverlapped(firstLabel, nextLabel)) {
-                    firstLabel.ignore = true;
-                }
-            }
-            if (axisModel.getMax() != null) {
-                var lastLabel = textEls[textEls.length - 1];
-                var prevLabel = textEls[textEls.length - 2];
-                if (isTwoLabelOverlapped(prevLabel, lastLabel)) {
-                    lastLabel.ignore = true;
-                }
-            }
+            fixMinMaxLabelShow(axisModel, textEls);
         },
 
         /**
@@ -426,7 +402,9 @@
 
             var truncateOpt = axisModel.get('nameTruncate', true) || {};
             var ellipsis = truncateOpt.ellipsis;
-            var maxWidth = retrieve(truncateOpt.maxWidth, axisNameAvailableWidth);
+            var maxWidth = retrieve(
+                opt.nameTruncateMaxWidth, truncateOpt.maxWidth, axisNameAvailableWidth
+            );
             var truncatedText = (ellipsis != null && maxWidth != null)
                 ? formatUtil.truncateText(
                     name, maxWidth, textFont, ellipsis,
@@ -536,9 +514,6 @@
         };
     };
 
-    /**
-     * @inner
-     */
     function endTextLayout(opt, textPosition, textRotate, extent) {
         var rotationDiff = remRadian(textRotate - opt.rotation);
         var textAlign;
@@ -572,9 +547,6 @@
         };
     }
 
-    /**
-     * @inner
-     */
     function isSilent(axisModel) {
         var tooltipOpt = axisModel.get('tooltip');
         return axisModel.get('silent')
@@ -584,6 +556,53 @@
             );
     }
 
+    function fixMinMaxLabelShow(axisModel, textEls) {
+        // If min or max are user set, we need to check
+        // If the tick on min(max) are overlap on their neighbour tick
+        // If they are overlapped, we need to hide the min(max) tick label
+        var showMinLabel = axisModel.get('axisLabel.showMinLabel');
+        var showMaxLabel = axisModel.get('axisLabel.showMaxLabel');
+        var firstLabel = textEls[0];
+        var nextLabel = textEls[1];
+        var lastLabel = textEls[textEls.length - 1];
+        var prevLabel = textEls[textEls.length - 2];
+
+        if (showMinLabel === false) {
+            firstLabel.ignore = true;
+        }
+        else if (axisModel.getMin() != null && isTwoLabelOverlapped(firstLabel, nextLabel)) {
+            showMinLabel ? (nextLabel.ignore = true) : (firstLabel.ignore = true);
+        }
+
+        if (showMaxLabel === false) {
+            lastLabel.ignore = true;
+        }
+        else if (axisModel.getMax() != null && isTwoLabelOverlapped(prevLabel, lastLabel)) {
+            showMaxLabel ? (prevLabel.ignore = true) : (lastLabel.ignore = true);
+        }
+    }
+
+    function isTwoLabelOverlapped(current, next, labelLayout) {
+        // current and next has the same rotation.
+        var firstRect = current && current.getBoundingRect().clone();
+        var nextRect = next && next.getBoundingRect().clone();
+
+        if (!firstRect || !nextRect) {
+            return;
+        }
+
+        // When checking intersect of two rotated labels, we use mRotationBack
+        // to avoid that boundingRect is enlarge when using `boundingRect.applyTransform`.
+        var mRotationBack = matrix.identity([]);
+        matrix.rotate(mRotationBack, mRotationBack, -current.rotation);
+
+        firstRect.applyTransform(matrix.mul([], mRotationBack, current.getLocalTransform()));
+        nextRect.applyTransform(matrix.mul([], mRotationBack, next.getLocalTransform()));
+
+        return firstRect.intersect(nextRect);
+    }
+
+
     /**
      * @static
      */

package/lib/component/axis/ParallelAxisView.js

@@ -3,6 +3,7 @@
     var zrUtil = require('zrender/lib/core/util');
     var AxisBuilder = require('./AxisBuilder');
     var BrushController = require('../helper/BrushController');
+    var brushHelper = require('../helper/brushHelper');
     var graphic = require('../../util/graphic');
 
     var elementList = ['axisLine', 'axisLabel', 'axisTick', 'axisName'];
@@ -45,9 +46,8 @@
                 return;
             }
 
-            var coordSys = ecModel.getComponent(
-                'parallel', axisModel.get('parallelIndex')
-            ).coordinateSystem;
+            var coordSysModel = getCoordSysModel(axisModel, ecModel);
+            var coordSys = coordSysModel.coordinateSystem;
 
             var areaSelectStyle = axisModel.getAreaSelectStyle();
             var areaWidth = areaSelectStyle.width;
@@ -55,22 +55,8 @@
             var dim = axisModel.axis.dim;
             var axisLayout = coordSys.getAxisLayout(dim);
 
-            // Fetch from axisModel by default.
-            var axisLabelShow;
-            var axisIndex = zrUtil.indexOf(coordSys.dimensions, dim);
-
-            var axisExpandWindow = axisLayout.axisExpandWindow;
-            if (axisExpandWindow
-                && (axisIndex <= axisExpandWindow[0] || axisIndex >= axisExpandWindow[1])
-            ) {
-                axisLabelShow = false;
-            }
-
             var builderOpt = zrUtil.extend(
-                {
-                    axisLabelShow: axisLabelShow,
-                    strokeContainThreshold: areaWidth
-                },
+                {strokeContainThreshold: areaWidth},
                 axisLayout
             );
 
@@ -80,26 +66,27 @@
 
             this._axisGroup.add(axisBuilder.getGroup());
 
-            this._refreshBrushController(builderOpt, areaSelectStyle, axisModel, areaWidth);
+            this._refreshBrushController(
+                builderOpt, areaSelectStyle, axisModel, coordSysModel, areaWidth, api
+            );
 
-            graphic.groupTransition(oldAxisGroup, this._axisGroup, axisModel);
+            var animationModel = (payload && payload.animation === false) ? null : axisModel;
+            graphic.groupTransition(oldAxisGroup, this._axisGroup, animationModel);
         },
 
-        _refreshBrushController: function (builderOpt, areaSelectStyle, axisModel, areaWidth) {
-            // After filtering, axis may change, select area needs to be update.
-            var axis = axisModel.axis;
-            var coverInfoList = zrUtil.map(axisModel.activeIntervals, function (interval) {
-                return {
-                    brushType: 'lineX',
-                    panelId: 'pl',
-                    range: [
-                        axis.dataToCoord(interval[0], true),
-                        axis.dataToCoord(interval[1], true)
-                    ]
-                };
-            });
+        /**
+         * @override
+         */
+        updateVisual: function (axisModel, ecModel, api, payload) {
+            this._brushController && this._brushController
+                .updateCovers(getCoverInfoList(axisModel));
+        },
 
-            var extent = axis.getExtent();
+        _refreshBrushController: function (
+            builderOpt, areaSelectStyle, axisModel, coordSysModel, areaWidth, api
+        ) {
+            // After filtering, axis may change, select area needs to be update.
+            var extent = axisModel.axis.getExtent();
             var extentLen = extent[1] - extent[0];
             var extra = Math.min(30, Math.abs(extentLen) * 0.1); // Arbitrary value.
 
@@ -122,21 +109,22 @@
                 })
                 .setPanels([{
                     panelId: 'pl',
-                    rect: rect
+                    clipPath: brushHelper.makeRectPanelClipPath(rect),
+                    isTargetByCursor: brushHelper.makeRectIsTargetByCursor(rect, api, coordSysModel),
+                    getLinearBrushOtherExtent: brushHelper.makeLinearBrushOtherExtent(rect, 0)
                 }])
                 .enableBrush({
                     brushType: 'lineX',
                     brushStyle: areaSelectStyle,
                     removeOnClick: true
                 })
-                .updateCovers(coverInfoList);
+                .updateCovers(getCoverInfoList(axisModel));
         },
 
         _onBrush: function (coverInfoList, opt) {
             // Do not cache these object, because the mey be changed.
             var axisModel = this.axisModel;
             var axis = axisModel.axis;
-
             var intervals = zrUtil.map(coverInfoList, function (coverInfo) {
                 return [
                     axis.coordToData(coverInfo.range[0], true),
@@ -172,4 +160,24 @@
             )[0] === axisModel;
     }
 
+    function getCoverInfoList(axisModel) {
+        var axis = axisModel.axis;
+        return zrUtil.map(axisModel.activeIntervals, function (interval) {
+            return {
+                brushType: 'lineX',
+                panelId: 'pl',
+                range: [
+                    axis.dataToCoord(interval[0], true),
+                    axis.dataToCoord(interval[1], true)
+                ]
+            };
+        });
+    }
+
+    function getCoordSysModel(axisModel, ecModel) {
+        return ecModel.getComponent(
+            'parallel', axisModel.get('parallelIndex')
+        );
+    }
+
     module.exports = AxisView;

package/lib/component/axisPointer/AxisPointerModel.js

@@ -76,7 +76,7 @@
 
             handle: {
                 show: false,
-                icon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4h1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z', // jshint ignore:line
+                icon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4h1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7v-1.2h6.6z M13.3,22H6.7v-1.2h6.6z M13.3,19.6H6.7v-1.2h6.6z', // jshint ignore:line
                 size: 45,
                 // handle margin is from symbol center to axis, which is stable when circular move.
                 margin: 50,

package/lib/component/axisPointer/BaseAxisPointer.js

@@ -194,22 +194,26 @@
          */
         createPointerEl: function (group, elOption, axisModel, axisPointerModel) {
             var pointerOption = elOption.pointer;
-            var pointerEl = get(group).pointerEl = new graphic[pointerOption.type](
-                clone(elOption.pointer)
-            );
-            group.add(pointerEl);
+            if (pointerOption) {
+                var pointerEl = get(group).pointerEl = new graphic[pointerOption.type](
+                    clone(elOption.pointer)
+                );
+                group.add(pointerEl);
+            }
         },
 
         /**
          * @protected
          */
         createLabelEl: function (group, elOption, axisModel, axisPointerModel) {
-            var labelEl = get(group).labelEl = new graphic.Rect(
-                clone(elOption.label)
-            );
+            if (elOption.label) {
+                var labelEl = get(group).labelEl = new graphic.Rect(
+                    clone(elOption.label)
+                );
 
-            group.add(labelEl);
-            updateLabelShowHide(labelEl, axisPointerModel);
+                group.add(labelEl);
+                updateLabelShowHide(labelEl, axisPointerModel);
+            }
         },
 
         /**
@@ -354,16 +358,17 @@
             }
 
             var payloadInfo = this._payloadInfo;
-            var payload = {
+            var axisModel = this._axisModel;
+            this._api.dispatchAction({
                 type: 'updateAxisPointer',
                 x: payloadInfo.cursorPoint[0],
                 y: payloadInfo.cursorPoint[1],
                 tooltipOption: payloadInfo.tooltipOption,
-                highDownKey: 'axisPointerHandle'
-            };
-            var axis = this._axisModel.axis;
-            payload[axis.dim + 'AxisId'] = this._axisModel.id;
-            this._api.dispatchAction(payload);
+                axesInfo: [{
+                    axisDim: axisModel.axis.dim,
+                    axisIndex: axisModel.componentIndex
+                }]
+            });
         },
 
         /**

package/lib/component/axisPointer/CartesianAxisPointer.js

@@ -19,12 +19,15 @@
             var otherExtent = getCartesian(grid, axis).getOtherAxis(axis).getGlobalExtent();
             var pixelValue = axis.toGlobalCoord(axis.dataToCoord(value, true));
 
-            var elStyle = viewHelper.buildElStyle(axisPointerModel);
-            var pointerOption = pointerShapeBuilder[axisPointerType](axis, pixelValue, otherExtent, elStyle);
-            pointerOption.style = elStyle;
-
-            elOption.graphicKey = pointerOption.type;
-            elOption.pointer = pointerOption;
+            if (axisPointerType && axisPointerType !== 'none') {
+                var elStyle = viewHelper.buildElStyle(axisPointerModel);
+                var pointerOption = pointerShapeBuilder[axisPointerType](
+                    axis, pixelValue, otherExtent, elStyle
+                );
+                pointerOption.style = elStyle;
+                elOption.graphicKey = pointerOption.type;
+                elOption.pointer = pointerOption;
+            }
 
             var layoutInfo = cartesianAxisHelper.layout(grid.model, axisModel);
             viewHelper.buildCartesianSingleLabelElOption(

package/lib/component/axisPointer/PolarAxisPointer.js

@@ -28,14 +28,16 @@
             var coordValue;
             coordValue = axis['dataTo' + formatUtil.capitalFirst(axis.dim)](value);
 
-            var elStyle = viewHelper.buildElStyle(axisPointerModel);
-            var pointerOption = pointerShapeBuilder[axisPointerModel.get('type')](
-                axis, polar, coordValue, otherExtent, elStyle
-            );
-            pointerOption.style = elStyle;
-
-            elOption.graphicKey = pointerOption.type;
-            elOption.pointer = pointerOption;
+            var axisPointerType = axisPointerModel.get('type');
+            if (axisPointerType && axisPointerType !== 'none') {
+                var elStyle = viewHelper.buildElStyle(axisPointerModel);
+                var pointerOption = pointerShapeBuilder[axisPointerType](
+                    axis, polar, coordValue, otherExtent, elStyle
+                );
+                pointerOption.style = elStyle;
+                elOption.graphicKey = pointerOption.type;
+                elOption.pointer = pointerOption;
+            }
 
             var labelMargin = axisPointerModel.get('label.margin');
             var labelPos = getLabelPosition(value, axisModel, axisPointerModel, polar, labelMargin);

package/lib/component/axisPointer/SingleAxisPointer.js

@@ -20,14 +20,18 @@
             var coordSys = axis.coordinateSystem;
             var otherExtent = getGlobalExtent(coordSys, 1 - getPointDimIndex(axis));
             var pixelValue = coordSys.dataToPoint(value)[0];
-            var elStyle = viewHelper.buildElStyle(axisPointerModel);
-            var pointerOption = pointerShapeBuilder[axisPointerModel.get('type')](
-                axis, pixelValue, otherExtent, elStyle
-            );
-            pointerOption.style = elStyle;
 
-            elOption.graphicKey = pointerOption.type;
-            elOption.pointer = pointerOption;
+            var axisPointerType = axisPointerModel.get('type');
+            if (axisPointerType && axisPointerType !== 'none') {
+                var elStyle = viewHelper.buildElStyle(axisPointerModel);
+                var pointerOption = pointerShapeBuilder[axisPointerType](
+                    axis, pixelValue, otherExtent, elStyle
+                );
+                pointerOption.style = elStyle;
+
+                elOption.graphicKey = pointerOption.type;
+                elOption.pointer = pointerOption;
+            }
 
             var layoutInfo = singleAxisHelper.layout(axisModel);
             viewHelper.buildCartesianSingleLabelElOption(