echarts 4.0.1 → 4.1.0

package/src/visual/visualDefault.js

@@ -1,3 +1,22 @@
+/*
+* 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.
+*/
+
 /**
  * @file Visual mapping.
  */

package/src/visual/visualSolution.js

@@ -1,3 +1,22 @@
+/*
+* 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.
+*/
+
 /**
  * @file Visual solution, for consistent option specification.
  */
@@ -115,10 +134,10 @@ export function applyVisual(stateList, visualMappings, data, getValueState, scop
     }
 
     if (dimension == null) {
-        data.each(eachItem, true);
+        data.each(eachItem);
     }
     else {
-        data.each([dimension], eachItem, true);
+        data.each([dimension], eachItem);
     }
 
     function eachItem(valueOrIndex, index) {
@@ -170,7 +189,8 @@ export function incrementalApplyVisual(stateList, visualMappings, getValueState,
             data.setItemVisual(dataIndex, key, value);
         }
 
-        for (var dataIndex = params.start; dataIndex < params.end; dataIndex++) {
+        var dataIndex;
+        while ((dataIndex = params.next()) != null) {
             var rawDataItem = data.getRawDataItem(dataIndex);
 
             // Consider performance

package/theme/dark.js

@@ -1,3 +1,22 @@
+/*
+* 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.
+*/
+
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.

package/theme/infographic.js

@@ -1,3 +1,22 @@
+/*
+* 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.
+*/
+
 (function (root, factory) {if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
         define(['exports', 'echarts'], factory);

package/theme/macarons.js

@@ -1,3 +1,22 @@
+/*
+* 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.
+*/
+
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.

package/theme/roma.js

@@ -1,3 +1,22 @@
+/*
+* 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.
+*/
+
 (function (root, factory) {if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
         define(['exports', 'echarts'], factory);

package/theme/shine.js

@@ -1,3 +1,22 @@
+/*
+* 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.
+*/
+
 (function (root, factory) {if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
         define(['exports', 'echarts'], factory);

package/theme/vintage.js

@@ -1,3 +1,22 @@
+/*
+* 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.
+*/
+
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.

package/build/rollup-plugin-ec-dev.js

@@ -1,38 +0,0 @@
-/**
- * Define variable `__DEV__`.
- *
- * Usage:
- *
- * import ecDevPlugin from 'echats/build/rollup-plugin-ec-dev';
- * let rollupConfig = {
- *     plugins: [
- *         ecDevPlugin(),
- *         ...
- *     ]
- * };
- *
- * We use global variable `__DEV__` for convenience, but it bring trouble
- * while building: it is not able to make sure the decaration of `__DEV__`
- * occures in front of the whole code if we use ES module import. So we
- * use the plugin to handle that.
- *
- * See `echarts/src/config.js`.
- */
-
-module.exports = function (opt) {
-
-    return {
-        intro: function () {
-            return [
-                'if (typeof __DEV__ === "undefined") {',
-                '    if (typeof window !== "undefined") {',
-                '        window.__DEV__ = true;',
-                '    }',
-                '    else if (typeof global !== "undefined") {',
-                '        global.__DEV__ = true;',
-                '    }',
-                '}'
-            ].join('\n');
-        }
-    };
-};

package/lib/chart/helper/WhiskerBoxDraw.js

@@ -1,201 +0,0 @@
-var zrUtil = require("zrender/lib/core/util");
-
-var graphic = require("../../util/graphic");
-
-var Path = require("zrender/lib/graphic/Path");
-
-/**
- * @module echarts/chart/helper/Symbol
- */
-var WhiskerPath = Path.extend({
-  type: 'whiskerInBox',
-  shape: {},
-  buildPath: function (ctx, shape) {
-    for (var i in shape) {
-      if (shape.hasOwnProperty(i) && i.indexOf('ends') === 0) {
-        var pts = shape[i];
-        ctx.moveTo(pts[0][0], pts[0][1]);
-        ctx.lineTo(pts[1][0], pts[1][1]);
-      }
-    }
-  }
-});
-/**
- * @constructor
- * @alias {module:echarts/chart/helper/WhiskerBox}
- * @param {module:echarts/data/List} data
- * @param {number} idx
- * @param {Function} styleUpdater
- * @param {boolean} isInit
- * @extends {module:zrender/graphic/Group}
- */
-
-function WhiskerBox(data, idx, styleUpdater, isInit) {
-  graphic.Group.call(this);
-  /**
-   * @type {number}
-   * @readOnly
-   */
-
-  this.bodyIndex;
-  /**
-   * @type {number}
-   * @readOnly
-   */
-
-  this.whiskerIndex;
-  /**
-   * @type {Function}
-   */
-
-  this.styleUpdater = styleUpdater;
-
-  this._createContent(data, idx, isInit);
-
-  this.updateData(data, idx, isInit);
-  /**
-   * Last series model.
-   * @type {module:echarts/model/Series}
-   */
-
-  this._seriesModel;
-}
-
-var whiskerBoxProto = WhiskerBox.prototype;
-
-whiskerBoxProto._createContent = function (data, idx, isInit) {
-  var itemLayout = data.getItemLayout(idx);
-  var constDim = itemLayout.chartLayout === 'horizontal' ? 1 : 0;
-  var count = 0; // Whisker element.
-
-  this.add(new graphic.Polygon({
-    shape: {
-      points: isInit ? transInit(itemLayout.bodyEnds, constDim, itemLayout) : itemLayout.bodyEnds
-    },
-    style: {
-      strokeNoScale: true
-    },
-    z2: 100
-  }));
-  this.bodyIndex = count++; // Box element.
-
-  var whiskerEnds = zrUtil.map(itemLayout.whiskerEnds, function (ends) {
-    return isInit ? transInit(ends, constDim, itemLayout) : ends;
-  });
-  this.add(new WhiskerPath({
-    shape: makeWhiskerEndsShape(whiskerEnds),
-    style: {
-      strokeNoScale: true
-    },
-    z2: 100
-  }));
-  this.whiskerIndex = count++;
-};
-
-function transInit(points, dim, itemLayout) {
-  return zrUtil.map(points, function (point) {
-    point = point.slice();
-    point[dim] = itemLayout.initBaseline;
-    return point;
-  });
-}
-
-function makeWhiskerEndsShape(whiskerEnds) {
-  // zr animation only support 2-dim array.
-  var shape = {};
-  zrUtil.each(whiskerEnds, function (ends, i) {
-    shape['ends' + i] = ends;
-  });
-  return shape;
-}
-/**
- * Update symbol properties
- * @param  {module:echarts/data/List} data
- * @param  {number} idx
- */
-
-
-whiskerBoxProto.updateData = function (data, idx, isInit) {
-  var seriesModel = this._seriesModel = data.hostModel;
-  var itemLayout = data.getItemLayout(idx);
-  var updateMethod = graphic[isInit ? 'initProps' : 'updateProps']; // this.childAt(this.bodyIndex).stopAnimation(true);
-  // this.childAt(this.whiskerIndex).stopAnimation(true);
-
-  updateMethod(this.childAt(this.bodyIndex), {
-    shape: {
-      points: itemLayout.bodyEnds
-    }
-  }, seriesModel, idx);
-  updateMethod(this.childAt(this.whiskerIndex), {
-    shape: makeWhiskerEndsShape(itemLayout.whiskerEnds)
-  }, seriesModel, idx);
-  this.styleUpdater.call(null, this, data, idx);
-};
-
-zrUtil.inherits(WhiskerBox, graphic.Group);
-/**
- * @constructor
- * @alias module:echarts/chart/helper/WhiskerBoxDraw
- */
-
-function WhiskerBoxDraw(styleUpdater) {
-  this.group = new graphic.Group();
-  this.styleUpdater = styleUpdater;
-}
-
-var whiskerBoxDrawProto = WhiskerBoxDraw.prototype;
-/**
- * Update symbols draw by new data
- * @param {module:echarts/data/List} data
- */
-
-whiskerBoxDrawProto.updateData = function (data) {
-  var group = this.group;
-  var oldData = this._data;
-  var styleUpdater = this.styleUpdater;
-  data.diff(oldData).add(function (newIdx) {
-    if (data.hasValue(newIdx)) {
-      var symbolEl = new WhiskerBox(data, newIdx, styleUpdater, true);
-      data.setItemGraphicEl(newIdx, symbolEl);
-      group.add(symbolEl);
-    }
-  }).update(function (newIdx, oldIdx) {
-    var symbolEl = oldData.getItemGraphicEl(oldIdx); // Empty data
-
-    if (!data.hasValue(newIdx)) {
-      group.remove(symbolEl);
-      return;
-    }
-
-    if (!symbolEl) {
-      symbolEl = new WhiskerBox(data, newIdx, styleUpdater);
-    } else {
-      symbolEl.updateData(data, newIdx);
-    } // Add back
-
-
-    group.add(symbolEl);
-    data.setItemGraphicEl(newIdx, symbolEl);
-  }).remove(function (oldIdx) {
-    var el = oldData.getItemGraphicEl(oldIdx);
-    el && group.remove(el);
-  }).execute();
-  this._data = data;
-};
-/**
- * Remove symbols.
- * @param {module:echarts/data/List} data
- */
-
-
-whiskerBoxDrawProto.remove = function () {
-  var group = this.group;
-  var data = this._data;
-  this._data = null;
-  data && data.eachItemGraphicEl(function (el) {
-    el && group.remove(el);
-  });
-};
-
-var _default = WhiskerBoxDraw;
-module.exports = _default;

package/lib/chart/tree/commonLayout.js

@@ -1,108 +0,0 @@
-var _traversalHelper = require("./traversalHelper");
-
-var eachAfter = _traversalHelper.eachAfter;
-var eachBefore = _traversalHelper.eachBefore;
-
-var _layoutHelper = require("./layoutHelper");
-
-var init = _layoutHelper.init;
-var firstWalk = _layoutHelper.firstWalk;
-var secondWalk = _layoutHelper.secondWalk;
-var sep = _layoutHelper.separation;
-var radialCoordinate = _layoutHelper.radialCoordinate;
-var getViewRect = _layoutHelper.getViewRect;
-
-function _default(seriesModel, api) {
-  var layoutInfo = getViewRect(seriesModel, api);
-  seriesModel.layoutInfo = layoutInfo;
-  var layout = seriesModel.get('layout');
-  var width = 0;
-  var height = 0;
-  var separation = null;
-
-  if (layout === 'radial') {
-    width = 2 * Math.PI;
-    height = Math.min(layoutInfo.height, layoutInfo.width) / 2;
-    separation = sep(function (node1, node2) {
-      return (node1.parentNode === node2.parentNode ? 1 : 2) / node1.depth;
-    });
-  } else {
-    width = layoutInfo.width;
-    height = layoutInfo.height;
-    separation = sep();
-  }
-
-  var virtualRoot = seriesModel.getData().tree.root;
-  var realRoot = virtualRoot.children[0];
-  init(virtualRoot);
-  eachAfter(realRoot, firstWalk, separation);
-  virtualRoot.hierNode.modifier = -realRoot.hierNode.prelim;
-  eachBefore(realRoot, secondWalk);
-  var left = realRoot;
-  var right = realRoot;
-  var bottom = realRoot;
-  eachBefore(realRoot, function (node) {
-    var x = node.getLayout().x;
-
-    if (x < left.getLayout().x) {
-      left = node;
-    }
-
-    if (x > right.getLayout().x) {
-      right = node;
-    }
-
-    if (node.depth > bottom.depth) {
-      bottom = node;
-    }
-  });
-  var delta = left === right ? 1 : separation(left, right) / 2;
-  var tx = delta - left.getLayout().x;
-  var kx = 0;
-  var ky = 0;
-  var coorX = 0;
-  var coorY = 0;
-
-  if (layout === 'radial') {
-    kx = width / (right.getLayout().x + delta + tx); // here we use (node.depth - 1), bucause the real root's depth is 1
-
-    ky = height / (bottom.depth - 1 || 1);
-    eachBefore(realRoot, function (node) {
-      coorX = (node.getLayout().x + tx) * kx;
-      coorY = (node.depth - 1) * ky;
-      var finalCoor = radialCoordinate(coorX, coorY);
-      node.setLayout({
-        x: finalCoor.x,
-        y: finalCoor.y,
-        rawX: coorX,
-        rawY: coorY
-      }, true);
-    });
-  } else {
-    if (seriesModel.get('orient') === 'horizontal') {
-      ky = height / (right.getLayout().x + delta + tx);
-      kx = width / (bottom.depth - 1 || 1);
-      eachBefore(realRoot, function (node) {
-        coorY = (node.getLayout().x + tx) * ky;
-        coorX = (node.depth - 1) * kx;
-        node.setLayout({
-          x: coorX,
-          y: coorY
-        }, true);
-      });
-    } else {
-      kx = width / (right.getLayout().x + delta + tx);
-      ky = height / (bottom.depth - 1 || 1);
-      eachBefore(realRoot, function (node) {
-        coorX = (node.getLayout().x + tx) * kx;
-        coorY = (node.depth - 1) * ky;
-        node.setLayout({
-          x: coorX,
-          y: coorY
-        }, true);
-      });
-    }
-  }
-}
-
-module.exports = _default;

package/lib/chart/tree/orthogonalLayout.js

@@ -1,9 +0,0 @@
-var commonLayout = require("./commonLayout");
-
-function _default(ecModel, api) {
-  ecModel.eachSeriesByType('tree', function (seriesModel) {
-    commonLayout(seriesModel, api);
-  });
-}
-
-module.exports = _default;

package/lib/chart/tree/radialLayout.js

@@ -1,9 +0,0 @@
-var commonLayout = require("./commonLayout");
-
-function _default(ecModel, api) {
-  ecModel.eachSeriesByType('tree', function (seriesModel) {
-    commonLayout(seriesModel, api);
-  });
-}
-
-module.exports = _default;

package/lib/component/dataset/DatasetModel.js

@@ -1,29 +0,0 @@
-var echarts = require("../../echarts");
-
-var _sourceHelper = require("../../data/helper/sourceHelper");
-
-var detectSourceFormat = _sourceHelper.detectSourceFormat;
-
-var _sourceType = require("../../data/helper/sourceType");
-
-var SERIES_LAYOUT_BY_COLUMN = _sourceType.SERIES_LAYOUT_BY_COLUMN;
-var DatasetModel = echarts.extendComponentModel({
-  type: 'dataset',
-
-  /**
-   * @protected
-   */
-  defaultOption: {
-    // 'row', 'column'
-    seriesLayoutBy: SERIES_LAYOUT_BY_COLUMN,
-    // null/'auto': auto detect header, see "module:echarts/data/helper/sourceHelper"
-    sourceHeader: null,
-    dimensions: null,
-    source: null
-  },
-  optionUpdated: function () {
-    detectSourceFormat(this);
-  }
-});
-var _default = DatasetModel;
-module.exports = _default;