Handle dimension normalize and display name.

src/data/helper/completeDimensions.js

@@ -3,7 +3,7 @@
  * Use `echarts/data/helper/createDimensions` instead.
  */
 
-import {createHashMap, each, isString, defaults, clone} from 'zrender/src/core/util';
+import {createHashMap, each, isString, defaults, extend, isObject, clone} from 'zrender/src/core/util';
 import {normalizeToArray} from '../../util/model';
 import {guessOrdinal} from './sourceHelper';
 import Source from '../Source';
@@ -19,6 +19,7 @@ import {OTHER_DIMENSIONS} from './dimensionHelper';
  *
  * @param {Array.<string>} sysDims Necessary dimensions, like ['x', 'y'], which
  *      provides not only dim template, but also default order.
+ *      properties: 'name', 'type', 'displayName'.
  *      `name` of each item provides default coord name.
  *      [{dimsDef: [string...]}, ...] can be specified to give names.
  * @param {module:echarts/data/Source|Array|Object} source or data (for compatibal with pervious)
@@ -35,11 +36,12 @@ import {OTHER_DIMENSIONS} from './dimensionHelper';
  * @param {number} [opt.encodeDefaulter] If not specified, auto find the next available data dim.
  * @return {Array.<Object>} [{
  *      name: string mandatory,
+ *      displayName: string, the origin name in dimsDef, see source helper.
+ *                 If displayName given, the tooltip will displayed vertically.
  *      coordDim: string mandatory,
  *      isSysCoord: boolean True if the coord is from sys dimension.
  *      coordDimIndex: number mandatory,
  *      type: string optional,
- *      tooltipName: string optional,
  *      otherDims: { never null/undefined
  *          tooltip: number optional,
  *          label: number optional,
@@ -69,18 +71,21 @@ function completeDimensions(sysDims, source, opt) {
 
     // Apply user defined dims (`name` and `type`) and init result.
     for (var i = 0; i < dimCount; i++) {
-        var dimDefItem = isString(dimsDef[i]) ? {name: dimsDef[i]} : (dimsDef[i] || {});
+        var dimDefItem = dimsDef[i] = extend(
+            {}, isObject(dimsDef[i]) ? dimsDef[i] : {name: dimsDef[i]}
+        );
         var userDimName = dimDefItem.name;
         var resultItem = result[i] = {otherDims: {}};
         // Name will be applied later for avoiding duplication.
         if (userDimName != null && dataDimNameMap.get(userDimName) == null) {
-            // Only if `series.dimensions` is defined in option, tooltipName
-            // will be set, and dimension will be diplayed vertically in
+            // Only if `series.dimensions` is defined in option
+            // displayName, will be set, and dimension will be diplayed vertically in
             // tooltip by default.
-            resultItem.name = resultItem.tooltipName = userDimName;
+            resultItem.name = resultItem.displayName = userDimName;
             dataDimNameMap.set(userDimName, i);
         }
         dimDefItem.type != null && (resultItem.type = dimDefItem.type);
+        dimDefItem.displayName != null && (resultItem.displayName = dimDefItem.displayName);
     }
 
     // Set `coordDim` and `coordDimIndex` by `encodeDef` and normalize `encodeDef`.
@@ -134,7 +139,7 @@ function completeDimensions(sysDims, source, opt) {
             var resultItem = result[resultDimIdx];
             applyDim(defaults(resultItem, sysDimItem), coordDim, coordDimIndex);
             if (resultItem.name == null && sysDimItemDimsDef) {
-                resultItem.name = resultItem.tooltipName = sysDimItemDimsDef[coordDimIndex];
+                resultItem.name = resultItem.displayName = sysDimItemDimsDef[coordDimIndex];
             }
             resultItem.isSysCoord = true;
             // FIXME refactor, currently only used in case: {otherDims: {tooltip: false}}

src/data/helper/dataProvider.js

@@ -107,7 +107,7 @@ var providerMethods = {
     'keyedColumns': {
         pure: true,
         count: function () {
-            var dimName = this._source.dimensionsDefine[0];
+            var dimName = this._source.dimensionsDefine[0].name;
             var col = this._data[dimName];
             return col ? col.length : 0;
         },
@@ -115,7 +115,7 @@ var providerMethods = {
             var item = [];
             var dims = this._source.dimensionsDefine;
             for (var i = 0; i < dims.length; i++) {
-                var col = this._data[dims[i]];
+                var col = this._data[dims[i].name];
                 item.push(col ? col[idx] : null);
             }
         },

src/data/helper/sourceHelper.js

@@ -4,11 +4,13 @@ import {getCoordSysDefineBySeries} from '../../model/referHelper';
 import {
     createHashMap,
     each,
+    map,
     isArray,
     isString,
     isObject,
     isTypedArray,
     isArrayLike,
+    extend,
     assert
 } from 'zrender/src/core/util';
 import {getDataItemValue} from '../../util/model';
@@ -178,7 +180,7 @@ export function prepareSource(seriesModel) {
 // return {startIndex, dimensionsDefine, dimensionsCount}
 function completeBySourceData(data, sourceFormat, seriesLayoutBy, sourceHeader, dimensionsDefine) {
     if (!data) {
-        return {dimensionsDefine: dimensionsDefine};
+        return {dimensionsDefine: normalizeDimensionsDefine(dimensionsDefine)};
     }
 
     var dimensionsDetectCount;
@@ -211,7 +213,7 @@ function completeBySourceData(data, sourceFormat, seriesLayoutBy, sourceHeader,
         if (!dimensionsDefine && startIndex === 1) {
             dimensionsDefine = [];
             arrayRowsTravelFirst(function (val, index) {
-                dimensionsDefine[index] = val + '';
+                dimensionsDefine[index] = val != null ? val : '';
             }, seriesLayoutBy, data);
         }
 
@@ -259,13 +261,51 @@ function completeBySourceData(data, sourceFormat, seriesLayoutBy, sourceHeader,
 
     return {
         startIndex: startIndex,
-        dimensionsDefine: dimensionsDefine,
+        dimensionsDefine: normalizeDimensionsDefine(dimensionsDefine),
         dimensionsDetectCount: dimensionsDetectCount,
         potentialNameDimIndex: potentialNameDimIndex
         // TODO: potentialIdDimIdx
     };
 }
 
+// Consider dimensions defined like ['A', 'price', 'B', 'price', 'C', 'price'],
+// which is reasonable. But dimension name is duplicated.
+// Returns undefined or an array contains only object without null/undefiend or string.
+function normalizeDimensionsDefine(dimensionsDefine) {
+    if (!dimensionsDefine) {
+        // The meaning of null/undefined is different from empty array.
+        return;
+    }
+    var nameMap = createHashMap();
+    return map(dimensionsDefine, function (item, index) {
+        item = extend({}, isObject(item) ? item : {name: item});
+
+        // User can set null in dimensions.
+        // We dont auto specify name, othewise a given name may
+        // cause it be refered unexpectedly.
+        if (item.name == null) {
+            return item;
+        }
+
+        // Also consider number form like 2012.
+        item.name += '';
+        // Use may also specify displayName.
+        if (item.displayName == null) {
+            item.displayName = item.name;
+        }
+
+        var exist = nameMap.get(item.name);
+        if (!exist) {
+            nameMap.set(item.name, {count: 1});
+        }
+        else {
+            item.name += '-' + exist.count++;
+        }
+
+        return item;
+    });
+}
+
 function arrayRowsTravelFirst(cb, seriesLayoutBy, data, maxLoop) {
     maxLoop == null && (maxLoop = Infinity);
     if (seriesLayoutBy === SERIES_LAYOUT_BY_ROW) {
@@ -439,7 +479,10 @@ function doGuessOrdinal(
             return;
         }
         dimName = dimensionsDefine[dimIndex];
-        isObject(dimName) && (dimName = dimName.name);
+        dimName = isObject(dimName) ? dimName.name : dimName;
+        if (dimName == null) {
+            return;
+        }
     }
 
     if (sourceFormat === SOURCE_FORMAT_ARRAY_ROWS) {

src/model/Series.js

@@ -255,7 +255,7 @@ var SeriesModel = ComponentModel.extend({
             // check: category-no-encode-has-axis-data in dataset.html
             var vertially = zrUtil.reduce(value, function (vertially, val, idx) {
                 var dimItem = data.getDimensionInfo(idx);
-                return vertially |= dimItem && dimItem.tooltip !== false && dimItem.tooltipName != null;
+                return vertially |= dimItem && dimItem.tooltip !== false && dimItem.displayName != null;
             }, 0);
 
             var result = [];
@@ -276,7 +276,7 @@ var SeriesModel = ComponentModel.extend({
                 var dimType = dimInfo.type;
                 var dimHead = getTooltipMarker({color: color, type: 'subItem'});
                 var valStr = (vertially
-                        ? dimHead + encodeHTML(dimInfo.tooltipName || dimInfo.name) + ': '
+                        ? dimHead + encodeHTML(dimInfo.displayName || '-') + ': '
                         : ''
                     )
                     + encodeHTML(dimType === 'ordinal'