From 8638a38e3a0c4ea681164f3e71ea874ecd2cb422 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 5 Dec 2025 13:19:41 +0800 Subject: [PATCH 1/4] feat(Table): use dropdown-column selector --- src/BootstrapBlazor/Components/Table/Table.razor.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.scss b/src/BootstrapBlazor/Components/Table/Table.razor.scss index fd64dcd2d88..58c26e0d243 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.scss +++ b/src/BootstrapBlazor/Components/Table/Table.razor.scss @@ -307,7 +307,7 @@ margin-block-end: .5rem; } -.table-toolbar .dropdown-menu { +.table-toolbar .dropdown-column .dropdown-menu { max-height: var(--bb-table-columnlist-max-height); overflow: auto; } From b7f46230b82f2ea4c45464821fe4805c1f852e83 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 5 Dec 2025 13:49:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20IsGroupLabel?= =?UTF-8?q?=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Input/BootstrapInputGroupLabel.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor/Components/Input/BootstrapInputGroupLabel.cs b/src/BootstrapBlazor/Components/Input/BootstrapInputGroupLabel.cs index b85fe8a7ef5..2b001a45630 100644 --- a/src/BootstrapBlazor/Components/Input/BootstrapInputGroupLabel.cs +++ b/src/BootstrapBlazor/Components/Input/BootstrapInputGroupLabel.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the Apache 2.0 License // See the LICENSE file in the project root for more information. // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone @@ -51,9 +51,15 @@ public sealed class BootstrapInputGroupLabel : DisplayBase [Parameter] public RenderFragment? ChildContent { get; set; } + /// + /// 获得/设置 是否为 InputGroup 或 TableToolbar 内的标签 默认 null 未设置 + /// + [Parameter] + public bool? IsGroupLabel { get; set; } + private string? Required => ShowRequiredMark ? "true" : null; - private bool IsInputGroupLabel => InputGroup != null; + private bool IsInputGroupLabel => IsGroupLabel ?? InputGroup != null; /// /// From 3ff74fa7c78af83986f213678137b9e00469393d Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 5 Dec 2025 14:20:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?style:=20=E5=A2=9E=E5=8A=A0=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Button/Button.razor.scss | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Button/Button.razor.scss b/src/BootstrapBlazor/Components/Button/Button.razor.scss index 338e75a954e..8d69a79be6e 100644 --- a/src/BootstrapBlazor/Components/Button/Button.razor.scss +++ b/src/BootstrapBlazor/Components/Button/Button.razor.scss @@ -1,4 +1,4 @@ -@use "../../wwwroot/scss/variables" as *; +@use "../../wwwroot/scss/variables" as *; .btn { --bs-btn-font-size: #{$bs-btn-font-size}; @@ -91,4 +91,14 @@ display: block; } } + + > .input-group-text:not(:first-child) { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } + + > .input-group-text:not(:last-child) { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } } From 97e097d2c89713cc2a997c78a76f3f194deb4f01 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 5 Dec 2025 14:23:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/UnitTest/Components/InputTest.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/UnitTest/Components/InputTest.cs b/test/UnitTest/Components/InputTest.cs index 66c35169899..bf9b7844c9e 100644 --- a/test/UnitTest/Components/InputTest.cs +++ b/test/UnitTest/Components/InputTest.cs @@ -282,6 +282,19 @@ public void GroupLabel_Ok() cut.DoesNotContain("DisplayText"); } + [Fact] + public void IsGroupLabel_Ok() + { + var cut = Context.Render(); + cut.DoesNotContain("input-group-text"); + + cut.Render(pb => + { + pb.Add(a => a.IsGroupLabel, true); + }); + cut.Contains("input-group-text"); + } + [Fact] public void ShowRequiredMark_Ok() {