echarts 3.5.1 → 3.6.0

package/lib/util/graphic.js

@@ -4,11 +4,16 @@
     var zrUtil = require('zrender/lib/core/util');
 
     var pathTool = require('zrender/lib/tool/path');
-    var round = Math.round;
     var Path = require('zrender/lib/graphic/Path');
     var colorTool = require('zrender/lib/tool/color');
     var matrix = require('zrender/lib/core/matrix');
     var vector = require('zrender/lib/core/vector');
+    var Transformable = require('zrender/lib/mixin/Transformable');
+    var BoundingRect = require('zrender/lib/core/BoundingRect');
+
+    var round = Math.round;
+    var mathMax = Math.max;
+    var mathMin = Math.min;
 
     var graphic = {};
 
@@ -42,7 +47,7 @@
 
     graphic.RadialGradient = require('zrender/lib/graphic/RadialGradient');
 
-    graphic.BoundingRect = require('zrender/lib/core/BoundingRect');
+    graphic.BoundingRect = BoundingRect;
 
     /**
      * Extend shape with parameters
@@ -404,6 +409,17 @@
         });
     };
 
+    graphic.getFont = function (opt, ecModel) {
+        var gTextStyleModel = ecModel && ecModel.getModel('textStyle');
+        return [
+            // FIXME in node-canvas fontWeight is before fontStyle
+            opt.fontStyle || gTextStyleModel && gTextStyleModel.getShallow('fontStyle') || '',
+            opt.fontWeight || gTextStyleModel && gTextStyleModel.getShallow('fontWeight') || '',
+            (opt.fontSize || gTextStyleModel && gTextStyleModel.getShallow('fontSize') || 12) + 'px',
+            opt.fontFamily || gTextStyleModel && gTextStyleModel.getShallow('fontFamily') || 'sans-serif'
+        ].join(' ');
+    };
+
     function animateOrSetProps(isUpdate, el, props, animatableModel, dataIndex, cb) {
         if (typeof dataIndex === 'function') {
             cb = dataIndex;
@@ -433,9 +449,10 @@
 
             duration > 0
                 ? el.animateTo(props, duration, animationDelay || 0, animationEasing, cb)
-                : (el.attr(props), cb && cb());
+                : (el.stopAnimation(), el.attr(props), cb && cb());
         }
         else {
+            el.stopAnimation();
             el.attr(props);
             cb && cb();
         }
@@ -493,16 +510,22 @@
 
     /**
      * Apply transform to an vertex.
-     * @param {Array.<number>} vertex [x, y]
-     * @param {Array.<number>} transform Transform matrix: like [1, 0, 0, 1, 0, 0]
+     * @param {Array.<number>} target [x, y]
+     * @param {Array.<number>|TypedArray.<number>|Object} transform Can be:
+     *      + Transform matrix: like [1, 0, 0, 1, 0, 0]
+     *      + {position, rotation, scale}, the same as `zrender/Transformable`.
      * @param {boolean=} invert Whether use invert matrix.
      * @return {Array.<number>} [x, y]
      */
-    graphic.applyTransform = function (vertex, transform, invert) {
+    graphic.applyTransform = function (target, transform, invert) {
+        if (transform && !zrUtil.isArrayLike(transform)) {
+            transform = Transformable.getLocalTransform(transform);
+        }
+
         if (invert) {
             transform = matrix.invert([], transform);
         }
-        return vector.applyTransform([], vertex, transform);
+        return vector.applyTransform([], target, transform);
     };
 
     /**
@@ -532,7 +555,8 @@
     };
 
     /**
-     * Apply group transition animation from g1 to g2
+     * Apply group transition animation from g1 to g2.
+     * If no animatableModel, no animation.
      */
     graphic.groupTransition = function (g1, g2, animatableModel, cb) {
         if (!g1 || !g2) {
@@ -577,5 +601,43 @@
         });
     };
 
