echarts 3.7.1 → 3.7.2

package/src/component/toolbox/feature/DataView.js

@@ -6,7 +6,7 @@ define(function (require) {
 
     var zrUtil = require('zrender/core/util');
     var eventTool = require('zrender/core/event');
-
+    var lang = require('../../../lang').toolbox.dataView;
 
     var BLOCK_SPLITER = new Array(60).join('-');
     var ITEM_SPLITER = '\t';
@@ -277,8 +277,8 @@ define(function (require) {
         contentToOption: null,
 
         icon: 'M17.5,17.3H33 M17.5,17.3H33 M45.4,29.5h-28 M11.5,2v56H51V14.8L38.4,2H11.5z M38.4,2.2v12.7H51 M45.4,41.7h-28',
-        title: '数据视图',
-        lang: ['数据视图', '关闭', '刷新'],
+        title: zrUtil.clone(lang.title),
+        lang: zrUtil.clone(lang.lang),
         backgroundColor: '#fff',
         textColor: '#000',
         textareaColor: '#fff',

package/src/component/toolbox/feature/DataZoom.js

@@ -6,6 +6,7 @@ define(function(require) {
     var BrushTargetManager = require('../../helper/BrushTargetManager');
     var history = require('../../dataZoom/history');
     var sliderMove = require('../../helper/sliderMove');
+    var lang = require('../../../lang').toolbox.dataZoom;
 
     var each = zrUtil.each;
 
@@ -39,10 +40,8 @@ define(function(require) {
             zoom: 'M0,13.5h26.9 M13.5,26.9V0 M32.1,13.5H58V58H13.5 V32.1',
             back: 'M22,1.4L9.9,13.5l12.3,12.3 M10.3,13.5H54.9v44.6 H10.3v-26'
         },
-        title: {
-            zoom: '区域缩放',
-            back: '区域缩放还原'
-        }
+        // `zoom`, `back`
+        title: zrUtil.clone(lang.title)
     };
 
     var proto = DataZoom.prototype;

package/src/component/toolbox/feature/MagicType.js

@@ -2,6 +2,7 @@ define(function(require) {
     'use strict';
 
     var zrUtil = require('zrender/core/util');
+    var lang = require('../../../lang').toolbox.magicType;
 
     function MagicType(model) {
         this.model = model;
@@ -17,12 +18,8 @@ define(function(require) {
             stack: 'M8.2,38.4l-8.4,4.1l30.6,15.3L60,42.5l-8.1-4.1l-21.5,11L8.2,38.4z M51.9,30l-8.1,4.2l-13.4,6.9l-13.9-6.9L8.2,30l-8.4,4.2l8.4,4.2l22.2,11l21.5-11l8.1-4.2L51.9,30z M51.9,21.7l-8.1,4.2L35.7,30l-5.3,2.8L24.9,30l-8.4-4.1l-8.3-4.2l-8.4,4.2L8.2,30l8.3,4.2l13.9,6.9l13.4-6.9l8.1-4.2l8.1-4.1L51.9,21.7zM30.4,2.2L-0.2,17.5l8.4,4.1l8.3,4.2l8.4,4.2l5.5,2.7l5.3-2.7l8.1-4.2l8.1-4.2l8.1-4.1L30.4,2.2z', // jshint ignore:line
             tiled: 'M2.3,2.2h22.8V25H2.3V2.2z M35,2.2h22.8V25H35V2.2zM2.3,35h22.8v22.8H2.3V35z M35,35h22.8v22.8H35V35z'
         },
-        title: {
-            line: '切换为折线图',
-            bar: '切换为柱状图',
-            stack: '切换为堆叠',
-            tiled: '切换为平铺'
-        },
+        // `line`, `bar`, `stack`, `tiled`
+        title: zrUtil.clone(lang.title),
         option: {},
         seriesIndex: {}
     };

package/src/component/toolbox/feature/Restore.js

@@ -2,6 +2,7 @@ define(function(require) {
     'use strict';
 
     var history = require('../../dataZoom/history');
+    var lang = require('../../../lang').toolbox.restore;
 
     function Restore(model) {
         this.model = model;
@@ -10,7 +11,7 @@ define(function(require) {
     Restore.defaultOption = {
         show: true,
         icon: 'M3.8,33.4 M47,18.9h9.8V8.7 M56.3,20.1 C52.1,9,40.5,0.6,26.8,2.1C12.6,3.7,1.6,16.2,2.1,30.6 M13,41.1H3.1v10.2 M3.7,39.9c4.2,11.1,15.8,19.5,29.5,18 c14.2-1.6,25.2-14.1,24.7-28.5',
-        title: '还原'
+        title: lang.title
     };
 
     var proto = Restore.prototype;

package/src/component/toolbox/feature/SaveAsImage.js

@@ -1,6 +1,7 @@
 define(function (require) {
 
     var env = require('zrender/core/env');
+    var lang = require('../../../lang').toolbox.saveAsImage;
 
     function SaveAsImage (model) {
         this.model = model;
@@ -9,14 +10,14 @@ define(function (require) {
     SaveAsImage.defaultOption = {
         show: true,
         icon: 'M4.7,22.9L29.3,45.5L54.7,23.4M4.6,43.6L4.6,58L53.8,58L53.8,43.6M29.2,45.1L29.2,0',
-        title: '保存为图片',
+        title: lang.title,
         type: 'png',
         // Default use option.backgroundColor
         // backgroundColor: '#fff',
         name: '',
         excludeComponents: ['toolbox'],
         pixelRatio: 1,
-        lang: ['右键另存为图片']
+        lang: lang.lang.slice()
     };
 
     SaveAsImage.prototype.unusable = !env.canvasSupported;
@@ -49,13 +50,25 @@ define(function (require) {
         }
         // IE
         else {
-            var lang = model.get('lang');
-            var html = ''
-                + '<body style="margin:0;">'
-                + '<img src="' + url + '" style="max-width:100%;" title="' + ((lang && lang[0]) || '') + '" />'
-                + '</body>';
-            var tab = window.open();
-            tab.document.write(html);
+            if (window.navigator.msSaveOrOpenBlob) {
+                var bstr = atob(url.split(',')[1]);
+                var n = bstr.length;
+                var u8arr = new Uint8Array(n);
+                while(n--) {
+                    u8arr[n] = bstr.charCodeAt(n);
+                }
+                var blob = new Blob([u8arr]);
+                window.navigator.msSaveOrOpenBlob(blob, title + '.' + type);
+            }
+            else {
+                var lang = model.get('lang');
+                var html = '' +
+                    '<body style="margin:0;">' +
+                    '<img src="' + url + '" style="max-width:100%;" title="' + ((lang && lang[0]) || '') + '" />' +
+                    '</body>';
+                var tab = window.open();
+                tab.document.write(html);
+            }
         }
     };
 
@@ -64,4 +77,4 @@ define(function (require) {
     );
 
     return SaveAsImage;
-});
+});

package/src/component/visualMap/ContinuousModel.js

@@ -29,7 +29,8 @@ define(function(require) {
             itemWidth: null,        // The length of the other side.
             hoverLink: true,        // Enable hover highlight.
             hoverLinkDataSize: null,// The size of hovered data.
-            hoverLinkOnHandle: true // Whether trigger hoverLink when hover handle.
+            hoverLinkOnHandle: null // Whether trigger hoverLink when hover handle.
+                                    // If not specified, follow the value of `realtime`.
         },
 
         /**
@@ -38,7 +39,6 @@ define(function(require) {
         optionUpdated: function (newOption, isInit) {
             ContinuousModel.superApply(this, 'optionUpdated', arguments);
 
-            this.resetTargetSeries();
             this.resetExtent();
 
             this.resetVisual(function (mappingOption) {

package/src/component/visualMap/ContinuousView.js

@@ -606,7 +606,6 @@ define(function(require) {
                         // For hover link show when hover handle, which might be
                         // below or upper than sizeExtent.
                         pos[1] = mathMin(mathMax(0, pos[1]), itemSize[1]);
-
                         self._doHoverLinkToSeries(
                             pos[1],
                             0 <= pos[0] && pos[0] <= itemSize[0]
@@ -693,6 +692,7 @@ define(function(require) {
             }
 
             var resultBatches = modelUtil.compressBatches(oldBatch, newBatch);
+
             this._dispatchHighDown('downplay', helper.convertDataIndex(resultBatches[0]));
             this._dispatchHighDown('highlight', helper.convertDataIndex(resultBatches[1]));
         },
@@ -739,7 +739,6 @@ define(function(require) {
             this._hideIndicator();
 
             var indices = this._hoverLinkDataIndices;
-
             this._dispatchHighDown('downplay', helper.convertDataIndex(indices));
 
             indices.length = 0;
@@ -837,7 +836,8 @@ define(function(require) {
     }
 
     function useHoverLinkOnHandle(visualMapModel) {
-        return !visualMapModel.get('realtime') && visualMapModel.get('hoverLinkOnHandle');
+        var hoverLinkOnHandle = visualMapModel.get('hoverLinkOnHandle');
+        return !!(hoverLinkOnHandle == null ? visualMapModel.get('realtime') : hoverLinkOnHandle);
     }
 
     function getCursor(orient) {

package/src/component/visualMap/PiecewiseModel.js

@@ -81,7 +81,6 @@ define(function(require) {
              */
             this._pieceList = [];
 
-            this.resetTargetSeries();
             this.resetExtent();
 
             /**

package/src/component/visualMap/VisualMapModel.js

@@ -64,7 +64,8 @@ define(function(require) {
             zlevel: 0,
             z: 4,
 
-            seriesIndex: null,       // 所控制的series indices，默认所有有value的series.
+            seriesIndex: 'all',     // 'all' or null/undefined: all series.
+                                    // A number or an array of number: the specified series.
 
                                     // set min: 0, max: 200, only for campatible with ec2.
                                     // In fact min max should not have default value.
@@ -181,26 +182,31 @@ define(function(require) {
             );
         },
 
-
         /**
          * @protected
+         * @return {Array.<number>} An array of series indices.
          */
-        resetTargetSeries: function () {
-            var thisOption = this.option;
-            var allSeriesIndex = thisOption.seriesIndex == null;
-            thisOption.seriesIndex = allSeriesIndex
-                ? [] : modelUtil.normalizeToArray(thisOption.seriesIndex);
+        getTargetSeriesIndices: function () {
+            var optionSeriesIndex = this.option.seriesIndex;
+            var seriesIndices = [];
+
+            if (optionSeriesIndex == null || optionSeriesIndex === 'all') {
+                this.ecModel.eachSeries(function (seriesModel, index) {
+                    seriesIndices.push(index);
+                });
+            }
+            else {
+                seriesIndices = modelUtil.normalizeToArray(optionSeriesIndex);
+            }
 
-            allSeriesIndex && this.ecModel.eachSeries(function (seriesModel, index) {
-                thisOption.seriesIndex.push(index);
-            });
+            return seriesIndices;
         },
 
         /**
          * @public
          */
         eachTargetSeries: function (callback, context) {
-            zrUtil.each(this.option.seriesIndex, function (seriesIndex) {
+            zrUtil.each(this.getTargetSeriesIndices(), function (seriesIndex) {
                 callback.call(context, this.ecModel.getSeriesByIndex(seriesIndex));
             }, this);
         },

package/src/coord/calendar/Calendar.js

@@ -7,7 +7,7 @@ define(function (require) {
     var zrUtil = require('zrender/core/util');
 
     // (24*60*60*1000)
-    var ONE_DAY = 86400000;
+    var PROXIMATE_ONE_DAY = 86400000;
 
     /**
      * Calendar
@@ -76,7 +76,16 @@ define(function (require) {
          * get date info
          *
          * @param  {string|number} date date
-         * @return {Object}      info
+         * @return {Object}
+         * {
+         *      y: string, local full year, eg., '1940',
+         *      m: string, local month, from '01' ot '12',
+         *      d: string, local date, from '01' to '31' (if exists),
+         *      day: It is not date.getDay(). It is the location of the cell in a week, from 0 to 6,
+         *      time: timestamp,
+         *      formatedDate: string, yyyy-MM-dd,
+         *      date: original date object.
+         * }
          */
         getDateInfo: function (date) {
 
@@ -111,9 +120,10 @@ define(function (require) {
                 return this.getDateInfo(date);
             }
 
-            var time = this.getDateInfo(date).time;
+            date = new Date(this.getDateInfo(date).time);
+            date.setDate(date.getDate() + n);
 
-            return this.getDateInfo(time + ONE_DAY * n);
+            return this.getDateInfo(date);
         },
 
         update: function (ecModel, api) {
@@ -179,18 +189,18 @@ define(function (require) {
             }
 
             var week = dayInfo.day;
-            var nthWeek = this._getRangeInfo([range.start.time, date]).weeks;
+            var nthWeek = this._getRangeInfo([range.start.time, date]).nthWeek;
 
             if (this._orient === 'vertical') {
                 return [
                     this._rect.x + week * this._sw + this._sw / 2,
-                    this._rect.y + (nthWeek - 1) * this._sh + this._sh / 2
+                    this._rect.y + nthWeek * this._sh + this._sh / 2
                 ];
 
             }
 
             return [
-                this._rect.x + (nthWeek - 1) * this._sw + this._sw / 2,
+                this._rect.x + nthWeek * this._sw + this._sw / 2,
                 this._rect.y + week * this._sh + this._sh / 2
             ];
 
@@ -328,25 +338,60 @@ define(function (require) {
          *
          * @private
          * @param  {Array} range range ['2017-01-01', '2017-07-08']
+         *  If range[0] > range[1], they will not be reversed.
          * @return {Object}       obj
          */
         _getRangeInfo: function (range) {
+            range = [
+                this.getDateInfo(range[0]),
+                this.getDateInfo(range[1])
+            ];
 
-            var start = this.getDateInfo(range[0]);
-            var end = this.getDateInfo(range[1]);
+            var reversed;
+            if (range[0].time > range[1].time) {
+                reversed = true;
+                range.reverse();
+            }
 
-            var allDay = Math.floor(end.time / ONE_DAY) - Math.floor(start.time / ONE_DAY) + 1;
+            var allDay = Math.floor(range[1].time / PROXIMATE_ONE_DAY)
+                - Math.floor(range[0].time / PROXIMATE_ONE_DAY) + 1;
+
+            // Consider case:
+            // Firstly set system timezone as "Time Zone: America/Toronto",
+            // ```
+            // var first = new Date(1478412000000 - 3600 * 1000 * 2.5);
+            // var second = new Date(1478412000000);
+            // var allDays = Math.floor(second / ONE_DAY) - Math.floor(first / ONE_DAY) + 1;
+            // ```
+            // will get wrong result because of DST. So we should fix it.
+            var date = new Date(range[0].time);
+            var startDateNum = date.getDate();
+            var endDateNum = range[1].date.getDate();
+            date.setDate(startDateNum + allDay - 1);
+            // The bias can not over a month, so just compare date.
+            if (date.getDate() !== endDateNum) {
+                var sign = date.getTime() - range[1].time > 0 ? 1 : -1;
+                while (date.getDate() !== endDateNum && (date.getTime() - range[1].time) * sign > 0) {
+                    allDay -= sign;
+                    date.setDate(startDateNum + allDay - 1);
+                }
+            }
+
+            var weeks = Math.floor((allDay + range[0].day + 6) / 7);
+            var nthWeek = reversed ? -weeks + 1: weeks - 1;
 
-            var weeks = Math.floor((allDay + start.day + 6) / 7);
+            reversed && range.reverse();
 
             return {
-                range: [start.formatedDate, end.formatedDate],
-                start: start,
-                end: end,
+                range: [range[0].formatedDate, range[1].formatedDate],
+                start: range[0],
+                end: range[1],
                 allDay: allDay,
                 weeks: weeks,
-                fweek: start.day,
-                lweek: end.day
+                // From 0.
+                nthWeek: nthWeek,
+                fweek: range[0].day,
+                lweek: range[1].day
             };
         },
 
@@ -370,11 +415,10 @@ define(function (require) {
             }
 
             var nthDay = (nthWeek - 1) * 7 - rangeInfo.fweek + day;
+            var date = new Date(rangeInfo.start.time);
+            date.setDate(rangeInfo.start.d + nthDay);
 
-            var time = rangeInfo.start.time + nthDay * ONE_DAY;
-
-            return this.getDateInfo(time);
-
+            return this.getDateInfo(date);
         }
     };
 

package/src/echarts.js

@@ -44,12 +44,13 @@ define(function (require) {
     var modelUtil = require('./util/model');
     var throttle = require('./util/throttle');
 
-    var zrender = require('zrender');
+    var zrender = require('zrender/zrender');
     var zrUtil = require('zrender/core/util');
     var colorTool = require('zrender/tool/color');
     var Eventful = require('zrender/mixin/Eventful');
     var timsort = require('zrender/core/timsort');
 
+
     var each = zrUtil.each;
     var parseClassType = ComponentModel.parseClassType;
 
@@ -75,6 +76,7 @@ define(function (require) {
     var OPTION_UPDATED = '__optionUpdated';
     var ACTION_REG = /^[a-zA-Z0-9_]+$/;
 
+
     function createRegisterEventWithLowercaseName(method) {
         return function (eventName, handler, context) {
             // Event name is all lowercase
@@ -1524,9 +1526,9 @@ define(function (require) {
         /**
          * @type {number}
          */
-        version: '3.7.1',
+        version: '3.7.2',
         dependencies: {
-            zrender: '3.6.1'
+            zrender: '3.6.2'
         }
     };
 
@@ -1958,7 +1960,6 @@ define(function (require) {
         update: 'downplay'
     }, zrUtil.noop);
 
-
     // --------
     // Exports
     // --------

package/src/lang.js

@@ -0,0 +1,43 @@
+define(function(require) {
+
+    return {
+        toolbox: {
+            brush: {
+                title: {
+                    rect: '矩形选择',
+                    polygon: '圈选',
+                    lineX: '横向选择',
+                    lineY: '纵向选择',
+                    keep: '保持选择',
+                    clear: '清除选择'
+                }
+            },
+            dataView: {
+                title: '数据视图',
+                lang: ['数据视图', '关闭', '刷新']
+            },
+            dataZoom: {
+                title: {
+                    zoom: '区域缩放',
+                    back: '区域缩放还原'
+                }
+            },
+            magicType: {
+                title: {
+                    line: '切换为折线图',
+                    bar: '切换为柱状图',
+                    stack: '切换为堆叠',
+                    tiled: '切换为平铺'
+                }
+            },
+            restore: {
+                title: '还原'
+            },
+            saveAsImage: {
+                title: '保存为图片',
+                lang: ['右键另存为图片']
+            }
+        }
+    };
+
+});

package/src/langEN.js

@@ -0,0 +1,43 @@
+define(function(require) {
+
+    return {
+        toolbox: {
+            brush: {
+                title: {
+                    rect: 'Box Select',
+                    polygon: 'Lasso Select',
+                    lineX: 'Horizontally Select',
+                    lineY: 'Vertically Select',
+                    keep: 'Keep Selections',
+                    clear: 'Clear Selections'
+                }
+            },
+            dataView: {
+                title: 'Data View',
+                lang: ['Data View', 'Close', 'Refresh']
+            },
+            dataZoom: {
+                title: {
+                    zoom: 'Zoom',
+                    back: 'Zoom Reset'
+                }
+            },
+            magicType: {
+                title: {
+                    line: 'Switch to Line Chart',
+                    bar: 'Switch to Bar Chart',
+                    stack: 'Stack',
+                    tiled: 'Tile'
+                }
+            },
+            restore: {
+                title: 'Restore'
+            },
+            saveAsImage: {
+                title: 'Save as Image',
+                lang: ['Right Click to Save Image']
+            }
+        }
+    };
+
+});

package/src/preprocessor/helper/compatStyle.js

@@ -97,30 +97,31 @@ define(function (require) {
                 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/src/scale/Time.js

@@ -77,7 +77,7 @@ define(function (require) {
             // 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 @@ define(function (require) {
          * @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 @@ define(function (require) {
                 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);