From 352385e3c5f02e1f5534381b2a9e219f21639b5d Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Thu, 6 Jan 2022 18:55:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=97=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=A7=BB=E5=8A=A8=E5=88=B0=20Body=20?=
 =?UTF-8?q?=E5=86=85=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Table/Table.razor              | 28 +++++++------------
 .../Components/Table/Table.razor.cs           | 11 +++++++-
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
index 11a20f34a..e3b860195 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor
+++ b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -162,10 +162,6 @@
                     </div>
                     <div class="table-fixed-body scroll">
                         @RenderTable.Invoke(false)
-                        @if(IsShowEmpty)
-                        {
-                            @RenderEmpty()
-                        }
                     </div>
                 }
                 else if (FixedExtendButtonsColumn || Columns.Any(col => col.Fixed))
@@ -173,18 +169,10 @@
                     <div class="overflow-auto">
                         @RenderTable.Invoke(true)
                     </div>
-                    @if(IsShowEmpty)
-                    {
-                        @RenderEmpty()
-                    }
                 }
                 else
                 {
                     @RenderTable.Invoke(true)
-                    @if(IsShowEmpty)
-                    {
-                        @RenderEmpty()
-                    }
                 }
             }
             else
@@ -329,14 +317,9 @@
                     @RenderRow(item)
                     if (!IsExcel && ShowDetails())
                     {
-                        var colspan = ColumnVisibles.Count(col => col.Visible);
-                        if (IsMultipleSelect) colspan++;
-                        if (ShowLineNo) colspan++;
-                        if (ShowExtendButtons) colspan++;
-
                         <tr class="@GetDetailRowClassString(item)">
                             <td>&nbsp;</td>
-                            <td colspan="@colspan">
+                            <td colspan="@GetColumnCount()">
                                 <div class="table-cell is-wrap">
                                     @DetailRowTemplate?.Invoke(item)
                                 </div>
@@ -348,6 +331,15 @@
                         @RenderEditForm((EditModel, ItemChangedType.Update))
                     }
                 }
+                @if(IsShowEmpty)
+                {
+                    <tr>
+                        <td colspan="@GetColumnCount()">
+                            <Empty Text="@EmptyText" Image="@EmptyImage" Template="EmptyTemplate">
+                            </Empty>
+                        </td>
+                    </tr>
+                }
             }
         </tbody>
         @if (ShowFooter)
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.cs b/src/BootstrapBlazor/Components/Table/Table.razor.cs
index 1b61f09f0..7d84f7fea 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.cs
@@ -1099,13 +1099,22 @@ public partial class Table<TItem> : BootstrapComponentBase, IDisposable, ITable
         builder.OpenComponent<Empty>(index++);
         builder.AddAttribute(index++, nameof(Empty.Text), EmptyText);
         builder.AddAttribute(index++, nameof(Empty.Image), EmptyImage);
-        if(EmptyTemplate != null)
+        if (EmptyTemplate != null)
         {
             builder.AddAttribute(index++, nameof(Empty.Template), EmptyTemplate);
         }
         builder.CloseComponent();
     };
 
+    private int GetColumnCount()
+    {
+        var colspan = ColumnVisibles.Count(col => col.Visible);
+        if (IsMultipleSelect) colspan++;
+        if (ShowLineNo) colspan++;
+        if (ShowExtendButtons) colspan++;
+        return colspan;
+    }
+
     #region Dispose
     /// <summary>
     /// Dispose 方法
-- 
Gitee


From c46e6a57f90b16cb707944b497e4741f09c10c92 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Thu, 6 Jan 2022 18:59:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20IsHideFooterWh?=
 =?UTF-8?q?enNoData=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Table/Table.razor    | 6 +++---
 src/BootstrapBlazor/Components/Table/Table.razor.cs | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
index e3b860195..00194e9d7 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor
+++ b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -234,7 +234,7 @@
                         }
                     </DynamicElement>
                 }
-                @if (ShowFooter)
+                @if (ShowFooter && !IsHideFooterWhenNoData)
                 {
                     <div class="table-row table-footer">
                         <CascadingValue Value="@ScreenSize" Name="ScreenSize">
@@ -335,14 +335,14 @@
                 {
                     <tr>
                         <td colspan="@GetColumnCount()">
-                            <Empty Text="@EmptyText" Image="@EmptyImage" Template="EmptyTemplate">
+                            <Empty Text="@EmptyText" Image="@EmptyImage" Template="@EmptyTemplate">
                             </Empty>
                         </td>
                     </tr>
                 }
             }
         </tbody>
-        @if (ShowFooter)
+        @if (ShowFooter && !IsHideFooterWhenNoData)
         {
             <tfoot>
                 <CascadingValue Value="@(ScreenSize > RenderModelResponsiveWidth)" Name="IsMobileMode">
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.cs b/src/BootstrapBlazor/Components/Table/Table.razor.cs
index 7d84f7fea..ffd302aa5 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.cs
@@ -182,6 +182,12 @@ public partial class Table<TItem> : BootstrapComponentBase, IDisposable, ITable
     [Parameter]
     public bool? IsDetails { get; set; }
 
+    /// <summary>
+    /// 获得/设置 无数据时是否隐藏表格 Footer 默认为 false 不隐藏 
+    /// </summary>
+    [Parameter]
+    public bool IsHideFooterWhenNoData { get; set; }
+
     /// <summary>
     /// 获得/设置 每行显示组件数量 默认为 2
     /// </summary>
-- 
Gitee