From 3e1b72fa1c0995fc30061d468bf8eac374157e28 Mon Sep 17 00:00:00 2001 From: sallerli1 Date: Tue, 30 Jan 2024 15:52:34 +0800 Subject: [PATCH] fix(comp:table): tree table line doesn't appear normally --- packages/components/table/style/expandable.less | 12 ++++++++++++ packages/components/table/style/size.less | 14 +++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/packages/components/table/style/expandable.less b/packages/components/table/style/expandable.less index 004dff5fb..83af4c3ae 100644 --- a/packages/components/table/style/expandable.less +++ b/packages/components/table/style/expandable.less @@ -93,6 +93,9 @@ & tr&-expanded-row { & > td { background-color: var(--ix-table-body-row-bg-color-expanded); + .@{table-prefix}-expandable-trigger-button { + background-color: var(--ix-table-body-row-bg-color-expanded); + } > .@{table-prefix} { margin: -4px 28px; @@ -100,15 +103,24 @@ } &:hover > td { background-color: var(--ix-table-body-row-bg-color-expanded); + .@{table-prefix}-expandable-trigger-button { + background-color: var(--ix-table-body-row-bg-color-expanded); + } } } & tr[class*=~'@{table-prefix}-row-level-'] { & > td { background-color: var(--ix-table-body-row-bg-color-expanded); + .@{table-prefix}-expandable-trigger-button { + background-color: var(--ix-table-body-row-bg-color-expanded); + } } &:hover > td { background-color: var(--ix-table-body-row-bg-color-expanded); + .@{table-prefix}-expandable-trigger-button { + background-color: var(--ix-table-body-row-bg-color-expanded); + } } } } diff --git a/packages/components/table/style/size.less b/packages/components/table/style/size.less index 373d46060..50515c4d4 100644 --- a/packages/components/table/style/size.less +++ b/packages/components/table/style/size.less @@ -1,5 +1,9 @@ .table-size( @font-size, @head-height, @padding-horizontal, @padding-vertical) { - .reset-font-size(@font-size); + font-size: @font-size; + + @line-height: calc(@font-size + var(--ix-line-height-gutter)); + + line-height: @line-height; &:not(.@{table-prefix}-borderless) { > .@{header-prefix} { @@ -12,7 +16,7 @@ font-size: calc(@font-size + 2px); } .@{table-prefix}-expandable-wrapper { - height: calc(100% + 7px); // cell height + padding + height: calc(100% + @padding-vertical * 2); // cell height + padding margin-top: -1px; // cell border bottom } @@ -36,8 +40,12 @@ td.@{table-prefix}-cell, .@{table-prefix}-alert-row > td, - .@{table-prefix}-expanded-row > td, + .@{table-prefix}-expanded-row > td { + height: calc(@padding-vertical * 2 + @line-height); + padding: @padding-vertical @padding-horizontal; + } .@{table-prefix}-footer { + min-height: calc(@padding-vertical * 2 + @line-height); padding: @padding-vertical @padding-horizontal; }