From 93d39e333cebf68bf42e03d2b0fa00e121ba5299 Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Tue, 3 Dec 2024 22:45:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=A0=BC=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=20#13283?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/js/panel/common/common_table.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
index e9e69d7940..9bebf104f2 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
@@ -1505,7 +1505,7 @@ export function configMergeCells(chart: Chart, options: S2Options, dataConfig: S
                   showText: j === textIndex
                 })
               }
-              if (index === end) {
+              if (index === end && lastVal === curVal) {
                 tmpMergeCells.push({
                   colIndex: showIndex ? i + 1 : i,
                   rowIndex: index,
@@ -1513,7 +1513,7 @@ export function configMergeCells(chart: Chart, options: S2Options, dataConfig: S
                 })
               }
               mergedCellsInfo.push(tmpMergeCells)
-              curMergedColInfo.push([lastIndex, index === end ? index : index - 1])
+              curMergedColInfo.push([lastIndex, index === end && lastVal === curVal ? index : index - 1])
             }
             lastVal = curVal
             lastIndex = index