Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.6.1-beta03</Version>
<Version>9.6.1-beta02</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Logout/Logout.razor
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@if (HeaderTemplate == null)
{
<div class="d-flex flex-fill align-items-center">
<img alt="avatar" src="@ImageUrl">
<img alt="avatar" src="@ImageUrl" style="@AvatarStyleString">
<div class="flex-fill">
<div class="logout-dn">@PrefixDisplayNameText @DisplayName</div>
<div class="logout-un">@PrefixUserNameText @UserName</div>
Expand Down
22 changes: 16 additions & 6 deletions src/BootstrapBlazor/Components/Logout/Logout.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ namespace BootstrapBlazor.Components;
/// </summary>
public partial class Logout
{
private string? LogoutClassString => CssBuilder.Default("dropdown dropdown-logout")
.AddClassFromAttributes(AdditionalAttributes)
.Build();
[Inject]
[NotNull]
private IStringLocalizer<Logout>? Localizer { get; set; }

/// <summary>
/// 获得/设置 组件当前用户头像
Expand Down Expand Up @@ -70,9 +70,19 @@ public partial class Logout
[Parameter]
public RenderFragment? LinkTemplate { get; set; }

[Inject]
[NotNull]
private IStringLocalizer<Logout>? Localizer { get; set; }
/// <summary>
/// Gets or sets the avatar border radius. Default is null.
/// </summary>
[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();

/// <summary>
/// OnInitialized 方法
Expand Down
1 change: 1 addition & 0 deletions src/BootstrapBlazor/Components/Logout/Logout.razor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 11 additions & 0 deletions test/UnitTest/Components/LogoutTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,15 @@ public void LinkTemplate_Ok()
});
Assert.Contains("link_template", cut.Markup);
}

[Fact]
public void AvatarRadius_Ok()
{
// 未设置 Items
Comment thread
ArgoZhang marked this conversation as resolved.
var cut = Context.RenderComponent<Logout>(pb =>
{
pb.Add(a => a.AvatarRadius, "50%");
});
Assert.Contains("--bb-logout-user-avatar-border-radius: 50%;", cut.Markup);
}
}