echarts 4.0.4 → 4.1.0

package/lib/chart/helper/Symbol.js

@@ -14,17 +14,29 @@ var _labelHelper = require("./labelHelper");
 
 var getDefaultLabel = _labelHelper.getDefaultLabel;
 
+/*
+* 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.
+*/
+
 /**
  * @module echarts/chart/helper/Symbol
  */
-function getSymbolSize(data, idx) {
-  var symbolSize = data.getItemVisual(idx, 'symbolSize');
-  return symbolSize instanceof Array ? symbolSize.slice() : [+symbolSize, +symbolSize];
-}
 
-function getScale(symbolSize) {
-  return [symbolSize[0] / 2, symbolSize[1] / 2];
-}
 /**
  * @constructor
  * @alias {module:echarts/chart/helper/Symbol}
@@ -32,20 +44,34 @@ function getScale(symbolSize) {
  * @param {number} idx
  * @extends {module:zrender/graphic/Group}
  */
-
-
 function SymbolClz(data, idx, seriesScope) {
   graphic.Group.call(this);
   this.updateData(data, idx, seriesScope);
 }
 
 var symbolProto = SymbolClz.prototype;
+/**
+ * @public
+ * @static
+ * @param {module:echarts/data/List} data
+ * @param {number} dataIndex
+ * @return {Array.<number>} [width, height]
+ */
+
+var getSymbolSize = SymbolClz.getSymbolSize = function (data, idx) {
+  var symbolSize = data.getItemVisual(idx, 'symbolSize');
+  return symbolSize instanceof Array ? symbolSize.slice() : [+symbolSize, +symbolSize];
+};
+
+function getScale(symbolSize) {
+  return [symbolSize[0] / 2, symbolSize[1] / 2];
+}
 
 function driftSymbol(dx, dy) {
   this.parent.drift(dx, dy);
 }
 
