From c0f071e4640e1c0e5e185b7013e5042bf1a514f8 Mon Sep 17 00:00:00 2001
From: btea <2356281422@qq.com>
Date: Sun, 10 Nov 2024 14:39:45 +0800
Subject: [PATCH] fix(components): [table] `table-layout:auto` fixed column
 misalignment (#18736)

* fix(components): [table] `table-layout:auto` fixed column misalignment

* fix: update

* fix: update

* fix: update

* Update packages/components/table/src/table-header/index.ts

Co-authored-by: qiang <qw13131wang@gmail.com>

* Update packages/components/table/src/table-header/index.ts

Co-authored-by: qiang <qw13131wang@gmail.com>

* fix: lint

---------

Co-authored-by: qiang <qw13131wang@gmail.com>
---
 .../components/table/src/store/watcher.ts     | 18 +++++--
 .../table/src/table-header/index.ts           | 48 ++++++++++++++++---
 2 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/packages/components/table/src/store/watcher.ts b/packages/components/table/src/store/watcher.ts
index 9567ef9de8..c59c648ed0 100644
--- a/packages/components/table/src/store/watcher.ts
+++ b/packages/components/table/src/store/watcher.ts
@@ -77,9 +77,21 @@ function useWatcher<T>() {
   const sortOrder = ref(null)
   const hoverRow = ref(null)
 
-  watch(data, () => instance.state && scheduleLayout(false), {
-    deep: true,
-  })
+  watch(
+    data,
+    () => {
+      if (instance.state) {
+        scheduleLayout(false)
+        const needUpdateFixed = instance.props.tableLayout === 'auto'
+        if (needUpdateFixed) {
+          instance.refs.tableHeaderRef?.updateFixedColumnStyle()
+        }
+      }
+    },
+    {
+      deep: true,
+    }
+  )
 
   // 检查 rowKey 是否存在
   const assertRowKey = () => {
diff --git a/packages/components/table/src/table-header/index.ts b/packages/components/table/src/table-header/index.ts
index ba85e1f4f2..98ae2f5681 100644
--- a/packages/components/table/src/table-header/index.ts
+++ b/packages/components/table/src/table-header/index.ts
@@ -67,13 +67,38 @@ export default defineComponent({
     const ns = useNamespace('table')
     const filterPanels = ref({})
     const { onColumnsChange, onScrollableChange } = useLayoutObserver(parent!)
+
+    const isTableLayoutAuto = parent?.props.tableLayout === 'auto'
+    const saveIndexSelection = new Map()
+    const theadRef = ref()
+
+    const updateFixedColumnStyle = () => {
+      setTimeout(() => {
+        if (saveIndexSelection.size > 0) {
+          saveIndexSelection.forEach((column, key) => {
+            const el = theadRef.value.querySelector(
+              `.${key.replace(/\s/g, '.')}`
+            )
+            if (el) {
+              const width = el.getBoundingClientRect().width
+              column.width = width
+            }
+          })
+          saveIndexSelection.clear()
+        }
+      })
+    }
+
     onMounted(async () => {
       // Need double await, because updateColumns is executed after nextTick for now
       await nextTick()
       await nextTick()
       const { prop, order } = props.defaultSort
       parent?.store.commit('sort', { prop, order, init: true })
+
+      updateFixedColumnStyle()
     })
+
     const {
       handleHeaderClick,
       handleHeaderContextMenu,
@@ -118,6 +143,10 @@ export default defineComponent({
       handleFilterClick,
       isGroup,
       toggleAllSelection,
+      saveIndexSelection,
+      isTableLayoutAuto,
+      theadRef,
+      updateFixedColumnStyle,
     }
   },
   render() {
@@ -137,11 +166,14 @@ export default defineComponent({
       handleMouseOut,
       store,
       $parent,
+      saveIndexSelection,
+      isTableLayoutAuto,
     } = this
     let rowSpan = 1
     return h(
       'thead',
       {
+        ref: 'theadRef',
         class: { [ns.is('group')]: isGroup },
       },
       columnRows.map((subColumns, rowIndex) =>
@@ -156,15 +188,19 @@ export default defineComponent({
             if (column.rowSpan > rowSpan) {
               rowSpan = column.rowSpan
             }
+            const _class = getHeaderCellClass(
+              rowIndex,
+              cellIndex,
+              subColumns,
+              column
+            )
+            if (isTableLayoutAuto && column.fixed) {
+              saveIndexSelection.set(_class, column)
+            }
             return h(
               'th',
               {
-                class: getHeaderCellClass(
-                  rowIndex,
-                  cellIndex,
-                  subColumns,
-                  column
-                ),
+                class: _class,
                 colspan: column.colSpan,
                 key: `${column.id}-thead`,
                 rowspan: column.rowSpan,