diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index b485ca4d05a60d2cbb00b9f0aa570cfe80c3e69c..b36a652c7edbfd708bc88b791312ef7b435df832 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 6.5.1-beta03 + 6.5.1-beta04 diff --git a/src/BootstrapBlazor/Components/Button/ButtonBase.cs b/src/BootstrapBlazor/Components/Button/ButtonBase.cs index fc9e2ebc16aa45406fd2fbbaf9d5bc8e161a9896..0afd53fe26388acf67503611aabff215de8a9663 100644 --- a/src/BootstrapBlazor/Components/Button/ButtonBase.cs +++ b/src/BootstrapBlazor/Components/Button/ButtonBase.cs @@ -69,7 +69,7 @@ public abstract class ButtonBase : TooltipComponentBase /// 获得/设置 按钮颜色 /// [Parameter] - public Color Color { get; set; } = Color.Primary; + public virtual Color Color { get; set; } = Color.Primary; /// /// 获得/设置 显示图标 diff --git a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor index d98bb8d5c8fed259be9b6990d44c8f3a39e3fe4c..018d63d9c1e9f4dd6d312562b5261672ff6270c3 100644 --- a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor +++ b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor @@ -3,7 +3,7 @@ + class="@PopButtonClassName" disabled="@Disabled" role="button" aria-disabled="@Disabled" tabindex="@Tab"> @if (!string.IsNullOrEmpty(Icon)) { diff --git a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs index a0590d8bb8ec040794554f2767707d618cb6d689..31badedbdf895997b80322520d28f6c18a33ab11 100644 --- a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs +++ b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs @@ -12,6 +12,19 @@ namespace BootstrapBlazor.Components; /// public partial class PopConfirmButton { + private string? PopButtonClassName => IsLink ? InternalClassName : ClassName; + + private string? InternalClassName => CssBuilder.Default() + .AddClass($"text-{Color.ToDescriptionString()}", Color != Color.None) + .AddClassFromAttributes(AdditionalAttributes) + .Build(); + + /// + /// 获得/设置 按钮颜色 + /// + [Parameter] + public override Color Color { get; set; } = Color.None; + /// /// 获得/设置 PopoverConfirm 服务实例 /// @@ -35,11 +48,6 @@ public partial class PopConfirmButton ConfirmButtonText ??= Localizer[nameof(ConfirmButtonText)]; CloseButtonText ??= Localizer[nameof(CloseButtonText)]; Content ??= Localizer[nameof(Content)]; - - if (IsLink) - { - Color = Color.None; - } } ///