diff --git a/packages/components/table/src/table/style-helper.ts b/packages/components/table/src/table/style-helper.ts index cc7fe1fc0a..ccdd92903b 100644 --- a/packages/components/table/src/table/style-helper.ts +++ b/packages/components/table/src/table/style-helper.ts @@ -232,7 +232,7 @@ function useStyle( tableScrollHeight.value = table.refs.tableWrapper?.scrollHeight || 0 headerScrollHeight.value = tableHeader?.scrollHeight || 0 - footerScrollHeight.value = table.refs.footerWrapper?.scrollHeight || 0 + footerScrollHeight.value = table.refs.footerWrapper?.offsetHeight || 0 bodyScrollHeight.value = tableScrollHeight.value - headerScrollHeight.value - diff --git a/packages/theme-chalk/src/table.scss b/packages/theme-chalk/src/table.scss index c25199991a..089ee5b148 100644 --- a/packages/theme-chalk/src/table.scss +++ b/packages/theme-chalk/src/table.scss @@ -36,9 +36,10 @@ } &.has-footer { - .#{$namespace}-table__inner-wrapper { - &::before { - bottom: 0; + &.#{$namespace}-table--scrollable-y, + &.#{$namespace}-table--fluid-height { + tr:last-child td.#{$namespace}-table__cell { + border-bottom-color: transparent; } } } @@ -237,6 +238,10 @@ } } + @include e((footer-wrapper)) { + border-top: getCssVar('table-border'); + } + // 拥有多级表头 @include m((group, border)) { @include e((inner-wrapper, footer-wrapper)) { @@ -249,9 +254,6 @@ } } } - @include e((footer-wrapper)) { - border-top: getCssVar('table-border'); - } @include share-rule(border-pseudo) { content: ''; @@ -302,15 +304,6 @@ flex-shrink: 0; } - @include e(footer-wrapper) { - margin-top: -2px; - } - - // fix: #1013 - // &.#{$namespace}-loading-parent--relative { - // border-color: transparent; - // } - .#{$namespace}-table__cell { border-right: getCssVar('table-border'); }