echarts 4.5.0 → 4.9.0

package/lib/scale/helper.js

@@ -99,48 +99,6 @@ function fixExtent(niceTickExtent, extent) {
   }
 }
 
-function intervalScaleGetTicks(interval, extent, niceTickExtent, intervalPrecision) {
-  var ticks = []; // If interval is 0, return [];
-
-  if (!interval) {
-    return ticks;
-  } // Consider this case: using dataZoom toolbox, zoom and zoom.
-
-
-  var safeLimit = 10000;
-
-  if (extent[0] < niceTickExtent[0]) {
-    ticks.push(extent[0]);
-  }
-
-  var tick = niceTickExtent[0];
-
-  while (tick <= niceTickExtent[1]) {
-    ticks.push(tick); // Avoid rounding error
-
-    tick = roundNumber(tick + interval, intervalPrecision);
-
-    if (tick === ticks[ticks.length - 1]) {
-      // Consider out of safe float point, e.g.,
-      // -3711126.9907707 + 2e-10 === -3711126.9907707
-      break;
-    }
-
-    if (ticks.length > safeLimit) {
-      return [];
-    }
-  } // Consider this case: the last item of ticks is smaller
-  // than niceTickExtent[1] and niceTickExtent[1] === extent[1].
-
-
-  if (extent[1] > (ticks.length ? ticks[ticks.length - 1] : niceTickExtent[1])) {
-    ticks.push(extent[1]);
-  }
-
-  return ticks;
-}
-
 exports.intervalScaleNiceTicks = intervalScaleNiceTicks;
 exports.getIntervalPrecision = getIntervalPrecision;
-exports.fixExtent = fixExtent;
-exports.intervalScaleGetTicks = intervalScaleGetTicks;
+exports.fixExtent = fixExtent;

package/lib/stream/Scheduler.js

@@ -101,7 +101,7 @@ var proto = Scheduler.prototype;
  */
 
 proto.restoreData = function (ecModel, payload) {
-  // TODO: Only restroe needed series and components, but not all components.
+  // TODO: Only restore needed series and components, but not all components.
   // Currently `restoreData` of all of the series and component will be called.
   // But some independent components like `title`, `legend`, `graphic`, `toolbox`,
   // `tooltip`, `axisPointer`, etc, do not need series refresh when `setOption`,
@@ -280,7 +280,15 @@ function performStageTasks(scheduler, stageHandlers, ecModel, payload, opt) {
           task.dirty();
         }
 
-        var performArgs = scheduler.getPerformArgs(task, opt.block);
+        var performArgs = scheduler.getPerformArgs(task, opt.block); // FIXME
+        // if intending to decalare `performRawSeries` in handlers, only
+        // stream-independent (specifically, data item independent) operations can be
+        // performed. Because is a series is filtered, most of the tasks will not
+        // be performed. A stream-dependent operation probably cause wrong biz logic.
+        // Perhaps we should not provide a separate callback for this case instead
+        // of providing the config `performRawSeries`. The stream-dependent operaions
+        // and stream-independent operations should better not be mixed.
+
         performArgs.skip = !stageHandler.performRawSeries && ecModel.isSeriesFiltered(task.context.model);
         updatePayload(task, payload);
         unfinished |= task.perform(performArgs);

package/lib/theme/dark.js

@@ -80,6 +80,9 @@ var theme = {
       },
       crossStyle: {
         color: contrastColor
+      },
+      label: {
+        color: '#000'
       }
     }
   },

package/lib/util/format.js

@@ -45,7 +45,7 @@ var numberUtil = require("./number");
 // import Text from 'zrender/src/graphic/Text';
 
 /**
- * 每三位默认加,格式化
+ * add commas after every three numbers
  * @param {string|number} x
  * @return {string}
  */
