From f1c69fa2969572fc3d17c9767140da481d8fde71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=98=89=E8=B1=AA?=
 <42510293+ziyujiahao@users.noreply.github.com>
Date: Mon, 15 Dec 2025 15:25:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=97=B6=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=9C=89=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=20(#17605)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/components/js/panel/charts/table/t-heatmap.ts      | 5 +++--
 .../views/chart/components/js/panel/common/common_antv.ts    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/t-heatmap.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/t-heatmap.ts
index 67109910f8..63d6c47ad6 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/t-heatmap.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/t-heatmap.ts
@@ -124,8 +124,9 @@ export class TableHeatmap extends G2PlotChartView<HeatmapOptions, Heatmap> {
     const extColorField = extColor[0].dataeaseName
     // data
     const tmpData = cloneDeep(chart.data.tableRow)
-    const data = tmpData.filter(cell => cell[xField] && cell[xFieldExt] && cell[extColorField])
-    data.forEach(i => {
+    const data =
+      tmpData?.filter(cell => cell[xField] && cell[xFieldExt] && cell[extColorField]) || []
+    data?.forEach(i => {
       Object.keys(i).forEach(key => {
         if (key === '*') {
           i['@'] = i[key]
diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
index 4f098478bc..f6a3813de6 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
@@ -2353,8 +2353,8 @@ export const configEmptyDataStyle = (newData, container, newChart?, content?) =>
     }
   }
   removeEmptyDom()
-  if (newData.length > 0) return
-  if (!newData.length) {
+  if (newData?.length > 0) return
+  if (!newData?.length) {
     const emptyDom = document.createElement('div')
     emptyDom.id = container + '_empty'
     emptyDom.textContent = content || tI18n('data_set.no_data')