From 1da192b4af38c2eda971753a93c10fa985916647 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 4 Mar 2025 15:25:19 +0800 Subject: [PATCH 01/12] =?UTF-8?q?refactor:=20Pageable=20=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20IsPagination?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/ListViews.razor | 2 +- .../Components/ListView/ListView.razor | 4 ++-- .../Components/ListView/ListView.razor.cs | 11 ++++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) 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..eb4c9e29e0e 100644 --- a/src/BootstrapBlazor/Components/ListView/ListView.razor.cs +++ b/src/BootstrapBlazor/Components/ListView/ListView.razor.cs @@ -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 @@ -200,6 +208,7 @@ protected async Task QueryData() { queryData = await OnQueryAsync(new QueryPageOptions() { + IsPage = IsPagination, PageIndex = _pageIndex, PageItems = PageItems, }); From 23361bd7a6fd0e7ec2299e89f1471655bc445e13 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 4 Mar 2025 15:25:43 +0800 Subject: [PATCH 02/12] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=20IsTriggerByP?= =?UTF-8?q?agination=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/ListView/ListView.razor.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/BootstrapBlazor/Components/ListView/ListView.razor.cs b/src/BootstrapBlazor/Components/ListView/ListView.razor.cs index eb4c9e29e0e..b8032a60f0c 100644 --- a/src/BootstrapBlazor/Components/ListView/ListView.razor.cs +++ b/src/BootstrapBlazor/Components/ListView/ListView.razor.cs @@ -185,23 +185,23 @@ 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) @@ -209,6 +209,7 @@ protected async Task QueryData() queryData = await OnQueryAsync(new QueryPageOptions() { IsPage = IsPagination, + IsTriggerByPagination = triggerByPagination, PageIndex = _pageIndex, PageItems = PageItems, }); From fdce47300ea32a4f3b5f3f8ac5754ed111bba68a Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 4 Mar 2025 15:31:16 +0800 Subject: [PATCH 03/12] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/UnitTest/Components/ListViewTest.cs | 38 ++++++++++++++---------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/test/UnitTest/Components/ListViewTest.cs b/test/UnitTest/Components/ListViewTest.cs index 63df5a1f26a..506b18bfa3a 100644 --- a/test/UnitTest/Components/ListViewTest.cs +++ b/test/UnitTest/Components/ListViewTest.cs @@ -76,6 +76,7 @@ public async Task ListView_Ok() [Fact] public async Task Pageable_Ok() { + var triggerByPage = false; var items = Enumerable.Range(1, 6).Select(i => new Product() { ImageUrl = $"images/Pic{i}.jpg", @@ -84,26 +85,31 @@ 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 => + { + 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); 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 +120,7 @@ public void QueryAsync_Ok() { pb.Add(a => a.OnQueryAsync, option => { + page = option.IsPage; query = true; var ret = new QueryData() { @@ -122,11 +129,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 +167,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 +217,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 +254,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 +289,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); }); From c952bc22dbbd1916ea01ad5c833d3f6cb7c09134 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 4 Mar 2025 15:33:36 +0800 Subject: [PATCH 04/12] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/ListView/ListView.razor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/ListView/ListView.razor.cs b/src/BootstrapBlazor/Components/ListView/ListView.razor.cs index b8032a60f0c..c6f684306be 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; } From 132f5dddde941913c60ea94adad75f51af2ad787 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 4 Mar 2025 15:35:01 +0800 Subject: [PATCH 05/12] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=20PageInde?= =?UTF-8?q?x=20=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/ListView/ListView.razor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/ListView/ListView.razor.cs b/src/BootstrapBlazor/Components/ListView/ListView.razor.cs index c6f684306be..3d28bb54603 100644 --- a/src/BootstrapBlazor/Components/ListView/ListView.razor.cs +++ b/src/BootstrapBlazor/Components/ListView/ListView.razor.cs @@ -151,7 +151,7 @@ public partial class ListView : BootstrapComponentBase /// /// 获得/设置 当前页码 /// - private int _pageIndex; + private int _pageIndex = 1; /// /// 获得/设置 数据总条目 From 48082ab507369c856da89556a8f73c1fc02e4d99 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 4 Mar 2025 15:36:38 +0800 Subject: [PATCH 06/12] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/UnitTest/Components/ListViewTest.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/UnitTest/Components/ListViewTest.cs b/test/UnitTest/Components/ListViewTest.cs index 506b18bfa3a..ea198d9fdaa 100644 --- a/test/UnitTest/Components/ListViewTest.cs +++ b/test/UnitTest/Components/ListViewTest.cs @@ -77,6 +77,7 @@ public async Task ListView_Ok() 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", @@ -87,6 +88,7 @@ public async Task Pageable_Ok() { pb.Add(a => a.OnQueryAsync, option => { + pageIndex = option.PageIndex; triggerByPage = option.IsTriggerByPagination; return Task.FromResult(new QueryData() { @@ -98,6 +100,7 @@ public async Task Pageable_Ok() pb.Add(a => a.PageItems, 2); }); Assert.False(triggerByPage); + Assert.Equal(1, pageIndex); var pages = cut.FindAll(".page-link"); Assert.Equal(5, pages.Count); From c914e0b91de7ebe7c29d1828a1f89f2a63fe9539 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 4 Mar 2025 18:12:17 +0800 Subject: [PATCH 07/12] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Collapse/Collapse.razor | 2 +- src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/BootstrapBlazor/Components/Collapse/Collapse.razor b/src/BootstrapBlazor/Components/Collapse/Collapse.razor index a92f1529cbf..d6a8ce951e2 100644 --- a/src/BootstrapBlazor/Components/Collapse/Collapse.razor +++ b/src/BootstrapBlazor/Components/Collapse/Collapse.razor @@ -6,7 +6,7 @@ @CollapseItems - @foreach (var item in Children) + @foreach (var item in Items) {
diff --git a/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs b/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs index 48982a78148..36ca262663d 100644 --- a/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs +++ b/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs @@ -20,7 +20,6 @@ public partial class Collapse .Build(); private static string? GetHeaderClassString(CollapseItem item) => CssBuilder.Default("accordion-header") - .AddClass("collapsed", item.IsCollapsed) .AddClass($"bg-{item.TitleColor.ToDescriptionString()}", item.TitleColor != Color.None) .AddClass(item.HeaderClass) .Build(); @@ -47,7 +46,7 @@ public partial class Collapse /// /// 获得/设置 CollapseItem 集合 /// - protected List Children { get; } = new(10); + protected List Items { get; } = new(10); /// /// 获得/设置 是否为手风琴效果 默认为 false @@ -80,11 +79,11 @@ private async Task OnClickItem(CollapseItem item) /// 添加 CollapseItem 方法 由 CollapseItem 方法加载时调用 /// /// TabItemBase 实例 - internal void AddItem(CollapseItem item) => Children.Add(item); + internal void AddItem(CollapseItem item) => Items.Add(item); /// /// 移除 CollapseItem 方法 由 CollapseItem 方法 Dispose 时调用 /// /// TabItemBase 实例 - internal void RemoveItem(CollapseItem item) => Children.Remove(item); + internal void RemoveItem(CollapseItem item) => Items.Remove(item); } From 1c87692e80ae9129dfb6e8b5f4c56eebe2066c19 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 4 Mar 2025 18:12:40 +0800 Subject: [PATCH 08/12] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Collapse/Collapse.razor | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Collapse/Collapse.razor b/src/BootstrapBlazor/Components/Collapse/Collapse.razor index d6a8ce951e2..02ebd371af1 100644 --- a/src/BootstrapBlazor/Components/Collapse/Collapse.razor +++ b/src/BootstrapBlazor/Components/Collapse/Collapse.razor @@ -16,7 +16,9 @@ @item.HeaderTemplate
} -
+
@if(!string.IsNullOrEmpty(item.Icon)) { From ed29647617019838581a065dc34a759674d5bd6c Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 4 Mar 2025 18:12:54 +0800 Subject: [PATCH 09/12] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=8B?= =?UTF-8?q?=E9=A3=8E=E7=90=B4=E6=A8=A1=E5=BC=8F=E9=80=BB=E8=BE=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs b/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs index 36ca262663d..c59c3c9a5ac 100644 --- a/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs +++ b/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs @@ -68,6 +68,10 @@ public partial class Collapse private async Task OnClickItem(CollapseItem item) { + if (IsAccordion && item.IsCollapsed) + { + Items.Where(i => i != item).ToList().ForEach(i => i.SetCollapsed(true)); + } item.SetCollapsed(!item.IsCollapsed); if (OnCollapseChanged != null) { From b4aa730483ff6e0a3cb26d09a03b8e29ac2834a4 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 4 Mar 2025 18:15:51 +0800 Subject: [PATCH 10/12] =?UTF-8?q?refactor:=20=E7=B2=BE=E7=AE=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E9=AB=98=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs b/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs index c59c3c9a5ac..1e70cb69df4 100644 --- a/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs +++ b/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs @@ -70,7 +70,8 @@ private async Task OnClickItem(CollapseItem item) { if (IsAccordion && item.IsCollapsed) { - Items.Where(i => i != item).ToList().ForEach(i => i.SetCollapsed(true)); + // 手风琴模式，设置其他项收起 + Items.Where(i => i != item && !i.IsCollapsed).ToList().ForEach(i => i.SetCollapsed(true)); } item.SetCollapsed(!item.IsCollapsed); if (OnCollapseChanged != null) From 583a6dcf58b90bf25892b37aed34af7a71c8330f Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 4 Mar 2025 19:23:42 +0800 Subject: [PATCH 11/12] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/UnitTest/Components/CollapseTest.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/UnitTest/Components/CollapseTest.cs b/test/UnitTest/Components/CollapseTest.cs index cb421ee0d95..23811ce3027 100644 --- a/test/UnitTest/Components/CollapseTest.cs +++ b/test/UnitTest/Components/CollapseTest.cs @@ -33,7 +33,7 @@ public void Collapse_Ok() } [Fact] - public void Accordion_Ok() + public async Task Accordion_Ok() { var cut = Context.RenderComponent(pb => { @@ -53,8 +53,11 @@ public void Accordion_Ok() }); cut.Contains("is-accordion"); - var btn = cut.Find(".accordion-button"); - cut.InvokeAsync(() => btn.Click()); + var buttons = cut.FindAll(".accordion-button"); + await cut.InvokeAsync(() => buttons[0].Click()); + + buttons = cut.FindAll(".accordion-button"); + await cut.InvokeAsync(() => buttons[1].Click()); } [Fact] From e4a9a6df1a38aa74fbfbd3b3e664a5dae0f7cc0e Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 4 Mar 2025 19:33:04 +0800 Subject: [PATCH 12/12] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs b/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs index 1e70cb69df4..55ea52e301f 100644 --- a/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs +++ b/src/BootstrapBlazor/Components/Collapse/Collapse.razor.cs @@ -71,7 +71,10 @@ private async Task OnClickItem(CollapseItem item) if (IsAccordion && item.IsCollapsed) { // 手风琴模式，设置其他项收起 - Items.Where(i => i != item && !i.IsCollapsed).ToList().ForEach(i => i.SetCollapsed(true)); + foreach (var i in Items.Where(i => i != item && !i.IsCollapsed)) + { + i.SetCollapsed(true); + } } item.SetCollapsed(!item.IsCollapsed); if (OnCollapseChanged != null)