diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 69affd5da..454968aed 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,5 +1,11 @@ # CHANGELOG +## Pending + +### Fixes + +- Fix `n-data-table` the style penetration of the `n-spin`, closes[#663](https://github.com/TuSimple/naive-ui/issues/663). + ## 2.15.7 (2021-07-25) ### Feats diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index f36b4d6cd..01afe85ba 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,5 +1,9 @@ # CHANGELOG +### Fixes + +- 修复 `n-data-table` `n-spin`的样式穿透问题,关闭 [#663](https://github.com/TuSimple/naive-ui/issues/663) + ## 2.15.7 (2021-07-25) ### Feats diff --git a/src/data-table/src/styles/index.cssr.ts b/src/data-table/src/styles/index.cssr.ts index 91845b342..7f3f15ac0 100644 --- a/src/data-table/src/styles/index.cssr.ts +++ b/src/data-table/src/styles/index.cssr.ts @@ -82,7 +82,8 @@ export default c([ ]) ]) ]), - cB('base-loading', ` + c('>', [ + cB('base-loading', ` color: var(--loading-color); font-size: var(--loading-size); position: absolute; @@ -91,9 +92,10 @@ export default c([ transform: translateX(-50%) translateY(-50%); transition: color .3s var(--bezier); `, [ - fadeInScaleUpTransition({ - originalTransform: 'translateX(-50%) translateY(-50%)' - }) + fadeInScaleUpTransition({ + originalTransform: 'translateX(-50%) translateY(-50%)' + }) + ]) ]), cB('data-table-expand-trigger', 'cursor: pointer;'), cB('data-table-expand-placeholder', `