echarts 4.2.0-rc.2 → 4.2.1

package/lib/echarts.js

@@ -101,9 +101,9 @@ var each = zrUtil.each;
 var isFunction = zrUtil.isFunction;
 var isObject = zrUtil.isObject;
 var parseClassType = ComponentModel.parseClassType;
-var version = '4.2.0';
+var version = '4.2.1';
 var dependencies = {
-  zrender: '4.0.5'
+  zrender: '4.0.6'
 };
 var TEST_FRAME_REMAIN_TIME = 1;
 var PRIORITY_PROCESSOR_FILTER = 1000;
@@ -1396,7 +1396,7 @@ var MOUSE_EVENT_NAMES = ['click', 'dblclick', 'mouseover', 'mouseout', 'mousemov
 
 echartsProto._initEvents = function () {
   each(MOUSE_EVENT_NAMES, function (eveName) {
-    this._zr.on(eveName, function (e) {
+    var handler = function (e) {
       var ecModel = this.getModel();
       var el = e.target;
       var params;
@@ -1444,7 +1444,16 @@ echartsProto._initEvents = function () {
         };
         this.trigger(eveName, params);
       }
-    }, this);
+    }; // Consider that some component (like tooltip, brush, ...)
+    // register zr event handler, but user event handler might
+    // do anything, such as call `setOption` or `dispatchAction`,
+    // which probably update any of the content and probably
+    // cause problem if it is called previous other inner handlers.
+
+
+    handler.zrEventfulCallAtLast = true;
+
+    this._zr.on(eveName, handler, this);
   }, this);
   each(eventActionMap, function (actionType, eventType) {
     this._messageCenter.on(eventType, function (event) {

package/lib/model/Model.js

@@ -66,7 +66,7 @@ var inner = makeInner();
 /**
  * @alias module:echarts/model/Model
  * @constructor
- * @param {Object} option
+ * @param {Object} [option]
  * @param {module:echarts/model/Model} [parentModel]
  * @param {module:echarts/model/Global} [ecModel]
  */

package/lib/model/mixin/textStyle.js

@@ -65,7 +65,7 @@ var _default = {
     }, this.ecModel);
   },
   getTextRect: function (text) {
-    return textContain.getBoundingRect(text, this.getFont(), this.getShallow('align'), this.getShallow('verticalAlign') || this.getShallow('baseline'), this.getShallow('padding'), this.getShallow('rich'), this.getShallow('truncateText'));
+    return textContain.getBoundingRect(text, this.getFont(), this.getShallow('align'), this.getShallow('verticalAlign') || this.getShallow('baseline'), this.getShallow('padding'), this.getShallow('lineHeight'), this.getShallow('rich'), this.getShallow('truncateText'));
   }
 };
 module.exports = _default;

package/lib/scale/Time.js

@@ -48,9 +48,13 @@ var IntervalScale = require("./Interval");
 */
 
 /*
-* The `scaleLevels` references to d3.js. The use of the source
-* code of this file is also subject to the terms and consitions
-* of its license (BSD-3Clause, see <echarts/src/licenses/LICENSE-d3>).
+* A third-party license is embeded for some of the code in this file:
+* The "scaleLevels" was originally copied from "d3.js" with some
+* modifications made for this project.
+* (See more details in the comment on the definition of "scaleLevels" below.)
+* The use of the source code of this file is also subject to the terms
+* and consitions of the license of "d3.js" (BSD-3Clause, see
+* </licenses/LICENSE-d3>).
 */
 // [About UTC and local time zone]:
 // In most cases, `number.parseDate` will treat input data string as local time
@@ -179,7 +183,13 @@ zrUtil.each(['contain', 'normalize'], function (methodName) {
   TimeScale.prototype[methodName] = function (val) {
     return intervalScaleProto[methodName].call(this, this.parse(val));
   };
-}); // Steps from d3, see the license statement at the top of this file.
+});
+/**
+ * This implementation was originally copied from "d3.js"
+ * <https://github.com/d3/d3/blob/b516d77fb8566b576088e73410437494717ada26/src/time/scale.js>
+ * with some modifications made for this program.
+ * See the license statement at the head of this file.
+ */
 
 var scaleLevels = [// Format              interval
 ['hh:mm:ss', ONE_SECOND], // 1s

package/lib/util/format.js

@@ -233,7 +233,35 @@ function capitalFirst(str) {
 }
 
 var truncateText = textContain.truncateText;
-var getTextRect = textContain.getBoundingRect;
+/**
+ * @public
+ * @param {Object} opt
+ * @param {string} opt.text
+ * @param {string} opt.font
+ * @param {string} [opt.textAlign='left']
+ * @param {string} [opt.textVerticalAlign='top']
+ * @param {Array.<number>} [opt.textPadding]
+ * @param {number} [opt.textLineHeight]
+ * @param {Object} [opt.rich]
+ * @param {Object} [opt.truncate]
+ * @return {Object} {x, y, width, height, lineHeight}
+ */
+
+function getTextBoundingRect(opt) {
+  return textContain.getBoundingRect(opt.text, opt.font, opt.textAlign, opt.textVerticalAlign, opt.textPadding, opt.textLineHeight, opt.rich, opt.truncate);
+}
+/**
+ * @deprecated
+ * the `textLineHeight` was added later.
+ * For backward compatiblility, put it as the last parameter.
+ * But deprecated this interface. Please use `getTextBoundingRect` instead.
+ */
+
+
+function getTextRect(text, font, textAlign, textVerticalAlign, textPadding, rich, truncate, textLineHeight) {
+  return textContain.getBoundingRect(text, font, textAlign, textVerticalAlign, textPadding, textLineHeight, rich, truncate);
+}
+
 exports.addCommas = addCommas;
 exports.toCamelCase = toCamelCase;
 exports.normalizeCssArray = normalizeCssArray;
@@ -244,4 +272,5 @@ exports.getTooltipMarker = getTooltipMarker;
 exports.formatTime = formatTime;
 exports.capitalFirst = capitalFirst;
 exports.truncateText = truncateText;
+exports.getTextBoundingRect = getTextBoundingRect;
 exports.getTextRect = getTextRect;

package/lib/util/graphic.js

@@ -122,6 +122,7 @@ var round = Math.round;
 var mathMax = Math.max;
 var mathMin = Math.min;
 var EMPTY_OBJ = {};
+var Z2_EMPHASIS_LIFT = 1;
 /**
  * Extend shape with parameters
  */
@@ -347,11 +348,12 @@ function cacheElementStl(el) {
   var hoverStyle = el.__hoverStl;
 
   if (!hoverStyle) {
-    el.__normalStl = null;
+    el.__cachedNormalStl = el.__cachedNormalZ2 = null;
     return;
   }
 
-  var normalStyle = el.__normalStl = {};
+  var normalStyle = el.__cachedNormalStl = {};
+  el.__cachedNormalZ2 = el.z2;
   var elStyle = el.style;
 
   for (var name in hoverStyle) {
@@ -387,10 +389,7 @@ function doSingleEnterHover(el) {
   if (useHoverLayer) {
     elTarget = zr.addHover(el);
     targetStyle = elTarget.style;
-  } // Consider case: only `position: 'top'` is set on emphasis, then text
-  // color should be returned to `autoColor`, rather than remain '#fff'.
-  // So we should rollback then apply again after style merging.
-
+  }
 
   rollbackDefaultTextStyle(targetStyle);
 
@@ -424,7 +423,7 @@ function doSingleEnterHover(el) {
 
   if (!useHoverLayer) {
     el.dirty(false);
-    el.z2 += 1;
+    el.z2 += Z2_EMPHASIS_LIFT;
   }
 }
 
@@ -435,20 +434,19 @@ function setDefaultHoverFillStroke(targetStyle, hoverStyle, prop) {
 }
 
 function doSingleLeaveHover(el) {
-  if (el.__highlighted) {
-    doSingleRestoreHoverStyle(el);
-    el.__highlighted = false;
+  var highlighted = el.__highlighted;
+
+  if (!highlighted) {
+    return;
   }
-}
 
-function doSingleRestoreHoverStyle(el) {
-  var highlighted = el.__highlighted;
+  el.__highlighted = false;
 
   if (highlighted === 'layer') {
     el.__zr && el.__zr.removeHover(el);
   } else if (highlighted) {
     var style = el.style;
-    var normalStl = el.__normalStl;
+    var normalStl = el.__cachedNormalStl;
 
     if (normalStl) {
       rollbackDefaultTextStyle(style); // Consider null/undefined value, should use
@@ -456,7 +454,15 @@ function doSingleRestoreHoverStyle(el) {
 
       el.setStyle(normalStl);
       applyDefaultTextStyle(style);
-      el.z2 -= 1;
+    } // `__cachedNormalZ2` will not be reset if calling `setElementHoverStyle`
+    // when `el` is on emphasis state. So here by comparing with 1, we try
+    // hard to make the bug case rare.
+
+
+    var normalZ2 = el.__cachedNormalZ2;
+
+    if (normalZ2 != null && el.z2 - normalZ2 === Z2_EMPHASIS_LIFT) {
+      el.z2 = normalZ2;
     }
   }
 }
@@ -467,7 +473,10 @@ function traverseCall(el, method) {
   }) : method(el);
 }
 /**
- * Set hover style of element.
+ * Set hover style (namely "emphasis style") of element, based on the current
+ * style of the given `el`.
+ * This method should be called after all of the normal styles have been adopted
+ * to the `el`. See the reason on `setHoverStyle`.
  *
  * @param {module:zrender/Element} el Should not be `zrender/container/Group`.
  * @param {Object|boolean} [hoverStl] The specified hover style.
@@ -481,10 +490,26 @@ function traverseCall(el, method) {
 
 
 function setElementHoverStyle(el, hoverStl) {
+  // For performance consideration, it might be better to make the "hover style" only the
+  // difference properties from the "normal style", but not a entire copy of all styles.
   hoverStl = el.__hoverStl = hoverStl !== false && (hoverStl || {});
-  el.__hoverStlDirty = true;
+  el.__hoverStlDirty = true; // FIXME
+  // It is not completely right to save "normal"/"emphasis" flag on elements.
+  // It probably should be saved on `data` of series. Consider the cases:
+  // (1) A highlighted elements are moved out of the view port and re-enter
+  // again by dataZoom.
+  // (2) call `setOption` and replace elements totally when they are highlighted.
 
   if (el.__highlighted) {
+    // Consider the case:
+    // The styles of a highlighted `el` is being updated. The new "emphasis style"
+    // should be adapted to the `el`. Notice here new "normal styles" should have
+    // been set outside and the cached "normal style" is out of date.
+    el.__cachedNormalStl = null; // Do not clear `__cachedNormalZ2` here, because setting `z2` is not a constraint
+    // of this method. In most cases, `z2` is not set and hover style should be able
+    // to rollback. Of course, that would bring bug, but only in a rare case, see
+    // `doSingleLeaveHover` for details.
+
     doSingleLeaveHover(el);
     doSingleEnterHover(el);
   }
@@ -534,12 +559,29 @@ function leaveEmphasis() {
   traverseCall(this, doSingleLeaveHover);
 }
 /**
- * Set hover style of element.
+ * Set hover style (namely "emphasis style") of element,
+ * based on the current style of the given `el`.
+ *
+ * (1)
+ * **CONSTRAINTS** for this method:
+ * <A> This method MUST be called after all of the normal styles having been adopted
+ * to the `el`.
+ * <B> The input `hoverStyle` (that is, "emphasis style") MUST be the subset of the
+ * "normal style" having been set to the el.
+ * <C> `color` MUST be one of the "normal styles" (because color might be lifted as
+ * a default hover style).
+ *
+ * The reason: this method treat the current style of the `el` as the "normal style"
+ * and cache them when enter/update the "emphasis style". Consider the case: the `el`
+ * is in "emphasis" state and `setOption`/`dispatchAction` trigger the style updating
+ * logic, where the el should shift from the original emphasis style to the new
+ * "emphasis style" and should be able to "downplay" back to the new "normal style".
  *
- * [Caveat]:
- * This method can be called repeatly and achieve the same result.
+ * Indeed, it is error-prone to make a interface has so many constraints, but I have
+ * not found a better solution yet to fit the backward compatibility, performance and
+ * the current programming style.
  *
- * [Usage]:
+ * (2)
  * Call the method for a "root" element once. Do not call it for each descendants.
  * If the descendants elemenets of a group has itself hover style different from the
  * root group, we can simply mount the style on `el.hoverStyle` for them, but should
@@ -590,6 +632,7 @@ function setAsHoverStyleTrigger(el, opt) {
   }
 }
 /**
+ * See more info in `setTextStyleCommon`.
  * @param {Object|module:zrender/graphic/Style} normalStyle
  * @param {Object} emphasisStyle
  * @param {module:echarts/model/Model} normalModel
@@ -650,6 +693,7 @@ function setLabelStyle(normalStyle, emphasisStyle, normalModel, emphasisModel, o
 }
 /**
  * Set basic textStyle properties.
+ * See more info in `setTextStyleCommon`.
  * @param {Object|module:zrender/graphic/Style} textStyle
  * @param {module:echarts/model/Model} model
  * @param {Object} [specifiedTextStyle] Can be overrided by settings in model.
@@ -666,6 +710,7 @@ function setTextStyle(textStyle, textStyleModel, specifiedTextStyle, opt, isEmph
 }
 /**
  * Set text option in the style.
+ * See more info in `setTextStyleCommon`.
  * @deprecated
  * @param {Object} textStyle
  * @param {module:echarts/model/Model} labelModel
@@ -690,7 +735,23 @@ function setText(textStyle, labelModel, defaultColor) {
   setTextStyleCommon(textStyle, labelModel, opt, isEmphasis); // textStyle.host && textStyle.host.dirty && textStyle.host.dirty(false);
 }
 /**
- * {
+ * The uniform entry of set text style, that is, retrieve style definitions
+ * from `model` and set to `textStyle` object.
+ *
+ * Never in merge mode, but in overwrite mode, that is, all of the text style
+ * properties will be set. (Consider the states of normal and emphasis and
+ * default value can be adopted, merge would make the logic too complicated
+ * to manage.)
+ *
+ * The `textStyle` object can either be a plain object or an instance of
+ * `zrender/src/graphic/Style`, and either be the style of normal or emphasis.
+ * After this mothod called, the `textStyle` object can then be used in
+ * `el.setStyle(textStyle)` or `el.hoverStyle = textStyle`.
+ *
+ * Default value will be adopted and `insideRollbackOpt` will be created.
+ * See `applyDefaultTextStyle` `rollbackDefaultTextStyle` for more details.
+ *
+ * opt: {
  *      disableBox: boolean, Whether diable drawing box of block (outer most).
  *      isRectText: boolean,
  *      autoColor: string, specify a color when color is 'auto',
@@ -859,14 +920,28 @@ function setTokenTextStyle(textStyle, textStyleModel, globalTextStyle, opt, isEm
 
 function getAutoColor(color, opt) {
   return color !== 'auto' ? color : opt && opt.autoColor ? opt.autoColor : null;
-} // When text position is `inside` and `textFill` not specified, we
-// provide a mechanism to auto make text border for better view. But
-// text position changing when hovering or being emphasis should be
-// considered, where the `insideRollback` enables to restore the style.
+}
+/**
+ * Give some default value to the input `textStyle` object, based on the current settings
+ * in this `textStyle` object.
+ *
+ * The Scenario:
+ * when text position is `inside` and `textFill` is not specified, we show
+ * text border by default for better view. But it should be considered that text position
+ * might be changed when hovering or being emphasis, where the `insideRollback` is used to
+ * restore the style.
+ *
+ * Usage (& NOTICE):
+ * When a style object (eithor plain object or instance of `zrender/src/graphic/Style`) is
+ * about to be modified on its text related properties, `rollbackDefaultTextStyle` should
+ * be called before the modification and `applyDefaultTextStyle` should be called after that.
+ * (For the case that all of the text related properties is reset, like `setTextStyleCommon`
+ * does, `rollbackDefaultTextStyle` is not needed to be called).
+ */
 
 
 function applyDefaultTextStyle(textStyle) {
-  var opt = textStyle.insideRollbackOpt; // Only insideRollbackOpt create (setTextStyleCommon used),
+  var opt = textStyle.insideRollbackOpt; // Only `insideRollbackOpt` created (in `setTextStyleCommon`),
   // applyDefaultTextStyle works.
 
   if (!opt || textStyle.textFill != null) {
@@ -903,6 +978,17 @@ function applyDefaultTextStyle(textStyle) {
     textStyle.insideRollback = insideRollback;
   }
 }
+/**
+ * Consider the case: in a scatter,
+ * label: {
+ *     normal: {position: 'inside'},
+ *     emphasis: {position: 'top'}
+ * }
+ * In the normal state, the `textFill` will be set as '#fff' for pretty view (see
+ * `applyDefaultTextStyle`), but when switching to emphasis state, the `textFill`
+ * should be retured to 'autoColor', but not keep '#fff'.
+ */
+
 
 function rollbackDefaultTextStyle(style) {
   var insideRollback = style.insideRollback;
@@ -1179,6 +1265,7 @@ function createIcon(iconStr, opt, rect) {
   }
 }
 
+exports.Z2_EMPHASIS_LIFT = Z2_EMPHASIS_LIFT;
 exports.extendShape = extendShape;
 exports.extendPath = extendPath;
 exports.makePath = makePath;

package/lib/util/model.js

@@ -502,6 +502,31 @@ function getTooltipRenderMode(renderModeOption) {
     return renderModeOption || 'html';
   }
 }
+/**
+ * Group a list by key.
+ *
+ * @param {Array} array
+ * @param {Function} getKey
+ *        param {*} Array item
+ *        return {string} key
+ * @return {Object} Result
+ *        {Array}: keys,
+ *        {module:zrender/core/util/HashMap} buckets: {key -> Array}
+ */
+
+
+function groupData(array, getKey) {
+  var buckets = zrUtil.createHashMap();
+  var keys = [];
+  zrUtil.each(array, function (item) {
+    var key = getKey(item);
+    (buckets.get(key) || (keys.push(key), buckets.set(key, []))).push(item);
+  });
+  return {
+    keys: keys,
+    buckets: buckets
+  };
+}
 
 exports.normalizeToArray = normalizeToArray;
 exports.defaultEmphasis = defaultEmphasis;
@@ -518,4 +543,5 @@ exports.makeInner = makeInner;
 exports.parseFinder = parseFinder;
 exports.setAttribute = setAttribute;
 exports.getAttribute = getAttribute;
-exports.getTooltipRenderMode = getTooltipRenderMode;
+exports.getTooltipRenderMode = getTooltipRenderMode;
+exports.groupData = groupData;

package/lib/util/number.js

@@ -38,6 +38,15 @@ var zrUtil = require("zrender/lib/core/util");
 * specific language governing permissions and limitations
 * under the License.
 */
+
+/*
+* A third-party license is embeded for some of the code in this file:
+* The method "quantile" was copied from "d3.js".
+* (See more details in the comment of the method below.)
+* The use of the source code of this file is also subject to the terms
+* and consitions of the license of "d3.js" (BSD-3Clause, see
+* </licenses/LICENSE-d3>).
+*/
 var RADIAN_EPSILON = 1e-4;
 
 function _trim(str) {
@@ -440,39 +449,9 @@ function nice(val, round) {
   return exponent >= -20 ? +val.toFixed(exponent < 0 ? -exponent : 0) : val;
 }
 /**
- * BSD 3-Clause
- *
- * Copyright (c) 2010-2015, Michael Bostock
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * The name Michael Bostock may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * @see <https://github.com/mbostock/d3/blob/master/src/arrays/quantile.js>
- * @see <http://en.wikipedia.org/wiki/Quantile>
+ * This code was copied from "d3.js"
+ * <https://github.com/d3/d3/blob/9cc9a875e636a1dcf36cc1e07bdf77e1ad6e2c74/src/arrays/quantile.js>.
+ * See the license statement at the head of this file.
  * @param {Array.<number>} ascArr
  */
 

package/lib/visual/visualSolution.js

@@ -211,7 +211,7 @@ function incrementalApplyVisual(stateList, visualMappings, getValueState, dim) {
       var rawDataItem = data.getRawDataItem(dataIndex); // Consider performance
 
       if (rawDataItem && rawDataItem.visualMap === false) {
-        return;
+        continue;
       }
 
       var value = dim != null ? data.get(dim, dataIndex, true) : dataIndex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echarts",
-  "version": "4.2.0-rc.2",
+  "version": "4.2.1",
   "description": "A powerful charting and visualization library for browser",
   "keywords": [
     "visualization",
@@ -15,7 +15,7 @@
     "prepublish": "node build/build.js --prepublish"
   },
   "dependencies": {
-    "zrender": "4.0.5"
+    "zrender": "4.0.7"
   },
   "devDependencies": {
     "@babel/core": "7.0.0-beta.31",
@@ -33,7 +33,6 @@
     "glob": "7.0.0",
     "rollup": "0.50.0",
     "rollup-plugin-node-resolve": "3.0.0",
-    "rollup-plugin-uglify": "2.0.1",
-    "zrender": "4.0.5"
+    "rollup-plugin-uglify": "2.0.1"
   }
 }

package/src/chart/graph/GraphView.js

@@ -27,6 +27,8 @@ import {onIrrelevantElement} from '../../component/helper/cursorHelper';
 import * as graphic from '../../util/graphic';
 import adjustEdge from './adjustEdge';
 
+var FOCUS_ADJACENCY = '__focusNodeAdjacency';
+var UNFOCUS_ADJACENCY = '__unfocusNodeAdjacency';
 
 var nodeOpacityPath = ['itemStyle', 'opacity'];
 var lineOpacityPath = ['lineStyle', 'opacity'];
@@ -47,7 +49,11 @@ function fadeOutItem(item, opacityPath, opacityRatio) {
     el.downplay && el.downplay();
     el.traverse(function (child) {
         if (child.type !== 'group') {
-            child.setStyle('opacity', opacity);
+            var opct = child.lineLabelOriginalOpacity;
+            if (opct == null || opacityRatio != null) {
+                opct = opacity;
+            }
+            child.setStyle('opacity', opct);
         }
     });
 }
@@ -151,24 +157,23 @@ export default echarts.extendChartView({
             }
             el.setDraggable(draggable && forceLayout);
 
-            el.off('mouseover', el.__focusNodeAdjacency);
-            el.off('mouseout', el.__unfocusNodeAdjacency);
+            el[FOCUS_ADJACENCY] && el.off('mouseover', el[FOCUS_ADJACENCY]);
+            el[UNFOCUS_ADJACENCY] && el.off('mouseout', el[UNFOCUS_ADJACENCY]);
 
             if (itemModel.get('focusNodeAdjacency')) {
-                el.on('mouseover', el.__focusNodeAdjacency = function () {
+                el.on('mouseover', el[FOCUS_ADJACENCY] = function () {
                     api.dispatchAction({
                         type: 'focusNodeAdjacency',
                         seriesId: seriesModel.id,
                         dataIndex: el.dataIndex
                     });
                 });
-                el.on('mouseout', el.__unfocusNodeAdjacency = function () {
+                el.on('mouseout', el[UNFOCUS_ADJACENCY] = function () {
                     api.dispatchAction({
                         type: 'unfocusNodeAdjacency',
                         seriesId: seriesModel.id
                     });
                 });
-
             }
 
         }, this);
@@ -176,18 +181,18 @@ export default echarts.extendChartView({
         data.graph.eachEdge(function (edge) {
             var el = edge.getGraphicEl();
 
-            el.off('mouseover', el.__focusNodeAdjacency);
-            el.off('mouseout', el.__unfocusNodeAdjacency);
+            el[FOCUS_ADJACENCY] && el.off('mouseover', el[FOCUS_ADJACENCY]);
+            el[UNFOCUS_ADJACENCY] && el.off('mouseout', el[UNFOCUS_ADJACENCY]);
 
             if (edge.getModel().get('focusNodeAdjacency')) {
-                el.on('mouseover', el.__focusNodeAdjacency = function () {
+                el.on('mouseover', el[FOCUS_ADJACENCY] = function () {
                     api.dispatchAction({
                         type: 'focusNodeAdjacency',
                         seriesId: seriesModel.id,
                         edgeDataIndex: edge.dataIndex
                     });
                 });
-                el.on('mouseout', el.__unfocusNodeAdjacency = function () {
+                el.on('mouseout', el[UNFOCUS_ADJACENCY] = function () {
                     api.dispatchAction({
                         type: 'unfocusNodeAdjacency',
                         seriesId: seriesModel.id

package/src/chart/graph/forceHelper.js

@@ -18,10 +18,13 @@
 */
 
 /*
-* The layout implementation references to d3.js. The use of
-* the source code of this file is also subject to the terms
-* and consitions of its license (BSD-3Clause, see
-* <echarts/src/licenses/LICENSE-d3>).
+* A third-party license is embeded for some of the code in this file:
+* Some formulas were originally copied from "d3.js" with some
+* modifications made for this project.
+* (See more details in the comment of the method "step" below.)
+* The use of the source code of this file is also subject to the terms
+* and consitions of the license of "d3.js" (BSD-3Clause, see
+* </licenses/LICENSE-d3>).
 */
 
 import * as vec2 from 'zrender/src/core/vector';
@@ -53,26 +56,10 @@ export function forceLayout(nodes, edges, opts) {
     for (var i = 0; i < nodes.length; i++) {
         var n = nodes[i];
         if (!n.p) {
-            // Use the position from first adjecent node with defined position
-            // Or use a random position
-            // From d3
-            // if (n.edges) {
-            //     var j = -1;
-            //     while (++j < n.edges.length) {
-            //         var e = n.edges[j];
-            //         var other = adjacentNode(n, e);
-            //         if (other.p) {
-            //             n.p = vec2.clone(other.p);
-            //             break;
-            //         }
-            //     }
-            // }
-            // if (!n.p) {
-                n.p = vec2.create(
-                    width * (Math.random() - 0.5) + center[0],
-                    height * (Math.random() - 0.5) + center[1]
-                );
-            // }
+            n.p = vec2.create(
+                width * (Math.random() - 0.5) + center[0],
+                height * (Math.random() - 0.5) + center[1]
+            );
         }
         n.pp = vec2.clone(n.p);
         n.edges = null;
@@ -97,6 +84,12 @@ export function forceLayout(nodes, edges, opts) {
             nodes[idx].fixed = false;
         },
 
+        /**
+         * Some formulas were originally copied from "d3.js"
+         * https://github.com/d3/d3/blob/b516d77fb8566b576088e73410437494717ada26/src/layout/force.js
+         * with some modifications made for this project.
+         * See the license statement at the head of this file.
+         */
         step: function (cb) {
             var v12 = [];
             var nLen = nodes.length;