From 70fb74019f206dc100aa7be5e30b92888e5db4f0 Mon Sep 17 00:00:00 2001
From: Argo-Asicotech <argo@163.com>
Date: Fri, 14 Oct 2022 15:27:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20ShowShadow=20?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=94=A8=E4=BA=8E=E6=8E=A7=E5=88=B6=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=20=E6=98=BE=E7=A4=BA=E9=98=B4=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Button/PopConfirmButton.razor  |  2 +-
 .../Button/PopConfirmButton.razor.cs          |  7 -------
 .../Components/Button/PopConfirmButtonBase.cs | 20 +++++++++++++++++++
 .../Components/Popover/Popover.cs             | 13 ++++++++++++
 .../Components/Tooltip/Tooltip.razor          |  2 +-
 .../Components/Tooltip/Tooltip.razor.cs       |  5 +++++
 6 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor
index f7c6ce776..b272b147f 100644
--- a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor
+++ b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor
@@ -2,7 +2,7 @@
 @inherits PopConfirmButtonBase
 
 <DynamicElement TagName="@TagName" OnClick="Show" id="@Id" type="@ElementType"
-                data-bs-custom-class="@CustomClass" data-bs-trigger="@TriggerString" data-bs-placement="@PlacementString"
+                data-bs-custom-class="@CustomClassString" data-bs-trigger="@TriggerString" data-bs-placement="@PlacementString"
                 class="@ClassString" role="dialog" tabindex="@Tab">
     @if (!string.IsNullOrEmpty(ButtonIcon))
     {
diff --git a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs
index 41871479e..9382f35fb 100644
--- a/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs
+++ b/src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.cs
@@ -28,13 +28,6 @@ public partial class PopConfirmButton
     [Parameter]
     public override Color Color { get; set; } = Color.None;
 
-    /// <summary>
-    /// 获得/设置 自定义样式 默认 null
-    /// </summary>
-    /// <remarks>由 data-bs-custom-class 实现</remarks>
-    [Parameter]
-    public string? CustomClass { get; set; }
-
     [Inject]
     [NotNull]
     private IStringLocalizer<PopConfirmButton>? Localizer { get; set; }
diff --git a/src/BootstrapBlazor/Components/Button/PopConfirmButtonBase.cs b/src/BootstrapBlazor/Components/Button/PopConfirmButtonBase.cs
index 078360f2e..63f826199 100644
--- a/src/BootstrapBlazor/Components/Button/PopConfirmButtonBase.cs
+++ b/src/BootstrapBlazor/Components/Button/PopConfirmButtonBase.cs
@@ -101,6 +101,26 @@ public abstract class PopConfirmButtonBase : ButtonBase
     [NotNull]
     public string? ConfirmIcon { get; set; }
 
+    /// <summary>
+    /// 获得/设置 自定义样式 默认 null
+    /// </summary>
+    /// <remarks>由 data-bs-custom-class 实现</remarks>
+    [Parameter]
+    public string? CustomClass { get; set; }
+
+    /// <summary>
+    /// 获得/设置 是否显示阴影 默认 true
+    /// </summary>
+    [Parameter]
+    public bool ShowShadow { get; set; } = true;
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    protected virtual string? CustomClassString => CssBuilder.Default(CustomClass)
+        .AddClass("shadow", ShowShadow)
+        .Build();
+
     /// <summary>
     /// 
     /// </summary>
diff --git a/src/BootstrapBlazor/Components/Popover/Popover.cs b/src/BootstrapBlazor/Components/Popover/Popover.cs
index fc6744307..c1d2468d2 100644
--- a/src/BootstrapBlazor/Components/Popover/Popover.cs
+++ b/src/BootstrapBlazor/Components/Popover/Popover.cs
@@ -15,6 +15,19 @@ public class Popover : Tooltip
     [Parameter]
     public string? Content { get; set; }
 
+    /// <summary>
+    /// 获得/设置 是否显示阴影 默认 true
+    /// </summary>
+    [Parameter]
+    public bool ShowShadow { get; set; } = true;
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    protected override string? CustomClassString => CssBuilder.Default(CustomClass)
+        .AddClass("shadow", ShowShadow)
+        .Build();
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
diff --git a/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor b/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor
index a81c827ec..33fc1c4a5 100644
--- a/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor
+++ b/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor
@@ -2,7 +2,7 @@
 @inherits BootstrapModuleComponentBase
 
 <span @attributes="@AdditionalAttributes" class="@ClassString" tabindex="0" id="@Id" data-bs-selector="@Selector"
-      data-bs-toggle="@ToggleString" data-bs-placement="@PlacementString" data-bs-custom-class="@CustomClass"
+      data-bs-toggle="@ToggleString" data-bs-placement="@PlacementString" data-bs-custom-class="@CustomClassString"
       data-bs-trigger="@Trigger" data-bs-html="@HtmlString" data-bs-delay="@Delay" data-bs-sanitize="@SanitizeString">
     <CascadingValue Value="this" IsFixed="true">
         @ChildContent
diff --git a/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor.cs b/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor.cs
index 534c7fba1..1f7080c33 100644
--- a/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor.cs
+++ b/src/BootstrapBlazor/Components/Tooltip/Tooltip.razor.cs
@@ -93,6 +93,11 @@ public partial class Tooltip : ITooltip
     [Parameter]
     public RenderFragment? ChildContent { get; set; }
 
+    /// <summary>
+    /// 获得 CustomClass 字符串
+    /// </summary>
+    protected virtual string? CustomClassString => CustomClass;
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
-- 
Gitee


From 21a6713158012cad71f7d6ed0c947f7695e5c48e Mon Sep 17 00:00:00 2001
From: Argo-Asicotech <argo@163.com>
Date: Fri, 14 Oct 2022 15:28:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=AD=90=E7=B1=BB=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E9=98=B4=E5=BD=B1?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Table/TableExtensionButton.razor               | 4 ++--
 src/BootstrapBlazor/Components/Table/TableToolbar.razor       | 4 ++--
 src/BootstrapBlazor/wwwroot/modules/base/blazor-component.js  | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Table/TableExtensionButton.razor b/src/BootstrapBlazor/Components/Table/TableExtensionButton.razor
index 2a3f3f9d4..d9840bf07 100644
--- a/src/BootstrapBlazor/Components/Table/TableExtensionButton.razor
+++ b/src/BootstrapBlazor/Components/Table/TableExtensionButton.razor
@@ -16,12 +16,12 @@
         else if (button is TableCellPopconfirmButton pb && pb.IsShow)
         {
             <PopConfirmButton AdditionalAttributes="pb.AdditionalAttributes"
-                      Color="@pb.Color" Icon="@pb.Icon" Text="@pb.Text" Size="pb.Size"
+                      Color="@pb.Color" Icon="@pb.Icon" Text="@pb.Text" Size="pb.Size" ShowShadow="@pb.ShowShadow"
                       IsDisabled="@pb.IsDisabled" IsBlock="@pb.IsBlock" IsOutline="@pb.IsOutline"
                       OnBeforeClick="@pb.OnBeforeClick" OnClose="@pb.OnClose" OnConfirm="() => OnClickConfirm(pb)"
                       ConfirmIcon="@pb.ConfirmIcon" ConfirmButtonColor="@pb.ConfirmButtonColor"
                       ConfirmButtonText="@pb.ConfirmButtonText" CloseButtonColor="@pb.CloseButtonColor"
-                      Placement="@pb.Placement" Trigger="@pb.Trigger"
+                      Placement="@pb.Placement" Trigger="@pb.Trigger" CustomClass="@pb.CustomClass"
                       CloseButtonText="@pb.CloseButtonText" Content="@pb.Content">
             </PopConfirmButton>
         }
diff --git a/src/BootstrapBlazor/Components/Table/TableToolbar.razor b/src/BootstrapBlazor/Components/Table/TableToolbar.razor
index 7afaf4d37..faeba88c7 100644
--- a/src/BootstrapBlazor/Components/Table/TableToolbar.razor
+++ b/src/BootstrapBlazor/Components/Table/TableToolbar.razor
@@ -21,8 +21,8 @@
                     }
                     else if (button is TableToolbarPopconfirmButton<TItem> pb && pb.IsShow)
                     {
-                        <PopConfirmButton AdditionalAttributes="pb.AdditionalAttributes"
-                                          Color="@pb.Color" Icon="@pb.Icon" Text="@pb.Text" Size="pb.Size"
+                        <PopConfirmButton AdditionalAttributes="pb.AdditionalAttributes" CustomClass="@pb.CustomClass"
+                                          Color="@pb.Color" Icon="@pb.Icon" Text="@pb.Text" Size="pb.Size" ShowShadow="@pb.ShowShadow"
                                           IsAsync="@pb.IsAsync" IsDisabled="@pb.IsDisabled" IsBlock="@pb.IsBlock" IsOutline="@pb.IsOutline"
                                           OnBeforeClick="@pb.OnBeforeClick" OnClose="@pb.OnClose" OnConfirm="@pb.OnConfirm"
                                           ConfirmIcon="@pb.ConfirmIcon" ConfirmButtonColor="@pb.ConfirmButtonColor"
diff --git a/src/BootstrapBlazor/wwwroot/modules/base/blazor-component.js b/src/BootstrapBlazor/wwwroot/modules/base/blazor-component.js
index 9720300eb..551ef53ad 100644
--- a/src/BootstrapBlazor/wwwroot/modules/base/blazor-component.js
+++ b/src/BootstrapBlazor/wwwroot/modules/base/blazor-component.js
@@ -30,7 +30,6 @@ class BlazorComponent extends BaseComponent {
             const getTipElement = this._popover._getTipElement
             let fn = tip => {
                 tip.classList.add(this._config.class)
-                tip.classList.add('shadow')
             }
             this._popover._getTipElement = () => {
                 let tip = getTipElement.call(this._popover)
-- 
Gitee