echarts 3.7.1 → 3.7.2

package/index.blank.js

@@ -0,0 +1,4 @@
+/**
+ * Export echarts as CommonJS module
+ */
+module.exports = require('./lib/echarts');

package/lib/chart/bar/BaseBarSeries.js

@@ -57,10 +57,10 @@
             //     }
             // },
             itemStyle: {
-                normal: {
+                // normal: {
                     // color: '各异'
-                },
-                emphasis: {}
+                // },
+                // emphasis: {}
             }
         }
     });

package/lib/chart/candlestick/candlestickLayout.js

@@ -34,6 +34,8 @@
                 return;
             }
 
+            var dataIndex = 0;
+
             data.each([cDim].concat(vDims), function () {
                 var args = arguments;
                 var axisDimVal = args[0];
@@ -67,9 +69,30 @@
                 addBodyEnd(ocHighPoint, 0);
                 addBodyEnd(ocLowPoint, 1);
 
+                var sign;
+                if (openVal > closeVal) {
+                    sign = -1;
+                }
+                else if (openVal < closeVal) {
+                    sign = 1;
+                }
+                else {
+                    // If close === open, compare with close of last record
+                    if (dataIndex > 0) {
+                        sign = data.getItemModel(dataIndex - 1).get()[2]
+                            <= closeVal
+                                ? 1
+                                : -1;
+                    }
+                    else {
+                        // No record of previous, set to be positive
+                        sign = 1;
+                    }
+                }
+
                 data.setItemLayout(idx, {
                     chartLayout: chartLayout,
-                    sign: openVal > closeVal ? -1 : openVal < closeVal ? 1 : 0,
+                    sign: sign,
                     initBaseline: openVal > closeVal
                         ? ocHighPoint[constDim] : ocLowPoint[constDim], // open point.
                     bodyEnds: bodyEnds,
@@ -77,6 +100,8 @@
                     brushRect: makeBrushRect()
                 });
 
+                ++dataIndex;
+
                 function getPoint(val) {
                     var p = [];
                     p[variableDim] = axisDimVal;

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;

package/lib/chart/helper/whiskerBoxCommon.js

@@ -54,7 +54,11 @@
             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;
@@ -120,3 +124,4 @@
         seriesModelMixin: seriesModelMixin,
         viewMixin: viewMixin
     };
+

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/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/pie/PieSeries.js

@@ -89,8 +89,10 @@
             startAngle: 90,
             // 最小角度改为0
             minAngle: 0,
-            // 选中是扇区偏移量
+            // 选中时扇区偏移量
             selectedOffset: 10,
+            // 高亮扇区偏移量
+            hoverOffset: 10,
 
             // If use strategy to avoid label overlapping
             avoidLabelOverlap: true,

package/lib/chart/pie/PieView.js

@@ -168,7 +168,7 @@
             sector.stopAnimation(true);
             sector.animateTo({
                 shape: {
-                    r: layout.r + 10
+                    r: layout.r + seriesModel.get('hoverOffset')
                 }
             }, 300, 'elasticOut');
         }

package/lib/chart/treemap/TreemapView.js

@@ -67,12 +67,6 @@
              * @private
              */
             this._state = 'ready';
-
-            /**
-             * @private
-             * @type {boolean}
-             */
-            this._mayClick;
         },
 
         /**
@@ -397,8 +391,6 @@
          * @private
          */
         _onPan: function (dx, dy) {
-            this._mayClick = false;
-
             if (this._state !== 'animating'
                 && (Math.abs(dx) > DRAG_THRESHOLD || Math.abs(dy) > DRAG_THRESHOLD)
             ) {
@@ -431,8 +423,6 @@
          * @private
          */
         _onZoom: function (scale, mouseX, mouseY) {
-            this._mayClick = false;
-
             if (this._state !== 'animating') {
                 // These param must not be cached.
                 var root = this.seriesModel.getData().tree.root;
@@ -480,25 +470,11 @@
          * @private
          */
         _initEvents: function (containerGroup) {
-            // FIXME
-            // 不用click以及silent的原因是，animate时视图设置silent true来避免click生效，
-            // 但是animate中，按下鼠标，animate结束后（silent设回为false）松开鼠标，
-            // 还是会触发click，期望是不触发。
-
-            // Mousedown occurs when drag start, and mouseup occurs when drag end,
-            // click event should not be triggered in that case.
-
-            containerGroup.on('mousedown', function (e) {
-                this._state === 'ready' && (this._mayClick = true);
-            }, this);
-            containerGroup.on('mouseup', function (e) {
-                if (this._mayClick) {
-                    this._mayClick = false;
-                    this._state === 'ready' && onClick.call(this, e);
+            containerGroup.on('click', function (e) {
+                if (this._state !== 'ready') {
+                    return;
                 }
-            }, this);
 
-            function onClick(e) {
                 var nodeClick = this.seriesModel.get('nodeClick', true);
 
                 if (!nodeClick) {
@@ -526,7 +502,8 @@
                         link && window.open(link, linkTarget);
                     }
                 }
-            }
+
+            }, this);
         },
 
         /**