From 65ff796c04992771007e7721f838e80015ffc2cb Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Mon, 5 May 2025 20:19:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20AvatarRadius?= =?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/Logout/Logout.razor | 2 +- .../Components/Logout/Logout.razor.cs | 22 ++++++++++++++----- .../Components/Logout/Logout.razor.scss | 1 + 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/BootstrapBlazor/Components/Logout/Logout.razor b/src/BootstrapBlazor/Components/Logout/Logout.razor index 7803114bbc0..d3a276160ad 100644 --- a/src/BootstrapBlazor/Components/Logout/Logout.razor +++ b/src/BootstrapBlazor/Components/Logout/Logout.razor @@ -21,7 +21,7 @@ @if (HeaderTemplate == null) {
- avatar + avatar
@PrefixDisplayNameText @DisplayName
@PrefixUserNameText @UserName
diff --git a/src/BootstrapBlazor/Components/Logout/Logout.razor.cs b/src/BootstrapBlazor/Components/Logout/Logout.razor.cs index 4a2212d3d39..5176a741a4b 100644 --- a/src/BootstrapBlazor/Components/Logout/Logout.razor.cs +++ b/src/BootstrapBlazor/Components/Logout/Logout.razor.cs @@ -12,9 +12,9 @@ namespace BootstrapBlazor.Components; /// public partial class Logout { - private string? LogoutClassString => CssBuilder.Default("dropdown dropdown-logout") - .AddClassFromAttributes(AdditionalAttributes) - .Build(); + [Inject] + [NotNull] + private IStringLocalizer? Localizer { get; set; } /// /// 获得/设置 组件当前用户头像 @@ -70,9 +70,19 @@ public partial class Logout [Parameter] public RenderFragment? LinkTemplate { get; set; } - [Inject] - [NotNull] - private IStringLocalizer? Localizer { get; set; } + /// + /// Gets or sets the avatar border radius. Default is null. + /// + [Parameter] + public string? AvatarRadius { get; set; } + + private string? LogoutClassString => CssBuilder.Default("dropdown dropdown-logout") + .AddClassFromAttributes(AdditionalAttributes) + .Build(); + + private string? AvatarStyleString => CssBuilder.Default() + .AddStyle("--bb-logout-user-avatar-border-radius", AvatarRadius, !string.IsNullOrEmpty(AvatarRadius)) + .Build(); /// /// OnInitialized 方法 diff --git a/src/BootstrapBlazor/Components/Logout/Logout.razor.scss b/src/BootstrapBlazor/Components/Logout/Logout.razor.scss index c1d00c1a073..7d42b2d4ab2 100644 --- a/src/BootstrapBlazor/Components/Logout/Logout.razor.scss +++ b/src/BootstrapBlazor/Components/Logout/Logout.razor.scss @@ -70,6 +70,7 @@ width: var(--bb-logout-user-avatar-width); height: var(--bb-logout-user-avatar-height); margin-inline-end: var(--bb-logout-user-avatar-margin-right); + border-radius: var(--bb-logout-user-avatar-border-radius, 0); } .dropdown-logout .logout-un { From d2d3c2abff479867b94920b867609ea2ce76e4a5 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Mon, 5 May 2025 20:23:06 +0800 Subject: [PATCH 2/3] =?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/LogoutTest.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/UnitTest/Components/LogoutTest.cs b/test/UnitTest/Components/LogoutTest.cs index 9e8bf8f6318..2284cb48b91 100644 --- a/test/UnitTest/Components/LogoutTest.cs +++ b/test/UnitTest/Components/LogoutTest.cs @@ -96,4 +96,15 @@ public void LinkTemplate_Ok() }); Assert.Contains("link_template", cut.Markup); } + + [Fact] + public void AvatarRadius_Ok() + { + // 未设置 Items + var cut = Context.RenderComponent(pb => + { + pb.Add(a => a.AvatarRadius, "50%"); + }); + Assert.Contains("--bb-logout-user-avatar-border-radius: 50%;", cut.Markup); + } } From 0252d87d9c239163618aed76ae0e2348fd616132 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Mon, 5 May 2025 20:24:55 +0800 Subject: [PATCH 3/3] chore: bump version 9.6.1-beta02 --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index d7b84e4d7b4..1a7f7ef8660 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.6.1-beta03 + 9.6.1-beta02