This is an automated email from the ASF dual-hosted git repository.

yufeng04 pushed a commit to branch fix-11528
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git

commit 122938006ff4b16e0469c21370e8ec24fb907de9
Author: yufeng04 <[email protected]>
AuthorDate: Fri Jan 3 14:10:58 2020 +0800

    fix bug #11528 Modify default value of tooltip and label
---
 src/chart/helper/labelHelper.js | 3 ++-
 src/model/Series.js             | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/chart/helper/labelHelper.js b/src/chart/helper/labelHelper.js
index ef08c78..9680daf 100644
--- a/src/chart/helper/labelHelper.js
+++ b/src/chart/helper/labelHelper.js
@@ -25,7 +25,8 @@ import {retrieveRawValue} from 
'../../data/helper/dataProvider';
  * @return {string} label string. Not null/undefined
  */
 export function getDefaultLabel(data, dataIndex) {
-    var labelDims = data.mapDimension('defaultedLabel', true);
+    var dataDimsLen = data.dimensions.length;
+    var labelDims = data.mapDimension(dataDimsLen > 2 ? 
data.dimensions[dataDimsLen - 1] : 'defaultedLabel', true);
     var len = labelDims.length;
 
     // Simple optimization (in lots of cases, label dims length is 1)
diff --git a/src/model/Series.js b/src/model/Series.js
index 98ef49c..873ae4e 100644
--- a/src/model/Series.js
+++ b/src/model/Series.js
@@ -395,7 +395,8 @@ var SeriesModel = ComponentModel.extend({
         }
 
         var data = this.getData();
-        var tooltipDims = data.mapDimension('defaultedTooltip', true);
+        var dataDimsLen = data.dimensions.length;
+        var tooltipDims = data.mapDimension(dataDimsLen > 2 ? 
data.dimensions[dataDimsLen - 1] : 'defaultedTooltip', true);
         var tooltipDimLen = tooltipDims.length;
         var value = this.getRawValue(dataIndex);
         var isValueArr = zrUtil.isArray(value);


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to