From 6324a5a35a8e17f04f8c9dbab1bf92ee7e8bf16e Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 4 Jan 2025 13:11:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20ShowSearch=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Select/SelectTree.razor | 8 +++++-- .../Components/Select/SelectTree.razor.cs | 22 +++++++++++++++++++ .../Components/Select/SelectTree.razor.scss | 10 ++++++--- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/src/BootstrapBlazor/Components/Select/SelectTree.razor b/src/BootstrapBlazor/Components/Select/SelectTree.razor index acf35fb66b6..4e4e8941bd7 100644 --- a/src/BootstrapBlazor/Components/Select/SelectTree.razor +++ b/src/BootstrapBlazor/Components/Select/SelectTree.razor @@ -8,7 +8,7 @@ }
-
+
@if (IsEditable) { @@ -20,7 +20,11 @@
- +
@if (!IsPopover) { diff --git a/src/BootstrapBlazor/Components/Select/SelectTree.razor.cs b/src/BootstrapBlazor/Components/Select/SelectTree.razor.cs index efe1266f51f..6656d4d0aa3 100644 --- a/src/BootstrapBlazor/Components/Select/SelectTree.razor.cs +++ b/src/BootstrapBlazor/Components/Select/SelectTree.razor.cs @@ -120,6 +120,24 @@ public partial class SelectTree : IModelEqualityComparer [Parameter] public bool IsEditable { get; set; } + /// + /// 获得/设置 是否显示搜索栏 默认 false 不显示 + /// + [Parameter] + public bool ShowSearch { get; set; } + + /// + /// 获得/设置 是否固定搜索栏 默认 false 不固定 + /// + [Parameter] + public bool IsFixedSearch { get; set; } + + /// + /// 获得/设置 是否显示重置搜索栏按钮 默认 true 显示 + /// + [Parameter] + public bool ShowResetSearchButton { get; set; } = true; + [Inject] [NotNull] private IStringLocalizer>? Localizer { get; set; } @@ -149,6 +167,10 @@ public partial class SelectTree : IModelEqualityComparer [NotNull] private IIconTheme? IconTheme { get; set; } + private string? SelectTreeCustomClassString => CssBuilder.Default(CustomClassString) + .AddClass("select-tree", IsPopover) + .Build(); + /// /// /// diff --git a/src/BootstrapBlazor/Components/Select/SelectTree.razor.scss b/src/BootstrapBlazor/Components/Select/SelectTree.razor.scss index 1ebcdae22b2..82609cd566a 100644 --- a/src/BootstrapBlazor/Components/Select/SelectTree.razor.scss +++ b/src/BootstrapBlazor/Components/Select/SelectTree.razor.scss @@ -1,7 +1,11 @@ -.select-tree { +.select-tree { --bb-select-tree-dropdown-max-height: var(--bb-dropdown-max-height); -} - .select-tree .dropdown-menu { + .dropdown-menu { max-height: var(--bb-select-tree-dropdown-max-height); + + .tree-view { + max-height: calc(var(--bb-select-tree-dropdown-max-height) - var(--bs-dropdown-padding-y) * 2 - 2px); + } } +} From 5e92087bb6ed7642268e71f882e27994576959d1 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 4 Jan 2025 13:12:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=20Search=20=E6=A0=8F=E6=A0=B7=E5=BC=8F=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=20Select-Tree?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/TreeView/TreeView.razor | 4 ++-- .../Components/TreeView/TreeView.razor.cs | 2 +- .../Components/TreeView/TreeView.razor.scss | 10 +++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/BootstrapBlazor/Components/TreeView/TreeView.razor b/src/BootstrapBlazor/Components/TreeView/TreeView.razor index b780feb36f3..03604f9b78d 100644 --- a/src/BootstrapBlazor/Components/TreeView/TreeView.razor +++ b/src/BootstrapBlazor/Components/TreeView/TreeView.razor @@ -44,7 +44,7 @@ else } @if (IsVirtualize) { -
+
@RenderTreeRow(context) @@ -54,7 +54,7 @@ else } else { -
+
@foreach (var item in Rows) { @RenderTreeRow(item) diff --git a/src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs b/src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs index 35cf7984cf4..a941c657111 100644 --- a/src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs +++ b/src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs @@ -17,7 +17,7 @@ public partial class TreeView : IModelEqualityComparer /// /// 获得 按钮样式集合 /// - private string? ClassString => CssBuilder.Default("tree-view") + private string? ClassString => CssBuilder.Default("tree-view scroll") .AddClass("is-fixed-search", ShowSearch && IsFixedSearch) .AddClassFromAttributes(AdditionalAttributes) .Build(); diff --git a/src/BootstrapBlazor/Components/TreeView/TreeView.razor.scss b/src/BootstrapBlazor/Components/TreeView/TreeView.razor.scss index 22158c4a98d..eee300d413a 100644 --- a/src/BootstrapBlazor/Components/TreeView/TreeView.razor.scss +++ b/src/BootstrapBlazor/Components/TreeView/TreeView.razor.scss @@ -18,11 +18,15 @@ height: 100%; .tree-search { - margin-block-end: .5rem; + padding: var(--bb-tree-padding); + padding-bottom: .5rem; + background-color: var(--bs-body-bg); } - &.is-fixed-search .tree-root { - height: calc(100% - var(--bb-tree-search-height)); + &.is-fixed-search .tree-search { + position: sticky; + top: 0; + z-index: 5; } .tree-root { From ae92b684ef430f6dff48f9eeb94f3a0058a34e5c Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 4 Jan 2025 13:19:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=20TreeView=20?= =?UTF-8?q?=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/TreeViewTest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/UnitTest/Components/TreeViewTest.cs b/test/UnitTest/Components/TreeViewTest.cs index 7bfcc6a7986..f497929a7d0 100644 --- a/test/UnitTest/Components/TreeViewTest.cs +++ b/test/UnitTest/Components/TreeViewTest.cs @@ -516,7 +516,7 @@ public async Task IsVirtualize_Ok() pb.Add(a => a.IsVirtualize, false); pb.Add(a => a.Items, items); }); - cut.Contains("tree-root scroll"); + cut.Contains("tree-root"); cut.SetParametersAndRender(pb => { @@ -537,7 +537,7 @@ public async Task IsVirtualize_Ok() return [node1, node2]; }); }); - cut.Contains("tree-root is-virtual scroll"); + cut.Contains("tree-root is-virtual"); // 触发第一个节点展开 await cut.InvokeAsync(() => cut.Find(".node-icon.visible").Click()); From 3fe167483175a91abacd6e780cc87db30b30c18c Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 4 Jan 2025 13:19:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=20SelectTree=20?= =?UTF-8?q?=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/SelectTreeTest.cs | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/test/UnitTest/Components/SelectTreeTest.cs b/test/UnitTest/Components/SelectTreeTest.cs index 60983f06896..52b718a65d3 100644 --- a/test/UnitTest/Components/SelectTreeTest.cs +++ b/test/UnitTest/Components/SelectTreeTest.cs @@ -204,6 +204,31 @@ public void IsActive_Ok() Assert.Contains("active", nodes[1].ClassName); } + [Fact] + public void ShowSearch_Ok() + { + var items = TreeFoo.GetTreeItems(); + var cut = Context.RenderComponent>(builder => + { + builder.Add(p => p.Items, items); + builder.Add(p => p.Value, new TreeFoo() { Id = "1020", Text = "Navigation Two" }); + builder.Add(p => p.ShowSearch, true); + }); + cut.Contains("tree-search"); + + cut.SetParametersAndRender(pb => + { + pb.Add(a => a.ShowResetSearchButton, true); + }); + cut.Contains("tree-search-reset"); + + cut.SetParametersAndRender(pb => + { + pb.Add(a => a.IsFixedSearch, true); + }); + cut.Contains("is-fixed-search"); + } + private List> BindItems { get; } = [ new TreeViewItem("Test1")