diff --git a/core/frontend/src/views/chart/components/ChartComponentS2.vue b/core/frontend/src/views/chart/components/ChartComponentS2.vue
index 2cb9548a74..40818d5376 100644
--- a/core/frontend/src/views/chart/components/ChartComponentS2.vue
+++ b/core/frontend/src/views/chart/components/ChartComponentS2.vue
@@ -331,11 +331,8 @@ export default {
       if (this.chart.type === 'table-pivot') {
         rowData = { ...meta.rowQuery, ...meta.colQuery }
         rowData[meta.valueField] = meta.fieldValue
-      } else if (this.showPage && (this.chart.datasetMode === 1 || (this.chart.datasetMode === 0 && this.not_support_page_dataset.includes(this.chart.datasourceType)))) {
-        const rowIndex = (this.currentPage.page - 1) * this.currentPage.pageSize + meta.rowIndex
-        rowData = this.chart.data.tableRow[rowIndex]
       } else {
-        rowData = this.chart.data.tableRow[meta.rowIndex]
+        rowData = this.myChart.dataSet.getRowData(meta)
       }
       const dimensionList = []
       for (const key in rowData) {