echarts 3.6.1 → 3.7.2

package/lib/chart/graph/forceHelper.js

@@ -83,6 +83,11 @@
                     vec2.sub(v12, n2.p, n1.p);
                     var d = vec2.len(v12) - e.d;
                     var w = n2.w / (n1.w + n2.w);
+
+                    if (isNaN(w)) {
+                        w = 0;
+                    }
+
                     vec2.normalize(v12, v12);
 
                     !n1.fixed && scaleAndAdd(n1.p, n1.p, v12, w * d * friction);

package/lib/chart/graph/forceLayout.js

@@ -49,7 +49,6 @@
 
                 var nodes = nodeData.mapArray('value', function (value, idx) {
                     var point = nodeData.getItemLayout(idx);
-                    // var w = numberUtil.linearMap(value, nodeDataExtent, [0, 50]);
                     var rep = numberUtil.linearMap(value, nodeDataExtent, repulsion);
                     if (isNaN(rep)) {
                         rep = (repulsion[0] + repulsion[1]) / 2;
@@ -57,6 +56,7 @@
                     return {
                         w: rep,
                         rep: rep,
+                        fixed: nodeData.getItemModel(idx).get('fixed'),
                         p: (!point || isNaN(point[0]) || isNaN(point[1])) ? null : point
                     };
                 });

package/lib/chart/heatmap/HeatmapLayer.js

@@ -60,8 +60,15 @@
                 ctx.drawImage(brush, x - r, y - r);
             }
 
+            if (!canvas.width || !canvas.height) {
+                // Avoid "Uncaught DOMException: Failed to execute 'getImageData' on
+                // 'CanvasRenderingContext2D': The source height is 0."
+                return canvas;
+            }
+
             // colorize the canvas using alpha value and set with gradient
             var imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
+
             var pixels = imageData.data;
             var offset = 0;
             var pixelLen = pixels.length;

package/lib/chart/heatmap/HeatmapView.js

@@ -191,17 +191,18 @@
                 if (rawValue && rawValue[2] != null) {
                     defaultText = rawValue[2];
                 }
-                if (labelModel.getShallow('show')) {
-                    graphic.setText(style, labelModel);
-                    style.text = seriesModel.getFormattedLabel(idx, 'normal') || defaultText;
-                }
-                if (hoverLabelModel.getShallow('show')) {
-                    graphic.setText(hoverStl, hoverLabelModel);
-                    hoverStl.text = seriesModel.getFormattedLabel(idx, 'emphasis') || defaultText;
-                }
 
-                rect.setStyle(style);
+                graphic.setLabelStyle(
+                    style, hoverStl, labelModel, hoverLabelModel,
+                    {
+                        labelFetcher: seriesModel,
+                        labelDataIndex: idx,
+                        defaultText: defaultText,
+                        isRectText: true
+                    }
+                );
 
+                rect.setStyle(style);
                 graphic.setHoverStyle(rect, data.hasItemOption ? hoverStl : zrUtil.extend({}, hoverStl));
 
                 group.add(rect);

package/lib/chart/helper/EffectSymbol.js

@@ -112,7 +112,7 @@
 
         // Must reinitialize effect if following configuration changed
         var DIFFICULT_PROPS = ['symbolType', 'period', 'rippleScale'];
