From 06e6b49808f2b975dbceef667d5033366f97e363 Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <argo@163.com>
Date: Tue, 6 Sep 2022 18:16:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20TableFilter=20?=
 =?UTF-8?q?=E5=86=85=E7=BD=AE=20ValidateForm=20=E4=B8=AD=E5=89=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Display/DisplayBase.cs              | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Display/DisplayBase.cs b/src/BootstrapBlazor/Components/Display/DisplayBase.cs
index bf0c36dce..539e3d490 100644
--- a/src/BootstrapBlazor/Components/Display/DisplayBase.cs
+++ b/src/BootstrapBlazor/Components/Display/DisplayBase.cs
@@ -85,6 +85,12 @@ public abstract class DisplayBase<TValue> : TooltipComponentBase
     [CascadingParameter]
     protected BootstrapInputGroup? InputGroup { get; set; }
 
+    /// <summary>
+    /// 获得 IFilter 实例
+    /// </summary>
+    [CascadingParameter]
+    protected IFilter? Filter { get; set; }
+
     /// <summary>
     /// SetParametersAsync 方法
     /// </summary>
@@ -115,9 +121,13 @@ public abstract class DisplayBase<TValue> : TooltipComponentBase
         // 显式设置显示标签时一定显示
         var showLabel = ShowLabel;
 
-        // 如果被 InputGroup 包裹不显示 Label
-        if (InputGroup == null)
+        if (Filter != null)
+        {
+            IsShowLabel = false;
+        }
+        else if (InputGroup == null)
         {
+            // 如果被 InputGroup 包裹不显示 Label
             // 组件自身未设置 ShowLabel 取 EditorForm/VaidateForm 级联值
             if (ShowLabel == null && (EditorForm != null || ValidateForm != null))
             {
-- 
Gitee


From 8e68d61a2a7e4b501074ca7311534c4b3966777e Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <argo@163.com>
Date: Tue, 6 Sep 2022 18:17:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Table=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=86=85=20Checkbox=20=E5=86=85=E7=BD=AE=20V?=
 =?UTF-8?q?alidateForm=20=E4=B8=AD=E5=87=BA=E7=8E=B0=E5=89=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Table/Table.razor | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
index f37cb04b7..4a86f0681 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor
+++ b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -454,7 +454,7 @@ RenderFragment<bool> RenderHeader => hasScroll =>
             {
                 <th>
                     <div class="table-cell">
-                        <Checkbox TValue="TItem" DisplayText="@CheckboxDisplayTextString" ShowAfterLabel="@ShowCheckboxText"
+                        <Checkbox TValue="TItem" DisplayText="@CheckboxDisplayTextString" ShowLabel="false" ShowAfterLabel="@ShowCheckboxText"
                                   State="@HeaderCheckState()" OnStateChanged="OnHeaderCheck"></Checkbox>
                     </div>
                 </th>
@@ -590,7 +590,7 @@ RenderFragment<TItem> RenderRow => item =>
     {
         <td>
             <div class="table-cell">
-                <Checkbox TValue="TItem" Value="@item" State="RowCheckState(item)" OnStateChanged="OnCheck" @onclick:stopPropagation></Checkbox>
+                <Checkbox TValue="TItem" Value="@item" ShowLabel="false" State="RowCheckState(item)" OnStateChanged="OnCheck" @onclick:stopPropagation></Checkbox>
             </div>
         </td>
     }
@@ -699,7 +699,7 @@ RenderFragment RenderPlaceHolderRow =>
     {
         <td>
             <div class="table-cell">
-                <Checkbox TValue="TItem" State="CheckboxState.UnChecked"></Checkbox>
+                <Checkbox TValue="TItem" ShowLabel="false" State="CheckboxState.UnChecked"></Checkbox>
             </div>
         </td>
     }
-- 
Gitee