fix(data-table): header & body may have wrong border radius, closes #…

…1712
tusen-ai · Dec 2, 2021 · b00ee42 · b00ee42
1 parent c76925c
commit b00ee42
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -7,6 +7,7 @@
 - Fix `n-input` 's `borderHover` theme variable doesn't work, closes [#1704](https://github.com/TuSimple/naive-ui/issues/1704).
 - Fix `n-dialog`'s `content` word-break.
 - Fix `n-input-number` cannot input decimals value.
+- Fix `n-data-table`'s header & body may have wrong border radius, closes [#1712](https://github.com/TuSimple/naive-ui/issues/1712).
 
 ### Feats
 

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -7,6 +7,7 @@
 - 修复 `n-input` 的 `borderHover` 主题变量不生效， 关闭 [#1704](https://github.com/TuSimple/naive-ui/issues/1704)
 - 修复 `n-dialog` 的 `content` 内容为英文时的换行问题
 - 修复 `n-input-number` 不能输入小数值
+- 修复 `n-data-table` 的表头和主体可能有错误的圆角，关闭 [#1712](https://github.com/TuSimple/naive-ui/issues/1712)
 
 ### Feats
 

diff --git a/src/data-table/src/styles/index.cssr.ts b/src/data-table/src/styles/index.cssr.ts
@@ -329,19 +329,11 @@ export default c([
       ])
     ]),
     cM('bordered', [
-      cB('data-table-wrapper', {
-        border: '1px solid var(--merged-border-color)',
-        borderBottomLeftRadius: 'var(--border-radius)',
-        borderBottomRightRadius: 'var(--border-radius)'
-      }),
-      cB('data-table-td', [
-        cM('last-row', {
-          borderBottom: '0 solid var(--merged-border-color)'
-        })
-      ]),
-      cB('data-table-base-table-body', `
-        border-bottom-left-radius: calc(var(--border-radius) - 1px);
-        border-bottom-right-radius: calc(var(--border-radius) - 1px);
+      cB('data-table-wrapper', `
+        border: 1px solid var(--merged-border-color);
+        border-bottom-left-radius: var(--border-radius);
+        border-bottom-right-radius: var(--border-radius);
+        overflow: hidden;
       `)
     ]),
     cB('data-table-base-table', [