From bb20e4b4a547098b04f09e506447f69ab8486106 Mon Sep 17 00:00:00 2001 From: fengtianze Date: Wed, 11 May 2022 11:44:55 +0800 Subject: [PATCH] fix: inner scroll table --- src/paginator/paginator.component.scss | 9 +++------ src/table/table-scroll.scss | 8 ++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/paginator/paginator.component.scss b/src/paginator/paginator.component.scss index 3ed98baf3..20c759aca 100644 --- a/src/paginator/paginator.component.scss +++ b/src/paginator/paginator.component.scss @@ -7,7 +7,8 @@ $input-width: 80px; .#{$block} { display: inline-flex; align-items: center; - color: use-rgb(n-1); + white-space: nowrap; + @include text-set(m); .aui-button { width: use-var(line-height-xl); @@ -71,15 +72,11 @@ $input-width: 80px; } } - &__total { - font-size: use-var(font-size-m); - } - &__navigator.aui-button { background-color: use-rgb(n-8); aui-icon { - font-size: use-var(font-size-l); + font-size: use-var(icon-size-m); } &:hover { diff --git a/src/table/table-scroll.scss b/src/table/table-scroll.scss index 78ef5f8f6..4a8f1f155 100644 --- a/src/table/table-scroll.scss +++ b/src/table/table-scroll.scss @@ -7,12 +7,17 @@ $stickyCssClass: 'aui-table-sticky'; // style for column shadow .aui-table__scroll-wrapper { + display: flex; + flex-direction: column; + max-height: 100%; + overflow: hidden; background-color: use-rgb(n-9); padding: 0 $table-padding $table-padding; border-radius: use-var(border-radius-l); @include scroll-bar; .aui-table { + max-height: 100%; padding: 0; border-radius: 0; } @@ -96,6 +101,9 @@ $stickyCssClass: 'aui-table-sticky'; align-items: stretch; .aui-table__cell { + display: flex; + flex-direction: column; + justify-content: center; border-width: 1px 0; border-style: solid; border-color: use-rgb(n-8);