From 3bffdb11f14976aac9a31dbe7616bd159922038f Mon Sep 17 00:00:00 2001 From: sunsunmonkey <2933201543@qq.com> Date: Sun, 10 Dec 2023 21:14:24 +0800 Subject: [PATCH 1/5] fix: Resolved table's unexpected rounded corners --- src/Table.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Table.tsx b/src/Table.tsx index 7b7751554..d84c28c50 100644 --- a/src/Table.tsx +++ b/src/Table.tsx @@ -739,7 +739,6 @@ function Table( ); } - let fullTable = (
( {...dataProps} > {title && {title(mergedData)}} -
+
{groupTableNode}
{footer && {footer(mergedData)}} From 87a09362590a8a9a44c8760ee7d3e6c0fd280874 Mon Sep 17 00:00:00 2001 From: sunsunmonkey <2933201543@qq.com> Date: Sun, 10 Dec 2023 21:17:24 +0800 Subject: [PATCH 2/5] fix: add a class to resolved table's unexpected rounded corners --- src/Table.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Table.tsx b/src/Table.tsx index d84c28c50..b161d3fd7 100644 --- a/src/Table.tsx +++ b/src/Table.tsx @@ -764,7 +764,7 @@ function Table(
{groupTableNode} From 1e1a5e0f94a645af5c0c8715dac6f59fd222319e Mon Sep 17 00:00:00 2001 From: sunsunmonkey <2933201543@qq.com> Date: Mon, 11 Dec 2023 10:42:04 +0800 Subject: [PATCH 3/5] refactor: the className use classNames methods --- src/Table.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Table.tsx b/src/Table.tsx index b161d3fd7..184fbfb19 100644 --- a/src/Table.tsx +++ b/src/Table.tsx @@ -763,9 +763,9 @@ function Table( {title && {title(mergedData)}}
{groupTableNode}
From 1b2dacdcf12e763982d9a6d25f91cb52407b6af4 Mon Sep 17 00:00:00 2001 From: sunsunmonkey <2933201543@qq.com> Date: Mon, 11 Dec 2023 11:13:51 +0800 Subject: [PATCH 4/5] docs: add the example with showHeader --- assets/index.less | 6 +++++- docs/demo/showHeader.md | 8 ++++++++ docs/examples/showHeader.tsx | 39 ++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 docs/demo/showHeader.md create mode 100644 docs/examples/showHeader.tsx diff --git a/assets/index.less b/assets/index.less index f00920ba6..4c9fb032f 100644 --- a/assets/index.less +++ b/assets/index.less @@ -54,7 +54,11 @@ border-left: @border; } } - + // ================== Container ================== + &-container-header{ + border-start-start-radius: 8px; + border-start-end-radius: 8px; + } // ================== Cell ================== &-cell { background: #f4f4f4; diff --git a/docs/demo/showHeader.md b/docs/demo/showHeader.md new file mode 100644 index 000000000..b13325f36 --- /dev/null +++ b/docs/demo/showHeader.md @@ -0,0 +1,8 @@ +--- +title: showHeader +nav: + title: Demo + path: /demo +--- + + diff --git a/docs/examples/showHeader.tsx b/docs/examples/showHeader.tsx new file mode 100644 index 000000000..78ae174ba --- /dev/null +++ b/docs/examples/showHeader.tsx @@ -0,0 +1,39 @@ +import React from 'react'; +import Table from 'rc-table'; +import '../../assets/index.less'; + +const columns = [ + { + title: 'Name', + dataIndex: 'name', + key: 'name', + }, + { + title: 'Age', + dataIndex: 'age', + key: 'age', + }, + { + title: 'Address', + dataIndex: 'address', + key: 'address', + }, +]; + +const data = [ + { name: 'John', age: '25', address: '1 A Street' }, + { name: 'Fred', age: '38', address: '2 B Street' }, + { name: 'Anne', age: '47', address: '3 C Street' }, +]; + +const Demo = () => ( +
+

Table with no header

+ +
+

Table with header

+
+ +); + +export default Demo; From 041669a4d1b5b4f4d18afa806fe3a153ddd7247f Mon Sep 17 00:00:00 2001 From: sunsunmonkey <2933201543@qq.com> Date: Mon, 11 Dec 2023 11:22:39 +0800 Subject: [PATCH 5/5] test: update snap with showHeader --- tests/__snapshots__/ExpandRow.spec.jsx.snap | 18 ++++++------ tests/__snapshots__/FixedColumn.spec.jsx.snap | 10 +++---- tests/__snapshots__/Table.spec.jsx.snap | 28 +++++++++---------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/tests/__snapshots__/ExpandRow.spec.jsx.snap b/tests/__snapshots__/ExpandRow.spec.jsx.snap index 96f841d8f..5984e40cd 100644 --- a/tests/__snapshots__/ExpandRow.spec.jsx.snap +++ b/tests/__snapshots__/ExpandRow.spec.jsx.snap @@ -6,7 +6,7 @@ LoadedCheerio { class="rc-table" >