+    /**
+     * @param {Array.<Array.<number>>} points Like: [[23, 44], [53, 66], ...]
+     * @param {Object} rect {x, y, width, height}
+     * @return {Array.<Array.<number>>} A new clipped points.
+     */
+    graphic.clipPointsByRect = function (points, rect) {
+        return zrUtil.map(points, function (point) {
+            var x = point[0];
+            x = mathMax(x, rect.x);
+            x = mathMin(x, rect.x + rect.width);
+            var y = point[1];
+            y = mathMax(y, rect.y);
+            y = mathMin(y, rect.y + rect.height);
+            return [x, y];
+        });
+    };
+
+    /**
+     * @param {Object} targetRect {x, y, width, height}
+     * @param {Object} rect {x, y, width, height}
+     * @return {Object} A new clipped rect. If rect size are negative, return undefined.
+     */
+    graphic.clipRectByRect = function (targetRect, rect) {
+        var x = mathMax(targetRect.x, rect.x);
+        var x2 = mathMin(targetRect.x + targetRect.width, rect.x + rect.width);
+        var y = mathMax(targetRect.y, rect.y);
+        var y2 = mathMin(targetRect.y + targetRect.height, rect.y + rect.height);
+
+        if (x2 >= x && y2 >= y) {
+            return {
+                x: x,
+                y: y,
+                width: x2 - x,
+                height: y2 - y
+            };
+        }
+    };
+
     module.exports = graphic;
 

package/lib/util/layout.js

@@ -405,9 +405,13 @@
             });
 
             if (ignoreSize[hvIdx]) {
-                // Only one of left/height is premitted to exist.
-                hasValue(newOption, names[2]) && (merged[names[1]] = null);
-                hasValue(newOption, names[1]) && (merged[names[2]] = null);
+                // Only one of left/right is premitted to exist.
+                if (hasValue(newOption, names[1])) {
+                    merged[names[2]] = null;
+                }
+                else if (hasValue(newOption, names[2])) {
+                    merged[names[1]] = null;
+                }
                 return merged;
             }
 

package/lib/util/model.js

@@ -145,6 +145,7 @@
             var rawDataIndex = data.getRawIndex(dataIndex);
             var name = data.getName(dataIndex, true);
             var itemOpt = data.getRawDataItem(dataIndex);
+            var color = data.getItemVisual(dataIndex, 'color');
 
             return {
                 componentType: this.mainType,
@@ -158,7 +159,8 @@
                 data: itemOpt,
                 dataType: dataType,
                 value: rawValue,
-                color: data.getItemVisual(dataIndex, 'color'),
+                color: color,
+                marker: formatUtil.getTooltipMarker(color),
 
                 // Param name list for mapping `a`, `b`, `c`, `d`, `e`
                 $vars: ['seriesName', 'name', 'value']
@@ -333,22 +335,22 @@
         // to specify multi components (like series) by one name.
 
         // Ensure that each id is distinct.
-        var idMap = {};
+        var idMap = zrUtil.createHashMap();
 
         each(mapResult, function (item, index) {
             var existCpt = item.exist;
-            existCpt && (idMap[existCpt.id] = item);
+            existCpt && idMap.set(existCpt.id, item);
         });
 
         each(mapResult, function (item, index) {
             var opt = item.option;
 
             zrUtil.assert(
-                !opt || opt.id == null || !idMap[opt.id] || idMap[opt.id] === item,
+                !opt || opt.id == null || !idMap.get(opt.id) || idMap.get(opt.id) === item,
                 'id duplicates: ' + (opt && opt.id)
             );
 
-            opt && opt.id != null && (idMap[opt.id] = item);
+            opt && opt.id != null && idMap.set(opt.id, item);
             !item.keyInfo && (item.keyInfo = {});
         });
 
@@ -388,10 +390,10 @@
                 do {
                     keyInfo.id = '\0' + keyInfo.name + '\0' + idNum++;
                 }
-                while (idMap[keyInfo.id]);
+                while (idMap.get(keyInfo.id));
             }
 
-            idMap[keyInfo.id] = item;
+            idMap.set(keyInfo.id, item);
         });
     };
 
@@ -597,6 +599,60 @@
         return result;
     };
 
