From acd3fdc7b4fddaab5f0191d6e7afbd391fa247b1 Mon Sep 17 00:00:00 2001
From: Gimmy <975402925@qq.com>
Date: Mon, 23 Jun 2025 11:30:17 +0800
Subject: [PATCH 1/4] fix(grid): fix custom empty text align not center

---
 packages/theme-saas/src/grid/table.less | 1 +
 packages/theme/src/grid/table.less      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/theme-saas/src/grid/table.less b/packages/theme-saas/src/grid/table.less
index e00a94778a..0218f5cef2 100644
--- a/packages/theme-saas/src/grid/table.less
+++ b/packages/theme-saas/src/grid/table.less
@@ -870,6 +870,7 @@
     @apply flex-auto;
     @apply items-center;
     @apply justify-center;
+    @apply text-center;
     @apply sticky;
     @apply left-0;
   }
diff --git a/packages/theme/src/grid/table.less b/packages/theme/src/grid/table.less
index 2ee12af0a3..71e2a1197c 100644
--- a/packages/theme/src/grid/table.less
+++ b/packages/theme/src/grid/table.less
@@ -725,6 +725,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
+    text-align: center;
     position: sticky;
     left: 0;
     flex: auto;

From 26628415b2a6dc83ea43ff58871558abadd1ca1a Mon Sep 17 00:00:00 2001
From: Gimmy <975402925@qq.com>
Date: Mon, 23 Jun 2025 19:41:31 +0800
Subject: [PATCH 2/4] fix(grid): fix selection error

---
 packages/vue/src/grid/src/keyboard/src/methods.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/vue/src/grid/src/keyboard/src/methods.ts b/packages/vue/src/grid/src/keyboard/src/methods.ts
index 2630ffe6a5..a428f6e7a7 100644
--- a/packages/vue/src/grid/src/keyboard/src/methods.ts
+++ b/packages/vue/src/grid/src/keyboard/src/methods.ts
@@ -508,10 +508,13 @@ export default {
     this.editStore.indexs.rowNodes = rowNodes
   },
   _clearIndexChecked() {
-    let indexCheckeds = this.elemStore['main-body-list'].querySelectorAll('.col__index-checked')
-    let eachHandler = (colNode) => removeClass(colNode, 'col__index-checked')
+    const tbody = this.elemStore['main-body-list']
+    if (tbody) {
+      const indexCheckeds = tbody.querySelectorAll('.col__index-checked')
+      const eachHandler = (colNode) => removeClass(colNode, 'col__index-checked')
 
-    arrayEach(indexCheckeds, eachHandler)
+      arrayEach(indexCheckeds, eachHandler)
+    }
 
     Object.assign(this.editStore.indexs, { rowNodes: [] })
 

From 7fbfbdadde653dd5b6cdba6b7f3ce1e2fbc9bcf6 Mon Sep 17 00:00:00 2001
From: Gimmy <975402925@qq.com>
Date: Tue, 24 Jun 2025 14:49:41 +0800
Subject: [PATCH 3/4] fix(grid): fix multi header tooltip error

---
 packages/vue/src/grid/src/table/src/methods.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/vue/src/grid/src/table/src/methods.ts b/packages/vue/src/grid/src/table/src/methods.ts
index 643dcc24e9..22698bea5f 100644
--- a/packages/vue/src/grid/src/table/src/methods.ts
+++ b/packages/vue/src/grid/src/table/src/methods.ts
@@ -407,15 +407,15 @@ const Methods = {
     }
   },
   // 更新列的 Map
-  cacheColumnMap() {
-    let { fullColumnMap, tableFullColumn: fullColumn } = this
-    let fullColumnIdData = {}
+  cacheColumnMap(options) {
+    const { fullColumnMap } = this
+    const fullColumnIdData = {}
     this.fullColumnIdData = fullColumnIdData
-    Map.prototype.clear.apply(fullColumnMap)
-    fullColumn.forEach((column, index) => {
-      let colCache = { colid: column.id, column, index }
-      fullColumnIdData[column.id] = colCache
-      fullColumnMap.set(column, colCache)
+    fullColumnMap.clear()
+
+    options.columnCaches.forEach((cache) => {
+      fullColumnIdData[cache.colid] = cache
+      fullColumnMap.set(cache.column, cache)
     })
   },
   // 通过tr的dom元素获取行数据等相关信息

From 91390540ef2e588c80fad43c6ba9f79d60853cc5 Mon Sep 17 00:00:00 2001
From: Gimmy <975402925@qq.com>
Date: Tue, 24 Jun 2025 14:56:09 +0800
Subject: [PATCH 4/4] fix(grid): fix grid border style error

---
 packages/theme-saas/src/grid/table.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/theme-saas/src/grid/table.less b/packages/theme-saas/src/grid/table.less
index 0218f5cef2..7ccd7497ea 100644
--- a/packages/theme-saas/src/grid/table.less
+++ b/packages/theme-saas/src/grid/table.less
@@ -321,7 +321,7 @@
         );
       @apply bg-no-repeat;
       background-size: 1px 100%, 100% 1px;
-      background-position: 100% 0, 100% 99%;
+      background-position: 100% 0, 100% 100%;
     }
 
     &.is__row-span .@{grid-prefix-cls}-body__column {
@@ -330,7 +330,7 @@
 
     .@{grid-prefix-cls}-body__row:last-child {
       .@{grid-prefix-cls}-body__column {
-        background-position: 100% 0, 100% 97%;
+        background-position: 100% 0, 100% 100%;
       }
     }