From b70968d8c8a62b56a5b58a912b9e2c0decc131e3 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Fri, 17 Jun 2022 14:36:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20ShowLoadingInF?= =?UTF-8?q?irstRender?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Table/Table.razor | 2 +- .../Components/Table/Table.razor.Toolbar.cs | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor index c36beea2f..3ed2d59c8 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor +++ b/src/BootstrapBlazor/Components/Table/Table.razor @@ -12,7 +12,7 @@ { } - else + else if(ShowLoadingInFirstRender) {
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs index bca22845e..6a5d5af43 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs @@ -16,11 +16,17 @@ public partial class Table public bool ShowToolbar { get; set; } /// - /// 获得/设置 是否显示加载骨架屏 默认 false 不显示 + /// 获得/设置 首次加载是否显示加载骨架屏 默认 false 不显示 使用 参数值 /// [Parameter] public bool ShowSkeleton { get; set; } + /// + /// 获得/设置 首次加载是否显示加载动画 默认 true 显示 设置 值覆盖此参数 + /// + [Parameter] + public bool ShowLoadingInFirstRender { get; set; } = true; + /// /// 获得/设置 是否显示按钮列 默认为 true /// -- Gitee From e253b59b86f918db8f8c27951c79c243c8868192 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Fri, 17 Jun 2022 14:37:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?doc:=20=E5=A2=9E=E5=8A=A0=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Shared/Locales/en.json | 3 ++- src/BootstrapBlazor.Shared/Locales/zh.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Locales/en.json b/src/BootstrapBlazor.Shared/Locales/en.json index 645a7e7c0..77fafba48 100644 --- a/src/BootstrapBlazor.Shared/Locales/en.json +++ b/src/BootstrapBlazor.Shared/Locales/en.json @@ -2955,7 +2955,8 @@ "ShowExtendEditButtonAttr": "Show row edit action button", "ShowExtendDeleteButtonAttr": "Show row delete action button", "ShowUnsetGroupItemsOnTopAttr": "Whether ungrouped edits are rendered at the beginning", - "ShowSkeletonAttr": "Whether to display skeleton screen when loading", + "ShowSkeletonAttr": "Whether to display skeleton screen when first render", + "ShowLoadingInFirstRenderAttr": "Whether to display the loading animation when first render", "ShowColumnListAttr": "Show columnshow/hide control buttons", "ShowEmptyAttr": "Show no data prompts", "ShowToastAfterSaveOrDeleteModelAttr": "Do you show a toast prompt box after a save/delete failure", diff --git a/src/BootstrapBlazor.Shared/Locales/zh.json b/src/BootstrapBlazor.Shared/Locales/zh.json index 819f6fd7e..750ee4220 100644 --- a/src/BootstrapBlazor.Shared/Locales/zh.json +++ b/src/BootstrapBlazor.Shared/Locales/zh.json @@ -2967,7 +2967,8 @@ "ShowExtendEditButtonAttr": "显示行编辑操作按钮", "ShowExtendDeleteButtonAttr": "显示行删除操作按钮", "ShowUnsetGroupItemsOnTopAttr": "未分组编辑项是否在开头渲染", - "ShowSkeletonAttr": "加载时是否显示骨架屏", + "ShowSkeletonAttr": "首次加载时是否显示骨架屏", + "ShowLoadingInFirstRenderAttr": "首次加载时是否显示加载动画", "ShowColumnListAttr": "是否显示列显示/隐藏控制按钮", "ShowEmptyAttr": "是否显示无数据提示", "ShowToastAfterSaveOrDeleteModelAttr": "保存/删除失败后是否显示 Toast 提示框", -- Gitee From c1066dcb208c8dd802f910f7662ce7c015f31264 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Fri, 17 Jun 2022 14:38:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Samples/Table/Tables.razor.cs | 8 ++++++ .../Samples/Table/TablesLoading.razor | 26 ++++++++++++++++++- .../Samples/Table/TablesLoading.razor.cs | 1 + 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Shared/Samples/Table/Tables.razor.cs b/src/BootstrapBlazor.Shared/Samples/Table/Tables.razor.cs index cb3031dea..7c3f4208a 100644 --- a/src/BootstrapBlazor.Shared/Samples/Table/Tables.razor.cs +++ b/src/BootstrapBlazor.Shared/Samples/Table/Tables.razor.cs @@ -773,6 +773,14 @@ public partial class Tables DefaultValue = "false" }, new() + { + Name = "ShowLoadingInFirstRender", + Description = TablesLocalizer["ShowLoadingInFirstRenderAttr"], + Type = "boolean", + ValueList = "true / false", + DefaultValue = "true" + }, + new() { Name = "ShowColumnList", Description = TablesLocalizer["ShowColumnListAttr"], diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesLoading.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesLoading.razor index 55e77475d..d348a6b38 100644 --- a/src/BootstrapBlazor.Shared/Samples/Table/TablesLoading.razor +++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesLoading.razor @@ -7,7 +7,31 @@ + + + +
+ + + + + + + +
+ + + + diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesLoading.razor.cs b/src/BootstrapBlazor.Shared/Samples/Table/TablesLoading.razor.cs index 99f74bab9..848597a39 100644 --- a/src/BootstrapBlazor.Shared/Samples/Table/TablesLoading.razor.cs +++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesLoading.razor.cs @@ -87,6 +87,7 @@ public partial class TablesLoading { // 模拟延时 await Task.Delay(1000); + IEnumerable items = Items; // 处理高级搜索 -- Gitee From 1dea85480e4a395e8ab844fb71b84759869468a2 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Fri, 17 Jun 2022 15:03:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=20ShowLoadingInF?= =?UTF-8?q?irstRender=20=E5=8D=95=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 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs index 974459b0a..0e652553b 100644 --- a/test/UnitTest/Components/TableTest.cs +++ b/test/UnitTest/Components/TableTest.cs @@ -102,6 +102,27 @@ public class TableTest : TableTestBase }); } + [Fact] + public void ShowLoading_Ok() + { + var localizer = Context.Services.GetRequiredService>(); + var cut = Context.RenderComponent(pb => + { + pb.AddChildContent>(pb => + { + pb.Add(a => a.ShowLoadingInFirstRender, false); + pb.Add(a => a.Items, Foo.GenerateFoo(localizer)); + pb.Add(a => a.TableColumns, foo => builder => + { + builder.OpenComponent>(0); + builder.AddAttribute(1, "Field", "Name"); + builder.AddAttribute(2, "FieldExpression", Utility.GenerateValueExpression(foo, "Name", typeof(string))); + builder.CloseComponent(); + }); + }); + }); + } + [Fact] public async Task ShowSearch_Ok() { -- Gitee