echarts 3.5.4 → 3.6.0

package/lib/model/Global.js

@@ -63,7 +63,7 @@
             this._optionManager = optionManager;
         },
 
-        setOption: function (option, optionPreprocessorFuncs, onlyGraphic) {
+        setOption: function (option, optionPreprocessorFuncs) {
             zrUtil.assert(
                 !(OPTION_INNER_KEY in option),
                 'please use chart.getOption()'
@@ -71,7 +71,7 @@
 
             this._optionManager.setOption(option, optionPreprocessorFuncs);
 
-            this.resetOption(null, onlyGraphic);
+            this.resetOption(null);
         },
 
         /**
@@ -81,7 +81,7 @@
          *                      'media': only reset media query option
          * @return {boolean} Whether option changed.
          */
-        resetOption: function (type, onlyGraphic) {
+        resetOption: function (type) {
             var optionChanged = false;
             var optionManager = this._optionManager;
 
@@ -92,11 +92,7 @@
                     initBase.call(this, baseOption);
                 }
                 else {
-                    // If only graphic, other series and component will not
-                    // go through update process, data should not be restored.
-                    // Otherwise grphic els mounted on data will be eliminated
-                    // and downplay will not work.
-                    !onlyGraphic && this.restoreData();
+                    this.restoreData();
                     this.mergeOption(baseOption);
                 }
                 optionChanged = true;
@@ -158,7 +154,7 @@
                 var newCptOptionList = modelUtil.normalizeToArray(newOption[mainType]);
 
                 var mapResult = modelUtil.mappingToExists(
-                    componentsMap[mainType], newCptOptionList
+                    componentsMap.get(mainType), newCptOptionList
                 );
 
                 modelUtil.makeIdAndName(mapResult);
@@ -177,7 +173,7 @@
                 );
 
                 option[mainType] = [];
-                componentsMap[mainType] = [];
+                componentsMap.set(mainType, []);
 
                 each(mapResult, function (resultItem, index) {
                     var componentModel = resultItem.exist;
@@ -227,13 +223,13 @@
                         }
                     }
 
-                    componentsMap[mainType][index] = componentModel;
+                    componentsMap.get(mainType)[index] = componentModel;
                     option[mainType][index] = componentModel.option;
                 }, this);
 
                 // Backup series for filtering.
                 if (mainType === 'series') {
-                    this._seriesIndices = createSeriesIndices(componentsMap.series);
+                    this._seriesIndices = createSeriesIndices(componentsMap.get('series'));
                 }
             }
         },
