echarts 3.7.1 → 3.7.2

package/lib/preprocessor/helper/compatStyle.js

@@ -97,30 +97,31 @@
                 compatItemStyle(data[i]);
                 compatLabelTextStyle(data[i] && data[i].label);
             }
-            // mark point data
-            var markPoint = seriesOpt.markPoint;
-            if (markPoint && markPoint.data) {
-                var mpData = markPoint.data;
-                for (var i = 0; i < mpData.length; i++) {
-                    compatItemStyle(mpData[i]);
-                    compatLabelTextStyle(mpData[i] && mpData[i].label);
-                }
+        }
+
+        // mark point data
+        var markPoint = seriesOpt.markPoint;
+        if (markPoint && markPoint.data) {
+            var mpData = markPoint.data;
+            for (var i = 0; i < mpData.length; i++) {
+                compatItemStyle(mpData[i]);
+                compatLabelTextStyle(mpData[i] && mpData[i].label);
             }
-            // mark line data
-            var markLine = seriesOpt.markLine;
-            if (markLine && markLine.data) {
-                var mlData = markLine.data;
-                for (var i = 0; i < mlData.length; i++) {
-                    if (zrUtil.isArray(mlData[i])) {
-                        compatItemStyle(mlData[i][0]);
-                        compatLabelTextStyle(mlData[i][0] && mlData[i][0].label);
-                        compatItemStyle(mlData[i][1]);
-                        compatLabelTextStyle(mlData[i][1] && mlData[i][1].label);
-                    }
-                    else {
-                        compatItemStyle(mlData[i]);
-                        compatLabelTextStyle(mlData[i] && mlData[i].label);
-                    }
+        }
+        // mark line data
+        var markLine = seriesOpt.markLine;
+        if (markLine && markLine.data) {
+            var mlData = markLine.data;
+            for (var i = 0; i < mlData.length; i++) {
+                if (zrUtil.isArray(mlData[i])) {
+                    compatItemStyle(mlData[i][0]);
+                    compatLabelTextStyle(mlData[i][0] && mlData[i][0].label);
+                    compatItemStyle(mlData[i][1]);
+                    compatLabelTextStyle(mlData[i][1] && mlData[i][1].label);
+                }
+                else {
+                    compatItemStyle(mlData[i]);
+                    compatLabelTextStyle(mlData[i] && mlData[i].label);
                 }
             }
         }

package/lib/scale/Time.js

@@ -77,7 +77,7 @@
             // If there are no data and extent are [Infinity, -Infinity]
             if (extent[1] === -Infinity && extent[0] === Infinity) {
                 var d = new Date();
-                extent[1] = new Date(d.getFullYear(), d.getMonth(), d.getDate());
+                extent[1] = +new Date(d.getFullYear(), d.getMonth(), d.getDate());
                 extent[0] = extent[1] - ONE_DAY;
             }
 
@@ -98,8 +98,6 @@
          * @override
          */
         niceTicks: function (approxTickNum, minInterval, maxInterval) {
-            var timezoneOffset = this.getSetting('useUTC')
-                ? 0 : numberUtil.getTimezoneOffset() * 60 * 1000;
             approxTickNum = approxTickNum || 10;
 
             var extent = this._extent;
@@ -129,9 +127,11 @@
                 interval *= yearStep;
             }
 
+            var timezoneOffset = this.getSetting('useUTC')
+                ? 0 : (new Date(+extent[0] || +extent[1])).getTimezoneOffset() * 60 * 1000;
             var niceExtent = [
                 Math.round(mathCeil((extent[0] - timezoneOffset) / interval) * interval + timezoneOffset),
-                Math.round(mathFloor((extent[1] - timezoneOffset)/ interval) * interval + timezoneOffset)
+                Math.round(mathFloor((extent[1] - timezoneOffset) / interval) * interval + timezoneOffset)
             ];
 
             scaleHelper.fixExtent(niceExtent, extent);

package/lib/util/graphic.js

@@ -550,7 +550,7 @@
      *              for textFill, textStroke, textBackgroundColor, and textBorderColor.
      *              If autoColor specified, it is used as default textFill.
      *      useInsideStyle:
-     *              `true`: Use inside style (textFill, textStroke, textLineWidth)
+     *              `true`: Use inside style (textFill, textStroke, textStrokeWidth)
      *                  if `textFill` is not specified.
      *              `false`: Do not use inside style.
      *              `null/undefined`: use inside style if `isRectText` is true and
@@ -663,7 +663,7 @@
             || globalTextStyle.color;
         textStyle.textStroke = getAutoColor(textStyleModel.getShallow('textBorderColor'), opt)
             || globalTextStyle.textBorderColor;
-        textStyle.textLineWidth = zrUtil.retrieve2(
+        textStyle.textStrokeWidth = zrUtil.retrieve2(
             textStyleModel.getShallow('textBorderWidth'),
             globalTextStyle.textBorderWidth
         );
@@ -747,13 +747,13 @@
             insideRollback = {
                 textFill: null,
                 textStroke: textStyle.textStroke,
-                textLineWidth: textStyle.textLineWidth
+                textStrokeWidth: textStyle.textStrokeWidth
             };
             textStyle.textFill = '#fff';
             // Consider text with #fff overflow its container.
             if (textStyle.textStroke == null) {
                 textStyle.textStroke = opt.autoColor;
-                textStyle.textLineWidth == null && (textStyle.textLineWidth = 2);
+                textStyle.textStrokeWidth == null && (textStyle.textStrokeWidth = 2);
             }
         }
 
@@ -765,7 +765,7 @@
         if (insideRollback) {
             style.textFill = insideRollback.textFill;
             style.textStroke = insideRollback.textStroke;
-            style.textLineWidth = insideRollback.textLineWidth;
+            style.textStrokeWidth = insideRollback.textStrokeWidth;
         }
     }
 

package/lib/util/number.js

@@ -273,11 +273,14 @@
     var TIME_REG = /^(?:(\d{4})(?:[-\/](\d{1,2})(?:[-\/](\d{1,2})(?:[T ](\d{1,2})(?::(\d\d)(?::(\d\d)(?:[.,](\d+))?)?)?(Z|[\+\-]\d\d:?\d\d)?)?)?)?)?$/; // jshint ignore:line
 
     /**
+     * Consider DST, it is incorrect to provide a method `getTimezoneOffset`
+     * without time specified. So this method is removed.
+     *
      * @return {number} in minutes
      */
-    number.getTimezoneOffset = function () {
-        return (new Date()).getTimezoneOffset();
-    };
+    // number.getTimezoneOffset = function () {
+    //     return (new Date()).getTimezoneOffset();
+    // };
 
     /**
      * @param {string|Date|number} value These values can be accepted:
@@ -311,24 +314,42 @@
                 return new Date(NaN);
             }
 
-            var timezoneOffset = number.getTimezoneOffset();
-            var timeOffset = !match[8]
-                ? 0
-                : match[8].toUpperCase() === 'Z'
-                ? timezoneOffset
-                : +match[8].slice(0, 3) * 60 + timezoneOffset;
-
-            // match[n] can only be string or undefined.
-            // But take care of '12' + 1 => '121'.
-            return new Date(
-                +match[1],
-                +(match[2] || 1) - 1,
-                +match[3] || 1,
-                +match[4] || 0,
-                +(match[5] || 0) - timeOffset,
-                +match[6] || 0,
-                +match[7] || 0
-            );
+            // Use local time when no timezone offset specifed.
+            if (!match[8]) {
+                // match[n] can only be string or undefined.
+                // But take care of '12' + 1 => '121'.
+                return new Date(
+                    +match[1],
+                    +(match[2] || 1) - 1,
+                    +match[3] || 1,
+                    +match[4] || 0,
+                    +(match[5] || 0),
+                    +match[6] || 0,
+                    +match[7] || 0
+                );
+            }
+            // Timezoneoffset of Javascript Date has considered DST (Daylight Saving Time,
+            // https://tc39.github.io/ecma262/#sec-daylight-saving-time-adjustment).
+            // For example, system timezone is set as "Time Zone: America/Toronto",
+            // then these code will get different result:
+            // `new Date(1478411999999).getTimezoneOffset();  // get 240`
+            // `new Date(1478412000000).getTimezoneOffset();  // get 300`
+            // So we should not use `new Date`, but use `Date.UTC`.
+            else {
+                var hour = +match[4] || 0;
+                if (match[8].toUpperCase() !== 'Z') {
+                    hour -= match[8].slice(0, 3);
+                }
+                return new Date(Date.UTC(
+                    +match[1],
+                    +(match[2] || 1) - 1,
+                    +match[3] || 1,
+                    hour,
+                    +(match[5] || 0),
+                    +match[6] || 0,
+                    +match[7] || 0
+                ));
+            }
         }
         else if (value == null) {
             return new Date(NaN);

package/lib/visual/VisualMapping.js

@@ -142,7 +142,7 @@
                             // which will be much faster and useful in pixel manipulation
                             var returnRGBArray = !!out;
                             !isNormalized && (value = this._normalizeData(value));
-                            out = zrColor.fastMapToColor(value, thisOption.parsedVisual, out);
+                            out = zrColor.fastLerp(value, thisOption.parsedVisual, out);
                             return returnRGBArray ? out : zrColor.stringify(out, 'rgba');
                         },
                     this
@@ -152,7 +152,7 @@
             _doMap: {
                 linear: function (normalized) {
                     return zrColor.stringify(
-                        zrColor.fastMapToColor(normalized, this.option.parsedVisual),
+                        zrColor.fastLerp(normalized, this.option.parsedVisual),
                         'rgba'
                     );
                 },
@@ -161,7 +161,7 @@
                     var result = getSpecifiedVisual.call(this, value);
                     if (result == null) {
                         result = zrColor.stringify(
-                            zrColor.fastMapToColor(normalized, this.option.parsedVisual),
+                            zrColor.fastLerp(normalized, this.option.parsedVisual),
                             'rgba'
                         );
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echarts",
-  "version": "3.7.1",
+  "version": "3.7.2",
   "description": "A powerful charting and visualization library for browser",
   "keywords": [
     "visualization",
@@ -35,7 +35,7 @@
     "prepublish": "node build/amd2common.js"
   },
   "dependencies": {
-    "zrender": "^3.6.1"
+    "zrender": "^3.6.2"
   },
   "devDependencies": {
     "coordtransform": "^2.0.2",
@@ -45,6 +45,6 @@
     "fs-extra": "^0.26.5",
     "glob": "^7.0.0",
     "webpack": "^1.12.13",
-    "zrender": "^3.6.1"
+    "zrender": "^3.6.2"
   }
 }

package/rollup.config.js

@@ -0,0 +1,49 @@
+import resolve from 'rollup-plugin-node-resolve';
+import commonjs from 'rollup-plugin-commonjs';
+import uglify from 'rollup-plugin-uglify';
+
+function plugins(production) {
+    let plugins = [
+        resolve(),
+        commonjs()
+    ];
+    if (production) {
+        plugins.push(uglify({
+            compress: {
+                global_defs: {
+                    __DEV__: true
+                }
+            }
+        }));
+    }
+    return plugins;
+}
+
+function createBuild(type, production) {
+    if (type) {
+        type = '.' + type;
+    }
+    var postfix = '';
+    if (production) {
+        postfix = '.min';
+    }
+    return {
+        entry: `./index${type}.js`,
+        format: 'umd',
+        moduleName: 'echarts',
+        plugins: plugins(production),
+        dest: `dist/echarts${type}${postfix}.js`
+    };
+}
+
+export default [
+    createBuild('blank', false),
+    createBuild('simple', false),
+    createBuild('common', false),
+    createBuild('', false),
+
+    createBuild('blank', true),
+    createBuild('simple', true),
+    createBuild('common', true),
+    createBuild('', true)
+];

package/src/chart/bar/BaseBarSeries.js

@@ -58,10 +58,10 @@ define(function(require) {
             //     }
             // },
             itemStyle: {
-                normal: {
+                // normal: {
                     // color: '各异'
-                },
-                emphasis: {}
+                // },
+                // emphasis: {}
             }
         }
     });

package/src/chart/candlestick/candlestickLayout.js

@@ -34,6 +34,8 @@ define(function (require) {
                 return;
             }
 
+            var dataIndex = 0;
+
             data.each([cDim].concat(vDims), function () {
                 var args = arguments;
                 var axisDimVal = args[0];
@@ -67,9 +69,30 @@ define(function (require) {
                 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 @@ define(function (require) {
                     brushRect: makeBrushRect()
                 });
 
+                ++dataIndex;
+
                 function getPoint(val) {
                     var p = [];
                     p[variableDim] = axisDimVal;

package/src/chart/graph/forceHelper.js

@@ -83,6 +83,11 @@ define(function (require) {
                     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/src/chart/graph/forceLayout.js

@@ -49,7 +49,6 @@ define(function (require) {
 
                 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/src/chart/helper/whiskerBoxCommon.js

@@ -55,7 +55,11 @@ define(function(require) {
             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;
@@ -121,4 +125,4 @@ define(function(require) {
         seriesModelMixin: seriesModelMixin,
         viewMixin: viewMixin
     };
-});
+});

package/src/chart/line/LineView.js

@@ -54,8 +54,20 @@ define(function(require) {
     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/src/chart/lines/LinesView.js

@@ -48,9 +48,13 @@ define(function (require) {
             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 @@ define(function (require) {
                     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 @@ define(function (require) {
             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/src/chart/pie/PieSeries.js

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

package/src/chart/pie/PieView.js

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

package/src/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);
         },
 
         /**