diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesPages.razor.cs b/src/BootstrapBlazor.Shared/Samples/Table/TablesPages.razor.cs
index b0c3a1a0d1b21c5c7a01507c5a7795dda5325896..1cac8930f7fb0f1a0ff441e72d15dde7fddb56e7 100644
--- a/src/BootstrapBlazor.Shared/Samples/Table/TablesPages.razor.cs
+++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesPages.razor.cs
@@ -9,7 +9,7 @@ namespace BootstrapBlazor.Shared.Samples.Table;
 /// </summary>
 public partial class TablesPages
 {
-    private static IEnumerable<int> PageItemsSource => new int[] { 4, 10, 20 };
+    private static IEnumerable<int> PageItemsSource => new int[] { 4, 10, 20, 40, 80, 100 };
 
     [NotNull]
     private List<Foo>? Items { get; set; }
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index a230ed733fe272c9b6d9d85733847395f73535b7..7affc695ffaa0702d728289d52c99176e98765d4 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.0.3</Version>
+    <Version>7.0.4-beta01</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
diff --git a/src/BootstrapBlazor/Components/ListView/ListView.razor b/src/BootstrapBlazor/Components/ListView/ListView.razor
index 7919fba61ea79e3c1c962ac1465a58b50e16bfea..db938a5c9fd0141f7f0fcb1c580044025dd10de6 100644
--- a/src/BootstrapBlazor/Components/ListView/ListView.razor
+++ b/src/BootstrapBlazor/Components/ListView/ListView.razor
@@ -39,13 +39,13 @@
     @if (FooterTemplate != null || Pageable)
     {
         <div class="listview-footer">
-            @if (Pageable)
+            @if (FooterTemplate != null)
             {
-                <Pagination PageCount="@PageCount" PageIndex="@PageIndex" OnPageLinkClick="@OnPageLinkClick"></Pagination>
+                @FooterTemplate
             }
-            else
+            else if (Pageable)
             {
-                @FooterTemplate
+                <Pagination PageCount="@PageCount" PageIndex="@PageIndex" OnPageLinkClick="@OnPageLinkClick"></Pagination>
             }
         </div>
     }
diff --git a/src/BootstrapBlazor/Components/Pagination/Pagination.razor b/src/BootstrapBlazor/Components/Pagination/Pagination.razor
index 0c98b8e8b25d104aefaeab3ece2eb1e13aa6d838..ee76eff0fb4d14a73e94a2c5dbbf88ff76b8940d 100644
--- a/src/BootstrapBlazor/Components/Pagination/Pagination.razor
+++ b/src/BootstrapBlazor/Components/Pagination/Pagination.razor
@@ -2,7 +2,7 @@
 @inherits BootstrapComponentBase
 
 <nav @attributes="AdditionalAttributes" class="@ClassString">
-    @if(ShowPageInfo)
+    @if (ShowPageInfo)
     {
         if (PageInfoTemplate != null)
         {
@@ -13,47 +13,50 @@
             <div class="page-info">@PageInfoText</div>
         }
     }
-    <ul class="@PaginationClassString">
-        <PaginationItem OnClick="MovePrev" Index="1">
-            <i class="@PrevPageIcon"></i>
-        </PaginationItem>
-        <PaginationItem OnClick="OnClick" Index="1" IsActive="InternalPageIndex == 1" />
-        @if (InternalPageCount > MaxPageLinkCount)
-        {
-            @if (StartPageIndex != 2)
+    @if (PageCount > 1)
+    {
+        <ul class="@PaginationClassString">
+            <PaginationItem OnClick="MovePrev" Index="1">
+                <i class="@PrevPageIcon"></i>
+            </PaginationItem>
+            <PaginationItem OnClick="OnClick" Index="1" IsActive="InternalPageIndex == 1" />
+            @if (InternalPageCount > MaxPageLinkCount)
             {
-                <PaginationItem OnClick="MovePrev" Index="MaxPageLinkCount" class="prev-link">
-                    <i class="@PrevEllipsisPageIcon"></i>
-                </PaginationItem>
+                @if (StartPageIndex != 2)
+                {
+                    <PaginationItem OnClick="MovePrev" Index="MaxPageLinkCount" class="prev-link">
+                        <i class="@PrevEllipsisPageIcon"></i>
+                    </PaginationItem>
+                }
             }
-        }
-        @for (int i = StartPageIndex; i <= EndPageIndex; i++)
-        {
-            <PaginationItem @key="i" OnClick="OnClick" Index="i" IsActive="InternalPageIndex == i" />
-        }
-        @if (InternalPageCount > MaxPageLinkCount)
-        {
-            @if (EndPageIndex != InternalPageCount - 1)
+            @for (int i = StartPageIndex; i <= EndPageIndex; i++)
             {
-                <PaginationItem OnClick="MoveNext" Index="MaxPageLinkCount" class="next-link">
-                    <i class="@NextEllipsisPageIcon"></i>
-                </PaginationItem>
+                <PaginationItem @key="i" OnClick="OnClick" Index="i" IsActive="InternalPageIndex == i" />
             }
-        }
-        <PaginationItem OnClick="OnClick" Index="InternalPageCount" IsActive="InternalPageIndex == InternalPageCount" />
-        <PaginationItem OnClick="MoveNext" Index="1">
-            <i class="@NextPageIcon"></i>
-        </PaginationItem>
-    </ul>
-    @if (ShowGotoNavigator)
-    {
-        if (GotoTemplate != null)
-        {
-            @GotoTemplate
-        }
-        else
+            @if (InternalPageCount > MaxPageLinkCount)
+            {
+                @if (EndPageIndex != InternalPageCount - 1)
+                {
+                    <PaginationItem OnClick="MoveNext" Index="MaxPageLinkCount" class="next-link">
+                        <i class="@NextEllipsisPageIcon"></i>
+                    </PaginationItem>
+                }
+            }
+            <PaginationItem OnClick="OnClick" Index="InternalPageCount" IsActive="InternalPageIndex == InternalPageCount" />
+            <PaginationItem OnClick="MoveNext" Index="1">
+                <i class="@NextPageIcon"></i>
+            </PaginationItem>
+        </ul>
+        @if (ShowGotoNavigator)
         {
-            <GotoNavigator Index="InternalPageIndex" GotoText="@GotoNavigatorLabelText" OnNavigation="OnGoto" />
+            if (GotoTemplate != null)
+            {
+                @GotoTemplate
+            }
+            else
+            {
+                <GotoNavigator Index="InternalPageIndex" GotoText="@GotoNavigatorLabelText" OnNavigation="OnGoto" />
+            }
         }
     }
 </nav>
diff --git a/src/BootstrapBlazor/Components/Pagination/Pagination.razor.cs b/src/BootstrapBlazor/Components/Pagination/Pagination.razor.cs
index f46800f8b28ca754fbbdcfc46ce555c45337734c..6d7d8d3d4816273bd86d6850adfed99d346625bc 100644
--- a/src/BootstrapBlazor/Components/Pagination/Pagination.razor.cs
+++ b/src/BootstrapBlazor/Components/Pagination/Pagination.razor.cs
@@ -20,7 +20,6 @@ public partial class Pagination
     /// 获得 组件 样式
     /// </summary>
     protected string? ClassString => CssBuilder.Default("nav nav-pages")
-        .AddClass("d-none", InternalPageCount == 1)
         .AddClassFromAttributes(AdditionalAttributes)
         .Build();
 
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
index 8e36bb3984ae02f23057e7b606f56a387b4d230f..3e6c231316e9b7c7212402729abe1f6f029ec416 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor
+++ b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -154,7 +154,7 @@
             </div>
         }
 
-        @if (ShowTopPagination && PageCount > 1 && IsPagination)
+        @if (ShowTopPagination && IsPagination)
         {
             @RenderPagination
         }
@@ -257,7 +257,7 @@
             }
         </div>
 
