From ca47f383a7ab1e3a73942d9cf50f7753fef6df5e Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Thu, 6 Jan 2022 20:01:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20Empty=20?= =?UTF-8?q?=E5=86=85=E9=83=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Empty/Empty.razor | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/BootstrapBlazor/Components/Empty/Empty.razor b/src/BootstrapBlazor/Components/Empty/Empty.razor index 6700581a2..0802c6718 100644 --- a/src/BootstrapBlazor/Components/Empty/Empty.razor +++ b/src/BootstrapBlazor/Components/Empty/Empty.razor @@ -2,23 +2,26 @@ @inherits BootstrapComponentBase
- @if (!string.IsNullOrEmpty(Image)) - { -
- -
- } - @if (!string.IsNullOrEmpty(Text)) - { -
- @Text -
- } @if (Template != null) {
@Template
} - @ChildContent + else + { + @if (!string.IsNullOrEmpty(Image)) + { +
+ +
+ } + @if (!string.IsNullOrEmpty(Text)) + { +
+ @Text +
+ } + @ChildContent + }
-- Gitee From 678ff56df62cd4f5f948a9259aa7033a984382d7 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Thu, 6 Jan 2022 20:01:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=9B=86=E5=90=88?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E8=81=9A=E5=90=88=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Table/Table.razor | 2 +- .../Components/Table/TableFooterCell.razor.cs | 27 +++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor index 00194e9d7..a917ad80f 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor +++ b/src/BootstrapBlazor/Components/Table/Table.razor @@ -335,7 +335,7 @@ { - + diff --git a/src/BootstrapBlazor/Components/Table/TableFooterCell.razor.cs b/src/BootstrapBlazor/Components/Table/TableFooterCell.razor.cs index 01e2c8eec..2aa5fa5bb 100644 --- a/src/BootstrapBlazor/Components/Table/TableFooterCell.razor.cs +++ b/src/BootstrapBlazor/Components/Table/TableFooterCell.razor.cs @@ -59,7 +59,7 @@ public partial class TableFooterCell [CascadingParameter(Name = "TableFooterContext")] private object? DataSource { get; set; } - private string? GetText() => Text ?? GetCountValue() ?? GetAggegateValue(); + private string? GetText() => Text ?? (GetCount(DataSource) == 0 ? "0" : (GetCountValue() ?? GetAggegateValue())); /// /// 解析 Count Aggregate @@ -209,5 +209,28 @@ public partial class TableFooterCell return mi?.MakeGenericMethod(modelType); } - private static int CreateCountMethod(IEnumerable source) => Enumerable.Count(source); + private static int CreateCountMethod(IEnumerable source) => source.Count(); + + private static int GetCount(object? source) + { + var ret = 0; + if (source != null) + { + // 绑定数据源类型 + var type = source.GetType(); + + // 数据源泛型 TModel 类型 + var modelType = type.GenericTypeArguments[0]; + + var mi = typeof(TableFooterCell).GetMethod(nameof(CreateCountMethod), BindingFlags.NonPublic | BindingFlags.Static) + ?.MakeGenericMethod(modelType); + + if (mi != null) + { + var v = mi.Invoke(null, new object[] { source })?.ToString(); + _ = int.TryParse(v, out ret); + } + } + return ret; + } } -- Gitee From 0b22e886e559ed0642c2bc33e8d45ae10f6a5336 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Thu, 6 Jan 2022 20:01:39 +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 --- src/BootstrapBlazor.Shared/Samples/Table/TablesFooter.razor | 4 ++-- .../Samples/Table/TablesFooter.razor.cs | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesFooter.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesFooter.razor index 70b025218..b183115d7 100644 --- a/src/BootstrapBlazor.Shared/Samples/Table/TablesFooter.razor +++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesFooter.razor @@ -60,11 +60,11 @@
- Average: @context.Average(i => i.Count) + Average: @GetAverage(context)
- Sum: @context.Sum(i => i.Count) + Sum: @GetSum(context)
diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesFooter.razor.cs b/src/BootstrapBlazor.Shared/Samples/Table/TablesFooter.razor.cs index bbd6f94aa..578dfbd63 100644 --- a/src/BootstrapBlazor.Shared/Samples/Table/TablesFooter.razor.cs +++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesFooter.razor.cs @@ -73,4 +73,8 @@ public sealed partial class TablesFooter IsSearch = true }); } + + private static double GetAverage(IEnumerable items) => items.Any() ? items.Average(i => i.Count) : 0; + + private static int GetSum(IEnumerable items) => items.Any() ? items.Sum(i => i.Count) : 0; } -- Gitee From d9086f1203b7f2b504d40a4aef52bfe7a2ae6efd Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Thu, 6 Jan 2022 20:02:20 +0800 Subject: [PATCH 4/4] chore: bump version 6.2.1 --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 289dc7be7..48c26d66f 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 6.2.0 + 6.2.1 -- Gitee