+    /**
+     * @see {module:echarts/data/helper/completeDimensions}
+     * @param {module:echarts/data/List} data
+     * @param {string|number} dataDim
+     * @return {string}
+     */
+    modelUtil.dataDimToCoordDim = function (data, dataDim) {
+        var dimensions = data.dimensions;
+        dataDim = data.getDimension(dataDim);
+        for (var i = 0; i < dimensions.length; i++) {
+            var dimItem = data.getDimensionInfo(dimensions[i]);
+            if (dimItem.name === dataDim) {
+                return dimItem.coordDim;
+            }
+        }
+    };
+
+    /**
+     * @see {module:echarts/data/helper/completeDimensions}
+     * @param {module:echarts/data/List} data
+     * @param {string} coordDim
+     * @return {Array.<string>} data dimensions on the coordDim.
+     */
+    modelUtil.coordDimToDataDim = function (data, coordDim) {
+        var dataDim = [];
+        each(data.dimensions, function (dimName) {
+            var dimItem = data.getDimensionInfo(dimName);
+            if (dimItem.coordDim === coordDim) {
+                dataDim[dimItem.coordDimIndex] = dimItem.name;
+            }
+        });
+        return dataDim;
+    };
+
+    /**
+     * @see {module:echarts/data/helper/completeDimensions}
+     * @param {module:echarts/data/List} data
+     * @param {string} otherDim Can be `otherDims`
+     *                        like 'label' or 'tooltip'.
+     * @return {Array.<string>} data dimensions on the otherDim.
+     */
+    modelUtil.otherDimToDataDim = function (data, otherDim) {
+        var dataDim = [];
+        each(data.dimensions, function (dimName) {
+            var dimItem = data.getDimensionInfo(dimName);
+            var otherDims = dimItem.otherDims;
+            var dimIndex = otherDims[otherDim];
+            if (dimIndex != null && dimIndex !== false) {
+                dataDim[dimIndex] = dimItem.name;
+            }
+        });
+        return dataDim;
+    };
+
     function has(obj, prop) {
         return obj && obj.hasOwnProperty(prop);
     }

package/lib/util/number.js

