From 2fb99b01e15709d7b0c5cbd71af7ea545e22ed5f Mon Sep 17 00:00:00 2001
From: tinyfind <67093787+tinyfind@users.noreply.github.com>
Date: Wed, 19 Oct 2022 10:15:59 +0800
Subject: [PATCH] fix(components): [table] fix merge cell cannot show side
 shadow (#10095)

---
 .../components/table/src/table-body/render-helper.ts |  2 +-
 .../components/table/src/table-body/styles-helper.ts | 12 ++++++++++--
 packages/components/table/src/util.ts                | 10 +++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/components/table/src/table-body/render-helper.ts b/packages/components/table/src/table-body/render-helper.ts
index 9ecbc03a7c..9531a7c774 100644
--- a/packages/components/table/src/table-body/render-helper.ts
+++ b/packages/components/table/src/table-body/render-helper.ts
@@ -116,7 +116,7 @@ function useRender<T>(props: Partial<TableBodyProps<T>>) {
           'td',
           {
             style: getCellStyle($index, cellIndex, row, column),
-            class: getCellClass($index, cellIndex, row, column),
+            class: getCellClass($index, cellIndex, row, column, colspan - 1),
             key: `${patchKey}${baseKey}`,
             rowspan,
             colspan,
diff --git a/packages/components/table/src/table-body/styles-helper.ts b/packages/components/table/src/table-body/styles-helper.ts
index 00ea147486..2b52210001 100644
--- a/packages/components/table/src/table-body/styles-helper.ts
+++ b/packages/components/table/src/table-body/styles-helper.ts
@@ -79,11 +79,19 @@ function useStyles<T>(props: Partial<TableBodyProps<T>>) {
     rowIndex: number,
     columnIndex: number,
     row: T,
-    column: TableColumnCtx<T>
+    column: TableColumnCtx<T>,
+    offset: number
   ) => {
     const fixedClasses = column.isSubColumn
       ? []
-      : getFixedColumnsClass(ns.b(), columnIndex, props?.fixed, props.store)
+      : getFixedColumnsClass(
+          ns.b(),
+          columnIndex,
+          props?.fixed,
+          props.store,
+          undefined,
+          offset
+        )
     const classes = [column.id, column.align, column.className, ...fixedClasses]
     const cellClassName = parent?.props.cellClassName
     if (typeof cellClassName === 'string') {
diff --git a/packages/components/table/src/util.ts b/packages/components/table/src/util.ts
index 2ebcdb43db..a0b3be1f2d 100644
--- a/packages/components/table/src/util.ts
+++ b/packages/components/table/src/util.ts
@@ -440,18 +440,22 @@ export const getFixedColumnsClass = <T>(
   index: number,
   fixed: string | boolean,
   store: any,
-  realColumns?: TableColumnCtx<T>[]
+  realColumns?: TableColumnCtx<T>[],
+  offset = 0
 ) => {
   const classes: string[] = []
   const { direction, start } = isFixedColumn(index, fixed, store, realColumns)
   if (direction) {
     const isLeft = direction === 'left'
     classes.push(`${namespace}-fixed-column--${direction}`)
-    if (isLeft && start === store.states.fixedLeafColumnsLength.value - 1) {
+    if (
+      isLeft &&
+      start + offset === store.states.fixedLeafColumnsLength.value - 1
+    ) {
       classes.push('is-last-column')
     } else if (
       !isLeft &&
-      start ===
+      start - offset ===
         store.states.columns.value.length -
           store.states.rightFixedLeafColumnsLength.value
     ) {