From 7334ca40a5d2a7cd1fe05cd2d7615ac88cd3cb2f Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 16:04:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Table/Table.razor | 5 ++--- src/BootstrapBlazor/Components/Table/Table.razor.cs | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor index e0a925d96f7..e083fb21aac 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor +++ b/src/BootstrapBlazor/Components/Table/Table.razor @@ -369,13 +369,12 @@ { @if (Items != null) { - + } else { - diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.cs b/src/BootstrapBlazor/Components/Table/Table.razor.cs index 36187ef085d..d4138c9dd37 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.cs @@ -38,7 +38,8 @@ public partial class Table : ITable, IModelEqualityComparer where /// /// 获得/设置 内置虚拟化组件实例 /// - protected Virtualize? VirtualizeElement { get; set; } + [NotNull] + private Virtualize? _virtualizeElement = null; /// /// 获得 Table 组件样式表 From 57609e3ddb9fdb5803e0fa719b87ab6b3dbf07e0 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 16:28:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Table/Table.razor.Edit.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Edit.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Edit.cs index fa8b766812e..7b60864524d 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Edit.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Edit.cs @@ -404,9 +404,9 @@ protected void OnClickCardView() private async Task QueryAsync(bool shouldRender, int? pageIndex = null, bool triggerByPagination = false) { - if (ScrollMode == ScrollMode.Virtual && VirtualizeElement != null) + if (ScrollMode == ScrollMode.Virtual && _virtualizeElement != null) { - await VirtualizeElement.RefreshDataAsync(); + await _virtualizeElement.RefreshDataAsync(); } else { From 4656052f623ea256aaf5f2d290815421c4de8895 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Mar 2025 18:27:11 +0800 Subject: [PATCH 3/3] =?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/TableTest.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs index 54527fb6684..29c77576725 100644 --- a/test/UnitTest/Components/TableTest.cs +++ b/test/UnitTest/Components/TableTest.cs @@ -8911,9 +8911,10 @@ public async Task TestLoopQueryAsync() public RenderFragment RenderVirtualPlaceHolder() => new(builder => { - if (ScrollMode == ScrollMode.Virtual && VirtualizeElement != null) + var fieldInfo = GetType().BaseType!.GetField("_virtualizeElement", BindingFlags.NonPublic | BindingFlags.Instance)!; + if (ScrollMode == ScrollMode.Virtual && fieldInfo.GetValue(this) is Virtualize element) { - builder.AddContent(0, VirtualizeElement.Placeholder?.Invoke(new Microsoft.AspNetCore.Components.Web.Virtualization.PlaceholderContext())); + builder.AddContent(0, element.Placeholder?.Invoke(new PlaceholderContext())); } });