echarts 3.6.1 → 3.7.2

package/src/util/model.js

@@ -29,9 +29,7 @@ define(function(require) {
      *         normal: {
      *             show: false,
      *             position: 'outside',
-     *             textStyle: {
-     *                 fontSize: 18
-     *             }
+     *             fontSize: 18
      *         },
      *         emphasis: {
      *             show: true
@@ -46,16 +44,32 @@ define(function(require) {
             var normalOpt = opt.normal = opt.normal || {};
 
             // Default emphasis option from normal
-            each(subOpts, function (subOptName) {
-                var val = zrUtil.retrieve(emphasisOpt[subOptName], normalOpt[subOptName]);
-                if (val != null) {
-                    emphasisOpt[subOptName] = val;
+            for (var i = 0, len = subOpts.length; i < len; i++) {
+                var subOptName = subOpts[i];
+                if (!emphasisOpt.hasOwnProperty(subOptName)
+                    && normalOpt.hasOwnProperty(subOptName)
+                ) {
+                    emphasisOpt[subOptName] = normalOpt[subOptName];
                 }
-            });
+            }
         }
     };
 
-    modelUtil.LABEL_OPTIONS = ['position', 'offset', 'show', 'textStyle', 'distance', 'formatter'];
+    modelUtil.TEXT_STYLE_OPTIONS = [
+        'fontStyle', 'fontWeight', 'fontSize', 'fontFamily',
+        'rich', 'tag', 'color', 'textBorderColor', 'textBorderWidth',
+        'width', 'height', 'lineHeight', 'align', 'verticalAlign', 'baseline',
+        'shadowColor', 'shadowBlur', 'shadowOffsetX', 'shadowOffsetY',
+        'textShadowColor', 'textShadowBlur', 'textShadowOffsetX', 'textShadowOffsetY',
+        'backgroundColor', 'borderColor', 'borderWidth', 'borderRadius', 'padding'
+    ];
+
+    // modelUtil.LABEL_OPTIONS = modelUtil.TEXT_STYLE_OPTIONS.concat([
+    //     'position', 'offset', 'rotate', 'origin', 'show', 'distance', 'formatter',
+    //     'fontStyle', 'fontWeight', 'fontSize', 'fontFamily',
+    //     // FIXME: deprecated, check and remove it.
+    //     'textStyle'
+    // ]);
 
     /**
      * data could be [12, 2323, {value: 223}, [1221, 23], {value: [2, 23]}]
@@ -173,9 +187,10 @@ define(function(require) {
          * @param {string} [status='normal'] 'normal' or 'emphasis'
          * @param {string} [dataType]
          * @param {number} [dimIndex]
+         * @param {string} [labelProp='label']
          * @return {string}
          */
-        getFormattedLabel: function (dataIndex, status, dataType, dimIndex) {
+        getFormattedLabel: function (dataIndex, status, dataType, dimIndex, labelProp) {
             status = status || 'normal';
             var data = this.getData(dataType);
             var itemModel = data.getItemModel(dataIndex);
@@ -185,7 +200,7 @@ define(function(require) {
                 params.value = params.value[dimIndex];
             }
 
-            var formatter = itemModel.get(['label', status, 'formatter']);
+            var formatter = itemModel.get([labelProp || 'label', status, 'formatter']);
 
             if (typeof formatter === 'function') {
                 params.status = status;

package/src/util/number.js

@@ -5,6 +5,8 @@
 
 define(function (require) {
 
+    var zrUtil = require('zrender/core/util');
+
     var number = {};
 
     var RADIAN_EPSILON = 1e-4;
@@ -185,6 +187,68 @@ define(function (require) {
         return !isFinite(precision) ? 20 : precision;
     };
 
+    /**
+     * Get a data of given precision, assuring the sum of percentages
+     * in valueList is 1.
+     * The largest remainer method is used.
+     * https://en.wikipedia.org/wiki/Largest_remainder_method
+     *
+     * @param {Array.<number>} valueList a list of all data
+     * @param {number} idx index of the data to be processed in valueList
+     * @param {number} precision integer number showing digits of precision
+     * @return {number} percent ranging from 0 to 100
+     */
+    number.getPercentWithPrecision = function (valueList, idx, precision) {
+        if (!valueList[idx]) {
+            return 0;
+        }
+
+        var sum = zrUtil.reduce(valueList, function (acc, val) {
+            return acc + (isNaN(val) ? 0 : val);
+        }, 0);
+        if (sum === 0) {
+            return 0;
+        }
+
+        var digits = Math.pow(10, precision);
+        var votesPerQuota = zrUtil.map(valueList, function (val) {
+            return (isNaN(val) ? 0 : val) / sum * digits * 100;
+        });
+        var targetSeats = digits * 100;
+
+        var seats = zrUtil.map(votesPerQuota, function (votes) {
+            // Assign automatic seats.
+            return Math.floor(votes);
+        });
+        var currentSum = zrUtil.reduce(seats, function (acc, val) {
+            return acc + val;
+        }, 0);
+
+        var remainder = zrUtil.map(votesPerQuota, function (votes, idx) {
+            return votes - seats[idx];
+        });
+
+        // Has remainding votes.
+        while (currentSum < targetSeats) {
+            // Find next largest remainder.
+            var max = Number.NEGATIVE_INFINITY;
+            var maxId = null;
+            for (var i = 0, len = remainder.length; i < len; ++i) {
+                if (remainder[i] > max) {
+                    max = remainder[i];
+                    maxId = i;
+                }
+            }
+
+            // Add a vote to max remainder.
+            ++seats[maxId];
+            remainder[maxId] = 0;
+            ++currentSum;
+        }
+
+        return seats[idx] / digits;
+    };
+
     // Number.MAX_SAFE_INTEGER, ie do not support.
     number.MAX_SAFE_INTEGER = 9007199254740991;
 
@@ -209,11 +273,14 @@ define(function (require) {
     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:
@@ -247,24 +314,42 @@ define(function (require) {
                 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/src/visual/VisualMapping.js

@@ -142,7 +142,7 @@ define(function (require) {
                             // 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 @@ define(function (require) {
             _doMap: {
                 linear: function (normalized) {
                     return zrColor.stringify(
-                        zrColor.fastMapToColor(normalized, this.option.parsedVisual),
+                        zrColor.fastLerp(normalized, this.option.parsedVisual),
                         'rgba'
                     );
                 },
@@ -161,7 +161,7 @@ define(function (require) {
                     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'
                         );
                     }
@@ -471,7 +471,7 @@ define(function (require) {
     /**
      * @public
      * @param {Object} obj
-     * @return {Oject} new object containers visual values.
+     * @return {Object} new object containers visual values.
      *                 If no visuals, return null.
      */
     VisualMapping.retrieveVisuals = function (obj) {

package/webpack.config.js

@@ -1,13 +1,25 @@
 var PROD = process.argv.indexOf('-p') >= 0;
 var webpack = require('webpack');
 
+var IS_EN = process.argv.indexOf('--lang-en') >= 0;
+
+var plugins = [
+    new webpack.DefinePlugin({
+        'typeof __DEV__': JSON.stringify('boolean'),
+        __DEV__: PROD ? false : true
+    })
+];
+var outputSuffix = '';
+
+if (IS_EN) {
+    plugins.unshift(
+        new webpack.NormalModuleReplacementPlugin(/\/lang[.]js/, './langEN.js')
+    );
+    outputSuffix = '-en';
+}
+
 module.exports = {
-    plugins: [
-        new webpack.DefinePlugin({
-            'typeof __DEV__': JSON.stringify('boolean'),
-            __DEV__: PROD ? false : true
-        })
-    ],
+    plugins: plugins,
     entry: {
         'echarts': __dirname + '/index.js',
         'echarts.simple': __dirname + '/index.simple.js',
@@ -17,6 +29,8 @@ module.exports = {
         libraryTarget: 'umd',
         library: 'echarts',
         path: __dirname + '/dist',
-        filename: PROD ? '[name].min.js' : '[name].js'
+        filename: PROD
+            ? '[name]' + outputSuffix + '.min.js'
+            : '[name]' + outputSuffix + '.js'
     }
 };

package/.npmignore

@@ -1,10 +0,0 @@
-/build
-/test
-/map/tool
-/map/raw
-/theme/tool
-/theme/thumb
-todo
-npm-debug.log
-/benchmark
-echarts.d.ts