echarts 4.0.4 → 4.1.0

package/lib/layout/barGrid.js

@@ -7,7 +7,30 @@ var parsePercent = _number.parsePercent;
 var _dataStackHelper = require("../data/helper/dataStackHelper");
 
 var isDimensionStacked = _dataStackHelper.isDimensionStacked;
+
+var createRenderPlanner = require("../chart/helper/createRenderPlanner");
+
+/*
+* 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 STACK_PREFIX = '__ec_stack_';
+var LARGE_BAR_MIN_WIDTH = 0.5;
+var LargeArr = typeof Float32Array !== 'undefined' ? Float32Array : Array;
 
 function getSeriesStackId(seriesModel) {
   return seriesModel.get('stack') || STACK_PREFIX + seriesModel.seriesIndex;
@@ -28,7 +51,7 @@ function getAxisKey(axis) {
  */
 
 
-function getLayoutOnAxis(opt, api) {
+function getLayoutOnAxis(opt) {
   var params = [];
   var baseAxis = opt.axis;
   var axisKey = 'axis0';
@@ -47,7 +70,7 @@ function getLayoutOnAxis(opt, api) {
     }, opt));
   }
 
-  var widthAndOffsets = doCalBarWidthAndOffset(params, api);
+  var widthAndOffsets = doCalBarWidthAndOffset(params);
   var result = [];
 
   for (var i = 0; i < opt.count; i++) {
@@ -59,8 +82,20 @@ function getLayoutOnAxis(opt, api) {
   return result;
 }
 
-function calBarWidthAndOffset(barSeries, api) {
-  var seriesInfoList = zrUtil.map(barSeries, function (seriesModel) {
+function prepareLayoutBarSeries(seriesType, ecModel) {
+  var seriesModels = [];
+  ecModel.eachSeriesByType(seriesType, function (seriesModel) {
+    // Check series coordinate, do layout for cartesian2d only
+    if (isOnCartesian(seriesModel) && !isInLargeMode(seriesModel)) {
+      seriesModels.push(seriesModel);
+    }
+  });
+  return seriesModels;
+}
+
+function makeColumnLayout(barSeries) {
+  var seriesInfoList = [];
+  zrUtil.each(barSeries, function (seriesModel) {
     var data = seriesModel.getData();
     var cartesian = seriesModel.coordinateSystem;
     var baseAxis = cartesian.getBaseAxis();
@@ -70,7 +105,7 @@ function calBarWidthAndOffset(barSeries, api) {
     var barMaxWidth = parsePercent(seriesModel.get('barMaxWidth'), bandWidth);
     var barGap = seriesModel.get('barGap');
     var barCategoryGap = seriesModel.get('barCategoryGap');
-    return {
+    seriesInfoList.push({
       bandWidth: bandWidth,
       barWidth: barWidth,
       barMaxWidth: barMaxWidth,
@@ -78,12 +113,12 @@ function calBarWidthAndOffset(barSeries, api) {
       barCategoryGap: barCategoryGap,
       axisKey: getAxisKey(baseAxis),
       stackId: getSeriesStackId(seriesModel)
-    };
+    });
   });
-  return doCalBarWidthAndOffset(seriesInfoList, api);
+  return doCalBarWidthAndOffset(seriesInfoList);
 }
 
-function doCalBarWidthAndOffset(seriesInfoList, api) {
+function doCalBarWidthAndOffset(seriesInfoList) {
   // Columns info on each category axis. Key is cartesian name
   var columnsMap = {};
   zrUtil.each(seriesInfoList, function (seriesInfo, idx) {
@@ -186,22 +221,34 @@ function doCalBarWidthAndOffset(seriesInfoList, api) {
   });
   return result;
 }
+/**
+ * @param {Object} barWidthAndOffset The result of makeColumnLayout
+ * @param {module:echarts/coord/Axis} axis
+ * @param {module:echarts/model/Series} [seriesModel] If not provided, return all.
+ * @return {Object} {stackId: {offset, width}} or {offset, width} if seriesModel provided.
+ */
+
+
+function retrieveColumnLayout(barWidthAndOffset, axis, seriesModel) {
+  if (barWidthAndOffset && axis) {
+    var result = barWidthAndOffset[getAxisKey(axis)];
+
+    if (result != null && seriesModel != null) {
+      result = result[getSeriesStackId(seriesModel)];
+    }
+
+    return result;
+  }
+}
 /**
  * @param {string} seriesType
  * @param {module:echarts/model/Global} ecModel
- * @param {module:echarts/ExtensionAPI} api
  */
 
 
-function layout(seriesType, ecModel, api) {
-  var seriesModels = [];
-  ecModel.eachSeriesByType(seriesType, function (seriesModel) {
-    // Check series coordinate, do layout for cartesian2d only
-    if (seriesModel.coordinateSystem && seriesModel.coordinateSystem.type === 'cartesian2d') {
-      seriesModels.push(seriesModel);
-    }
-  });
-  var barWidthAndOffset = calBarWidthAndOffset(seriesModels);
+function layout(seriesType, ecModel) {
+  var seriesModels = prepareLayoutBarSeries(seriesType, ecModel);
+  var barWidthAndOffset = makeColumnLayout(seriesModels);
   var lastStackCoords = {};
   var lastStackCoordsOrigin = {};
   zrUtil.each(seriesModels, function (seriesModel) {
@@ -223,9 +270,11 @@ function layout(seriesType, ecModel, api) {
     });
     var valueDim = data.mapDimension(valueAxis.dim);
     var baseDim = data.mapDimension(baseAxis.dim);
-    var stacked = isDimensionStacked(data, valueDim, baseDim);
+    var stacked = isDimensionStacked(data, valueDim
+    /*, baseDim*/
+    );
     var isValueAxisH = valueAxis.isHorizontal();
-    var valueAxisStart = baseAxis.onZero || stacked ? valueAxis.toGlobalCoord(valueAxis.dataToCoord(0)) : valueAxis.getGlobalExtent()[0];
+    var valueAxisStart = getValueAxisStart(baseAxis, valueAxis, stacked);
 
     for (var idx = 0, len = data.count(); idx < len; idx++) {
       var value = data.get(valueDim, idx);
@@ -294,8 +343,76 @@ function layout(seriesType, ecModel, api) {
       });
     }
   }, this);
+} // TODO: Do not support stack in large mode yet.
+
+
+var largeLayout = {
+  seriesType: 'bar',
+  plan: createRenderPlanner(),
+  reset: function (seriesModel) {
+    if (!isOnCartesian(seriesModel) || !isInLargeMode(seriesModel)) {
+      return;
+    }
+
+    var data = seriesModel.getData();
+    var cartesian = seriesModel.coordinateSystem;
+    var baseAxis = cartesian.getBaseAxis();
+    var valueAxis = cartesian.getOtherAxis(baseAxis);
+    var valueDim = data.mapDimension(valueAxis.dim);
+    var baseDim = data.mapDimension(baseAxis.dim);
+    var valueAxisHorizontal = valueAxis.isHorizontal();
+    var valueDimIdx = valueAxisHorizontal ? 0 : 1;
+    var barWidth = retrieveColumnLayout(makeColumnLayout([seriesModel]), baseAxis, seriesModel).width;
+
+    if (!(barWidth > LARGE_BAR_MIN_WIDTH)) {
+      // jshint ignore:line
+      barWidth = LARGE_BAR_MIN_WIDTH;
+    }
+
+    return {
+      progress: progress
+    };
+
+    function progress(params, data) {
+      var largePoints = new LargeArr(params.count * 2);
+      var dataIndex;
+      var coord = [];
+      var valuePair = [];
+      var offset = 0;
+
+      while ((dataIndex = params.next()) != null) {
+        valuePair[valueDimIdx] = data.get(valueDim, dataIndex);
+        valuePair[1 - valueDimIdx] = data.get(baseDim, dataIndex);
+        coord = cartesian.dataToPoint(valuePair, null, coord);
+        largePoints[offset++] = coord[0];
+        largePoints[offset++] = coord[1];
+      }
+
+      data.setLayout({
+        largePoints: largePoints,
+        barWidth: barWidth,
+        valueAxisStart: getValueAxisStart(baseAxis, valueAxis, false),
+        valueAxisHorizontal: valueAxisHorizontal
+      });
+    }
+  }
+};
+
+function isOnCartesian(seriesModel) {
+  return seriesModel.coordinateSystem && seriesModel.coordinateSystem.type === 'cartesian2d';
+}
+
+function isInLargeMode(seriesModel) {
+  return seriesModel.pipelineContext && seriesModel.pipelineContext.large;
+}
+
+function getValueAxisStart(baseAxis, valueAxis, stacked) {
+  return zrUtil.indexOf(baseAxis.getAxesOnZeroOf(), valueAxis) >= 0 || stacked ? valueAxis.toGlobalCoord(valueAxis.dataToCoord(0)) : valueAxis.getGlobalExtent()[0];
 }
 
 exports.getLayoutOnAxis = getLayoutOnAxis;
-exports.calBarWidthAndOffset = calBarWidthAndOffset;
-exports.layout = layout;
+exports.prepareLayoutBarSeries = prepareLayoutBarSeries;
+exports.makeColumnLayout = makeColumnLayout;
+exports.retrieveColumnLayout = retrieveColumnLayout;
+exports.layout = layout;
+exports.largeLayout = largeLayout;

package/lib/layout/barPolar.js

@@ -8,6 +8,24 @@ var _dataStackHelper = require("../data/helper/dataStackHelper");
 
 var isDimensionStacked = _dataStackHelper.isDimensionStacked;
 
+/*
+* 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 getSeriesStackId(seriesModel) {
   return seriesModel.get('stack') || '__ec_stack_' + seriesModel.seriesIndex;
 }
@@ -51,7 +69,9 @@ function barLayoutPolar(seriesType, ecModel, api) {
     lastStackCoords[stackId] = lastStackCoords[stackId] || [];
     var valueDim = data.mapDimension(valueAxis.dim);
     var baseDim = data.mapDimension(baseAxis.dim);
-    var stacked = isDimensionStacked(data, valueDim, baseDim);
+    var stacked = isDimensionStacked(data, valueDim
+    /*, baseDim*/
+    );
     var valueAxisStart = valueAxis.getExtent()[0];
 
     for (var idx = 0, len = data.count(); idx < len; idx++) {

package/lib/layout/points.js

@@ -8,6 +8,24 @@ var _dataStackHelper = require("../data/helper/dataStackHelper");
 
 var isDimensionStacked = _dataStackHelper.isDimensionStacked;
 
+/*
+* 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(seriesType) {
   return {
     seriesType: seriesType,
@@ -26,13 +44,18 @@ function _default(seriesType) {
         return data.mapDimension(dim);
       }).slice(0, 2);
       var dimLen = dims.length;
+      var stackResultDim = data.getCalculationInfo('stackResultDimension');
 
-      if (isDimensionStacked(data, dims[0], dims[1])) {
-        dims[0] = data.getCalculationInfo('stackResultDimension');
+      if (isDimensionStacked(data, dims[0]
+      /*, dims[1]*/
+      )) {
+        dims[0] = stackResultDim;
       }
 
-      if (isDimensionStacked(data, dims[1], dims[0])) {
-        dims[1] = data.getCalculationInfo('stackResultDimension');
+      if (isDimensionStacked(data, dims[1]
+      /*, dims[0]*/
+      )) {
+        dims[1] = stackResultDim;
       }
 
       function progress(params, data) {
@@ -43,11 +66,11 @@ function _default(seriesType) {
           var point;
 
           if (dimLen === 1) {
-            var x = data.get(dims[0], i, true);
+            var x = data.get(dims[0], i);
             point = !isNaN(x) && coordSys.dataToPoint(x, null, tmpOut);
           } else {
-            var x = tmpIn[0] = data.get(dims[0], i, true);
-            var y = tmpIn[1] = data.get(dims[1], i, true); // Also {Array.<number>}, not undefined to avoid if...else... statement
+            var x = tmpIn[0] = data.get(dims[0], i);
+            var y = tmpIn[1] = data.get(dims[1], i); // Also {Array.<number>}, not undefined to avoid if...else... statement
 
             point = !isNaN(x) && !isNaN(y) && coordSys.dataToPoint(tmpIn, null, tmpOut);
           }

package/lib/loading/default.js

@@ -2,6 +2,24 @@ var zrUtil = require("zrender/lib/core/util");
 
 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.
+*/
 var PI = Math.PI;
 /**
  * @param {module:echarts/ExtensionAPI} api

package/lib/model/Component.js

@@ -17,6 +17,25 @@ var layout = require("../util/layout");
 
 var boxLayoutMixin = require("./mixin/boxLayout");
 
+/*
+* 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 model
  *

package/lib/model/Global.js

@@ -32,6 +32,25 @@ var _sourceHelper = require("../data/helper/sourceHelper");
 
 var resetSourceDefaulter = _sourceHelper.resetSourceDefaulter;
 
+/*
+* 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.
+*/
+
 /**
  * ECharts global model
  *
@@ -60,7 +79,6 @@ var OPTION_INNER_KEY = '\0_ec_inner';
  */
 
 var GlobalModel = Model.extend({
-  constructor: GlobalModel,
   init: function (option, parentModel, theme, optionManager) {
     theme = theme || {};
     this.option = null; // Mark as not initialized.

package/lib/model/Model.js

@@ -19,6 +19,25 @@ var textStyleMixin = require("./mixin/textStyle");
 
 var itemStyleMixin = require("./mixin/itemStyle");
 
+/*
+* 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/model/Model
  */

package/lib/model/OptionManager.js

@@ -4,6 +4,25 @@ var modelUtil = require("../util/model");
 
 var ComponentModel = require("./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.
+*/
+
 /**
  * ECharts option manager
  *

package/lib/model/Series.js

@@ -38,6 +38,25 @@ var getSource = _sourceHelper.getSource;
 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.
+*/
 var inner = modelUtil.makeInner();
 var SeriesModel = ComponentModel.extend({
   type: 'series.__base__',
@@ -161,7 +180,7 @@ var SeriesModel = ComponentModel.extend({
     // Default data label emphasis `show`
     // FIXME Tree structure data ?
     // FIXME Performance ?
-    if (data) {
+    if (data && !zrUtil.isTypedArray(data)) {
       var props = ['show'];
 
       for (var i = 0; i < data.length; i++) {
@@ -223,7 +242,7 @@ var SeriesModel = ComponentModel.extend({
     if (task) {
       var context = task.context; // Consider case: filter, data sample.
 
-      if (context.data !== data && task.isOverallFilter) {
+      if (context.data !== data && task.modifyOutputEnd) {
         task.setOutputEnd(data.count());
       }
 

package/lib/model/globalDefault.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 platform = ''; // Navigator not exists in node
 
 if (typeof navigator !== 'undefined') {

package/lib/model/mixin/areaStyle.js

@@ -1,5 +1,23 @@
 var makeStyleMapper = require("./makeStyleMapper");
 
+/*
+* 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 getAreaStyle = makeStyleMapper([['fill', 'color'], ['shadowBlur'], ['shadowOffsetX'], ['shadowOffsetY'], ['opacity'], ['shadowColor']]);
 var _default = {
   getAreaStyle: function (excludes, includes) {

package/lib/model/mixin/boxLayout.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 _default = {
   getBoxLayoutParams: function () {
     return {

package/lib/model/mixin/colorPalette.js

@@ -2,6 +2,25 @@ var _model = require("../../util/model");
 
 var makeInner = _model.makeInner;
 var normalizeToArray = _model.normalizeToArray;
+
+/*
+* 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 inner = makeInner();
 
 function getNearestColorPalette(colors, requestColorNum) {

package/lib/model/mixin/dataFormat.js

@@ -6,6 +6,25 @@ var _format = require("../../util/format");
 
 var getTooltipMarker = _format.getTooltipMarker;
 var formatTpl = _format.formatTpl;
+
+/*
+* 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 DIMENSION_LABEL_REG = /\{@(.+?)\}/g; // PENDING A little ugly
 
 var _default = {
@@ -19,7 +38,7 @@ var _default = {
     var data = this.getData(dataType);
     var rawValue = this.getRawValue(dataIndex, dataType);
     var rawDataIndex = data.getRawIndex(dataIndex);
-    var name = data.getName(dataIndex, true);
+    var name = data.getName(dataIndex);
     var itemOpt = data.getRawDataItem(dataIndex);
     var color = data.getItemVisual(dataIndex, 'color');
     return {

package/lib/model/mixin/itemStyle.js

@@ -1,5 +1,23 @@
 var makeStyleMapper = require("./makeStyleMapper");
 
+/*
+* 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 getItemStyle = makeStyleMapper([['fill', 'color'], ['stroke', 'borderColor'], ['lineWidth', 'borderWidth'], ['opacity'], ['shadowBlur'], ['shadowOffsetX'], ['shadowOffsetY'], ['shadowColor'], ['textPosition'], ['textAlign']]);
 var _default = {
   getItemStyle: function (excludes, includes) {