diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
index 9baf45fbc1270c5c3c5dd5afe38fb811aaf3803d..3aff4837985c6d41fb01d9cfa10cb1df4e319400 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor
+++ b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -30,7 +30,7 @@
         <div class="table-toolbar">
             @if (IsExcel || ShowToolbar)
             {
-                <TableToolbar TItem="TItem" OnGetSelectedRows="@GetSelectedRows">
+                <TableToolbar OnGetSelectedRows="@GetSelectedRows">
                     @if (IsExcel || ShowDefaultButtons)
                     {
                         @if (ShowAddButton)
@@ -316,16 +316,7 @@
                             <td>&nbsp;</td>
                             <td colspan="@colspan">
                                 <div class="table-cell is-wrap">
-                                    @if (DetailRows.Contains(item))
-                                    {
-                                        @DetailRowTemplate?.Invoke(item)
-                                    }
-                                    else
-                                    {
-                                        <div class="table-loading">
-                                            <Spinner Color="Color.Primary" />
-                                        </div>
-                                    }
+                                    @DetailRowTemplate?.Invoke(item)
                                 </div>
                             </td>
                         </tr>
diff --git a/src/BootstrapBlazor/Components/Table/TableToolbar.razor b/src/BootstrapBlazor/Components/Table/TableToolbar.razor
index 92273ec798931b381260770a194abae4720b2d0d..8a6c3f54ba392106de774203b88c43215b58156e 100644
--- a/src/BootstrapBlazor/Components/Table/TableToolbar.razor
+++ b/src/BootstrapBlazor/Components/Table/TableToolbar.razor
@@ -14,19 +14,19 @@
                     @if (button is TableToolbarButton<TItem> b)
                     {
                         <Button AdditionalAttributes="b.AdditionalAttributes"
-                                Color="@b.Color" Icon="@b.Icon" Text="@b.Text" IsAsync="@b.IsAsync"
-                                OnClickWithoutRender="@(() => OnToolbarButtonClick(b))"
-                                IsDisabled="@GetDisabled(b)"></Button>
+                            Color="@b.Color" Icon="@b.Icon" Text="@b.Text" IsAsync="@b.IsAsync"
+                            OnClickWithoutRender="() => OnToolbarButtonClick(b)"
+                            IsDisabled="GetDisabled(b)"></Button>
                     }
                     else if (button is TableToolbarPopconfirmButton<TItem> pb)
                     {
                         <PopConfirmButton AdditionalAttributes="pb.AdditionalAttributes"
-                                          Color="@pb.Color" Icon="@pb.Icon" Text="@pb.Text"
-                                          IsDisabled="@pb.IsDisabled" IsBlock="@pb.IsBlock" IsOutline="@pb.IsOutline"
-                                          OnBeforeClick="@pb.OnBeforeClick" OnClose="@pb.OnClose" OnConfirm="@pb.OnConfirm"
-                                          ConfirmIcon="@pb.ConfirmIcon" ConfirmButtonColor="@pb.ConfirmButtonColor"
-                                          ConfirmButtonText="@pb.ConfirmButtonText" CloseButtonColor="@pb.CloseButtonColor"
-                                          CloseButtonText="@pb.CloseButtonText" Content="@pb.Content">
+                              Color="@pb.Color" Icon="@pb.Icon" Text="@pb.Text"
+                              IsDisabled="@pb.IsDisabled" IsBlock="@pb.IsBlock" IsOutline="@pb.IsOutline"
+                              OnBeforeClick="@pb.OnBeforeClick" OnClose="@pb.OnClose" OnConfirm="@pb.OnConfirm"
+                              ConfirmIcon="@pb.ConfirmIcon" ConfirmButtonColor="@pb.ConfirmButtonColor"
+                              ConfirmButtonText="@pb.ConfirmButtonText" CloseButtonColor="@pb.CloseButtonColor"
+                              CloseButtonText="@pb.CloseButtonText" Content="@pb.Content">
                         </PopConfirmButton>
                     }
                 }
@@ -40,28 +40,28 @@
                     {
                         @if (button is TableToolbarButton<TItem> b)
                         {
-                            <div class="dropdown-item" @onclick="@(e => OnToolbarButtonClick(b))">
-								@if(string.IsNullOrEmpty(b.Icon))
-								{
-									<span>@b.Text</span>
-								}
-								else
-								{
-									<i class="@b.Icon"></i>
-								}
+                            <div class="dropdown-item" @onclick="e => OnToolbarButtonClick(b)">
+                                @if (string.IsNullOrEmpty(b.Icon))
+                                {
+                                    <span>@b.Text</span>
+                                }
+                                else
+                                {
+                                    <i class="@b.Icon"></i>
+                                }
                             </div>
                         }
                         else if (button is TableToolbarPopconfirmButton<TItem> pb)
                         {
-                            <div class="dropdown-item" @onclick="@pb.OnConfirm">
-								@if(string.IsNullOrEmpty(pb.Icon))
-								{
-									<span>@pb.Text</span>
-								}
-								else
-								{
-									<i class="@pb.Icon"></i>
-								}
+                            <div class="dropdown-item" @onclick="pb.OnConfirm">
+                                @if (string.IsNullOrEmpty(pb.Icon))
+                                {
+                                    <span>@pb.Text</span>
+                                }
+                                else
+                                {
+                                    <i class="@pb.Icon"></i>
+                                }
                             </div>
                         }
                     }
diff --git a/src/BootstrapBlazor/Components/Table/TableToolbar.razor.cs b/src/BootstrapBlazor/Components/Table/TableToolbar.razor.cs
index 5009e9cbe9db45653252e2fb2ffbab37dba1e7e6..d5113cc8de1f5a4c00135371d68c92079a669805 100644
--- a/src/BootstrapBlazor/Components/Table/TableToolbar.razor.cs
+++ b/src/BootstrapBlazor/Components/Table/TableToolbar.razor.cs
@@ -14,6 +14,9 @@ namespace BootstrapBlazor.Components
     /// <summary>
     /// Table Toolbar 组件
     /// </summary>
+#if NET6_0_OR_GREATER
+    [CascadingTypeParameter(nameof(TItem))]
+#endif
     public partial class TableToolbar<TItem> : ComponentBase
     {
         /// <summary>
@@ -62,6 +65,10 @@ namespace BootstrapBlazor.Components
             {
                 ret = b;
             }
+            else if (button.IsEnableWhenSelectedOneRow)
+            {
+                ret = OnGetSelectedRows().Count() != 1;
+            }
             return ret;
         }
 
diff --git a/src/BootstrapBlazor/Components/Table/TableToolbarButton.cs b/src/BootstrapBlazor/Components/Table/TableToolbarButton.cs
index 10e516b0adc2c973d3c85b361d4c79d60874c973..b5bd66bb09ba1493780ce4b383ec1e212f6c5561 100644
--- a/src/BootstrapBlazor/Components/Table/TableToolbarButton.cs
+++ b/src/BootstrapBlazor/Components/Table/TableToolbarButton.cs
@@ -56,6 +56,12 @@ namespace BootstrapBlazor.Components
         [Parameter]
         public Func<Task>? OnClick { get; set; }
 
+        /// <summary>
+        /// 获得/设置 选中一行时启用按钮 默认 false 均可用
+        /// </summary>
+        [Parameter]
+        public bool IsEnableWhenSelectedOneRow { get; set; }
+
         /// <summary>
         /// 获得/设置 Table Toolbar 实例
         /// </summary>