@@ -102,7 +102,9 @@
     };
 
     /**
-     * Fix rounding error of float numbers
+     * (1) Fix rounding error of float numbers.
+     * (2) Support return string to avoid scientific notation like '3.5e-7'.
+     *
      * @param {number} x
      * @param {number} [precision]
      * @param {boolean} [returnStr]
@@ -147,17 +149,28 @@
         return count;
     };
 
+    /**
+     * @param {string|number} val
+     * @return {number}
+     */
     number.getPrecisionSafe = function (val) {
         var str = val.toString();
-        var dotIndex = str.indexOf('.');
-        if (dotIndex < 0) {
-            return 0;
+
+        // Consider scientific notation: '3.4e-12' '3.4e+12'
+        var eIndex = str.indexOf('e');
+        if (eIndex > 0) {
+            var precision = +str.slice(eIndex + 1);
+            return precision < 0 ? -precision : 0;
+        }
+        else {
+            var dotIndex = str.indexOf('.');
+            return dotIndex < 0 ? 0 : str.length - 1 - dotIndex;
         }
-        return str.length - 1 - dotIndex;
     };
 
     /**
      * Minimal dicernible data precisioin according to a single pixel.
+     *
      * @param {Array.<number>} dataExtent
      * @param {Array.<number>} pixelExtent
      * @return {number} precision
@@ -193,8 +206,14 @@
         return val > -RADIAN_EPSILON && val < RADIAN_EPSILON;
     };
 
-    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
-    var TIMEZONE_OFFSET = (new Date()).getTimezoneOffset();
+    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
+
+    /**
+     * @return {number} in minutes
+     */
+    number.getTimezoneOffset = function () {
+        return (new Date()).getTimezoneOffset();
+    };
 
     /**
      * @param {string|Date|number} value These values can be accepted:
@@ -203,9 +222,9 @@
      *     + only year, month, date: '2012-03', '2012-03-01', '2012-03-01 05', '2012-03-01 05:06',
      *     + separated with T or space: '2012-03-01T12:22:33.123', '2012-03-01 12:22:33.123',
      *     + time zone: '2012-03-01T12:22:33Z', '2012-03-01T12:22:33+8000', '2012-03-01T12:22:33-05:00',
-     *     all of which will be treated as they reperent a time in UTC
-     *     if time zone is not specified.
-     *   + Or other string format, including:
+     *     all of which will be treated as local time if time zone is not specified
+     *     (see <https://momentjs.com/>).
+     *   + Or other string format, including (all of which will be treated as loacal time):
      *     '2012', '2012-3-1', '2012/3/1', '2012/03/01',
      *     '2009/6/12 2:00', '2009/6/12 2:05:08', '2009/6/12 2:05:08.123'
      *   + a timestamp, which represent a time in UTC.
@@ -228,6 +247,13 @@
                 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(
@@ -235,7 +261,7 @@
                 +(match[2] || 1) - 1,
                 +match[3] || 1,
                 +match[4] || 0,
-                +(match[5] || 0) - (match[8] || 0) * 60 - TIMEZONE_OFFSET,
+                +(match[5] || 0) - timeOffset,
                 +match[6] || 0,
                 +match[7] || 0
             );
@@ -249,24 +275,33 @@
 
     /**
      * Quantity of a number. e.g. 0.1, 1, 10, 100
+     *
      * @param  {number} val
      * @return {number}
      */
     number.quantity = function (val) {
-        return Math.pow(10, Math.floor(Math.log(val) / Math.LN10));
+        return Math.pow(10, quantityExponent(val));
     };
 
-    // "Nice Numbers for Graph Labels" of Graphic Gems
+    function quantityExponent(val) {
+        return Math.floor(Math.log(val) / Math.LN10);
+    }
+
     /**
-     * find a “nice” number approximately equal to x. Round the number if round = true, take ceiling if round = false
-     * The primary observation is that the “nicest” numbers in decimal are 1, 2, and 5, and all power-of-ten multiples of these numbers.
-     * @param  {number} val
+     * find a “nice” number approximately equal to x. Round the number if round = true,
+     * take ceiling if round = false. The primary observation is that the “nicest”
+     * numbers in decimal are 1, 2, and 5, and all power-of-ten multiples of these numbers.
+     *
+     * See "Nice Numbers for Graph Labels" of Graphic Gems.
+     *
+     * @param  {number} val Non-negative value.
      * @param  {boolean} round
      * @return {number}
      */
     number.nice = function (val, round) {
-        var exp10 = number.quantity(val);
-        var f = val / exp10; // between 1 and 10
+        var exponent = quantityExponent(val);
+        var exp10 = Math.pow(10, exponent);
+        var f = val / exp10; // 1 <= f < 10
         var nf;
         if (round) {
             if (f < 1.5) { nf = 1; }
@@ -282,7 +317,11 @@
             else if (f < 5) { nf = 5; }
             else { nf = 10; }
         }
-        return nf * exp10;
+        val = nf * exp10;
+
+        // Fix 3 * 0.1 === 0.30000000000000004 issue (see IEEE 754).
+        // 20 is the uppper bound of toFixed.
+        return exponent >= -20 ? +val.toFixed(exponent < 0 ? -exponent : 0) : val;
     };
 
     /**
@@ -353,6 +392,7 @@
      * parseFloat NaNs numeric-cast false positives (null|true|false|"")
      * ...but misinterprets leading-number strings, particularly hex literals ("0x...")
      * subtraction forces infinities to NaN
+     *
      * @param {*} v
      * @return {boolean}
      */

package/lib/util/throttle.js

@@ -24,6 +24,7 @@
         var diff;
         var scope;
         var args;
+        var debounceNextCall;
 
         delay = delay || 0;
 
@@ -37,12 +38,15 @@
             currCall = (new Date()).getTime();
             scope = this;
             args = arguments;
-            diff = currCall - (debounce ? lastCall : lastExec) - delay;
+            var thisDelay = debounceNextCall || delay;
+            var thisDebounce = debounceNextCall || debounce;
+            debounceNextCall = null;
+            diff = currCall - (thisDebounce ? lastCall : lastExec) - thisDelay;
 
             clearTimeout(timer);
 
-            if (debounce) {
-                timer = setTimeout(exec, delay);
+            if (thisDebounce) {
+                timer = setTimeout(exec, thisDelay);
             }
             else {
                 if (diff >= 0) {
@@ -67,6 +71,13 @@
             }
         };
 
+        /**
+         * Enable debounce once.
+         */
+        cb.debounceNextCall = function (debounceDelay) {
+            debounceNextCall = debounceDelay;
+        };
+
         return cb;
     };