-        @if (!ShowTopPagination && PageCount > 1 && IsPagination)
+        @if (!ShowTopPagination && IsPagination)
         {
             @RenderPagination
         }
@@ -903,9 +903,7 @@ RenderFragment RenderPageInfo =>
 </div>;
 
 RenderFragment RenderPagination =>
-@<div class="table-pagination">
-    <Pagination PageCount="@PageCount" PageIndex="@PageIndex" OnPageLinkClick="@OnPageLinkClick"
+@<Pagination PageCount="@PageCount" PageIndex="@PageIndex" OnPageLinkClick="@OnPageLinkClick"
                 ShowGotoNavigator="ShowGotoNavigator" GotoTemplate="GotoTemplate!" GotoNavigatorLabelText="@GotoNavigatorLabelText"
-                ShowPageInfo="ShowPageInfo" PageInfoTemplate="InternalPageInfoTemplate" />
-</div>;
+                ShowPageInfo="ShowPageInfo" PageInfoTemplate="InternalPageInfoTemplate" />;
 }
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Pagination.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Pagination.cs
index d6f71d26510d5cbbc09e5351b388f5b0f26713bd..6a25a5e9e8079144d907fa64186ed1ff6a580e74 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.Pagination.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.Pagination.cs
@@ -118,7 +118,6 @@ public partial class Table<TItem>
         }
         else if (!string.IsNullOrEmpty(PageInfoText))
         {
-            // <div class="page-info">@PageInfoText</div>
             builder.OpenElement(1, "div");
             builder.AddAttribute(2, "class", "page-info");
             builder.AddContent(3, PageInfoText);
diff --git a/src/BootstrapBlazor/wwwroot/modules/table.js b/src/BootstrapBlazor/wwwroot/modules/table.js
index 7d1a09bf373935997afc933003e358897b76c37c..32bf1cdd820e1ac9f18d2d5ddbadd477240f59a9 100644
--- a/src/BootstrapBlazor/wwwroot/modules/table.js
+++ b/src/BootstrapBlazor/wwwroot/modules/table.js
@@ -89,7 +89,7 @@ export class Table extends BlazorComponent {
         if (search) {
             searchHeight = getHeight(search)
         }
-        const pagination = this._element.querySelector('.table-pagination')
+        const pagination = this._element.querySelector('.nav-pages')
         let paginationHeight = 0
         if (pagination) {
             paginationHeight = getHeight(pagination)
diff --git a/test/UnitTest/Components/ListViewTest.cs b/test/UnitTest/Components/ListViewTest.cs
index a0da434e3fe09427441bee5dadd9432644541959..1bb0bc23e709febb92e69c2cca1272807afcebd2 100644
--- a/test/UnitTest/Components/ListViewTest.cs
+++ b/test/UnitTest/Components/ListViewTest.cs
@@ -51,7 +51,7 @@ public class ListViewTest : BootstrapBlazorTestBase
     }
 
     [Fact]
-    public async Task Pageable_Ok()
+    public void Pageable_Ok()
     {
         var items = Enumerable.Range(1, 6).Select(i => new Product()
         {
@@ -63,10 +63,12 @@ public class ListViewTest : BootstrapBlazorTestBase
         {
             pb.Add(a => a.OnQueryAsync, Query);
             pb.Add(a => a.Pageable, true);
+            pb.Add(a => a.PageItems, 2);
         });
 
         var pages = cut.FindAll(".page-link");
-        await cut.InvokeAsync(() => pages[2].Click());
+        Assert.Equal(5, pages.Count);
+        cut.InvokeAsync(() => pages[2].Click());
 
         Task<QueryData<Product>> Query(QueryPageOptions option) => Task.FromResult(new QueryData<Product>()
         {
diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs
index de73bd074ab1cbe5bef51e9a2834ddfa87c6d6db..666614b61a1fa087d066a967fd1552ba997e3ef3 100644
--- a/test/UnitTest/Components/TableTest.cs
+++ b/test/UnitTest/Components/TableTest.cs
@@ -622,7 +622,7 @@ public class TableTest : TableTestBase
         });
 
         var table = cut.FindComponent<Table<Foo>>();
-        table.Contains("table-pagination");
+        table.Contains("nav nav-pages");
     }
 
     [Fact]