@@ -261,6 +261,22 @@ function getTextBoundingRect(opt) {
 function getTextRect(text, font, textAlign, textVerticalAlign, textPadding, rich, truncate, textLineHeight) {
   return textContain.getBoundingRect(text, font, textAlign, textVerticalAlign, textPadding, textLineHeight, rich, truncate);
 }
+/**
+ * open new tab
+ * @param {string} link url
+ * @param {string} target blank or self
+ */
+
+
+function windowOpen(link, target) {
+  if (target === '_blank' || target === 'blank') {
+    var blank = window.open();
+    blank.opener = null;
+    blank.location = link;
+  } else {
+    window.open(link, target);
+  }
+}
 
 exports.addCommas = addCommas;
 exports.toCamelCase = toCamelCase;
@@ -273,4 +289,5 @@ exports.formatTime = formatTime;
 exports.capitalFirst = capitalFirst;
 exports.truncateText = truncateText;
 exports.getTextBoundingRect = getTextBoundingRect;
-exports.getTextRect = getTextRect;
+exports.getTextRect = getTextRect;
+exports.windowOpen = windowOpen;

package/lib/util/graphic.js

@@ -727,11 +727,13 @@ function getHighlightDigit(highlightKey) {
  * @param {Object} opt Check `opt` of `setTextStyleCommon` to find other props.
  * @param {string|Function} [opt.defaultText]
  * @param {module:echarts/model/Model} [opt.labelFetcher] Fetch text by
- *      `opt.labelFetcher.getFormattedLabel(opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex)`
- * @param {module:echarts/model/Model} [opt.labelDataIndex] Fetch text by
- *      `opt.textFetcher.getFormattedLabel(opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex)`
- * @param {module:echarts/model/Model} [opt.labelDimIndex] Fetch text by
- *      `opt.textFetcher.getFormattedLabel(opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex)`
+ *      `opt.labelFetcher.getFormattedLabel(opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex, opt.labelProp)`
+ * @param {number} [opt.labelDataIndex] Fetch text by
+ *      `opt.textFetcher.getFormattedLabel(opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex, opt.labelProp)`
+ * @param {number} [opt.labelDimIndex] Fetch text by
+ *      `opt.textFetcher.getFormattedLabel(opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex, opt.labelProp)`
+ * @param {string} [opt.labelProp] Fetch text by
+ *      `opt.textFetcher.getFormattedLabel(opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex, opt.labelProp)`
  * @param {Object} [normalSpecified]
  * @param {Object} [emphasisSpecified]
  */
@@ -741,7 +743,8 @@ function setLabelStyle(normalStyle, emphasisStyle, normalModel, emphasisModel, o
   opt = opt || EMPTY_OBJ;
   var labelFetcher = opt.labelFetcher;
   var labelDataIndex = opt.labelDataIndex;
-  var labelDimIndex = opt.labelDimIndex; // This scenario, `label.normal.show = true; label.emphasis.show = false`,
+  var labelDimIndex = opt.labelDimIndex;
+  var labelProp = opt.labelProp; // This scenario, `label.normal.show = true; label.emphasis.show = false`,
   // is not supported util someone requests.
 
   var showNormal = normalModel.getShallow('show');
@@ -753,7 +756,7 @@ function setLabelStyle(normalStyle, emphasisStyle, normalModel, emphasisModel, o
 
   if (showNormal || showEmphasis) {
     if (labelFetcher) {
-      baseText = labelFetcher.getFormattedLabel(labelDataIndex, 'normal', null, labelDimIndex);
+      baseText = labelFetcher.getFormattedLabel(labelDataIndex, 'normal', null, labelDimIndex, labelProp);
     }
 
     if (baseText == null) {
@@ -762,7 +765,7 @@ function setLabelStyle(normalStyle, emphasisStyle, normalModel, emphasisModel, o
   }
 
   var normalStyleText = showNormal ? baseText : null;
-  var emphasisStyleText = showEmphasis ? zrUtil.retrieve2(labelFetcher ? labelFetcher.getFormattedLabel(labelDataIndex, 'emphasis', null, labelDimIndex) : null, baseText) : null; // Optimize: If style.text is null, text will not be drawn.
+  var emphasisStyleText = showEmphasis ? zrUtil.retrieve2(labelFetcher ? labelFetcher.getFormattedLabel(labelDataIndex, 'emphasis', null, labelDimIndex, labelProp) : null, baseText) : null; // Optimize: If style.text is null, text will not be drawn.
 
   if (normalStyleText != null || emphasisStyleText != null) {
     // Always set `textStyle` even if `normalStyle.text` is null, because default
@@ -1125,8 +1128,7 @@ function rollbackDefaultTextStyle(style) {
 }
 
 function getFont(opt, ecModel) {
-  // ecModel or default text style model.
-  var gTextStyleModel = ecModel || ecModel.getModel('textStyle');
+  var gTextStyleModel = ecModel && ecModel.getModel('textStyle');
   return zrUtil.trim([// 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(' '));
 }
@@ -1168,7 +1170,7 @@ function animateOrSetProps(isUpdate, el, props, animatableModel, dataIndex, cb)
  * configuration in series.
  *
  * Caution: this method will stop previous animation.
- * So if do not use this method to one element twice before
+ * So do not use this method to one element twice before
  * animation starts, unless you know what you are doing.
  *
  * @param {module:zrender/Element} el
@@ -1195,7 +1197,7 @@ function updateProps(el, props, animatableModel, dataIndex, cb) {
  * configuration in series.
  *
  * Caution: this method will stop previous animation.
- * So if do not use this method to one element twice before
+ * So do not use this method to one element twice before
  * animation starts, unless you know what you are doing.
  *
  * @param {module:zrender/Element} el

package/lib/visual/LegendVisualProvider.js

@@ -0,0 +1,75 @@
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+/**
+ * LegendVisualProvider is an bridge that pick encoded color from data and
+ * provide to the legend component.
+ * @param {Function} getDataWithEncodedVisual Function to get data after filtered. It stores all the encoding info
+ * @param {Function} getRawData Function to get raw data before filtered.
+ */
+function LegendVisualProvider(getDataWithEncodedVisual, getRawData) {
+  this.getAllNames = function () {
+    var rawData = getRawData(); // We find the name from the raw data. In case it's filtered by the legend component.
+    // Normally, the name can be found in rawData, but can't be found in filtered data will display as gray.
+
+    return rawData.mapArray(rawData.getName);
+  };
+
+  this.containName = function (name) {
+    var rawData = getRawData();
+    return rawData.indexOfName(name) >= 0;
+  };
+
+  this.indexOfName = function (name) {
+    // Only get data when necessary.
+    // Because LegendVisualProvider constructor may be new in the stage that data is not prepared yet.
+    // Invoking Series#getData immediately will throw an error.
+    var dataWithEncodedVisual = getDataWithEncodedVisual();
+    return dataWithEncodedVisual.indexOfName(name);
+  };
+
+  this.getItemVisual = function (dataIndex, key) {
+    // Get encoded visual properties from final filtered data.
+    var dataWithEncodedVisual = getDataWithEncodedVisual();
+    return dataWithEncodedVisual.getItemVisual(dataIndex, key);
+  };
+}
+
+var _default = LegendVisualProvider;
+module.exports = _default;

package/lib/visual/VisualMapping.js

@@ -70,7 +70,7 @@ var CATEGORY_DEFAULT_VISUAL_INDEX = -1;
  *                                            visual data can be array or object
  *                                            (like: {cate1: '#222', none: '#fff'})
  *                                            or primary types (which represents
- *                                            defualt category visual), otherwise visual
+ *                                            default category visual), otherwise visual
  *                                            can be array or primary (which will be
  *                                            normalized to array).
  *

package/lib/visual/dataColor.js

@@ -76,29 +76,19 @@ function _default(seriesType) {
         }
 
         if (!singleDataColor) {
-          var color = itemModel.get('itemStyle.color') || seriesModel.getColorFromPalette(dataAll.getName(rawIdx) || rawIdx + '', seriesModel.__paletteScope, dataAll.count()); // Legend may use the visual info in data before processed
-
-          dataAll.setItemVisual(rawIdx, 'color', color); // Data is not filtered
+          var color = itemModel.get('itemStyle.color') || seriesModel.getColorFromPalette(dataAll.getName(rawIdx) || rawIdx + '', seriesModel.__paletteScope, dataAll.count()); // Data is not filtered
 
           if (filteredIdx != null) {
             data.setItemVisual(filteredIdx, 'color', color);
           }
-        } else {
-          // Set data all color for legend
-          dataAll.setItemVisual(rawIdx, 'color', singleDataColor);
         }
 
         if (!singleDataBorderColor) {
-          var borderColor = itemModel.get('itemStyle.borderColor'); // Legend may use the visual info in data before processed
-
-          dataAll.setItemVisual(rawIdx, 'borderColor', borderColor); // Data is not filtered
+          var borderColor = itemModel.get('itemStyle.borderColor'); // Data is not filtered
 
           if (filteredIdx != null) {
             data.setItemVisual(filteredIdx, 'borderColor', borderColor);
           }
-        } else {
-          // Set data all borderColor for legend
-          dataAll.setItemVisual(rawIdx, 'borderColor', singleDataBorderColor);
         }
       });
     }

package/lib/visual/seriesColor.js

@@ -20,6 +20,10 @@
 
 var Gradient = require("zrender/lib/graphic/Gradient");
 
+var _util = require("zrender/lib/core/util");
+
+var isFunction = _util.isFunction;
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -43,11 +47,15 @@ var _default = {
   performRawSeries: true,
   reset: function (seriesModel, ecModel) {
     var data = seriesModel.getData();
-    var colorAccessPath = (seriesModel.visualColorAccessPath || 'itemStyle.color').split('.');
-    var color = seriesModel.get(colorAccessPath) // Set in itemStyle
-    || seriesModel.getColorFromPalette( // TODO series count changed.
-    seriesModel.name, null, ecModel.getSeriesCount()); // Default color
-    // FIXME Set color function or use the platte color
+    var colorAccessPath = (seriesModel.visualColorAccessPath || 'itemStyle.color').split('.'); // Set in itemStyle
+
+    var color = seriesModel.get(colorAccessPath);
+    var colorCallback = isFunction(color) && !(color instanceof Gradient) ? color : null; // Default color
+
+    if (!color || colorCallback) {
+      color = seriesModel.getColorFromPalette( // TODO series count changed.
+      seriesModel.name, null, ecModel.getSeriesCount());
+    }
 
     data.setVisual('color', color);
     var borderColorAccessPath = (seriesModel.visualBorderColorAccessPath || 'itemStyle.borderColor').split('.');
@@ -55,9 +63,9 @@ var _default = {
     data.setVisual('borderColor', borderColor); // Only visible series has each data be visual encoded
 
     if (!ecModel.isSeriesFiltered(seriesModel)) {
-      if (typeof color === 'function' && !(color instanceof Gradient)) {
+      if (colorCallback) {
         data.each(function (idx) {
-          data.setItemVisual(idx, 'color', color(seriesModel.getDataParams(idx)));
+          data.setItemVisual(idx, 'color', colorCallback(seriesModel.getDataParams(idx)));
         });
       } // itemStyle in each data item
 

package/lib/visual/symbol.js

@@ -51,11 +51,14 @@ function _default(seriesType, defaultSymbolType, legendSymbol) {
       var symbolType = seriesModel.get('symbol');
       var symbolSize = seriesModel.get('symbolSize');
       var keepAspect = seriesModel.get('symbolKeepAspect');
+      var symbolRotate = seriesModel.get('symbolRotate');
       var hasSymbolTypeCallback = isFunction(symbolType);
       var hasSymbolSizeCallback = isFunction(symbolSize);
-      var hasCallback = hasSymbolTypeCallback || hasSymbolSizeCallback;
+      var hasSymbolRotateCallback = isFunction(symbolRotate);
+      var hasCallback = hasSymbolTypeCallback || hasSymbolSizeCallback || hasSymbolRotateCallback;
       var seriesSymbol = !hasSymbolTypeCallback && symbolType ? symbolType : defaultSymbolType;
       var seriesSymbolSize = !hasSymbolSizeCallback ? symbolSize : null;
+      var seriesSymbolRotate = !hasSymbolRotateCallback ? seriesSymbolRotate : null;
       data.setVisual({
         legendSymbol: legendSymbol || seriesSymbol,
         // If seting callback functions on `symbol` or `symbolSize`, for simplicity and avoiding
@@ -64,7 +67,8 @@ function _default(seriesType, defaultSymbolType, legendSymbol) {
         // some cases but generally it is not recommanded.
         symbol: seriesSymbol,
         symbolSize: seriesSymbolSize,
-        symbolKeepAspect: keepAspect
+        symbolKeepAspect: keepAspect,
+        symbolRotate: symbolRotate
       }); // Only visible series has each data be visual encoded
 
       if (ecModel.isSeriesFiltered(seriesModel)) {
@@ -77,12 +81,14 @@ function _default(seriesType, defaultSymbolType, legendSymbol) {
           var params = seriesModel.getDataParams(idx);
           hasSymbolTypeCallback && data.setItemVisual(idx, 'symbol', symbolType(rawValue, params));
           hasSymbolSizeCallback && data.setItemVisual(idx, 'symbolSize', symbolSize(rawValue, params));
+          hasSymbolRotateCallback && data.setItemVisual(idx, 'symbolRotate', symbolRotate(rawValue, params));
         }
 
         if (data.hasItemOption) {
           var itemModel = data.getItemModel(idx);
           var itemSymbolType = itemModel.getShallow('symbol', true);
           var itemSymbolSize = itemModel.getShallow('symbolSize', true);
+          var itemSymbolRotate = itemModel.getShallow('symbolRotate', true);
           var itemSymbolKeepAspect = itemModel.getShallow('symbolKeepAspect', true); // If has item symbol
 
           if (itemSymbolType != null) {
@@ -94,6 +100,10 @@ function _default(seriesType, defaultSymbolType, legendSymbol) {
             data.setItemVisual(idx, 'symbolSize', itemSymbolSize);
           }
 
+          if (itemSymbolRotate != null) {
+            data.setItemVisual(idx, 'symbolRotate', itemSymbolRotate);
+          }
+
           if (itemSymbolKeepAspect != null) {
             data.setItemVisual(idx, 'symbolKeepAspect', itemSymbolKeepAspect);
           }