-symbolProto._createSymbol = function (symbolType, data, idx, symbolSize) {
+symbolProto._createSymbol = function (symbolType, data, idx, symbolSize, keepAspect) {
   // Remove paths created before
   this.removeAll();
   var color = data.getItemVisual(idx, 'color'); // var symbolPath = createSymbol(
@@ -55,7 +81,7 @@ symbolProto._createSymbol = function (symbolType, data, idx, symbolSize) {
   // and macOS Sierra, a circle stroke become a rect, no matter what
   // the scale is set. So we set width/height as 2. See #4150.
 
-  var symbolPath = createSymbol(symbolType, -1, -1, 2, 2, color);
+  var symbolPath = createSymbol(symbolType, -1, -1, 2, 2, color, keepAspect);
   symbolPath.attr({
     z2: 100,
     culling: true,
@@ -158,7 +184,9 @@ symbolProto.updateData = function (data, idx, seriesScope) {
   var isInit = symbolType !== this._symbolType;
 
   if (isInit) {
-    this._createSymbol(symbolType, data, idx, symbolSize);
+    var keepAspect = data.getItemVisual(idx, 'symbolKeepAspect');
+
+    this._createSymbol(symbolType, data, idx, symbolSize, keepAspect);
   } else {
     var symbolPath = this.childAt(0);
     symbolPath.silent = false;
@@ -251,6 +279,19 @@ symbolProto._updateCommon = function (data, idx, symbolSize, seriesScope) {
     elStyle.opacity = opacity;
   }
 
+  var liftZ = data.getItemVisual(idx, 'liftZ');
+  var z2Origin = symbolPath.__z2Origin;
+
+  if (liftZ != null) {
+    if (z2Origin == null) {
+      symbolPath.__z2Origin = symbolPath.z2;
+      symbolPath.z2 += liftZ;
+    }
+  } else if (z2Origin != null) {
+    symbolPath.z2 = z2Origin;
+    symbolPath.__z2Origin = null;
+  }
+
   var useNameLabel = seriesScope && seriesScope.useNameLabel;
   graphic.setLabelStyle(elStyle, hoverItemStyle, labelModel, hoverLabelModel, {
     labelFetcher: seriesModel,

package/lib/chart/helper/SymbolDraw.js

@@ -6,6 +6,25 @@ var _util = require("zrender/lib/core/util");
 
 var isObject = _util.isObject;
 
+/*
+* 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.
+*/
+
 /**
  * @module echarts/chart/helper/SymbolDraw
  */
@@ -23,8 +42,9 @@ function SymbolDraw(symbolCtor) {
 var symbolDrawProto = SymbolDraw.prototype;
 
 function symbolNeedsDraw(data, point, idx, opt) {
-  return point && !isNaN(point[0]) && !isNaN(point[1]) && !(opt.isIgnore && opt.isIgnore(idx)) // We do not set clipShape on group, because it will
-  // cut part of the symbol element shape.
+  return point && !isNaN(point[0]) && !isNaN(point[1]) && !(opt.isIgnore && opt.isIgnore(idx)) // We do not set clipShape on group, because it will cut part of
+  // the symbol element shape. We use the same clip shape here as
+  // the line clip.
   && !(opt.clipShape && !opt.clipShape.contain(point[0], point[1])) && data.getItemVisual(idx, 'symbol') !== 'none';
 }
 /**

package/lib/chart/helper/createGraphFromNodeEdge.js

@@ -12,6 +12,24 @@ var CoordinateSystem = require("../../CoordinateSystem");
 
 var createListFromArray = require("./createListFromArray");
 
+/*
+* 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 _default(nodes, edges, seriesModel, directed, beforeLink) {
   // ??? TODO
   // support dataset?
@@ -44,11 +62,17 @@ function _default(nodes, edges, seriesModel, directed, beforeLink) {
   if (coordSys === 'cartesian2d' || coordSys === 'polar') {
     nodeData = createListFromArray(nodes, seriesModel);
   } else {
-    // FIXME
-    var coordSysCtor = CoordinateSystem.get(coordSys); // FIXME
+    var coordSysCtor = CoordinateSystem.get(coordSys);
+    var coordDimensions = coordSysCtor && coordSysCtor.type !== 'view' ? coordSysCtor.dimensions || [] : []; // FIXME: Some geo do not need `value` dimenson, whereas `calendar` needs
+    // `value` dimension, but graph need `value` dimension. It's better to
+    // uniform this behavior.
+
+    if (zrUtil.indexOf(coordDimensions, 'value') < 0) {
+      coordDimensions.concat(['value']);
+    }
 
     var dimensionNames = createDimensions(nodes, {
-      coordDimensions: (coordSysCtor && coordSysCtor.type !== 'view' ? coordSysCtor.dimensions || [] : []).concat(['value'])
+      coordDimensions: coordDimensions
     });
     nodeData = new List(dimensionNames, seriesModel);
     nodeData.initData(nodes);

package/lib/chart/helper/createGraphFromNodeMatrix.js

@@ -12,6 +12,25 @@ var CoordinateSystem = require("../../CoordinateSystem");
 
 var createListFromArray = require("./createListFromArray");
 
+/*
+* 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.
+*/
+
 /**
  * 从邻接矩阵生成
  * ```

package/lib/chart/helper/createListFromArray.js

@@ -28,6 +28,25 @@ var _dataStackHelper = require("../../data/helper/dataStackHelper");
 
 var enableDataStack = _dataStackHelper.enableDataStack;
 
+/*
+* 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.
+*/
+
 /**
  * @param {module:echarts/data/Source|Array} source Or raw data.
  * @param {module:echarts/model/Series} seriesModel

package/lib/chart/helper/createListSimply.js

@@ -7,6 +7,25 @@ var _util = require("zrender/lib/core/util");
 var extend = _util.extend;
 var isArray = _util.isArray;
 
+/*
+* 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.
+*/
+
 /**
  * [Usage]:
  * (1)

package/lib/chart/helper/createRenderPlanner.js

@@ -2,6 +2,25 @@ var _model = require("../../util/model");
 
 var makeInner = _model.makeInner;
 
+/*
+* 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.
+*/
+
 /**
  * @return {string} If large mode changed, return string 'reset';
  */
@@ -11,9 +30,9 @@ function _default() {
     var fields = inner(seriesModel);
     var pipelineContext = seriesModel.pipelineContext;
     var originalLarge = fields.large;
-    var originalProgressive = fields.canProgressiveRender;
+    var originalProgressive = fields.progressiveRender;
     var large = fields.large = pipelineContext.large;
-    var progressive = fields.canProgressiveRender = pipelineContext.canProgressiveRender;
+    var progressive = fields.progressiveRender = pipelineContext.progressiveRender;
     return !!(originalLarge ^ large || originalProgressive ^ progressive) && 'reset';
   };
 }

package/lib/chart/helper/labelHelper.js

@@ -2,6 +2,25 @@ var _dataProvider = require("../../data/helper/dataProvider");
 
 var retrieveRawValue = _dataProvider.retrieveRawValue;
 
+/*
+* 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.
+*/
+
 /**
  * @param {module:echarts/data/List} data
  * @param {number} dataIndex

package/lib/chart/helper/treeHelper.js

@@ -1,5 +1,23 @@
 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.
+*/
 function retrieveTargetInfo(payload, validPayloadTypes, seriesModel) {
   if (payload && zrUtil.indexOf(validPayloadTypes, payload.type) >= 0) {
     var root = seriesModel.getData().tree.root;

package/lib/chart/helper/whiskerBoxCommon.js

@@ -1,12 +1,29 @@
 var createListSimply = require("../helper/createListSimply");
 
-var WhiskerBoxDraw = require("../helper/WhiskerBoxDraw");
-
 var zrUtil = require("zrender/lib/core/util");
 
 var _dimensionHelper = require("../../data/helper/dimensionHelper");
 
 var getDimensionTypeByAxis = _dimensionHelper.getDimensionTypeByAxis;
+
+/*
+* 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 seriesModelMixin = {
   /**
    * @private
@@ -100,28 +117,4 @@ var seriesModelMixin = {
     return this.ecModel.getComponent(dim + 'Axis', this.get(dim + 'AxisIndex')).axis;
   }
 };
-var viewMixin = {
-  init: function () {
-    /**
-     * Old data.
-     * @private
-     * @type {module:echarts/chart/helper/WhiskerBoxDraw}
-     */
-    var whiskerBoxDraw = this._whiskerBoxDraw = new WhiskerBoxDraw(this.getStyleUpdater());
-    this.group.add(whiskerBoxDraw.group);
-  },
-  render: function (seriesModel, ecModel, api) {
-    this._whiskerBoxDraw.updateData(seriesModel.getData());
-  },
-  incrementalPrepareRender: function (seriesModel, ecModel, api) {
-    this._whiskerBoxDraw.incrementalPrepareUpdate(seriesModel, ecModel, api);
-  },
-  incrementalRender: function (params, seriesModel, ecModel, api) {
-    this._whiskerBoxDraw.incrementalUpdate(params, seriesModel, ecModel, api);
-  },
-  remove: function (ecModel) {
-    this._whiskerBoxDraw.remove();
-  }
-};
-exports.seriesModelMixin = seriesModelMixin;
-exports.viewMixin = viewMixin;
+exports.seriesModelMixin = seriesModelMixin;

package/lib/chart/line/LineSeries.js

@@ -6,6 +6,24 @@ var createListFromArray = require("../helper/createListFromArray");
 
 var SeriesModel = require("../../model/Series");
 
+/*
+* 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 _default = SeriesModel.extend({
   type: 'series.line',
   dependencies: ['grid', 'polar'],
@@ -14,9 +32,7 @@ var _default = SeriesModel.extend({
   },
   defaultOption: {
     zlevel: 0,
-    // 一级层叠
     z: 2,
-    // 二级层叠
     coordinateSystem: 'cartesian2d',
     legendHoverLink: true,
     hoverAnimation: true,
@@ -48,19 +64,18 @@ var _default = SeriesModel.extend({
     // Disabled if step is true
     smooth: false,
     smoothMonotone: null,
-    // 拐点图形类型
     symbol: 'emptyCircle',
-    // 拐点图形大小
     symbolSize: 4,
-    // 拐点图形旋转控制
     symbolRotate: null,
-    // 是否显示 symbol, 只有在 tooltip hover 的时候显示
     showSymbol: true,
-    // 标志图形默认只有主轴显示（随主轴标签间隔隐藏策略）
-    showAllSymbol: false,
-    // 是否连接断点
+    // `false`: follow the label interval strategy.
+    // `true`: show all symbols.
+    // `'auto'`: If possible, show all symbols, otherwise
+    //           follow the label interval strategy.
+    showAllSymbol: 'auto',
+    // Whether to connect break point.
     connectNulls: false,
-    // 数据过滤，'average', 'max', 'min', 'sum'
+    // Sampling for large data. Can be: 'average', 'max', 'min', 'sum'.
     sampling: 'none',
     animationEasing: 'linear',
     // Disable progressive