diff --git a/src/BootstrapBlazor.Server/Components/Samples/ListViews.razor b/src/BootstrapBlazor.Server/Components/Samples/ListViews.razor index 7d9ce17613e..dfc2cd3b6ec 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/ListViews.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/ListViews.razor @@ -35,7 +35,7 @@ - +
@Localizer["ProductListText"]
 diff --git a/src/BootstrapBlazor/Components/ListView/ListView.razor b/src/BootstrapBlazor/Components/ListView/ListView.razor index add35bd6505..7d9010c0b02 100644 --- a/src/BootstrapBlazor/Components/ListView/ListView.razor +++ b/src/BootstrapBlazor/Components/ListView/ListView.razor @@ -55,14 +55,14 @@ @EmptyText } - @if (FooterTemplate != null || Pageable) + @if (FooterTemplate != null || IsPagination) {
@if (FooterTemplate != null) { @FooterTemplate } - else if (Pageable) + else if (IsPagination) { } diff --git a/src/BootstrapBlazor/Components/ListView/ListView.razor.cs b/src/BootstrapBlazor/Components/ListView/ListView.razor.cs index d8e2441486a..3d28bb54603 100644 --- a/src/BootstrapBlazor/Components/ListView/ListView.razor.cs +++ b/src/BootstrapBlazor/Components/ListView/ListView.razor.cs @@ -51,7 +51,7 @@ public partial class ListView : BootstrapComponentBase public RenderFragment? BodyTemplate { get; set; } /// - /// 获得/设置 FooterTemplate 默认 null 未设置 设置值后 参数不起作用，请自行实现分页功能 + /// 获得/设置 FooterTemplate 默认 null 未设置 设置值后 参数不起作用，请自行实现分页功能 /// [Parameter] public RenderFragment? FooterTemplate { get; set; } @@ -66,7 +66,15 @@ public partial class ListView : BootstrapComponentBase /// 获得/设置 是否分页 默认为 false 不分页 设置 时分页功能自动被禁用 /// [Parameter] - public bool Pageable { get; set; } + [Obsolete("已弃用，请使用 IsPagination 代替。Deprecated, use IsPagination instead")] + [ExcludeFromCodeCoverage] + public bool Pageable { get => IsPagination; set => IsPagination = value; } + + /// + /// 获得/设置 是否分页 默认为 false 不分页 设置 时分页功能自动被禁用 + /// + [Parameter] + public bool IsPagination { get; set; } /// /// 获得/设置 分组 Lambda 表达式 默认 null @@ -143,7 +151,7 @@ public partial class ListView : BootstrapComponentBase /// /// 获得/设置 当前页码 /// - private int _pageIndex; + private int _pageIndex = 1; /// /// 获得/设置 数据总条目 @@ -177,29 +185,31 @@ protected override async Task OnParametersSetAsync() /// 点击页码调用此方法 /// /// - protected Task OnPageLinkClick(int pageIndex) => QueryAsync(pageIndex); + protected Task OnPageLinkClick(int pageIndex) => QueryAsync(pageIndex, true); /// /// 查询按钮调用此方法 /// /// - public async Task QueryAsync(int pageIndex = 1) + public async Task QueryAsync(int pageIndex = 1, bool triggerByPagination = false) { _pageIndex = pageIndex; - await QueryData(); + await QueryData(triggerByPagination); StateHasChanged(); } /// /// 调用 OnQuery 回调方法获得数据源 /// - protected async Task QueryData() + protected async Task QueryData(bool triggerByPagination = false) { QueryData? queryData = null; if (OnQueryAsync != null) { queryData = await OnQueryAsync(new QueryPageOptions() { + IsPage = IsPagination, + IsTriggerByPagination = triggerByPagination, PageIndex = _pageIndex, PageItems = PageItems, }); diff --git a/test/UnitTest/Components/ListViewTest.cs b/test/UnitTest/Components/ListViewTest.cs index 63df5a1f26a..ea198d9fdaa 100644 --- a/test/UnitTest/Components/ListViewTest.cs +++ b/test/UnitTest/Components/ListViewTest.cs @@ -76,6 +76,8 @@ public async Task ListView_Ok() [Fact] public async Task Pageable_Ok() { + var triggerByPage = false; + var pageIndex = 0; var items = Enumerable.Range(1, 6).Select(i => new Product() { ImageUrl = $"images/Pic{i}.jpg", @@ -84,26 +86,33 @@ public async Task Pageable_Ok() }); var cut = Context.RenderComponent>(pb => { - pb.Add(a => a.OnQueryAsync, Query); - pb.Add(a => a.Pageable, true); + pb.Add(a => a.OnQueryAsync, option => + { + pageIndex = option.PageIndex; + triggerByPage = option.IsTriggerByPagination; + return Task.FromResult(new QueryData() + { + Items = items, + TotalCount = 6 + }); + }); + pb.Add(a => a.IsPagination, true); pb.Add(a => a.PageItems, 2); }); + Assert.False(triggerByPage); + Assert.Equal(1, pageIndex); var pages = cut.FindAll(".page-link"); Assert.Equal(5, pages.Count); await cut.InvokeAsync(() => pages[2].Click()); - - Task> Query(QueryPageOptions option) => Task.FromResult(new QueryData() - { - Items = items, - TotalCount = 6 - }); + Assert.True(triggerByPage); } [Fact] - public void QueryAsync_Ok() + public async Task QueryAsync_Ok() { bool query = false; + bool page = false; var items = Enumerable.Range(1, 6).Select(i => new Product() { ImageUrl = $"images/Pic{i}.jpg", @@ -114,6 +123,7 @@ public void QueryAsync_Ok() { pb.Add(a => a.OnQueryAsync, option => { + page = option.IsPage; query = true; var ret = new QueryData() { @@ -122,11 +132,12 @@ public void QueryAsync_Ok() }; return Task.FromResult(ret); }); - pb.Add(a => a.Pageable, true); + pb.Add(a => a.IsPagination, true); pb.Add(a => a.PageItems, 2); }); Assert.True(query); - cut.InvokeAsync(() => cut.Instance.QueryAsync()); + Assert.True(page); + await cut.InvokeAsync(() => cut.Instance.QueryAsync()); } [Fact] @@ -159,7 +170,7 @@ public void Collapsible_Ok() }; return Task.FromResult(ret); }); - pb.Add(a => a.Pageable, true); + pb.Add(a => a.IsPagination, true); pb.Add(a => a.PageItems, 2); pb.Add(a => a.OnListViewItemClick, p => { @@ -209,7 +220,7 @@ public void IsAccordion_Ok() }; return Task.FromResult(ret); }); - pb.Add(a => a.Pageable, true); + pb.Add(a => a.IsPagination, true); pb.Add(a => a.PageItems, 2); }); var collapse = cut.FindComponent(); @@ -246,7 +257,7 @@ public void CollapsedGroupCallback_Ok() }; return Task.FromResult(ret); }); - pb.Add(a => a.Pageable, true); + pb.Add(a => a.IsPagination, true); pb.Add(a => a.PageItems, 2); }); Assert.True(callback); @@ -281,7 +292,7 @@ public void OnCollapseChanged_Ok() expect = item; return Task.CompletedTask; }); - pb.Add(a => a.Pageable, true); + pb.Add(a => a.IsPagination, true); pb.Add(a => a.PageItems, 2); });