From cc54bef826c12454ccf832bdaccdbc5d3442b4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=85=A7=E6=98=8E=E8=83=A7?=
 <25151442+mmmml-zhao@users.noreply.github.com>
Date: Wed, 26 Jun 2024 14:19:22 +0800
Subject: [PATCH] fix: The emptyText field of the table (#49599)

* fix: The emptyText field of the table
when emptyText is null

* test: update test case(#49599)
---
 components/table/InternalTable.tsx            |  7 +-
 .../__snapshots__/empty.test.tsx.snap         | 98 +++++++++++++++++++
 components/table/__tests__/empty.test.tsx     | 12 +++
 3 files changed, 114 insertions(+), 3 deletions(-)

diff --git a/components/table/InternalTable.tsx b/components/table/InternalTable.tsx
index 699384d22b..51d5384398 100644
--- a/components/table/InternalTable.tsx
+++ b/components/table/InternalTable.tsx
@@ -547,9 +547,10 @@ const InternalTable = <RecordType extends AnyObject = AnyObject>(
 
   const mergedStyle: React.CSSProperties = { ...table?.style, ...style };
 
-  const emptyText = locale?.emptyText || renderEmpty?.('Table') || (
-    <DefaultRenderEmpty componentName="Table" />
-  );
+  const emptyText =
+    typeof locale?.emptyText !== 'undefined'
+      ? locale.emptyText
+      : renderEmpty?.('Table') || <DefaultRenderEmpty componentName="Table" />;
 
   // ========================== Render ==========================
   const TableComponent = virtual ? RcVirtualTable : RcTable;
diff --git a/components/table/__tests__/__snapshots__/empty.test.tsx.snap b/components/table/__tests__/__snapshots__/empty.test.tsx.snap
index 397f1f3d20..a5f52d2f3e 100644
--- a/components/table/__tests__/__snapshots__/empty.test.tsx.snap
+++ b/components/table/__tests__/__snapshots__/empty.test.tsx.snap
@@ -147,6 +147,104 @@ exports[`Table renders empty table 1`] = `
 </div>
 `;
 
+exports[`Table renders empty table when emptyText is null 1`] = `
+<div
+  class="ant-table-wrapper"
+>
+  <div
+    class="ant-spin-nested-loading"
+  >
+    <div
+      class="ant-spin-container"
+    >
+      <div
+        class="ant-table ant-table-empty"
+      >
+        <div
+          class="ant-table-container"
+        >
+          <div
+            class="ant-table-content"
+          >
+            <table
+              style="table-layout: auto;"
+            >
+              <colgroup />
+              <thead
+                class="ant-table-thead"
+              >
+                <tr>
+                  <th
+                    class="ant-table-cell"
+                    scope="col"
+                  >
+                    Column 1
+                  </th>
+                  <th
+                    class="ant-table-cell"
+                    scope="col"
+                  >
+                    Column 2
+                  </th>
+                  <th
+                    class="ant-table-cell"
+                    scope="col"
+                  >
+                    Column 3
+                  </th>
+                  <th
+                    class="ant-table-cell"
+                    scope="col"
+                  >
+                    Column 4
+                  </th>
+                  <th
+                    class="ant-table-cell"
+                    scope="col"
+                  >
+                    Column 5
+                  </th>
+                  <th
+                    class="ant-table-cell"
+                    scope="col"
+                  >
+                    Column 6
+                  </th>
+                  <th
+                    class="ant-table-cell"
+                    scope="col"
+                  >
+                    Column 7
+                  </th>
+                  <th
+                    class="ant-table-cell"
+                    scope="col"
+                  >
+                    Column 8
+                  </th>
+                </tr>
+              </thead>
+              <tbody
+                class="ant-table-tbody"
+              >
+                <tr
+                  class="ant-table-placeholder"
+                >
+                  <td
+                    class="ant-table-cell"
+                    colspan="8"
+                  />
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
 exports[`Table renders empty table with custom emptyText 1`] = `
 <div
   class="ant-table-wrapper"
diff --git a/components/table/__tests__/empty.test.tsx b/components/table/__tests__/empty.test.tsx
index 41dd606263..3849d914c0 100644
--- a/components/table/__tests__/empty.test.tsx
+++ b/components/table/__tests__/empty.test.tsx
@@ -89,6 +89,18 @@ describe('Table', () => {
     });
   });
 
+  it('renders empty table when emptyText is null', () => {
+    const { container, asFragment } = render(
+      <Table dataSource={[]} columns={columns} pagination={false} locale={{ emptyText: null }} />,
+    );
+
+    expect(container.querySelector('.ant-table-placeholder>.ant-table-cell')?.hasChildNodes()).toBe(
+      false,
+    );
+
+    expect(asFragment().firstChild).toMatchSnapshot();
+  });
+
   it('renders empty table with custom emptyText', () => {
     const { asFragment } = render(
       <Table