@@ -277,7 +273,7 @@
          * @return {module:echarts/model/Component}
          */
         getComponent: function (mainType, idx) {
-            var list = this._componentsMap[mainType];
+            var list = this._componentsMap.get(mainType);
             if (list) {
                 return list[idx || 0];
             }
@@ -303,7 +299,7 @@
             var id = condition.id;
             var name = condition.name;
 
-            var cpts = this._componentsMap[mainType];
+            var cpts = this._componentsMap.get(mainType);
 
             if (!cpts || !cpts.length) {
                 return [];
@@ -378,7 +374,7 @@
             var queryCond = getQueryCond(query);
             var result = queryCond
                 ? this.queryComponents(queryCond)
-                : this._componentsMap[mainType];
+                : this._componentsMap.get(mainType);
 
             return doFilter(filterBySubType(result, condition));
 
@@ -437,14 +433,14 @@
             if (typeof mainType === 'function') {
                 context = cb;
                 cb = mainType;
-                each(componentsMap, function (components, componentType) {
+                componentsMap.each(function (components, componentType) {
                     each(components, function (component, index) {
                         cb.call(context, componentType, component, index);
                     });
                 });
             }
             else if (zrUtil.isString(mainType)) {
-                each(componentsMap[mainType], cb, context);
+                each(componentsMap.get(mainType), cb, context);
             }
             else if (isObject(mainType)) {
                 var queryResult = this.findComponents(mainType);
@@ -457,7 +453,7 @@
          * @return {Array.<module:echarts/model/Series>}
          */
         getSeriesByName: function (name) {
-            var series = this._componentsMap.series;
+            var series = this._componentsMap.get('series');
             return filter(series, function (oneSeries) {
                 return oneSeries.name === name;
             });
@@ -468,7 +464,7 @@
          * @return {module:echarts/model/Series}
          */
         getSeriesByIndex: function (seriesIndex) {
-            return this._componentsMap.series[seriesIndex];
+            return this._componentsMap.get('series')[seriesIndex];
         },
 
         /**
@@ -476,7 +472,7 @@
          * @return {Array.<module:echarts/model/Series>}
          */
         getSeriesByType: function (subType) {
-            var series = this._componentsMap.series;
+            var series = this._componentsMap.get('series');
             return filter(series, function (oneSeries) {
                 return oneSeries.subType === subType;
             });
@@ -486,7 +482,7 @@
          * @return {Array.<module:echarts/model/Series>}
          */
         getSeries: function () {
-            return this._componentsMap.series.slice();
+            return this._componentsMap.get('series').slice();
         },
 
         /**
@@ -499,7 +495,7 @@
         eachSeries: function (cb, context) {
             assertSeriesInitialized(this);
             each(this._seriesIndices, function (rawSeriesIndex) {
-                var series = this._componentsMap.series[rawSeriesIndex];
+                var series = this._componentsMap.get('series')[rawSeriesIndex];
                 cb.call(context, series, rawSeriesIndex);
             }, this);
         },
@@ -511,7 +507,7 @@
          * @param {*} context
          */
         eachRawSeries: function (cb, context) {
-            each(this._componentsMap.series, cb, context);
+            each(this._componentsMap.get('series'), cb, context);
         },
 
         /**
@@ -525,7 +521,7 @@
         eachSeriesByType: function (subType, cb, context) {
             assertSeriesInitialized(this);
             each(this._seriesIndices, function (rawSeriesIndex) {
-                var series = this._componentsMap.series[rawSeriesIndex];
+                var series = this._componentsMap.get('series')[rawSeriesIndex];
                 if (series.subType === subType) {
                     cb.call(context, series, rawSeriesIndex);
                 }
@@ -551,6 +547,13 @@
             return zrUtil.indexOf(this._seriesIndices, seriesModel.componentIndex) < 0;
         },
 
+        /**
+         * @return {Array.<number>}
+         */
+        getCurrentSeriesIndices: function () {
+            return (this._seriesIndices || []).slice();
+        },
+
         /**
          * @param {Function} cb
          * @param {*} context
@@ -558,7 +561,7 @@
         filterSeries: function (cb, context) {
             assertSeriesInitialized(this);
             var filteredSeries = filter(
-                this._componentsMap.series, cb, context
+                this._componentsMap.get('series'), cb, context
             );
             this._seriesIndices = createSeriesIndices(filteredSeries);
         },
@@ -566,10 +569,10 @@
         restoreData: function () {
             var componentsMap = this._componentsMap;
 
-            this._seriesIndices = createSeriesIndices(componentsMap.series);
+            this._seriesIndices = createSeriesIndices(componentsMap.get('series'));
 
             var componentTypes = [];
-            each(componentsMap, function (components, componentType) {
+            componentsMap.each(function (components, componentType) {
                 componentTypes.push(componentType);
             });
 
@@ -577,7 +580,7 @@
                 componentTypes,
                 ComponentModel.getAllClassMainTypes(),
                 function (componentType, dependencies) {
-                    each(componentsMap[componentType], function (component) {
+                    each(componentsMap.get(componentType), function (component) {
                         component.restoreData();
                     });
                 }
@@ -621,7 +624,7 @@
          * @type {Object.<string, Array.<module:echarts/model/Model>>}
          * @private
          */
-        this._componentsMap = {series: []};
+        this._componentsMap = zrUtil.createHashMap({series: []});
 
         /**
          * Mapping between filtered series list and raw series list.
@@ -651,7 +654,7 @@
 
         var ret = {};
         each(types, function (type) {
-            ret[type] = (componentsMap[type] || []).slice();
+            ret[type] = (componentsMap.get(type) || []).slice();
         });
 
         return ret;
@@ -702,7 +705,7 @@
         // which make sure that their initialization is after series.
         if (__DEV__) {
             if (!ecModel._seriesIndices) {
-                throw new Error('Series has not been initialized yet.');
+                throw new Error('Option should contains series.');
             }
         }
     }

package/lib/model/Series.js

@@ -181,7 +181,7 @@
          * @return {Array.<string>} dimensions on the axis.
          */
         coordDimToDataDim: function (coordDim) {
-            return [coordDim];
+            return modelUtil.coordDimToDataDim(this.getData(), coordDim);
         },
 
         /**
@@ -191,7 +191,7 @@
          * @return {string}
          */
         dataDimToCoordDim: function (dataDim) {
-            return dataDim;
+            return modelUtil.dataDimToCoordDim(this.getData(), dataDim);
         },
 
         /**
@@ -215,35 +215,46 @@
          */
         formatTooltip: function (dataIndex, multipleSeries, dataType) {
             function formatArrayValue(value) {
-                var result = [];
-
-                zrUtil.each(value, function (val, idx) {
-                    var dimInfo = data.getDimensionInfo(idx);
-                    var dimType = dimInfo && dimInfo.type;
-                    var valStr;
+                var vertially = zrUtil.reduce(value, function (vertially, val, idx) {
+                    var dimItem = data.getDimensionInfo(idx);
+                    return vertially |= dimItem.tooltip !== false && dimItem.tooltipName != null;
+                }, 0);
 
-                    if (dimType === 'ordinal') {
-                        valStr = val + '';
-                    }
-                    else if (dimType === 'time') {
-                        valStr = multipleSeries ? '' : formatUtil.formatTime('yyyy/MM/dd hh:mm:ss', val);
-                    }
-                    else {
-                        valStr = addCommas(val);
+                var result = [];
+                var tooltipDims = modelUtil.otherDimToDataDim(data, 'tooltip');
+
+                tooltipDims.length
+                    ? zrUtil.each(tooltipDims, function (dimIdx) {
+                        setEachItem(data.get(dimIdx, dataIndex), dimIdx);
+                    })
+                    // By default, all dims is used on tooltip.
+                    : zrUtil.each(value, setEachItem);
+
+                function setEachItem(val, dimIdx) {
+                    var dimInfo = data.getDimensionInfo(dimIdx);
+                    // If `dimInfo.tooltip` is not set, show tooltip.
+                    if (!dimInfo || dimInfo.otherDims.tooltip === false) {
+                        return;
                     }
+                    var dimType = dimInfo.type;
+                    var valStr = (vertially ? '- ' + (dimInfo.tooltipName || dimInfo.name) + ': ' : '')
+                        + (dimType === 'ordinal'
+                            ? val + ''
+                            : dimType === 'time'
+                            ? (multipleSeries ? '' : formatUtil.formatTime('yyyy/MM/dd hh:mm:ss', val))
+                            : addCommas(val)
+                        );
+                    valStr && result.push(encodeHTML(valStr));
+                }
 
-                    valStr && result.push(valStr);
-                });
-
-                return result.join(', ');
+                return (vertially ? '<br/>' : '') + result.join(vertially ? '<br/>' : ', ');
             }
 
             var data = get(this, 'data');
 
             var value = this.getRawValue(dataIndex);
-            var formattedValue = encodeHTML(
-                zrUtil.isArray(value) ? formatArrayValue(value) : addCommas(value)
-            );
+            var formattedValue = zrUtil.isArray(value)
+                ? formatArrayValue(value) : encodeHTML(addCommas(value));
             var name = data.getName(dataIndex);
 
             var color = data.getItemVisual(dataIndex, 'color');
@@ -252,8 +263,7 @@
             }
             color = color || 'transparent';
 
-            var colorEl = '<span style="display:inline-block;margin-right:5px;'
-                + 'border-radius:10px;width:9px;height:9px;background-color:' + encodeHTML(color) + '"></span>';
+            var colorEl = formatUtil.getTooltipMarker(color);
 
             var seriesName = this.name;
             // FIXME
@@ -261,14 +271,16 @@
                 // Not show '-'
                 seriesName = '';
             }
+            seriesName = seriesName
+                ? encodeHTML(seriesName) + (!multipleSeries ? '<br/>' : ': ')
+                : '';
             return !multipleSeries
-                ? ((seriesName && encodeHTML(seriesName) + '<br />') + colorEl
+                ? seriesName + colorEl
                     + (name
-                        ? encodeHTML(name) + ' : ' + formattedValue
+                        ? encodeHTML(name) + ': ' + formattedValue
                         : formattedValue
                     )
-                  )
-                : (colorEl + encodeHTML(this.name) + ' : ' + formattedValue);
+                : colorEl + seriesName + formattedValue;
         },
 
         /**

package/lib/model/mixin/colorPalette.js

@@ -14,7 +14,8 @@
             scope = scope || this;
             var colorIdx = get(scope, 'colorIdx') || 0;
             var colorNameMap = get(scope, 'colorNameMap') || set(scope, 'colorNameMap', {});
-            if (colorNameMap[name]) {
+            // Use `hasOwnProperty` to avoid conflict with Object.prototype.
+            if (colorNameMap.hasOwnProperty(name)) {
                 return colorNameMap[name];
             }
             var colorPalette = this.get('color', true) || [];

package/lib/model/mixin/textStyle.js

@@ -1,10 +1,7 @@
 
 
     var textContain = require('zrender/lib/contain/text');
-
-    function getShallow(model, path) {
-        return model && model.getShallow(path);
-    }
+    var graphicUtil = require('../../util/graphic');
 
     module.exports = {
         /**
@@ -22,15 +19,12 @@
          * @return {string}
          */
         getFont: function () {
-            var ecModel = this.ecModel;
-            var gTextStyleModel = ecModel && ecModel.getModel('textStyle');
-            return [
-                // FIXME in node-canvas fontWeight is before fontStyle
-                this.getShallow('fontStyle') || getShallow(gTextStyleModel, 'fontStyle'),
-                this.getShallow('fontWeight') || getShallow(gTextStyleModel, 'fontWeight'),
-                (this.getShallow('fontSize') || getShallow(gTextStyleModel, 'fontSize') || 12) + 'px',
-                this.getShallow('fontFamily') || getShallow(gTextStyleModel, 'fontFamily') || 'sans-serif'
-            ].join(' ');
+            return graphicUtil.getFont({
+                fontStyle: this.getShallow('fontStyle'),
+                fontWeight: this.getShallow('fontWeight'),
+                fontSize: this.getShallow('fontSize'),
+                fontFamily: this.getShallow('fontFamily')
+            }, this.ecModel);
         },
 
         getTextRect: function (text) {

package/lib/scale/Interval.js

@@ -47,8 +47,10 @@
          * Get interval
          */
         getInterval: function () {
-            if (!this._interval) {
-                this.niceTicks();
+            if (__DEV__) {
+                if (this._interval == null) {
+                    throw new Error('`nice` should be called firstly' );
+                }
             }
             return this._interval;
         },
@@ -67,8 +69,10 @@
          * @return {Array.<number>}
          */
         getTicks: function () {
-            if (!this._interval) {
-                this.niceTicks();
+            if (__DEV__) {
+                if (this._interval == null) {
+                    throw new Error('`nice` should be called firstly' );
+                }
             }
             return helper.intervalScaleGetTicks(
                 this._interval, this._extent, this._niceExtent, this._intervalPrecision
@@ -120,8 +124,9 @@
          * Update interval and extent of intervals for nice ticks
          *
          * @param {number} [splitNumber = 5] Desired number of ticks
+         * @param {number} [minInterval]
          */
-        niceTicks: function (splitNumber) {
+        niceTicks: function (splitNumber, minInterval) {
             splitNumber = splitNumber || 5;
             var extent = this._extent;
             var span = extent[1] - extent[0];
@@ -135,7 +140,7 @@
                 extent.reverse();
             }
 
-            var result = helper.intervalScaleNiceTicks(extent, splitNumber);
+            var result = helper.intervalScaleNiceTicks(extent, splitNumber, minInterval);
 
             this._intervalPrecision = result.intervalPrecision;
             this._interval = result.interval;
@@ -144,11 +149,13 @@
 
         /**
          * Nice extent.
-         * @param {number} [splitNumber = 5] Given approx tick number
-         * @param {boolean} [fixMin=false]
-         * @param {boolean} [fixMax=false]
+         * @param {Object} opt
+         * @param {number} [opt.splitNumber = 5] Given approx tick number
+         * @param {boolean} [opt.fixMin=false]
+         * @param {boolean} [opt.fixMax=false]
+         * @param {boolean} [opt.minInterval=false]
          */
-        niceExtent: function (splitNumber, fixMin, fixMax) {
+        niceExtent: function (opt) {
             var extent = this._extent;
             // If extent start and end are same, expand them
             if (extent[0] === extent[1]) {
@@ -160,7 +167,7 @@
                     //      Plus data are all 100 and axis extent are [100, 100].
                     // Extend to the both side will cause expanded max is larger than fixed max.
                     // So only expand to the smaller side.
-                    if (!fixMax) {
+                    if (!opt.fixMax) {
                         extent[1] += expandSize / 2;
                         extent[0] -= expandSize / 2;
                     }
@@ -179,15 +186,15 @@
                 extent[1] = 1;
             }
 
-            this.niceTicks(splitNumber);
+            this.niceTicks(opt.splitNumber, opt.minInterval);
 
             // var extent = this._extent;
             var interval = this._interval;
 
-            if (!fixMin) {
+            if (!opt.fixMin) {
                 extent[0] = roundNumber(Math.floor(extent[0] / interval) * interval);
             }
-            if (!fixMax) {
+            if (!opt.fixMax) {
                 extent[1] = roundNumber(Math.ceil(extent[1] / interval) * interval);
             }
         }

package/lib/scale/Log.js

@@ -158,16 +158,14 @@
 
         /**
          * Nice extent.
-         * @param {number} [approxTickNum = 10] Given approx tick number
-         * @param {boolean} [fixMin=false]
-         * @param {boolean} [fixMax=false]
+         * @override
          */
-        niceExtent: function (splitNumber, fixMin, fixMax) {
-            intervalScaleProto.niceExtent.call(this, splitNumber, fixMin, fixMax);
+        niceExtent: function (opt) {
+            intervalScaleProto.niceExtent.call(this, opt);
 
             var originalScale = this._originalScale;
-            originalScale.__fixMin = fixMin;
-            originalScale.__fixMax = fixMax;
+            originalScale.__fixMin = opt.fixMin;
+            originalScale.__fixMax = opt.fixMax;
         }
 
     });

package/lib/scale/Time.js

@@ -52,7 +52,9 @@
     var TimeScale = IntervalScale.extend({
         type: 'time',
 
-        // Overwrite
+        /**
+         * @override
+         */
         getLabel: function (val) {
             var stepLvl = this._stepLvl;
 
@@ -61,8 +63,10 @@
             return formatUtil.formatTime(stepLvl[0], date, this.getSetting('useUTC'));
         },
 
-        // Overwrite
-        niceExtent: function (approxTickNum, fixMin, fixMax) {
+        /**
+         * @override
+         */
+        niceExtent: function (opt) {
             var extent = this._extent;
             // If extent start and end are same, expand them
             if (extent[0] === extent[1]) {
@@ -77,20 +81,22 @@
                 extent[0] = extent[1] - ONE_DAY;
             }
 
-            this.niceTicks(approxTickNum);
+            this.niceTicks(opt.splitNumber);
 
             // var extent = this._extent;
             var interval = this._interval;
 
-            if (!fixMin) {
+            if (!opt.fixMin) {
                 extent[0] = numberUtil.round(mathFloor(extent[0] / interval) * interval);
             }
-            if (!fixMax) {
+            if (!opt.fixMax) {
                 extent[1] = numberUtil.round(mathCeil(extent[1] / interval) * interval);
             }
         },
 
-        // Overwrite
+        /**
+         * @override
+         */
         niceTicks: function (approxTickNum) {
             var timezoneOffset = this.getSetting('useUTC')
                 ? 0 : numberUtil.getTimezoneOffset() * 60 * 1000;

package/lib/scale/helper.js

@@ -13,13 +13,17 @@
      * @param {Array.<number>} extent Both extent[0] and extent[1] should be valid number.
      *                                Should be extent[0] < extent[1].
      * @param {number} splitNumber splitNumber should be >= 1.
+     * @param {number} [minInterval]
      * @return {Object} {interval, intervalPrecision, niceTickExtent}
      */
-    helper.intervalScaleNiceTicks = function (extent, splitNumber) {
+    helper.intervalScaleNiceTicks = function (extent, splitNumber, minInterval) {
         var result = {};
         var span = extent[1] - extent[0];
 
         var interval = result.interval = numberUtil.nice(span / splitNumber, true);
+        if (minInterval != null && interval < minInterval) {
+            interval = result.interval = minInterval;
+        }
         // Tow more digital for tick.
         var precision = result.intervalPrecision = numberUtil.getPrecisionSafe(interval) + 2;
         // Niced extent inside original extent

package/lib/util/format.js

@@ -129,6 +129,18 @@
         return tpl;
     };
 
+    /**
+     * @param {string} color
+     * @param {string} [extraCssText]
+     * @return {string}
+     */
+    formatUtil.getTooltipMarker = function (color, extraCssText) {
+        return color
+            ? '<span style="display:inline-block;margin-right:5px;'
+                + 'border-radius:10px;width:9px;height:9px;background-color:'
+                + formatUtil.encodeHTML(color) + ';' + (extraCssText || '') + '"></span>'
+            : '';
+    };
 
     /**
      * @param {string} str