From 0dc2f1496b00b941375772345efb262dea74364c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A4=A7=E5=8D=AB?= <15851990699@163.com>
Date: Sun, 5 Feb 2023 16:33:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=A0=BC=E9=A1=B5=E9=9D=A2=20=E7=94=B1=E4=BA=8E=20ant-design-v?=
 =?UTF-8?q?ue=20=E5=8D=87=E7=BA=A7=20v3=20=E7=89=88=E6=9C=AC=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8A=A5=20Warning:=20columns.customRender?=
 =?UTF-8?q?=20=E5=8D=B3=E5=B0=86=E5=BA=9F=E5=BC=83=EF=BC=8Ccolumns.customR?=
 =?UTF-8?q?ender=20=E7=94=A8=20columns.=20customCell=20=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=20(#2520)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(MergeHeader): 组件/Table/合并单元格页面 修改 Tabel.title 值为 合并单元格、修改 Table.bordered 值为 true 更好显示合并单元格效果

* fix(tableData): 由于 ant-design-vue 升级 v3 版本，页面报 Warning: columns.customRender 即将废弃
---
 src/views/demo/table/MergeHeader.vue |  3 +-
 src/views/demo/table/tableData.tsx   | 44 ++++++++++------------------
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/src/views/demo/table/MergeHeader.vue b/src/views/demo/table/MergeHeader.vue
index 2c3b612e9..5798c42d0 100644
--- a/src/views/demo/table/MergeHeader.vue
+++ b/src/views/demo/table/MergeHeader.vue
@@ -14,7 +14,8 @@
     components: { BasicTable },
     setup() {
       const [registerTable] = useTable({
-        title: '多级表头示例',
+        title: '合并单元格',
+        bordered: true,
         api: demoListApi,
         columns: getMergeHeaderColumns(),
       });
diff --git a/src/views/demo/table/tableData.tsx b/src/views/demo/table/tableData.tsx
index a248dc8fb..20d3975fe 100644
--- a/src/views/demo/table/tableData.tsx
+++ b/src/views/demo/table/tableData.tsx
@@ -157,29 +157,26 @@ export function getCustomHeaderColumns(): BasicColumn[] {
     },
   ];
 }
-const renderContent = ({ text, index }: { text: any; index: number }) => {
-  const obj: any = {
-    children: text,
-    attrs: {},
-  };
-  if (index === 9) {
-    obj.attrs.colSpan = 0;
-  }
-  return obj;
-};
+
+const cellContent = (_, index) => ({
+  colSpan: index === 9 ? 0 : 1,
+});
+
 export function getMergeHeaderColumns(): BasicColumn[] {
   return [
     {
       title: 'ID',
       dataIndex: 'id',
       width: 300,
-      customRender: renderContent,
+      customCell: (_, index) => ({
+        colSpan: index === 9 ? 6 : 1,
+      }),
     },
     {
       title: '姓名',
       dataIndex: 'name',
       width: 300,
-      customRender: renderContent,
+      customCell: cellContent,
     },
     {
       title: '地址',
@@ -187,19 +184,10 @@ export function getMergeHeaderColumns(): BasicColumn[] {
       colSpan: 2,
       width: 120,
       sorter: true,
-      customRender: ({ text, index }: { text: any; index: number }) => {
-        const obj: any = {
-          children: text,
-          attrs: {},
-        };
-        if (index === 2) {
-          obj.attrs.rowSpan = 2;
-        }
-        if (index === 3) {
-          obj.attrs.colSpan = 0;
-        }
-        return obj;
-      },
+      customCell: (_, index) => ({
+        rowSpan: index === 2 ? 2 : 1,
+        colSpan: index === 3 || index === 9 ? 0 : 1,
+      }),
     },
     {
       title: '编号',
@@ -209,19 +197,19 @@ export function getMergeHeaderColumns(): BasicColumn[] {
         { text: 'Male', value: 'male', children: [] },
         { text: 'Female', value: 'female', children: [] },
       ],
-      customRender: renderContent,
+      customCell: cellContent,
     },
     {
       title: '开始时间',
       dataIndex: 'beginTime',
       width: 200,
-      customRender: renderContent,
+      customCell: cellContent,
     },
     {
       title: '结束时间',
       dataIndex: 'endTime',
       width: 200,
-      customRender: renderContent,
+      customCell: cellContent,
     },
   ];
 }