tweak tooltip.

src/data/helper/dimensionHelper.js

@@ -44,10 +44,17 @@ export function summarizeDimensions(data) {
 
     var encodeLabel = encode.label;
     if (encodeLabel && encodeLabel.length) {
-        defaultedLabel = encode.label.slice();
+        defaultedLabel = encodeLabel.slice();
+    }
+
+    var defaultedTooltip = defaultedLabel.slice();
+    var encodeTooltip = encode.tooltip;
+    if (encodeTooltip && encodeTooltip.length) {
+        defaultedTooltip = encodeTooltip.slice();
     }
 
     encode.defaultedLabel = defaultedLabel;
+    encode.defaultedTooltip = defaultedTooltip;
 
     return summary;
 }

src/data/helper/sourceHelper.js

@@ -299,7 +299,11 @@ function makeDefaultEncode(
     seriesModel, datasetModel, data, sourceFormat, seriesLayoutBy, completeResult
 ) {
     var coordSysDefine = getCoordSysDefineBySeries(seriesModel);
-    var encode = {tooltip: [], itemName: [], label: [], seriesName: []};
+    var encode = {};
+    // var encodeTooltip = [];
+    // var encodeLabel = [];
+    var encodeItemName = [];
+    var encodeSeriesName = [];
     var seriesType = seriesModel.subType;
 
     // Usually in this case series will use the first data
@@ -318,21 +322,21 @@ function makeDefaultEncode(
             if (coordSysDefine.firstCategoryDimIndex == null) {
                 var dataDim = datasetRecord.valueWayDim++;
                 encode[coordDim] = dataDim;
-                encode.tooltip.push(dataDim);
-                encode.label.push(dataDim);
+                // encodeTooltip.push(dataDim);
+                // encodeLabel.push(dataDim);
             }
             // In category way, category axis.
             else if (coordSysDefine.categoryAxisMap.get(coordDim)) {
                 encode[coordDim] = 0;
-                encode.itemName.push(0);
+                encodeItemName.push(0);
             }
             // In category way, non-category axis.
             else {
                 var dataDim = datasetRecord.categoryWayDim++;
                 encode[coordDim] = dataDim;
-                encode.tooltip.push(dataDim);
-                encode.label.push(dataDim);
-                encode.seriesName.push(dataDim);
+                // encodeTooltip.push(dataDim);
+                // encodeLabel.push(dataDim);
+                encodeSeriesName.push(dataDim);
             }
         });
     }
@@ -350,15 +354,22 @@ function makeDefaultEncode(
             }
         }
         if (firstNotOrdinal != null) {
-            encode.value = encode.tooltip = firstNotOrdinal;
-            encode.itemName = completeResult.potentialNameDimIndex
+            encode.value = firstNotOrdinal;
+            var nameDimIndex = completeResult.potentialNameDimIndex
                 || Math.max(firstNotOrdinal - 1, 0);
             // By default, label use itemName in charts.
-            // So we dont set encode.label here.
-            encode.seriesName = encode.itemName;
+            // So we dont set encodeLabel here.
+            encodeSeriesName.push(nameDimIndex);
+            encodeItemName.push(nameDimIndex);
+            // encodeTooltip.push(firstNotOrdinal);
         }
     }
 
+    // encodeTooltip.length && (encode.tooltip = encodeTooltip);
+    // encodeLabel.length && (encode.label = encodeLabel);
+    encodeItemName.length && (encode.itemName = encodeItemName);
+    encodeSeriesName.length && (encode.seriesName = encodeSeriesName);
+
     return encode;
 }
 

src/model/Series.js

@@ -251,7 +251,7 @@ var SeriesModel = ComponentModel.extend({
     formatTooltip: function (dataIndex, multipleSeries, dataType) {
 
         function formatArrayValue(value) {
-            // ???
+            // ??? TODO refactor these logic.
             // check: category-no-encode-has-axis-data in dataset.html
             var vertially = zrUtil.reduce(value, function (vertially, val, idx) {
                 var dimItem = data.getDimensionInfo(idx);
@@ -262,7 +262,7 @@ var SeriesModel = ComponentModel.extend({
 
             tooltipDims.length
                 ? zrUtil.each(tooltipDims, function (dim) {
-                    setEachItem(data.get(dim, dataIndex), dim);
+                    setEachItem(data.get(dim, dataIndex, true), dim);
                 })
                 // By default, all dims is used on tooltip.
                 : zrUtil.each(value, setEachItem);
@@ -287,23 +287,23 @@ var SeriesModel = ComponentModel.extend({
             return (vertially ? '<br/>' : '') + result.join(vertially ? '<br/>' : ', ');
         }
 
-        var data = inner(this).data;
-        var tooltipDims = data.mapDimension('tooltip', true);
+        function formatSingleValue(val) {
+            return encodeHTML(addCommas(val));
+        }
 
-        // FIXME fragile way?
-        // object raw value?
+        var data = inner(this).data;
+        var tooltipDims = data.mapDimension('defaultedTooltip', true);
+        var tooltipDimLen = tooltipDims.length;
         var value = this.getRawValue(dataIndex);
         var isValueArr = zrUtil.isArray(value);
+
         // Complicated rule for pretty tooltip.
-        var formattedValue = (isValueArr && value.length > 1 && tooltipDims.length > 1)
+        var formattedValue = (tooltipDimLen > 1 || (isValueArr && !tooltipDimLen))
             ? formatArrayValue(value)
-            : encodeHTML(addCommas(
-                !isValueArr
-                ? value
-                : tooltipDims[0]
-                ? data.get(tooltipDims[0], dataIndex)
-                : value[0]
-            ));
+            : tooltipDimLen
+            ? formatSingleValue(data.get(tooltipDims[0], dataIndex, true))
+            : formatSingleValue(isValueArr ? value[0] : value);
+
         var name = data.getName(dataIndex);
 
         var color = data.getItemVisual(dataIndex, 'color');
@@ -315,14 +315,14 @@ var SeriesModel = ComponentModel.extend({
         var colorEl = getTooltipMarker(color);
 
         var seriesName = this.name;
-        // FIXME
-        if (seriesName === '\0-') {
+        if (seriesName === modelUtil.DEFAULT_COMPONENT_NAME) {
             // Not show '-'
             seriesName = '';
         }
         seriesName = seriesName
             ? encodeHTML(seriesName) + (!multipleSeries ? '<br/>' : ': ')
             : '';
+
         return !multipleSeries
             ? seriesName + colorEl
                 + (name

test/lib/reset.css

@@ -41,7 +41,7 @@ pre.test-print-object {
     font-family: Menlo, Monaco, 'Courier New', monospace;
 }
 .test-chart {
-    height: 300px;
+    height: 400px;
 }
 
 .test-data-table {
@@ -61,7 +61,7 @@ pre.test-print-object {
     padding: 3px 5px;
     font-size: 13px;
 }
-.test-data-table-key td {
+td.test-data-table-key {
     font-size: 12px;
     color: rgb(69, 162, 238)
 }