From 122938006ff4b16e0469c21370e8ec24fb907de9 Mon Sep 17 00:00:00 2001 From: yufeng04 Date: Fri, 3 Jan 2020 14:10:58 +0800 Subject: [PATCH] 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 ef08c78fb..9680daf06 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 98ef49c3b..873ae4e5b 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); -- GitLab