diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index e94fde0581..fff78e5fdd 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -66,7 +66,6 @@ If you want to read change logs before `2.0.0`, please visit [GitHub](https://gi - 📖 Rewrite the [Use in create-react-app](/docs/react/use-with-create-react-app) documentation without ejecting. [#7276](https://github.com/ant-design/ant-design/pull/7276) - 🌟 Better empty data style for fixed-columns Table. [#7298](https://github.com/ant-design/ant-design/issues/7298) - ![](https://gw.alipayobjects.com/zos/rmsportal/kpxITHnXvsLlMTqEKgUm.gif) - 🐞 Fix `disabled` logic of CheckboxGroup and Checkbox. [#7266](https://github.com/ant-design/ant-design/issues/7266) [@dilidili](https://github.com/dilidili) - 🐞 Fix errors of rendering Spin and Carousel in react-snapshot or other jsdom environment. [#3308](https://github.com/ant-design/ant-design/issues/3308) [#7318](https://github.com/ant-design/ant-design/issues/7318) - 🐞 Fix some details of Select, Tooltip and Menu. diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 8545c67635..afe9dc480f 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -66,9 +66,6 @@ timeline: true - 📖 重写了 [《在 create-react-app 中使用》](/docs/react/use-with-create-react-app) 文档,现在不再需要 eject。[#7276](https://github.com/ant-design/ant-design/pull/7276) - 🌟 优化了固定列的空表格样式。[#7298](https://github.com/ant-design/ant-design/issues/7298) - - ![](https://gw.alipayobjects.com/zos/rmsportal/kpxITHnXvsLlMTqEKgUm.gif) - - 🐞 修复了 CheckboxGroup 和 Checkbox 的 `disabled` 属性逻辑。[#7266](https://github.com/ant-design/ant-design/issues/7266) [@dilidili](https://github.com/dilidili) - 🐞 修复在 react-snapshot 或 jsdom 环境下测试 Spin 和 Carousel 时报错的问题。[#3308](https://github.com/ant-design/ant-design/issues/3308) [#7318](https://github.com/ant-design/ant-design/issues/7318) - 🐞 修复 Select、Tooltip、Menu 的一些细节样式问题。 diff --git a/components/table/__tests__/__snapshots__/empty.test.js.snap b/components/table/__tests__/__snapshots__/empty.test.js.snap index 430c477977..135f7c1b1b 100644 --- a/components/table/__tests__/__snapshots__/empty.test.js.snap +++ b/components/table/__tests__/__snapshots__/empty.test.js.snap @@ -356,55 +356,11 @@ exports[`Table renders empty table with fixed columns 1`] = ` - - - - - - - - - - - - - - - - + />
- - - - - - - + />
@@ -510,16 +449,7 @@ exports[`Table renders empty table with fixed columns 1`] = ` - - - - + /> diff --git a/components/table/style/index.less b/components/table/style/index.less index 1cbf8aca26..f1a70c2b43 100644 --- a/components/table/style/index.less +++ b/components/table/style/index.less @@ -69,11 +69,6 @@ &-tbody > tr > td { border-bottom: @border-width-base @border-style-base @border-color-split; transition: all .3s; - // height placeholder for empty cell - &:empty:after { - content: '.'; - visibility: hidden; - } } &-thead > tr, @@ -437,45 +432,10 @@ text-align: center; font-size: @font-size-base; color: @text-color-secondary; + z-index: 1; .@{iconfont-css-prefix} { margin-right: 4px; } - - &-fixed-columns { - position: absolute; - bottom: 0; - width: 100%; - background: transparent; - pointer-events: none; - // tricky code for https://github.com/ant-design/ant-design/issues/7457 - overflow-x: scroll; - opacity: 0.4; - color: #000; - } - } - - // Fix https://github.com/ant-design/ant-design/issues/7509 - &-middle &-placeholder { - padding: 10px 8px; - } - &-small &-placeholder { - padding: 6px 8px; - } - - // not scrollable - &-scroll-position-left&-scroll-position-right &-placeholder-fixed-columns { - overflow-x: hidden; - } - - &-row-empty-placeholder { - > td { - border-right-color: transparent !important; - } - > td > * { - color: transparent !important; - opacity: 0 !important; - height: 0 !important; - } } &-pagination { diff --git a/package.json b/package.json index 069e4ea28b..f9c932759f 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "rc-slider": "~8.2.0", "rc-steps": "~2.5.1", "rc-switch": "~1.5.1", - "rc-table": "~5.6.7", + "rc-table": "~5.6.9", "rc-tabs": "~9.1.2", "rc-time-picker": "~2.4.1", "rc-tooltip": "~3.4.6",