-        for (var i = 0; i < DIFFICULT_PROPS; i++) {
+        for (var i = 0; i < DIFFICULT_PROPS.length; i++) {
             var propName = DIFFICULT_PROPS[i];
             if (oldEffectCfg[propName] !== effectCfg[propName]) {
                 this.stopEffectAnimation();
@@ -198,13 +198,13 @@
             this.stopEffectAnimation();
             var symbol = this.childAt(0);
             var onEmphasis = function () {
-                symbol.trigger('emphasis');
+                symbol.highlight();
                 if (effectCfg.showEffectOn !== 'render') {
                     this.startEffectAnimation(effectCfg);
                 }
             };
             var onNormal = function () {
-                symbol.trigger('normal');
+                symbol.downplay();
                 if (effectCfg.showEffectOn !== 'render') {
                     this.stopEffectAnimation();
                 }

package/lib/chart/helper/LargeSymbolDraw.js

@@ -22,6 +22,11 @@
             var symbolProxyShape = symbolProxy.shape;
             for (var i = 0; i < points.length; i++) {
                 var pt = points[i];
+
+                if (isNaN(pt[0]) || isNaN(pt[1])) {
+                    continue;
+                }
+
                 var size = sizes[i];
                 if (size[0] < 4) {
                     // Optimize for small symbol
@@ -121,7 +126,7 @@
         symbolEl.on('mousemove', function (e) {
             symbolEl.dataIndex = null;
             var dataIndex = symbolEl.findDataIndex(e.offsetX, e.offsetY);
-            if (dataIndex > 0) {
+            if (dataIndex >= 0) {
                 // Provide dataIndex for tooltip
                 symbolEl.dataIndex = dataIndex;
             }

package/lib/chart/helper/Line.js

@@ -264,7 +264,7 @@
         }
 
         var visualColor = lineData.getItemVisual(idx, 'color');
-        var visualOpacity = zrUtil.retrieve(
+        var visualOpacity = zrUtil.retrieve3(
             lineData.getItemVisual(idx, 'opacity'),
             lineStyle.opacity,
             1
@@ -298,6 +298,8 @@
         var label = this.childOfName('label');
         var defaultLabelColor;
         var defaultText;
+        var normalText;
+        var emphasisText;
 
         if (showLabel || hoverShowLabel) {
             var rawVal = seriesModel.getRawValue(idx);
@@ -307,42 +309,50 @@
                 ? numberUtil.round(rawVal)
                 : rawVal;
             defaultLabelColor = visualColor || '#000';
+
+            normalText = zrUtil.retrieve2(
+                seriesModel.getFormattedLabel(idx, 'normal', lineData.dataType),
+                defaultText
+            );
+            emphasisText = zrUtil.retrieve2(
+                seriesModel.getFormattedLabel(idx, 'emphasis', lineData.dataType),
+                normalText
+            );
         }
 
         // label.afterUpdate = lineAfterUpdate;
         if (showLabel) {
-            var textStyleModel = labelModel.getModel('textStyle');
-            label.setStyle({
-                text: zrUtil.retrieve(
-                    seriesModel.getFormattedLabel(idx, 'normal', lineData.dataType),
-                    defaultText
-                ),
-                textFont: textStyleModel.getFont(),
-                fill: textStyleModel.getTextColor() || defaultLabelColor
+            var labelStyle = graphic.setTextStyle(label.style, labelModel, {
+                text: normalText
+            }, {
+                autoColor: defaultLabelColor
             });
 
-            label.__textAlign = textStyleModel.get('align');
-            label.__verticalAlign = textStyleModel.get('baseline');
-            label.__position = labelModel.get('position');
+            label.__textAlign = labelStyle.textAlign;
+            label.__verticalAlign = labelStyle.textVerticalAlign;
+            // 'start', 'middle', 'end'
+            label.__position = labelModel.get('position') || 'middle';
         }
         else {
-            label.setStyle('text', '');
+            label.setStyle('text', null);
         }
-        if (hoverShowLabel) {
-            var textStyleHoverModel = hoverLabelModel.getModel('textStyle');
 
+        if (hoverShowLabel) {
+            // Only these properties supported in this emphasis style here.
             label.hoverStyle = {
-                text: zrUtil.retrieve(
-                    seriesModel.getFormattedLabel(idx, 'emphasis', lineData.dataType),
-                    defaultText
-                ),
-                textFont: textStyleHoverModel.getFont(),
-                fill: textStyleHoverModel.getTextColor() || defaultLabelColor
+                text: emphasisText,
+                textFill: hoverLabelModel.getTextColor(true),
+                // For merging hover style to normal style, do not use
+                // `hoverLabelModel.getFont()` here.
+                fontStyle: hoverLabelModel.getShallow('fontStyle'),
+                fontWeight: hoverLabelModel.getShallow('fontWeight'),
+                fontSize: hoverLabelModel.getShallow('fontSize'),
+                fontFamily: hoverLabelModel.getShallow('fontFamily')
             };
         }
         else {
             label.hoverStyle = {
-                text: ''
+                text: null
             };
         }
 
@@ -351,6 +361,14 @@
         graphic.setHoverStyle(this);
     };
 
+    lineProto.highlight = function () {
+        this.trigger('emphasis');
+    };
+
+    lineProto.downplay = function () {
+        this.trigger('normal');
+    };
+
     lineProto.updateLayout = function (lineData, idx) {
         this.setLinePoints(lineData.getItemLayout(idx));
     };

package/lib/chart/helper/Symbol.js

@@ -178,6 +178,7 @@
         var labelModel = seriesScope && seriesScope.labelModel;
         var hoverLabelModel = seriesScope && seriesScope.hoverLabelModel;
         var hoverAnimation = seriesScope && seriesScope.hoverAnimation;
+        var cursorStyle = seriesScope && seriesScope.cursorStyle;
 
         if (!seriesScope || data.hasItemOption) {
             var itemModel = data.getItemModel(idx);
@@ -193,6 +194,7 @@
             labelModel = itemModel.getModel(normalLabelAccessPath);
             hoverLabelModel = itemModel.getModel(emphasisLabelAccessPath);
             hoverAnimation = itemModel.getShallow('hoverAnimation');
+            cursorStyle = itemModel.getShallow('cursor');
         }
         else {
             hoverItemStyle = zrUtil.extend({}, hoverItemStyle);
@@ -209,6 +211,8 @@
             ]);
         }
 
+        cursorStyle && symbolPath.attr('cursor', cursorStyle);
+
         // PENDING setColor before setStyle!!!
         symbolPath.setColor(color);
 
@@ -220,12 +224,19 @@
         }
 
         var valueDim = labelHelper.findLabelValueDim(data);
-        labelHelper.setTextToStyle(
-            data, idx, valueDim, elStyle, seriesModel, labelModel, color
-        );
-        labelHelper.setTextToStyle(
-            data, idx, valueDim, hoverItemStyle, seriesModel, hoverLabelModel, color
-        );
+
+        if (valueDim != null) {
+            graphic.setLabelStyle(
+                elStyle, hoverItemStyle, labelModel, hoverLabelModel,
+                {
+                    labelFetcher: seriesModel,
+                    labelDataIndex: idx,
+                    defaultText: data.get(valueDim, idx),
+                    isRectText: true,
+                    autoColor: color
+                }
+            );
+        }
 
         symbolPath.off('mouseover')
             .off('mouseout')
@@ -234,6 +245,8 @@
 
         symbolPath.hoverStyle = hoverItemStyle;
 
+        // FIXME
+        // Do not use symbol.trigger('emphasis'), but use symbol.highlight() instead.
         graphic.setHoverStyle(symbolPath);
 
         var scale = getScale(symbolSize);
@@ -265,7 +278,7 @@
         // Avoid mistaken hover when fading out
         this.silent = symbolPath.silent = true;
         // Not show text when animating
-        symbolPath.style.text = '';
+        symbolPath.style.text = null;
         graphic.updateProps(symbolPath, {
             scale: [0, 0]
         }, this._seriesModel, this.dataIndex, cb);

package/lib/chart/helper/SymbolDraw.js

@@ -48,7 +48,8 @@
             hoverAnimation: seriesModel.get('hoverAnimation'),
 
             labelModel: seriesModel.getModel('label.normal'),
-            hoverLabelModel: seriesModel.getModel('label.emphasis')
+            hoverLabelModel: seriesModel.getModel('label.emphasis'),
+            cursorStyle: seriesModel.get('cursor')
         };
 
         data.diff(oldData)

package/lib/chart/helper/labelHelper.js

@@ -3,8 +3,6 @@
  */
 
 
-    var graphic = require('../../util/graphic');
-    var zrUtil = require('zrender/lib/core/util');
     var modelUtil = require('../../util/model');
 
     var helper = {};
@@ -30,19 +28,4 @@
         return valueDim;
     };
 
-    helper.setTextToStyle = function (
-        data, dataIndex, valueDim, elStyle, seriesModel, labelModel, color
-    ) {
-        if (valueDim != null && labelModel.getShallow('show')) {
-            graphic.setText(elStyle, labelModel, color);
-            elStyle.text = zrUtil.retrieve(
-                seriesModel.getFormattedLabel(dataIndex, 'normal'),
-                data.get(valueDim, dataIndex)
-            );
-        }
-        else {
-            elStyle.text = '';
-        }
-    };
-
     module.exports = helper;

package/lib/chart/helper/whiskerBoxCommon.js

@@ -54,9 +54,14 @@
             var data = option.data;
 
             addOrdinal && zrUtil.each(data, function (item, index) {
-                zrUtil.isArray(item) && item.unshift(index);
+                if (item.value && zrUtil.isArray(item.value)) {
+                    item.value.unshift(index);
+                } else {
+                    zrUtil.isArray(item) && item.unshift(index);
+                }
             });
 
+            var defaultValueDimensions = this.defaultValueDimensions;
             var dimensions = [{
                 name: baseAxisDim,
                 otherDims: {
@@ -65,12 +70,14 @@
                 dimsDef: ['base']
             }, {
                 name: otherAxisDim,
-                dimsDef: this.defaultValueDimensions.slice()
+                dimsDef: defaultValueDimensions.slice()
             }];
 
             dimensions = completeDimensions(dimensions, data, {
                 encodeDef: this.get('encode'),
-                dimsDef: this.get('dimensions')
+                dimsDef: this.get('dimensions'),
+                // Consider empty data entry.
+                dimCount: defaultValueDimensions.length + 1
             });
 
             var list = new List(dimensions, this);
@@ -117,3 +124,4 @@
         seriesModelMixin: seriesModelMixin,
         viewMixin: viewMixin
     };
+

package/lib/chart/line/LineSeries.js

@@ -35,6 +35,7 @@
 
             // If clip the overflow value
             clipOverflow: true,
+            // cursor: null,
 
             label: {
                 normal: {

package/lib/chart/line/LineView.js

@@ -53,8 +53,20 @@
     function getStackedOnPoints(coordSys, data) {
         var baseAxis = coordSys.getBaseAxis();
         var valueAxis = coordSys.getOtherAxis(baseAxis);
-        var valueStart = baseAxis.onZero
-            ? 0 : valueAxis.scale.getExtent()[0];
+
+        var valueStart = 0;
+        if (!baseAxis.onZero) {
+            var extent = valueAxis.scale.getExtent();
+            if (extent[0] > 0) {
+                // Both positive
+                valueStart = extent[0];
+            }
+            else if (extent[1] < 0) {
+                // Both negative
+                valueStart = extent[1];
+            }
+            // If is one positive, and one negative, onZero shall be true
+        }
 
         var valueDim = valueAxis.dim;
 

package/lib/chart/line/poly.js

@@ -3,6 +3,7 @@
 
     var Path = require('zrender/lib/graphic/Path');
     var vec2 = require('zrender/lib/core/vector');
+    var fixClipWithShadow = require('zrender/lib/graphic/helper/fixClipWithShadow');
 
     var vec2Min = vec2.min;
     var vec2Max = vec2.max;
@@ -154,6 +155,8 @@
                 stroke: '#000'
             },
 
+            brush: fixClipWithShadow(Path.prototype.brush),
+
             buildPath: function (ctx, shape) {
                 var points = shape.points;
 
@@ -206,6 +209,8 @@
                 connectNulls: false
             },
 
+            brush: fixClipWithShadow(Path.prototype.brush),
+
             buildPath: function (ctx, shape) {
                 var points = shape.points;
                 var stackedOnPoints = shape.stackedOnPoints;

package/lib/chart/lines/LinesView.js

@@ -48,9 +48,13 @@
             var zr = api.getZr();
             // Avoid the drag cause ghost shadow
             // FIXME Better way ?
-            zr.painter.getLayer(zlevel).clear(true);
+            // SVG doesn't support
+            var isSvg = zr.painter.getType() === 'svg';
+            if (!isSvg) {
+                zr.painter.getLayer(zlevel).clear(true);
+            }
             // Config layer with motion blur
-            if (this._lastZlevel != null) {
+            if (this._lastZlevel != null && !isSvg) {
                 zr.configLayer(this._lastZlevel, {
                     motionBlur: false
                 });
@@ -66,10 +70,12 @@
                     notInIndividual && console.warn('Lines with trail effect should have an individual zlevel');
                 }
 
-                zr.configLayer(zlevel, {
-                    motionBlur: true,
-                    lastFrameAlpha: Math.max(Math.min(trailLength / 10 + 0.9, 1), 0)
-                });
+                if (!isSvg) {
+                    zr.configLayer(zlevel, {
+                        motionBlur: true,
+                        lastFrameAlpha: Math.max(Math.min(trailLength / 10 + 0.9, 1), 0)
+                    });
+                }
             }
 
             this.group.add(lineDraw.group);
@@ -83,11 +89,20 @@
             this._lineDraw.updateLayout(seriesModel);
             // Not use motion when dragging or zooming
             var zr = api.getZr();
-            zr.painter.getLayer(this._lastZlevel).clear(true);
+            var isSvg = zr.painter.getType() === 'svg';
+            if (!isSvg) {
+                zr.painter.getLayer(this._lastZlevel).clear(true);
+            }
         },
 
         remove: function (ecModel, api) {
             this._lineDraw && this._lineDraw.remove(api, true);
+            // Clear motion when lineDraw is removed
+            var zr = api.getZr();
+            var isSvg = zr.painter.getType() === 'svg';
+            if (!isSvg) {
+                zr.painter.getLayer(this._lastZlevel).clear(true);
+            }
         },
 
         dispose: function () {}

package/lib/chart/map/MapSeries.js

@@ -82,7 +82,7 @@
             // Shallow clone
             option = zrUtil.extend({}, option);
 
-            option.data = geoCreator.getFilledRegions(option.data, mapName);
+            option.data = geoCreator.getFilledRegions(option.data, mapName, option.nameMap);
 
             return option;
         },
@@ -216,15 +216,11 @@
             label: {
                 normal: {
                     show: false,
-                    textStyle: {
-                        color: '#000'
-                    }
+                    color: '#000'
                 },
                 emphasis: {
                     show: true,
-                    textStyle: {
-                        color: 'rgb(100,0,0)'
-                    }
+                    color: 'rgb(100,0,0)'
                 }
             },
             // scaleLimit: null,

package/lib/chart/map/MapView.js

@@ -2,6 +2,7 @@
 
     // var zrUtil = require('zrender/lib/core/util');
     var graphic = require('../../util/graphic');
+    var zrUtil = require('zrender/lib/core/util');
 
     var MapDraw = require('../../component/helper/MapDraw');
 
@@ -98,42 +99,52 @@
                         r: 3
                     },
                     silent: true,
-                    z2: 10
+                    // Do not overlap the first series, on which labels are displayed.
+                    z2: !offset ? 10 : 8
                 });
 
                 // First data on the same region
                 if (!offset) {
                     var fullData = mapModel.mainSeries.getData();
                     var name = originalData.getName(idx);
-                    var labelText = name;
+
                     var fullIndex = fullData.indexOfName(name);
 
                     var itemModel = originalData.getItemModel(idx);
                     var labelModel = itemModel.getModel('label.normal');
                     var hoverLabelModel = itemModel.getModel('label.emphasis');
 
-                    var textStyleModel = labelModel.getModel('textStyle');
-                    var hoverTextStyleModel = hoverLabelModel.getModel('textStyle');
-
                     var polygonGroups = fullData.getItemGraphicEl(fullIndex);
-                    circle.setStyle({
-                        textPosition: 'bottom'
-                    });
+
+                    var normalText = zrUtil.retrieve2(
+                        mapModel.getFormattedLabel(idx, 'normal'),
+                        name
+                    );
+                    var emphasisText = zrUtil.retrieve2(
+                        mapModel.getFormattedLabel(idx, 'emphasis'),
+                        normalText
+                    );
 
                     var onEmphasis = function () {
-                        circle.setStyle({
-                            text: hoverLabelModel.get('show') ? labelText : '',
-                            textFill: hoverTextStyleModel.getTextColor(),
-                            textFont: hoverTextStyleModel.getFont()
-                        });
+                        var hoverStyle = graphic.setTextStyle({}, hoverLabelModel, {
+                            text: hoverLabelModel.get('show') ? emphasisText : null
+                        }, {isRectText: true, useInsideStyle: false}, true);
+                        circle.style.extendFrom(hoverStyle);
+                        // Make label upper than others if overlaps.
+                        circle.__mapOriginalZ2 = circle.z2;
+                        circle.z2 += 1;
                     };
 
                     var onNormal = function () {
-                        circle.setStyle({
-                            text: labelModel.get('show') ? labelText : '',
-                            textFill: textStyleModel.getTextColor(),
-                            textFont: textStyleModel.getFont()
-                        });
+                        graphic.setTextStyle(circle.style, labelModel, {
+                            text: labelModel.get('show') ? normalText : null,
+                            textPosition: labelModel.getShallow('position') || 'bottom'
+                        }, {isRectText: true, useInsideStyle: false});
+
+                        if (circle.__mapOriginalZ2 != null) {
+                            circle.z2 = circle.__mapOriginalZ2;
+                            circle.__mapOriginalZ2 = null;
+                        }
                     };
 
                     polygonGroups.on('mouseover', onEmphasis)

package/lib/chart/pie/PieSeries.js

@@ -4,6 +4,7 @@
     var List = require('../../data/List');
     var zrUtil = require('zrender/lib/core/util');
     var modelUtil = require('../../util/model');
+    var numberUtil = require('../../util/number');
     var completeDimensions = require('../../data/helper/completeDimensions');
 
     var dataSelectableMixin = require('../../component/helper/selectableMixin');
@@ -44,11 +45,18 @@
         getDataParams: function (dataIndex) {
             var data = this.getData();
             var params = PieSeries.superCall(this, 'getDataParams', dataIndex);
-            var sum = data.getSum('value');
             // FIXME toFixed?
-            //
-            // Percent is 0 if sum is 0
-            params.percent = !sum ? 0 : +(data.get('value', dataIndex) / sum * 100).toFixed(2);
+
+            var valueList = [];
+            data.each('value', function (value) {
+                valueList.push(value);
+            });
+
+            params.percent = numberUtil.getPercentWithPrecision(
+                valueList,
+                dataIndex,
+                data.hostModel.get('percentPrecision')
+            );
 
             params.$vars.push('percent');
             return params;
@@ -81,8 +89,10 @@
             startAngle: 90,
             // 最小角度改为0
             minAngle: 0,
-            // 选中是扇区偏移量
+            // 选中时扇区偏移量
             selectedOffset: 10,
+            // 高亮扇区偏移量
+            hoverOffset: 10,
 
             // If use strategy to avoid label overlapping
             avoidLabelOverlap: true,
@@ -91,9 +101,13 @@
             // 南丁格尔玫瑰图模式，'radius'（半径） | 'area'（面积）
             // roseType: null,
 
+            percentPrecision: 2,
+
             // If still show when all data zero.
             stillShowZeroSum: true,
 
+            // cursor: null,
+
             label: {
                 normal: {
                     // If rotate around circle
@@ -102,7 +116,7 @@
                     // 'outer', 'inside', 'center'
                     position: 'outer'
                     // formatter: 标签文本格式器，同Tooltip.formatter，不支持异步回调
-                    // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
+                    // 默认使用全局文本样式，详见TEXTSTYLE
                     // distance: 当position为inner时有效，为label位置到圆心的距离与圆半径(环状图为内外半径和)的比例系数
                 },
                 emphasis: {}