echarts 4.0.1 → 4.1.0

package/lib/component/dataZoom/roams.js

@@ -4,6 +4,24 @@ var RoamController = require("../../component/helper/RoamController");
 
 var throttleUtil = require("../../util/throttle");
 
+/*
+* 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.
+*/
 // Only create one roam controller for each coordinate system.
 // one roam controller might be refered by two inside data zoom
 // components (for example, one for x and one for y). When user
@@ -88,22 +106,6 @@ function unregister(api, dataZoomId) {
  */
 
 
-function shouldRecordRange(payload, dataZoomId) {
-  if (payload && payload.type === 'dataZoom' && payload.batch) {
-    for (var i = 0, len = payload.batch.length; i < len; i++) {
-      if (payload.batch[i].dataZoomId === dataZoomId) {
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-/**
- * @public
- */
-
-
 function generateCoordId(coordModel) {
   return coordModel.type + '\0_' + coordModel.id;
 }
@@ -158,7 +160,7 @@ function wrapAndDispatch(record, getRange) {
       end: range[1]
     });
   });
-  record.dispatchAction(batch);
+  batch.length && record.dispatchAction(batch);
 }
 /**
  * This action will be throttled.
@@ -206,5 +208,4 @@ function mergeControllerParams(dataZoomInfos) {
 
 exports.register = register;
 exports.unregister = unregister;
-exports.shouldRecordRange = shouldRecordRange;
 exports.generateCoordId = generateCoordId;

package/lib/component/dataZoom/typeDefaulter.js

@@ -1,5 +1,23 @@
 var Component = require("../../model/Component");
 
+/*
+* 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.
+*/
 Component.registerSubTypeDefaulter('dataZoom', function () {
   // Default 'slider' when no type specified.
   return 'slider';

package/lib/component/dataset.js

@@ -1,7 +1,60 @@
-require("./dataset/DatasetModel");
+var ComponentModel = require("../model/Component");
 
-var echarts = require("../echarts");
+var ComponentView = require("../view/Component");
 
-echarts.extendComponentView({
+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;
+
+/*
+* 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.
+*/
+
+/**
+ * This module is imported by echarts directly.
+ *
+ * Notice:
+ * Always keep this file exists for backward compatibility.
+ * Because before 4.1.0, dataset is an optional component,
+ * some users may import this module manually.
+ */
+ComponentModel.extend({
+  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);
+  }
+});
+ComponentView.extend({
   type: 'dataset'
 });

package/lib/component/geo/GeoView.js

@@ -2,6 +2,24 @@ var MapDraw = require("../helper/MapDraw");
 
 var echarts = require("../../echarts");
 
+/*
+* 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 = echarts.extendComponentView({
   type: 'geo',
   init: function (ecModel, api) {

package/lib/component/geo.js

@@ -10,6 +10,24 @@ require("./geo/GeoView");
 
 require("../action/geoRoam");
 
+/*
+* 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 makeAction(method, actionInfo) {
   actionInfo.update = 'updateView';
   echarts.registerAction(actionInfo, function (payload, ecModel) {

package/lib/component/graphic.js

@@ -12,6 +12,24 @@ var graphicUtil = require("../util/graphic");
 
 var layoutUtil = require("../util/layout");
 
+/*
+* 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.
+*/
 // -------------
 // Preprocessor
 // -------------

package/lib/component/gridSimple.js

@@ -8,6 +8,24 @@ require("../coord/cartesian/Grid");
 
 require("./axis");
 
+/*
+* 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.
+*/
 // Grid view
 echarts.extendComponentView({
   type: 'grid',

package/lib/component/helper/BrushController.js

@@ -12,6 +12,24 @@ var interactionMutex = require("./interactionMutex");
 
 var DataDiffer = require("../../data/DataDiffer");
 
+/*
+* 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 curry = zrUtil.curry;
 var each = zrUtil.each;
 var map = zrUtil.map;

package/lib/component/helper/BrushTargetManager.js

@@ -10,6 +10,24 @@ var modelUtil = require("../../util/model");
 
 var brushHelper = require("./brushHelper");
 
+/*
+* 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;
 var indexOf = zrUtil.indexOf;
 var curry = zrUtil.curry;

package/lib/component/helper/MapDraw.js

@@ -10,6 +10,24 @@ var onIrrelevantElement = _cursorHelper.onIrrelevantElement;
 
 var graphic = require("../../util/graphic");
 
+/*
+* 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 getFixedItemStyle(model, scale) {
   var itemStyle = model.getItemStyle();
   var areaColor = model.get('areaColor'); // If user want the color not to be changed when hover,

package/lib/component/helper/RoamController.js

@@ -6,6 +6,25 @@ var eventTool = require("zrender/lib/core/event");
 
 var interactionMutex = require("./interactionMutex");
 
+/*
+* 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.
+*/
+
 /**
  * @alias module:echarts/component/helper/RoamController
  * @constructor

package/lib/component/helper/brushHelper.js

@@ -6,6 +6,24 @@ var onIrrelevantElement = _cursorHelper.onIrrelevantElement;
 
 var graphicUtil = require("../../util/graphic");
 
+/*
+* 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 makeRectPanelClipPath(rect) {
   rect = normalizeRect(rect);
   return function (localPoints, transform) {

package/lib/component/helper/cursorHelper.js

@@ -1,3 +1,21 @@
+/*
+* 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 IRRELEVANT_EXCLUDES = {
   'axisPointer': 1,
   'tooltip': 1,

package/lib/component/helper/interactionMutex.js

@@ -1,5 +1,23 @@
 var echarts = require("../../echarts");
 
+/*
+* 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 ATTR = '\0_ec_interaction_mutex';
 
 function take(zr, resourceKey, userKey) {

package/lib/component/helper/listComponent.js

@@ -8,6 +8,25 @@ var formatUtil = require("../../util/format");
 
 var graphic = require("../../util/graphic");
 
+/*
+* 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.
+*/
+
 /**
  * Layout list like component.
  * It will box layout each items in group of component and then position the whole group in the viewport

package/lib/component/helper/roamHelper.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.
+*/
+
 /**
  * For geo and graph.
  *

package/lib/component/helper/selectableMixin.js

@@ -1,5 +1,24 @@
 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.
+*/
+
 /**
  * Data selectable mixin for chart series.
  * To eanble data select, option of series must have `selectedMode`.
@@ -7,26 +26,12 @@ var zrUtil = require("zrender/lib/core/util");
  */
 var _default = {
   /**
-   * @param {Array.<Object>|module:echars/data/List} targetList
+   * @param {Array.<Object>} targetList [{name, value, selected}, ...]
    *        If targetList is an array, it should like [{name: ..., value: ...}, ...].
    *        If targetList is a "List", it must have coordDim: 'value' dimension and name.
    */
   updateSelectedMap: function (targetList) {
-    if (zrUtil.isArray(targetList)) {
-      this._targetList = targetList.slice();
-    } else {
-      var ecList = targetList;
-      var valueDim = ecList.mapDimension('value');
-      var targetList = this._targetList = [];
-
-      for (var i = 0, len = ecList.count(); i < len; i++) {
-        targetList.push({
-          name: ecList.getName(i),
-          value: ecList.get(valueDim, i)
-        });
-      }
-    }
-
+    this._targetList = zrUtil.isArray(targetList) ? targetList.slice() : [];
     this._selectTargetMap = zrUtil.reduce(targetList || [], function (targetMap, target) {
       targetMap.set(target.name, target);
       return targetMap;

package/lib/component/helper/sliderMove.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.
+*/
+
 /**
  * Calculate slider move result.
  * Usage:

package/lib/component/legend/LegendModel.js

@@ -6,7 +6,26 @@ var Model = require("../../model/Model");
 
 var _model = require("../../util/model");
 
-var DEFAULT_COMPONENT_NAME = _model.DEFAULT_COMPONENT_NAME;
+var isNameSpecified = _model.isNameSpecified;
+
+/*
+* 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 LegendModel = echarts.extendComponentModel({
   type: 'legend.plain',
   dependencies: ['series'],
@@ -57,7 +76,7 @@ var LegendModel = echarts.extendComponentModel({
     ecModel.eachRawSeries(function (seriesModel) {
       var seriesName = seriesModel.name;
       availableNames.push(seriesName);
-      var potentialSeriesName;
+      var isPotential;
 
       if (seriesModel.legendDataProvider) {
         var data = seriesModel.legendDataProvider();
@@ -70,14 +89,14 @@ var LegendModel = echarts.extendComponentModel({
         if (names.length) {
           potentialData = potentialData.concat(names);
         } else {
-          potentialSeriesName = seriesName;
+          isPotential = true;
         }
       } else {
-        potentialSeriesName = seriesName;
+        isPotential = true;
       }
 
-      if (potentialSeriesName && potentialSeriesName !== DEFAULT_COMPONENT_NAME) {
-        potentialData.push(potentialSeriesName);
+      if (isPotential && isNameSpecified(seriesModel)) {
+        potentialData.push(seriesModel.name);
       }
     });
     /**