From 080716ce4f7b89026dd94f3ccf2228a143fa4290 Mon Sep 17 00:00:00 2001 From: Argo Date: Wed, 4 Aug 2021 16:04:26 +0000 Subject: [PATCH] =?UTF-8?q?!1685=20feat(#I43XTG):=20use=20parameters=20in?= =?UTF-8?q?=20EditForm=20mode=20on=20Table=20component=20*=20doc:=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Card=20=E4=B8=A4=E8=A1=8C=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=20*=20style:=20=E8=A1=8C=E5=86=85=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E5=85=85=E6=BB=A1=20*=20style:=20?= =?UTF-8?q?=E5=BE=AE=E8=B0=83=E8=A1=8C=E5=86=85=E7=BC=96=E8=BE=91=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=91=A8=E8=BE=B9=E9=97=B4=E9=9A=99=20*=20style:=20?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=A1=8C=E5=86=85=E7=BC=96=E8=BE=91=E8=A1=8C?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E8=89=B2=E6=A0=B7=E5=BC=8F=20*=20style:=20?= =?UTF-8?q?=E8=A1=8C=E5=86=85=E7=BC=96=E8=BE=91=E5=BE=AE=E8=B0=83=E8=BE=B9?= =?UTF-8?q?=E8=B7=9D=20*=20feat:=20=E7=A7=BB=E9=99=A4=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E8=A1=8C=E8=83=8C=E6=99=AF=E8=89=B2=20*=20feat:=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=A1=A8=E5=8D=95=E7=BC=96=E8=BE=91=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/Samples/Rows.razor | 21 +++++++++++++++++++ .../Components/Table/Table.css | 14 +++++++++---- .../Components/Table/Table.razor | 4 ++-- .../Components/Table/Table.razor.cs | 1 + .../css/bootstrap.blazor.bundle.min.css | 2 +- 5 files changed, 35 insertions(+), 7 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/Rows.razor b/src/BootstrapBlazor.Shared/Pages/Samples/Rows.razor index 6266fe332..cdc250843 100644 --- a/src/BootstrapBlazor.Shared/Pages/Samples/Rows.razor +++ b/src/BootstrapBlazor.Shared/Pages/Samples/Rows.razor @@ -28,6 +28,27 @@ Go somewhere + + +
Card 1
+

Some quick example text to build on the card title and make up the bulk of the card's content.

+ Go somewhere +
+
+ + +
Card 2
+

Some quick example text to build on the card title and make up the bulk of the card's content.

+ Go somewhere +
+
+ + +
Card 3
+

Some quick example text to build on the card title and make up the bulk of the card's content.

+ Go somewhere +
+
diff --git a/src/BootstrapBlazor/Components/Table/Table.css b/src/BootstrapBlazor/Components/Table/Table.css index 6add06ff7..2962d7884 100644 --- a/src/BootstrapBlazor/Components/Table/Table.css +++ b/src/BootstrapBlazor/Components/Table/Table.css @@ -202,8 +202,9 @@ } .table-hover tbody tr.is-detail:hover, +.table-hover tbody tr.is-editform, .table-hover tbody tr.is-editform:hover { - background-color: unset; + --bs-table-accent-bg: unset; } .table tbody tr.is-master td:first-child { @@ -339,12 +340,13 @@ text-align: right; } -.table tbody tr.active, +.table tbody tr.active:not(.is-edit), .table-row.active { background-color: var(--bb-table-selected-bg); } -.table-hover > tbody > tr.is-detail:hover { +.table-hover > tbody > tr.is-detail:hover, +.table-hover > tbody > tr.is-edit.active { --bs-table-accent-bg: none; } @@ -518,7 +520,7 @@ } .table-cell.is-incell { - margin: -.5rem; + margin: -7px -6px; } .table-cell.is-incell .switch { @@ -526,6 +528,10 @@ padding-left: 9px; } + .table-cell.is-incell .select { + width: 100%; + } + .table-sm .table-cell.is-incell { margin: -.25rem; } diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor index a8fd8ffbc..ca4713f90 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor +++ b/src/BootstrapBlazor/Components/Table/Table.razor @@ -656,9 +656,9 @@ RenderFragment RenderEditForm => item => { - + -