echarts 3.6.1 → 3.7.2

package/lib/util/model.js

@@ -29,9 +29,7 @@
      *         normal: {
      *             show: false,
      *             position: 'outside',
-     *             textStyle: {
-     *                 fontSize: 18
-     *             }
+     *             fontSize: 18
      *         },
      *         emphasis: {
      *             show: true
@@ -46,16 +44,32 @@
             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 @@
          * @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 @@
                 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/lib/util/number.js

@@ -5,6 +5,8 @@
 
 
 
+    var zrUtil = require('zrender/lib/core/util');
+
     var number = {};
 
     var RADIAN_EPSILON = 1e-4;
@@ -185,6 +187,68 @@
         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 @@
     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 @@
                 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'
                         );
                     }
@@ -471,7 +471,7 @@
     /**
      * @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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echarts",
-  "version": "3.6.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.5.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.5.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/action/createDataSelectAction.js

@@ -15,13 +15,17 @@ define(function (require) {
                     {mainType: 'series', subType: seriesType, query: payload},
                     function (seriesModel) {
                         if (seriesModel[actionInfo.method]) {
-                            seriesModel[actionInfo.method](payload.name);
+                            seriesModel[actionInfo.method](
+                                payload.name,
+                                payload.dataIndex
+                            );
                         }
                         var data = seriesModel.getData();
                         // Create selected map
                         data.each(function (idx) {
                             var name = data.getName(idx);
-                            selected[name] = seriesModel.isSelected(name) || false;
+                            selected[name] = seriesModel.isSelected(name)
+                                || false;
                         });
                     }
                 );

package/src/chart/bar/BarView.js

@@ -181,7 +181,7 @@ define(function (require) {
 
     function removeRect(dataIndex, animationModel, el) {
         // Not show text when animating
-        el.style.text = '';
+        el.style.text = null;
         graphic.updateProps(el, {
             shape: {
                 width: 0
@@ -193,7 +193,7 @@ define(function (require) {
 
     function removeSector(dataIndex, animationModel, el) {
         // Not show text when animating
-        el.style.text = '';
+        el.style.text = null;
         graphic.updateProps(el, {
             shape: {
                 r: el.shape.r0
@@ -240,7 +240,7 @@ define(function (require) {
         var itemStyleModel = itemModel.getModel('itemStyle.normal');
         var hoverStyle = itemModel.getModel('itemStyle.emphasis').getBarItemStyle();
 
-        if (!isPolar && isHorizontal) {
+        if (!isPolar) {
             el.setShape('r', itemStyleModel.get('barBorderRadius') || 0);
         }
 
@@ -252,6 +252,9 @@ define(function (require) {
             itemStyleModel.getBarItemStyle()
         ));
 
+        var cursorStyle = itemModel.getShallow('cursor');
+        cursorStyle && el.attr('cursor', cursorStyle);
+
         var labelPositionOutside = isHorizontal
             ? (layout.height > 0 ? 'bottom' : 'top')
             : (layout.width > 0 ? 'left' : 'right');

package/src/chart/bar/BaseBarSeries.js

@@ -43,6 +43,7 @@ define(function(require) {
             barMinHeight: 0,
             // 最小角度为0，仅对极坐标系下的柱状图有效
             barMinAngle: 0,
+            // cursor: null,
 
             // barMaxWidth: null,
             // 默认自适应
@@ -57,10 +58,10 @@ define(function(require) {
             //     }
             // },
             itemStyle: {
-                normal: {
+                // normal: {
                     // color: '各异'
-                },
-                emphasis: {}
+                // },
+                // emphasis: {}
             }
         }
     });

package/src/chart/bar/PictorialBarSeries.js

@@ -22,7 +22,7 @@ define(function(require) {
             symbolRepeatDirection: 'end', // 'end' means from 'start' to 'end'.
 
             symbolClip: false,
-            symbolBoundingData: null,
+            symbolBoundingData: null, // Can be 60 or -40 or [-40, 60]
             symbolPatternSize: 400, // 400 * 400 px
 
             barGap: '-100%',      // In most case, overlap is needed.

package/src/chart/bar/PictorialBarView.js

@@ -183,12 +183,28 @@ define(function (require) {
         var symbolBoundingData = itemModel.get('symbolBoundingData');
         var valueAxis = opt.coordSys.getOtherAxis(opt.coordSys.getBaseAxis());
         var zeroPx = valueAxis.toGlobalCoord(valueAxis.dataToCoord(0));
+        var pxSignIdx = 1 - +(layout[valueDim.wh] <= 0);
+        var boundingLength;
 
-        var boundingLength = output.boundingLength = symbolBoundingData != null
-            ? valueAxis.toGlobalCoord(valueAxis.dataToCoord(valueAxis.scale.parse(symbolBoundingData))) - zeroPx
-            : symbolRepeat
-            ? opt.coordSysExtent[valueDim.index][1 - +(layout[valueDim.wh] <= 0)] - zeroPx
-            : layout[valueDim.wh];
+        if (zrUtil.isArray(symbolBoundingData)) {
+            var symbolBoundingExtent = [
+                convertToCoordOnAxis(valueAxis, symbolBoundingData[0]) - zeroPx,
+                convertToCoordOnAxis(valueAxis, symbolBoundingData[1]) - zeroPx
+            ];
+            symbolBoundingExtent[1] < symbolBoundingExtent[0] && (symbolBoundingExtent.reverse());
+            boundingLength = symbolBoundingExtent[pxSignIdx];
+        }
+        else if (symbolBoundingData != null) {
+            boundingLength = convertToCoordOnAxis(valueAxis, symbolBoundingData) - zeroPx;
+        }
+        else if (symbolRepeat) {
+            boundingLength = opt.coordSysExtent[valueDim.index][pxSignIdx] - zeroPx;
+        }
+        else {
+            boundingLength = layout[valueDim.wh];
+        }
+
+        output.boundingLength = boundingLength;
 
         if (symbolRepeat) {
             output.repeatCutLength = layout[valueDim.wh];
@@ -197,6 +213,10 @@ define(function (require) {
         output.pxSign = boundingLength > 0 ? 1 : boundingLength < 0 ? -1 : 0;
     }
 
+    function convertToCoordOnAxis(axis, value) {
+        return axis.toGlobalCoord(axis.dataToCoord(axis.scale.parse(value)));
+    }
+
     // Support ['100%', '100%']
     function prepareSymbolSize(
         data, dataIndex, layout, symbolRepeat, symbolClip, boundingLength,
@@ -405,7 +425,7 @@ define(function (require) {
             path.__pictorialRepeatTimes = repeatTimes;
             bundle.add(path);
 
-            var target = makeTarget(index, true);
+            var target = makeTarget(index);
 
             updateAttr(
                 path,
@@ -654,7 +674,7 @@ define(function (require) {
     function removeBar(data, dataIndex, animationModel, bar) {
         // Not show text when animating
         var labelRect = bar.__pictorialBarRect;
-        labelRect && (labelRect.style.text = '');
+        labelRect && (labelRect.style.text = null);
 
         var pathes = [];
         eachPath(bar, function (path) {
@@ -713,6 +733,7 @@ define(function (require) {
         // Because symbol provide setColor individually to set fill and stroke
         var normalStyle = itemModel.getModel('itemStyle.normal').getItemStyle(['color']);
         var hoverStyle = itemModel.getModel('itemStyle.emphasis').getItemStyle();
+        var cursorStyle = itemModel.getShallow('cursor');
 
         eachPath(bar, function (path) {
             // PENDING setColor should be before setStyle!!!
@@ -726,6 +747,7 @@ define(function (require) {
             ));
             graphic.setHoverStyle(path, hoverStyle);
 
+            cursorStyle && (path.cursor = cursorStyle);
             path.z2 = symbolMeta.z2;
         });
 

package/src/chart/bar/helper.js

@@ -1,6 +1,5 @@
 define(function (require) {
 
-    var zrUtil = require('zrender/core/util');
     var graphic = require('../../util/graphic');
 
     var helper = {};
@@ -11,38 +10,22 @@ define(function (require) {
         var labelModel = itemModel.getModel('label.normal');
         var hoverLabelModel = itemModel.getModel('label.emphasis');
 
-        if (labelModel.get('show')) {
-            setLabel(
-                normalStyle, labelModel, color,
-                zrUtil.retrieve(
-                    seriesModel.getFormattedLabel(dataIndex, 'normal'),
-                    seriesModel.getRawValue(dataIndex)
-                ),
-                labelPositionOutside
-            );
-        }
-        else {
-            normalStyle.text = '';
-        }
+        graphic.setLabelStyle(
+            normalStyle, hoverStyle, labelModel, hoverLabelModel,
+            {
+                labelFetcher: seriesModel,
+                labelDataIndex: dataIndex,
+                defaultText: seriesModel.getRawValue(dataIndex),
+                isRectText: true,
+                autoColor: color
+            }
+        );
 
-        if (hoverLabelModel.get('show')) {
-            setLabel(
-                hoverStyle, hoverLabelModel, color,
-                zrUtil.retrieve(
-                    seriesModel.getFormattedLabel(dataIndex, 'emphasis'),
-                    seriesModel.getRawValue(dataIndex)
-                ),
-                labelPositionOutside
-            );
-        }
-        else {
-            hoverStyle.text = '';
-        }
+        fixPosition(normalStyle);
+        fixPosition(hoverStyle);
     };
 
-    function setLabel(style, model, color, labelText, labelPositionOutside) {
-        graphic.setText(style, model, color);
-        style.text = labelText;
+    function fixPosition(style, labelPositionOutside) {
         if (style.textPosition === 'outside') {
             style.textPosition = labelPositionOutside;
         }

package/src/chart/candlestick/candlestickLayout.js

@@ -3,6 +3,7 @@ define(function (require) {
     var zrUtil = require('zrender/core/util');
     var retrieve = require('zrender/core/util').retrieve;
     var parsePercent = require('../../util/number').parsePercent;
+    var graphic = require('../../util/graphic');
 
     return function (ecModel) {
 
@@ -33,6 +34,8 @@ define(function (require) {
                 return;
             }
 
+            var dataIndex = 0;
+
             data.each([cDim].concat(vDims), function () {
                 var args = arguments;
                 var axisDimVal = args[0];
@@ -52,17 +55,44 @@ define(function (require) {
                 var highestPoint = getPoint(highestVal);
 
                 var whiskerEnds = [
-                    [highestPoint, ocHighPoint],
-                    [lowestPoint, ocLowPoint]
+                    [
+                        subPixelOptimizePoint(highestPoint),
+                        subPixelOptimizePoint(ocHighPoint)
+                    ],
+                    [
+                        subPixelOptimizePoint(lowestPoint),
+                        subPixelOptimizePoint(ocLowPoint)
+                    ]
                 ];
 
                 var bodyEnds = [];
                 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,
@@ -70,6 +100,8 @@ define(function (require) {
                     brushRect: makeBrushRect()
                 });
 
+                ++dataIndex;
+
                 function getPoint(val) {
                     var p = [];
                     p[variableDim] = axisDimVal;
@@ -82,8 +114,14 @@ define(function (require) {
                 function addBodyEnd(point, start) {
                     var point1 = point.slice();
                     var point2 = point.slice();
-                    point1[variableDim] += candleWidth / 2;
-                    point2[variableDim] -= candleWidth / 2;
+
+                    point1[variableDim] = graphic.subPixelOptimize(
+                        point1[variableDim] + candleWidth / 2, 1, false
+                    );
+                    point2[variableDim] = graphic.subPixelOptimize(
+                        point2[variableDim] - candleWidth / 2, 1, true
+                    );
+
                     start
                         ? bodyEnds.push(point1, point2)
                         : bodyEnds.push(point2, point1);
@@ -104,6 +142,11 @@ define(function (require) {
                     };
                 }
 
+                function subPixelOptimizePoint(point) {
+                    point[variableDim] = graphic.subPixelOptimize(point[variableDim], 1);
+                    return point;
+                }
+
             }, true);
         });
     };
@@ -132,6 +175,6 @@ define(function (require) {
             ? parsePercent(barWidth, bandWidth)
             // Put max outer to ensure bar visible in spite of overlap.
             : Math.max(Math.min(bandWidth / 2, barMaxWidth), barMinWidth);
-    }
+        }
 
 });