echarts 4.2.0-rc.2 → 4.2.1

package/src/util/number.js

@@ -17,6 +17,15 @@
 * 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>).
+*/
+
 import * as zrUtil from 'zrender/src/core/util';
 
 var RADIAN_EPSILON = 1e-4;
@@ -432,39 +441,9 @@ export function nice(val, round) {
 }
 
 /**
- * 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
  */
 export function quantile(ascArr, p) {

package/src/visual/visualSolution.js

@@ -195,7 +195,7 @@ export function incrementalApplyVisual(stateList, visualMappings, getValueState,
 
             // Consider performance
             if (rawDataItem && rawDataItem.visualMap === false) {
-                return;
+                continue;
             }
 
             var value = dim != null

package/extension/dataTool/quantile.js

@@ -1,82 +0,0 @@
-
-/*
-* 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.
-*/
-
-/**
- * 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>
- * @param {Array.<number>} ascArr
- */
-function _default(ascArr, p) {
-  var H = (ascArr.length - 1) * p + 1,
-      h = Math.floor(H),
-      v = +ascArr[h - 1],
-      e = H - h;
-  return e ? v + e * (ascArr[h] - v) : v;
-}
-
-module.exports = _default;

package/lib/component/tooltip/TooltipContentManager.js

@@ -1,126 +0,0 @@
-
-/*
-* 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.
-*/
-
-var zrUtil = require("zrender/lib/core/util");
-
-var TooltipContent = require("./TooltipContent");
-
-/*
-* 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.
-*/
-// var each = zrUtil.each;
-
-/**
- * @alias module:echarts/component/tooltip/TooltipContentManager
- * @constructor
- */
-function TooltipContentManager(container, api) {
-  /**
-   * @private
-   */
-  this._contents = {
-    // Default tooltip content
-    main: new TooltipContent(container, api)
-  };
-}
-
-TooltipContentManager.prototype = {
-  constructor: TooltipContentManager,
-
-  /**
-   * Update when tooltip is rendered
-   */
-  update: function () {
-    this._each('update');
-  },
-
-  /**
-   * @param {module:echarts/component/tooltip/TooltipModel}
-   * @param {string} [key='main']
-   */
-  show: function (tooltipModel, key) {
-    key = key || 'main';
-
-    this._giveContent(key).show(tooltipModel);
-  },
-
-  /**
-   * Create content if not exists.
-   */
-  _giveContent: function (key) {
-    return this._contents[key] || (this._contents[key] = new TooltipContent());
-  },
-  setContent: function (content) {
-    this.el.innerHTML = content;
-  },
-  setEnterable: function (enterable) {
-    this._enterable = enterable;
-  },
-  getSize: function () {
-    var el = this.el;
-    return [el.clientWidth, el.clientHeight];
-  },
-  moveTo: function (x, y) {
-    var style = this.el.style;
-    style.left = x + 'px';
-    style.top = y + 'px';
-    this._x = x;
-    this._y = y;
-  },
-  hide: function () {
-    this.el.style.display = 'none';
-    this._show = false;
-  },
-  // showLater: function ()
-  hideLater: function (time) {
-    if (this._show && !(this._inContent && this._enterable)) {
-      if (time) {
-        this._hideDelay = time; // Set show false to avoid invoke hideLater mutiple times
-
-        this._show = false;
-        this._hideTimeout = setTimeout(zrUtil.bind(this.hide, this), time);
-      } else {
-        this.hide();
-      }
-    }
-  },
-  _each: function (method, args) {
-    zrUtil.each(this._contents, function (content) {
-      content[method].apply(content, args);
-    });
-  }
-};
-var _default = TooltipContentManager;
-module.exports = _default;

package/lib/util/nest.js

@@ -1,148 +0,0 @@
-
-/*
-* 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.
-*/
-
-var zrUtil = require("zrender/lib/core/util");
-
-/*
-* 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.
-*/
-
-/*
-* The 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>).
-*/
-
-/**
- * nest helper used to group by the array.
- * can specified the keys and sort the keys.
- */
-function nest() {
-  var keysFunction = [];
-  var sortKeysFunction = [];
-  /**
-   * map an Array into the mapObject.
-   * @param {Array} array
-   * @param {number} depth
-   */
-
-  function map(array, depth) {
-    if (depth >= keysFunction.length) {
-      return array;
-    }
-
-    var i = -1;
-    var n = array.length;
-    var keyFunction = keysFunction[depth++];
-    var mapObject = {};
-    var valuesByKey = {};
-
-    while (++i < n) {
-      var keyValue = keyFunction(array[i]);
-      var values = valuesByKey[keyValue];
-
-      if (values) {
-        values.push(array[i]);
-      } else {
-        valuesByKey[keyValue] = [array[i]];
-      }
-    }
-
-    zrUtil.each(valuesByKey, function (value, key) {
-      mapObject[key] = map(value, depth);
-    });
-    return mapObject;
-  }
-  /**
-   * transform the Map Object to multidimensional Array
-   * @param {Object} map
-   * @param {number} depth
-   */
-
-
-  function entriesMap(mapObject, depth) {
-    if (depth >= keysFunction.length) {
-      return mapObject;
-    }
-
-    var array = [];
-    var sortKeyFunction = sortKeysFunction[depth++];
-    zrUtil.each(mapObject, function (value, key) {
-      array.push({
-        key: key,
-        values: entriesMap(value, depth)
-      });
-    });
-
-    if (sortKeyFunction) {
-      return array.sort(function (a, b) {
-        return sortKeyFunction(a.key, b.key);
-      });
-    }
-
-    return array;
-  }
-
-  return {
-    /**
-     * specified the key to groupby the arrays.
-     * users can specified one more keys.
-     * @param {Function} d
-     */
-    key: function (d) {
-      keysFunction.push(d);
-      return this;
-    },
-
-    /**
-     * specified the comparator to sort the keys
-     * @param {Function} order
-     */
-    sortKeys: function (order) {
-      sortKeysFunction[keysFunction.length - 1] = order;
-      return this;
-    },
-
-    /**
-     * the array to be grouped by.
-     * @param {Array} array
-     */
-    entries: function (array) {
-      return entriesMap(map(array, 0), 0);
-    }
-  };
-}
-
-module.exports = nest;

package/src/component/tooltip/TooltipContentManager.js

@@ -1,120 +0,0 @@
-
-/*
-* 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.
-*/
-
-import * as zrUtil from 'zrender/src/core/util';
-import TooltipContent from './TooltipContent';
-
-// var each = zrUtil.each;
-
-/**
- * @alias module:echarts/component/tooltip/TooltipContentManager
- * @constructor
- */
-function TooltipContentManager(container, api) {
-
-    /**
-     * @private
-     */
-    this._contents = {
-        // Default tooltip content
-        main: new TooltipContent(container, api)
-    };
-}
-
-TooltipContentManager.prototype = {
-
-    constructor: TooltipContentManager,
-
-    /**
-     * Update when tooltip is rendered
-     */
-    update: function () {
-        this._each('update');
-    },
-
-    /**
-     * @param {module:echarts/component/tooltip/TooltipModel}
-     * @param {string} [key='main']
-     */
-    show: function (tooltipModel, key) {
-        key = key || 'main';
-        this._giveContent(key).show(tooltipModel);
-    },
-
-    /**
-     * Create content if not exists.
-     */
-    _giveContent: function (key) {
-        return this._contents[key] || (
-            this._contents[key] = new TooltipContent()
-        );
-    },
-
-    setContent: function (content) {
-        this.el.innerHTML = content;
-    },
-
-    setEnterable: function (enterable) {
-        this._enterable = enterable;
-    },
-
-    getSize: function () {
-        var el = this.el;
-        return [el.clientWidth, el.clientHeight];
-    },
-
-    moveTo: function (x, y) {
-        var style = this.el.style;
-        style.left = x + 'px';
-        style.top = y + 'px';
-
-        this._x = x;
-        this._y = y;
-    },
-
-    hide: function () {
-        this.el.style.display = 'none';
-        this._show = false;
-    },
-
-    // showLater: function ()
-
-    hideLater: function (time) {
-        if (this._show && !(this._inContent && this._enterable)) {
-            if (time) {
-                this._hideDelay = time;
-                // Set show false to avoid invoke hideLater mutiple times
-                this._show = false;
-                this._hideTimeout = setTimeout(zrUtil.bind(this.hide, this), time);
-            }
-            else {
-                this.hide();
-            }
-        }
-    },
-
-    _each: function (method, args) {
-        zrUtil.each(this._contents, function (content) {
-            content[method].apply(content, args);
-        });
-    }
-};
-
-export default TooltipContentManager;

package/src/util/nest.js

@@ -1,127 +0,0 @@
-/*
-* 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.
-*/
-
-/*
-* The 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>).
-*/
-
-
-import * as zrUtil from 'zrender/src/core/util';
-
-/**
- * nest helper used to group by the array.
- * can specified the keys and sort the keys.
- */
-export default function nest() {
-
-    var keysFunction = [];
-    var sortKeysFunction = [];
-
-    /**
-     * map an Array into the mapObject.
-     * @param {Array} array
-     * @param {number} depth
-     */
-    function map(array, depth) {
-        if (depth >= keysFunction.length) {
-            return array;
-        }
-        var i = -1;
-        var n = array.length;
-        var keyFunction = keysFunction[depth++];
-        var mapObject = {};
-        var valuesByKey = {};
-
-        while (++i < n) {
-            var keyValue = keyFunction(array[i]);
-            var values = valuesByKey[keyValue];
-
-            if (values) {
-                values.push(array[i]);
-            }
-            else {
-                valuesByKey[keyValue] = [array[i]];
-            }
-        }
-
-        zrUtil.each(valuesByKey, function (value, key) {
-            mapObject[key] = map(value, depth);
-        });
-
-        return mapObject;
-    }
-
-    /**
-     * transform the Map Object to multidimensional Array
-     * @param {Object} map
-     * @param {number} depth
-     */
-    function entriesMap(mapObject, depth) {
-        if (depth >= keysFunction.length) {
-            return mapObject;
-        }
-        var array = [];
-        var sortKeyFunction = sortKeysFunction[depth++];
-
-        zrUtil.each(mapObject, function (value, key) {
-            array.push({
-                key: key, values: entriesMap(value, depth)
-            });
-        });
-
-        if (sortKeyFunction) {
-            return array.sort(function (a, b) {
-                return sortKeyFunction(a.key, b.key);
-            });
-        }
-
-        return array;
-    }
-
-    return {
-        /**
-         * specified the key to groupby the arrays.
-         * users can specified one more keys.
-         * @param {Function} d
-         */
-        key: function (d) {
-            keysFunction.push(d);
-            return this;
-        },
-
-        /**
-         * specified the comparator to sort the keys
-         * @param {Function} order
-         */
-        sortKeys: function (order) {
-            sortKeysFunction[keysFunction.length - 1] = order;
-            return this;
-        },
-
-        /**
-         * the array to be grouped by.
-         * @param {Array} array
-         */
-        entries: function (array) {
-            return entriesMap(map(array, 0), 0);
-        }
-    };
-}