From ed36371b02acc1171c3abaa94e37be4e286d975d Mon Sep 17 00:00:00 2001
From: KeXi <121713235+kyokaxin@users.noreply.github.com>
Date: Thu, 11 Jan 2024 11:15:51 +0800
Subject: [PATCH] fix(Table): fix merge width calculation logic when lock,
 close #4264 (#4709)

* fix(Table): should support for should support for merging cells in locked columns

* fix(Table): delete checkMatchingMergeColSpan

---------

Co-authored-by: chenkeyao.chenkeya <chenkeyao.chenkeya@alibaba-inc.com>
---
 components/table/__tests__/issue-spec.js | 52 ++++++++++++++++++++++++
 components/table/new-lock.jsx            |  5 ++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/components/table/__tests__/issue-spec.js b/components/table/__tests__/issue-spec.js
index 14206c83c4..cddbacbe3a 100644
--- a/components/table/__tests__/issue-spec.js
+++ b/components/table/__tests__/issue-spec.js
@@ -1426,6 +1426,58 @@ describe('TableScroll', () => {
         const scrollRowTop = scrollRow.getBoundingClientRect().top;
         assert(scrollRowTop >= getBodyTop() - 10);
     });
+
+    // fix https://github.com/alibaba-fusion/next/issues/4264
+    it('should support for merging cells in locked columns, close #4264', async () => {
+        const container = document.createElement('div');
+        document.body.appendChild(container);
+
+        const dataSource = j => {
+            const result = [];
+            for (let i = 0; i < j; i++) {
+                result.push({
+                    title: { name: `Quotation for 1PCS Nano ${3 + i}.0 controller compatible` },
+                    id: `100306660940${i}`,
+                    time: 2000 + i,
+                    index: i,
+                });
+            }
+            return result;
+        };
+
+        const mergeCell = (rowIndex, colIndex) => {
+            if (colIndex === 0 && rowIndex === 0) {
+                return {
+                    rowSpan: 2,
+                    colSpan: 2,
+                };
+            }
+        };
+        class App extends React.Component {
+            render() {
+                return (
+                    <Table.StickyLock dataSource={dataSource(3)} cellProps={mergeCell}>
+                        <Table.Column title="Id" dataIndex="id" width={200} lock />
+                        <Table.Column title="Title" dataIndex="title.name" lock width={200} />
+                        <Table.Column title="Time" dataIndex="time" width={200} lock />
+                        <Table.Column title="test" width={200} />
+                        <Table.Column title="test2" width={200} />
+                    </Table.StickyLock>
+                );
+            }
+        }
+        ReactDOM.render(<App />, container);
+
+        await delay(200);
+        const titleHeaderNode = container.querySelectorAll('thead .next-table-header-node')[1];
+        assert(titleHeaderNode);
+        assert(titleHeaderNode.colSpan === 1);
+        const idHeaderNode = container.querySelectorAll('thead .next-table-header-node')[0];
+        assert(idHeaderNode);
+        assert(titleHeaderNode.getBoundingClientRect().left === idHeaderNode.getBoundingClientRect().right);
+        const testNode = container.querySelector('tbody [data-next-table-col="1"][data-next-table-row="2"]');
+        assert(testNode);
+    });
     it('set keepForwardRenderRows to support large rowSpan when useVirtual, close #4395', async () => {
         const datas = j => {
             const result = [];
diff --git a/components/table/new-lock.jsx b/components/table/new-lock.jsx
index aef2ade3e3..ce2d012278 100644
--- a/components/table/new-lock.jsx
+++ b/components/table/new-lock.jsx
@@ -307,7 +307,10 @@ export default function stickyLock(BaseComponent) {
                 const node = isEmpty
                     ? this.getHeaderCellNode(headerCellRowIndex, headerCellColIndex)
                     : this.getCellNode(scrollToRow || (dataSource[0] && dataSource[0].__rowIndex) || 0, nodeToGetWidth);
-                const colWidth = (node && parseFloat(getComputedStyle(node).width)) || 0;
+                let colWidth = 0;
+                if (node) {
+                    colWidth = parseFloat(getComputedStyle(node).width) / node.colSpan || 0;
+                }
 
                 ret[tag] = (ret[tagNext] || 0) + colWidth;
                 return ret;