echarts 3.6.1 → 3.7.2

package/lib/coord/axisHelper.js

@@ -79,9 +79,22 @@
         if (min === 'dataMin') {
             min = originalExtent[0];
         }
+        else if (typeof min === 'function') {
+            min = min({
+                min: originalExtent[0],
+                max: originalExtent[1]
+            });
+        }
+
         if (max === 'dataMax') {
             max = originalExtent[1];
         }
+        else if (typeof max === 'function') {
+            max = max({
+                min: originalExtent[0],
+                max: originalExtent[1]
+            });
+        }
 
         (min == null || !isFinite(min)) && (min = NaN);
         (max == null || !isFinite(max)) && (max = NaN);
@@ -113,12 +126,16 @@
             scale.base = model.get('logBase');
         }
 
+        var scaleType = scale.type;
         scale.setExtent(extent[0], extent[1]);
         scale.niceExtent({
             splitNumber: splitNumber,
             fixMin: fixMin,
             fixMax: fixMax,
-            minInterval: scale.type === 'interval' ? model.get('minInterval') : null
+            minInterval: (scaleType === 'interval' || scaleType === 'time')
+                ? model.get('minInterval') : null,
+            maxInterval: (scaleType === 'interval' || scaleType === 'time')
+                ? model.get('maxInterval') : null
         });
 
         // If some one specified the min, max. And the default calculated interval

package/lib/coord/axisModelCommonMixin.js

@@ -42,7 +42,12 @@
             var min = (!origin && option.rangeStart != null)
                 ? option.rangeStart : option.min;
 
-            if (this.axis && min != null && min !== 'dataMin' && !zrUtil.eqNaN(min)) {
+            if (this.axis
+                && min != null
+                && min !== 'dataMin'
+                && typeof min !== 'function'
+                && !zrUtil.eqNaN(min)
+            ) {
                 min = this.axis.scale.parse(min);
             }
             return min;
@@ -57,7 +62,12 @@
             var max = (!origin && option.rangeEnd != null)
                 ? option.rangeEnd : option.max;
 
-            if (this.axis && max != null && max !== 'dataMax' && !zrUtil.eqNaN(max)) {
+            if (this.axis
+                && max != null
+                && max !== 'dataMax'
+                && typeof max !== 'function'
+                && !zrUtil.eqNaN(max)
+            ) {
                 max = this.axis.scale.parse(max);
             }
             return max;

package/lib/coord/calendar/Calendar.js

@@ -6,7 +6,7 @@
     var zrUtil = require('zrender/lib/core/util');
 
     // (24*60*60*1000)
-    var ONE_DAY = 86400000;
+    var PROXIMATE_ONE_DAY = 86400000;
 
     /**
      * Calendar
@@ -75,7 +75,16 @@
          * 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) {
 
@@ -110,9 +119,10 @@
                 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) {
@@ -178,18 +188,18 @@
             }
 
             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
             ];
 
@@ -255,7 +265,7 @@
         /**
          * Convert a (x, y) point to time date
          *
-         * @param  {string} point point
+         * @param  {Array} point point
          * @return {Object}       date
          */
         pointToDate: function (point) {
@@ -327,25 +337,60 @@
          *
          * @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 reversed;
+            if (range[0].time > range[1].time) {
+                reversed = true;
+                range.reverse();
+            }
 
-            var start = this.getDateInfo(range[0]);
-            var end = this.getDateInfo(range[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 allDay = Math.floor(end.time / ONE_DAY) - Math.floor(start.time / ONE_DAY) + 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
             };
         },
 
@@ -369,11 +414,10 @@
             }
 
             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/lib/coord/calendar/CalendarModel.js

@@ -55,9 +55,7 @@
                 position: 'start',
                 margin: '50%', // 50% of cellSize
                 nameMap: 'en',
-                textStyle: {
-                    color: '#000'
-                }
+                color: '#000'
             },
 
             // month text style
@@ -74,9 +72,7 @@
                 // cn en []
                 nameMap: 'en',
                 formatter: null,
-                textStyle: {
-                    color: '#000'
-                }
+                color: '#000'
             },
 
             // year text style
