From 727bbe8fc4ec06ac84e7becc16c0283235242235 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Wed, 20 Apr 2022 12:22:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20CollapsedTopSe?= =?UTF-8?q?arch=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Table/Table.razor | 14 +++++++------- .../Components/Table/Table.razor.Search.cs | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor index 5602234cb..c479d2f22 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor +++ b/src/BootstrapBlazor/Components/Table/Table.razor @@ -798,10 +798,10 @@ RenderFragment RenderRowExtendButtons => item => ; RenderFragment RenderSearch => -@ - +@
+
-
+
@SearchModalTitle
@@ -840,8 +840,8 @@ RenderFragment RenderSearch => }
- - +
+
@if(CustomerSearchModel != null && CustomerSearchTemplate != null) { @CustomerSearchTemplate(CustomerSearchModel) @@ -857,6 +857,6 @@ RenderFragment RenderSearch => } - -; +
+
; } diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs index e0d2c97c2..b28dd869d 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs @@ -51,6 +51,12 @@ public partial class Table [Parameter] public bool ShowSearch { get; set; } + /// + /// 获得/设置 是否显示搜索框 默认为 false 不收缩搜索框 是否显示搜索框请设置 值 Top + /// + [Parameter] + public bool CollapsedTopSearch { get; set; } + /// /// 获得/设置 是否显示搜索框 默认为 true 显示搜索文本框 /// @@ -117,6 +123,18 @@ public partial class Table [Parameter] public Func? OnResetSearchAsync { get; set; } + private string? TopSearchClassString => CssBuilder.Default("card") + .AddClass("collapsed", CollapsedTopSearch) + .Build(); + + private string? TopSearchHeaderClassString => CssBuilder.Default("table-search-collapse") + .AddClass("is-open", !CollapsedTopSearch) + .Build(); + + private string? TopSearchBodyClassString => CssBuilder.Default() + .AddClass("display: none;", CollapsedTopSearch) + .Build(); + /// /// 重置查询方法 /// -- Gitee From f6287bcbb51bc950b9e3a206d4f1169025cd1819 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Wed, 20 Apr 2022 12:22:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Shared/Samples/Table/TablesSearch.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Shared/Samples/Table/TablesSearch.razor b/src/BootstrapBlazor.Shared/Samples/Table/TablesSearch.razor index 759b06b97..43ecba231 100644 --- a/src/BootstrapBlazor.Shared/Samples/Table/TablesSearch.razor +++ b/src/BootstrapBlazor.Shared/Samples/Table/TablesSearch.razor @@ -9,7 +9,7 @@ -
    +
    • 通过设置 ShowEmpty="true" 开启无数据显示功能
    • EmptyText 参数用于设置无数据时显示文字,默认取资源文件中的内置文字
    • EmptyTemplate 参数用于自定义无数据显示模板
    • -- Gitee From a2aebb130b5584f0d164641631bc2e235c1f9e4e Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Wed, 20 Apr 2022 12:25:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20CollapsedTopSearch=20=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor.Shared/Samples/Table/Tables.razor.cs | 8 ++++++++ .../Components/Table/Table.razor.Search.cs | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Shared/Samples/Table/Tables.razor.cs b/src/BootstrapBlazor.Shared/Samples/Table/Tables.razor.cs index 91aecaaab..4c10e68d4 100644 --- a/src/BootstrapBlazor.Shared/Samples/Table/Tables.razor.cs +++ b/src/BootstrapBlazor.Shared/Samples/Table/Tables.razor.cs @@ -661,6 +661,14 @@ public partial class Tables DefaultValue = "Popup" }, new() + { + Name = nameof(Table.CollapsedTopSearch), + Description = "是否收缩顶部搜索框", + Type = "boolean", + ValueList = "true / false", + DefaultValue = "false" + }, + new() { Name = "ShowToolbar", Description = "显示 Toolbar", diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs index b28dd869d..b09011f0c 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Search.cs @@ -52,7 +52,7 @@ public partial class Table public bool ShowSearch { get; set; } /// - /// 获得/设置 是否显示搜索框 默认为 false 不收缩搜索框 是否显示搜索框请设置 值 Top + /// 获得/设置 是否收缩顶部搜索框 默认为 false 不收缩搜索框 是否显示搜索框请设置 值 Top /// [Parameter] public bool CollapsedTopSearch { get; set; } -- Gitee