From c2b1963ee290dd033cee352c0daa80125bc49f79 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Mon, 11 Apr 2022 17:12:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=9B=B4=E6=94=B9=20Color=20?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Button/ButtonBase.cs         | 2 +-
 .../Components/Button/PopConfirmButton.razor.cs             | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/Button/ButtonBase.cs b/src/BootstrapBlazor/Components/Button/ButtonBase.cs
index fc9e2ebc1..0afd53fe2 100644
--- a/src/BootstrapBlazor/Components/Button/ButtonBase.cs
+++ b/src/BootstrapBlazor/Components/Button/ButtonBase.cs
@@ -69,7 +69,7 @@ public abstract class ButtonBase : TooltipComponentBase
     /// 获得/设置 按钮颜色
     /// </summary>
     [Parameter]
-    public Color Color { get; set; } = Color.Primary;
+    public virtual Color Color { get; set; } = Color.Primary;
 
     /// <summary>
     /// 获得/设置 显示图标
diff --git a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs
index a0590d8bb..862e7bbae 100644
--- a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs
+++ b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs
@@ -12,6 +12,12 @@ namespace BootstrapBlazor.Components;
 /// </summary>
 public partial class PopConfirmButton
 {
+    /// <summary>
+    /// 获得/设置 按钮颜色
+    /// </summary>
+    [Parameter]
+    public override Color Color { get; set; } = Color.None;
+
     /// <summary>
     /// 获得/设置 PopoverConfirm 服务实例
     /// </summary>
-- 
Gitee


From a1a63e7e9b6deea32aef60cb1c0ec8d434d9f23b Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Mon, 11 Apr 2022 17:12:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Button/PopConfirmButton.razor         |  2 +-
 .../Components/Button/PopConfirmButton.razor.cs      | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor
index d98bb8d5c..018d63d9c 100644
--- a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor
+++ b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor
@@ -3,7 +3,7 @@
 
 <DynamicElement TagName="@TagName" OnClick="Show"
                 data-bs-toggle="confirm" data-bs-placement="@Placement.ToDescriptionString()" id="@Id" type="@ElementType"
-                class="@ClassName" disabled="@Disabled" role="button" aria-disabled="@Disabled" tabindex="@Tab">
+                class="@PopButtonClassName" disabled="@Disabled" role="button" aria-disabled="@Disabled" tabindex="@Tab">
     @if (!string.IsNullOrEmpty(Icon))
     {
         <i class="@Icon"></i>
diff --git a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs
index 862e7bbae..31badedbd 100644
--- a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs
+++ b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs
@@ -12,6 +12,13 @@ namespace BootstrapBlazor.Components;
 /// </summary>
 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();
+
     /// <summary>
     /// 获得/设置 按钮颜色
     /// </summary>
@@ -41,11 +48,6 @@ public partial class PopConfirmButton
         ConfirmButtonText ??= Localizer[nameof(ConfirmButtonText)];
         CloseButtonText ??= Localizer[nameof(CloseButtonText)];
         Content ??= Localizer[nameof(Content)];
-
-        if (IsLink)
-        {
-            Color = Color.None;
-        }
     }
 
     /// <summary>
-- 
Gitee


From 9f4c794774f14843094536fcfc6ca0e896e401ef Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Mon, 11 Apr 2022 17:14:42 +0800
Subject: [PATCH 3/3] chore: bump version 6.5.1-beta04

---
 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 b485ca4d0..b36a652c7 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>6.5.1-beta03</Version>
+    <Version>6.5.1-beta04</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-- 
Gitee