@@ -87,12 +83,10 @@
                 position: null,
                 margin: 30,
                 formatter: null,
-                textStyle: {
-                    color: '#ccc',
-                    fontFamily: 'sans-serif',
-                    fontWeight: 'bolder',
-                    fontSize: 20
-                }
+                color: '#ccc',
+                fontFamily: 'sans-serif',
+                fontWeight: 'bolder',
+                fontSize: 20
             }
         },
 

package/lib/coord/cartesian/Cartesian2D.js

@@ -54,20 +54,6 @@
                 && this.getAxis('y').containData(data[1]);
         },
 
-        /**
-         * Convert series data to an array of points
-         * @param {module:echarts/data/List} data
-         * @param {boolean} stack
-         * @return {Array}
-         *  Return array of points. For example:
-         *  `[[10, 10], [20, 20], [30, 30]]`
-         */
-        dataToPoints: function (data, stack) {
-            return data.mapArray(['x', 'y'], function (x, y) {
-                return this.dataToPoint([x, y]);
-            }, stack, this);
-        },
-
         /**
          * @param {Array.<number>} data
          * @param {boolean} [clamp=false]

package/lib/coord/cartesian/Grid.js

@@ -31,7 +31,7 @@ var factory = exports;
     function getLabelUnionRect(axis) {
         var axisModel = axis.model;
         var labels = axisModel.getFormattedLabels();
-        var textStyleModel = axisModel.getModel('axisLabel.textStyle');
+        var axisLabelModel = axisModel.getModel('axisLabel');
         var rect;
         var step = 1;
         var labelCount = labels.length;
@@ -41,7 +41,7 @@ var factory = exports;
         }
         for (var i = 0; i < labelCount; i += step) {
             if (!axis.isLabelIgnored(i)) {
-                var singleRect = textStyleModel.getTextRect(labels[i]);
+                var singleRect = axisLabelModel.getTextRect(labels[i]);
                 // FIXME consider label rotate
                 rect ? rect.union(singleRect) : (rect = singleRect);
             }
@@ -95,40 +95,17 @@ var factory = exports;
 
         this._updateScale(ecModel, this.model);
 
-        function ifAxisCanNotOnZero(otherAxisDim) {
-            var axes = axesMap[otherAxisDim];
-            for (var idx in axes) {
-                if (axes.hasOwnProperty(idx)) {
-                    var axis = axes[idx];
-                    if (axis && (
-                        axis.type === 'category' || axis.type === 'time' || !ifAxisCrossZero(axis)
-                    )) {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-
         each(axesMap.x, function (xAxis) {
             niceScaleExtent(xAxis.scale, xAxis.model);
         });
         each(axesMap.y, function (yAxis) {
             niceScaleExtent(yAxis.scale, yAxis.model);
         });
-        // Fix configuration
         each(axesMap.x, function (xAxis) {
-            // onZero can not be enabled in these two situations
-            // 1. When any other axis is a category axis
-            // 2. When any other axis not across 0 point
-            if (ifAxisCanNotOnZero('y')) {
-                xAxis.onZero = false;
-            }
+            fixAxisOnZero(axesMap, 'y', xAxis);
         });
         each(axesMap.y, function (yAxis) {
-            if (ifAxisCanNotOnZero('x')) {
-                yAxis.onZero = false;
-            }
+            fixAxisOnZero(axesMap, 'x', yAxis);
         });
 
         // Resize again if containLabel is enabled
@@ -136,6 +113,47 @@ var factory = exports;
         this.resize(this.model, api);
     };
 
+    function fixAxisOnZero(axesMap, otherAxisDim, axis) {
+        // onZero can not be enabled in these two situations:
+        // 1. When any other axis is a category axis.
+        // 2. When no axis is cross 0 point.
+        var axes = axesMap[otherAxisDim];
+
+        if (!axis.onZero) {
+            return;
+        }
+
+        var onZeroAxisIndex = axis.onZeroAxisIndex;
+
+        // If target axis is specified.
+        if (onZeroAxisIndex != null) {
+            var otherAxis = axes[onZeroAxisIndex];
+            if (otherAxis && canNotOnZeroToAxis(otherAxis)) {
+                axis.onZero = false;
+            }
+            return;
+        }
+
+        for (var idx in axes) {
+            if (axes.hasOwnProperty(idx)) {
+                var otherAxis = axes[idx];
+                if (otherAxis && !canNotOnZeroToAxis(otherAxis)) {
+                    onZeroAxisIndex = +idx;
+                    break;
+                }
+            }
+        }
+
+        if (onZeroAxisIndex == null) {
+            axis.onZero = false;
+        }
+        axis.onZeroAxisIndex = onZeroAxisIndex;
+    }
+
+    function canNotOnZeroToAxis(axis) {
+        return axis.type === 'category' || axis.type === 'time' || !ifAxisCrossZero(axis);
+    }
+
     /**
      * Resize the grid
      * @param {module:echarts/coord/cartesian/GridModel} gridModel
@@ -190,7 +208,7 @@ var factory = exports;
 
     /**
      * @param {string} axisType
-     * @param {ndumber} [axisIndex]
+     * @param {number} [axisIndex]
      */
     gridProto.getAxis = function (axisType, axisIndex) {
         var axesMapOnDim = this._axesMap[axisType];
@@ -417,6 +435,7 @@ var factory = exports;
                 axis.inverse = axisModel.get('inverse');
 
                 axis.onZero = axisModel.get('axisLine.onZero');
+                axis.onZeroAxisIndex = axisModel.get('axisLine.onZeroAxisIndex');
 
                 // Inject axis into axisModel
                 axisModel.axis = axis;

package/lib/coord/geo/Geo.js

@@ -13,7 +13,8 @@
     var geoFixFuncs = [
         require('./fix/nanhai'),
         require('./fix/textCoord'),
-        require('./fix/geoCoord')
+        require('./fix/geoCoord'),
+        require('./fix/diaoyuIsland')
     ];
 
     /**
@@ -191,23 +192,6 @@
             return (this._rect = rect || new BoundingRect(0, 0, 0, 0));
         },
 
-        /**
-         * Convert series data to a list of points
-         * @param {module:echarts/data/List} data
-         * @param {boolean} stack
-         * @return {Array}
-         *  Return list of points. For example:
-         *  `[[10, 10], [20, 20], [30, 30]]`
-         */
-        dataToPoints: function (data) {
-            var item = [];
-            return data.mapArray(['lng', 'lat'], function (lon, lat) {
-                item[0] = lon;
-                item[1] = lat;
-                return this.dataToPoint(item);
-            }, this);
-        },
-
         /**
          * @param {string|Array.<number>} data
          * @return {Array.<number>}

package/lib/coord/geo/GeoModel.js

@@ -23,17 +23,15 @@
         init: function (option) {
             ComponentModel.prototype.init.apply(this, arguments);
 
-            // Default label emphasis `position` and `show`
-            modelUtil.defaultEmphasis(
-                option.label, ['position', 'show', 'textStyle', 'distance', 'formatter']
-            );
+            // Default label emphasis `show`
+            modelUtil.defaultEmphasis(option.label, ['show']);
         },
 
         optionUpdated: function () {
             var option = this.option;
             var self = this;
 
-            option.regions = geoCreator.getFilledRegions(option.regions, option.map);
+            option.regions = geoCreator.getFilledRegions(option.regions, option.map, option.nameMap);
 
             this._optionModelMap = zrUtil.reduce(option.regions || [], function (optionModelMap, regionOpt) {
                 if (regionOpt.name) {
@@ -95,15 +93,11 @@
             label: {
                 normal: {
                     show: false,
-                    textStyle: {
-                        color: '#000'
-                    }
+                    color: '#000'
                 },
                 emphasis: {
                     show: true,
-                    textStyle: {
-                        color: 'rgb(100,0,0)'
-                    }
+                    color: 'rgb(100,0,0)'
                 }
             },
 
@@ -148,8 +142,7 @@
                 return formatter(params);
             }
             else if (typeof formatter === 'string') {
-                var serName = params.seriesName;
-                return formatter.replace('{a}', serName != null ? serName : '');
+                return formatter.replace('{a}', name != null ? name : '');
             }
         },
 

package/lib/coord/geo/fix/diaoyuIsland.js

@@ -0,0 +1,30 @@
+// Fix for 钓鱼岛
+
+
+    // var Region = require('../Region');
+    // var zrUtil = require('zrender/lib/core/util');
+
+    // var geoCoord = [126, 25];
+
+    var points = [
+        [
+            [123.45165252685547, 25.73527164402261],
+            [123.49731445312499, 25.73527164402261],
+            [123.49731445312499, 25.750734064600884],
+            [123.45165252685547, 25.750734064600884],
+            [123.45165252685547, 25.73527164402261]
+        ]
+    ];
+    module.exports = function (geo) {
+        if (geo.map === 'china') {
+            for (var i = 0, len = geo.regions.length; i < len; ++i) {
+                if (geo.regions[i].name === '台湾') {
+                    geo.regions[i].geometries.push({
+                        type: 'polygon',
+                        exterior: points[0]
+                    });
+                }
+            }
+        }
+    };
+

package/lib/coord/geo/geoCreator.js

@@ -245,11 +245,13 @@
          * Fill given regions array
          * @param  {Array.<Object>} originRegionArr
          * @param  {string} mapName
+         * @param  {Object} [nameMap]
          * @return {Array}
          */
-        getFilledRegions: function (originRegionArr, mapName) {
+        getFilledRegions: function (originRegionArr, mapName, nameMap) {
             // Not use the original
             var regionsArr = (originRegionArr || []).slice();
+            nameMap = nameMap || {};
 
             var map = geoCreator.getMap(mapName);
             var geoJson = map && map.geoJson;
@@ -269,6 +271,9 @@
             for (var i = 0; i < features.length; i++) {
                 var name = features[i].properties.name;
                 if (!dataNameMap.get(name)) {
+                    if (nameMap.hasOwnProperty(name)) {
+                        name = nameMap[name];
+                    }
                     regionsArr.push({
                         name: name
                     });

package/lib/coord/polar/Polar.js

@@ -163,19 +163,6 @@
             };
         },
 
-        /**
-         * Convert series data to a list of (x, y) points
-         * @param {module:echarts/data/List} data
-         * @return {Array}
-         *  Return list of coordinates. For example:
-         *  `[[10, 10], [20, 20], [30, 30]]`
-         */
-        dataToPoints: function (data) {
-            return data.mapArray(this.dimensions, function (radius, angle) {
-                return this.dataToPoint([radius, angle]);
-            }, true, this);
-        },
-
         /**
          * Convert a single data item to (x, y) point.
          * Parameter data is an array which the first element is radius and the second is angle

package/lib/coord/radar/Radar.js

@@ -162,7 +162,7 @@
 
             if (fixedMin != null && fixedMax != null) {
                 // User set min, max, divide to get new interval
-                // FIXME precision
+                scale.setExtent(+fixedMin, +fixedMax);
                 scale.setInterval(
                     (fixedMax - fixedMin) / splitNumber
                 );

package/lib/coord/radar/RadarModel.js

@@ -25,7 +25,7 @@
             var axisLine = this.get('axisLine');
             var axisTick = this.get('axisTick');
             var axisLabel = this.get('axisLabel');
-            var nameTextStyle = this.get('name.textStyle');
+            var nameTextStyle = this.get('name');
             var showName = this.get('name.show');
             var nameFormatter = this.get('name.formatter');
             var nameGap = this.get('nameGap');
@@ -39,6 +39,10 @@
                 else if (indicatorOpt.min != null && indicatorOpt.min < 0 && !indicatorOpt.max) {
                     indicatorOpt.max = 0;
                 }
+                var iNameTextStyle = nameTextStyle;
+                if(indicatorOpt.color != null) {
+                    iNameTextStyle = zrUtil.defaults({color: indicatorOpt.color}, nameTextStyle);
+                }
                 // Use same configuration
                 indicatorOpt = zrUtil.merge(zrUtil.clone(indicatorOpt), {
                     boundaryGap: boundaryGap,
@@ -52,7 +56,7 @@
                     nameLocation: 'end',
                     nameGap: nameGap,
                     // min: 0,
-                    nameTextStyle: nameTextStyle,
+                    nameTextStyle: iNameTextStyle,
                     triggerEvent: triggerEvent
                 }, false);
                 if (!showName) {

package/lib/data/DataDiffer.js

@@ -5,12 +5,21 @@
         return item;
     }
 
-    function DataDiffer(oldArr, newArr, oldKeyGetter, newKeyGetter) {
+    /**
+     * @param {Array} oldArr
+     * @param {Array} newArr
+     * @param {Function} oldKeyGetter
+     * @param {Function} newKeyGetter
+     * @param {Object} [context] Can be visited by this.context in callback.
+     */
+    function DataDiffer(oldArr, newArr, oldKeyGetter, newKeyGetter, context) {
         this._old = oldArr;
         this._new = newArr;
 
         this._oldKeyGetter = oldKeyGetter || defaultKeyGetter;
         this._newKeyGetter = newKeyGetter || defaultKeyGetter;
+
+        this.context = context;
     }
 
     DataDiffer.prototype = {
@@ -44,8 +53,6 @@
         execute: function () {
             var oldArr = this._old;
             var newArr = this._new;
-            var oldKeyGetter = this._oldKeyGetter;
-            var newKeyGetter = this._newKeyGetter;
 
             var oldDataIndexMap = {};
             var newDataIndexMap = {};
@@ -53,8 +60,8 @@
             var newDataKeyArr = [];
             var i;
 
-            initIndexMap(oldArr, oldDataIndexMap, oldDataKeyArr, oldKeyGetter);
-            initIndexMap(newArr, newDataIndexMap, newDataKeyArr, newKeyGetter);
+            initIndexMap(oldArr, oldDataIndexMap, oldDataKeyArr, '_oldKeyGetter', this);
+            initIndexMap(newArr, newDataIndexMap, newDataKeyArr, '_newKeyGetter', this);
 
             // Travel by inverted order to make sure order consistency
             // when duplicate keys exists (consider newDataIndex.pop() below).
@@ -103,10 +110,10 @@
         }
     };
 
-    function initIndexMap(arr, map, keyArr, keyGetter) {
+    function initIndexMap(arr, map, keyArr, keyGetterName, dataDiffer) {
         for (var i = 0; i < arr.length; i++) {
             // Add prefix to avoid conflict with Object.prototype.
-            var key = '_ec_' + keyGetter(arr[i], i);
+            var key = '_ec_' + dataDiffer[keyGetterName](arr[i], i);
             var existence = map[key];
             if (existence == null) {
                 keyArr.push(key);

package/lib/data/Graph.js

@@ -87,6 +87,9 @@
         var nodesMap = this._nodesMap;
 
         if (nodesMap[generateNodeKey(id)]) {
+            if (__DEV__) {
+                console.error('Graph nodes have duplicate name or id');
+            }
             return;
         }