From 403df723699afaf3cc7cb513fc323f4a96bd2d68 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 19 Mar 2025 15:25:15 +0800 Subject: [PATCH 1/8] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=20IsFixedSea?= =?UTF-8?q?rch=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # src/BootstrapBlazor/Components/Select/SelectBase.cs --- .../Components/EditorForm/IEditorItem.cs | 1 + .../Components/Select/MultiSelect.razor | 2 +- .../Components/Select/MultiSelect.razor.cs | 8 +--- .../Components/Select/MultiSelect.razor.scss | 7 ++- .../Components/Select/Select.razor | 2 +- .../Components/Select/Select.razor.scss | 44 ++++++------------- .../Components/Select/SelectBase.cs | 19 -------- .../SelectGeneric/SelectGeneric.razor | 2 +- src/BootstrapBlazor/Utils/Utility.cs | 2 - .../wwwroot/scss/theme/bootstrapblazor.scss | 2 +- 10 files changed, 22 insertions(+), 67 deletions(-) diff --git a/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs b/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs index 2ae1a00c138..a55588c36f4 100644 --- a/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs +++ b/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs @@ -89,6 +89,7 @@ public interface IEditorItem : ILookup /// /// Gets or sets whether to allow fixed search box within dropdown. Default is false. /// + [Obsolete("已弃用 Departur")] bool IsFixedSearchWhenSelect { get; set; } /// diff --git a/src/BootstrapBlazor/Components/Select/MultiSelect.razor b/src/BootstrapBlazor/Components/Select/MultiSelect.razor index dc4736af2bf..4777bdd8a2f 100644 --- a/src/BootstrapBlazor/Components/Select/MultiSelect.razor +++ b/src/BootstrapBlazor/Components/Select/MultiSelect.razor @@ -53,7 +53,7 @@ { } -
+
@if (ShowSearch) {
diff --git a/src/BootstrapBlazor/Components/Select/MultiSelect.razor.cs b/src/BootstrapBlazor/Components/Select/MultiSelect.razor.cs index 59b0a3597ad..f90631de90e 100644 --- a/src/BootstrapBlazor/Components/Select/MultiSelect.razor.cs +++ b/src/BootstrapBlazor/Components/Select/MultiSelect.razor.cs @@ -20,7 +20,7 @@ public partial class MultiSelect .AddClass("is-clearable", IsClearable) .Build(); - private string? MultipleDropdownMenuClassString => CssBuilder.Default(DropdownMenuClassString) + private string? DropdownMenuClassString => CssBuilder.Default("dropdown-menu") .AddClass("is-fixed-toolbar", ShowToolbar) .Build(); @@ -295,12 +295,6 @@ protected override List GetRowsByItems() return items; } - /// - /// - /// - /// - protected override bool CheckFixedSearch() => ShowToolbar ? true : base.CheckFixedSearch(); - /// /// 客户端回车回调方法 /// diff --git a/src/BootstrapBlazor/Components/Select/MultiSelect.razor.scss b/src/BootstrapBlazor/Components/Select/MultiSelect.razor.scss index 8d73f41a286..bac5dce2150 100644 --- a/src/BootstrapBlazor/Components/Select/MultiSelect.razor.scss +++ b/src/BootstrapBlazor/Components/Select/MultiSelect.razor.scss @@ -122,17 +122,16 @@ .dropdown-menu { &.is-fixed-toolbar { --bb-dropdown-max-height: 330px; + --bb-dropdown-toolbar-height: 38px; .dropdown-menu-body { - max-height: calc(var(--bb-dropdown-max-height) - 48px); - overflow: auto; + max-height: calc(var(--bb-dropdown-max-height) - var(--bb-dropdown-toolbar-height)); } } &.is-fixed-search.is-fixed-toolbar { .dropdown-menu-body { - max-height: calc(var(--bb-dropdown-max-height) - 117px); - overflow: auto; + max-height: calc(var(--bb-dropdown-max-height) - var(--bb-select-search-height) - var(--bb-dropdown-toolbar-height)); } } diff --git a/src/BootstrapBlazor/Components/Select/Select.razor b/src/BootstrapBlazor/Components/Select/Select.razor index 55f9a2e6b6c..47a5358528d 100644 --- a/src/BootstrapBlazor/Components/Select/Select.razor +++ b/src/BootstrapBlazor/Components/Select/Select.razor @@ -30,7 +30,7 @@ { } -
+
@if (ShowSearch) {
diff --git a/src/BootstrapBlazor/Components/Select/Select.razor.scss b/src/BootstrapBlazor/Components/Select/Select.razor.scss index 971a71456b7..4a71d7881aa 100644 --- a/src/BootstrapBlazor/Components/Select/Select.razor.scss +++ b/src/BootstrapBlazor/Components/Select/Select.razor.scss @@ -7,20 +7,11 @@ --bb-select-focus-shadow: #{$bb-select-focus-shadow}; --bb-select-padding-right: #{$bb-select-padding-right}; --bb-select-padding: #{$bb-select-padding}; - --bb-select-search-padding: #{$bb-select-search-padding}; - --bb-select-search-margin-bottom: #{$bb-select-search-margin-bottom}; - --bb-select-search-border-color: #{$bb-select-search-border-color}; - --bb-select-search-padding-right: #{$bb-select-search-padding-right}; - --bb-select-search-icon-color: #{$bb-select-search-icon-color}; - --bb-select-search-icon-right: #{$bb-select-search-icon-right}; - --bb-select-search-icon-top: #{$bb-select-search-icon-top}; - --bb-select-search-height: #{$bb-select-search-height}; --bb-select-append-width: #{$bb-select-append-width}; --bb-select-append-color: #{$bb-select-append-color}; } .select:not(.cascade) .dropdown-menu { - overflow-x: hidden; width: 100%; } @@ -48,22 +39,6 @@ background-color: var(--bs-secondary-bg); } -.dropdown-menu { - --bs-dropdown-border-radius: var(--bs-border-radius); - overflow: auto; - max-height: var(--bb-dropdown-max-height); -} - -.dropdown-menu .dropdown-virtual { - overflow-y: auto; - margin: calc(0px - var(--bs-dropdown-padding-y)) var(--bs-dropdown-padding-x); - padding: var(--bs-dropdown-padding-y) var(--bs-dropdown-padding-x); -} - -.dropdown-menu .search + .dropdown-virtual { - max-height: calc(var(--bb-dropdown-max-height) - var(--bb-select-search-height)); -} - .dropdown-item { cursor: pointer; } @@ -209,12 +184,14 @@ } .dropdown-menu { - &.is-fixed-search { - .dropdown-menu-body { - max-height: calc(var(--bb-dropdown-max-height) - 76px); - overflow: auto; - } - } + --bb-select-search-padding: #{$bb-select-search-padding}; + --bb-select-search-margin-bottom: #{$bb-select-search-margin-bottom}; + --bb-select-search-padding-right: #{$bb-select-search-padding-right}; + --bb-select-search-border-color: #{$bb-select-search-border-color}; + --bb-select-search-icon-color: #{$bb-select-search-icon-color}; + --bb-select-search-icon-right: #{$bb-select-search-icon-right}; + --bb-select-search-icon-top: #{$bb-select-search-icon-top}; + --bb-select-search-height: #{$bb-select-search-height}; .dropdown-menu-search { padding: var(--bb-select-search-padding); @@ -237,6 +214,11 @@ } } + .dropdown-menu-body { + max-height: var(--bb-dropdown-max-height); + overflow: auto; + } + .search-text { padding-inline-end: var(--bb-select-search-padding-right); } diff --git a/src/BootstrapBlazor/Components/Select/SelectBase.cs b/src/BootstrapBlazor/Components/Select/SelectBase.cs index a7c5e426322..ad4aa1c84d3 100644 --- a/src/BootstrapBlazor/Components/Select/SelectBase.cs +++ b/src/BootstrapBlazor/Components/Select/SelectBase.cs @@ -23,12 +23,6 @@ public abstract class SelectBase : PopoverSelectBase [Parameter] public bool ShowSearch { get; set; } - /// - /// Gets or sets whether the search bar in the dropdown is fixed. Default is false. - /// - [Parameter] - public bool IsFixedSearch { get; set; } - /// /// Gets or sets the search icon. /// @@ -168,13 +162,6 @@ public abstract class SelectBase : PopoverSelectBase .AddClass($"text-danger", IsValid.HasValue && !IsValid.Value) .Build(); - /// - /// Gets the dropdown menu class string. - /// - protected string? DropdownMenuClassString => CssBuilder.Default("dropdown-menu") - .AddClass("is-fixed-search", CheckFixedSearch()) - .Build(); - /// /// Gets the clear icon class string. /// @@ -243,10 +230,4 @@ protected virtual async Task OnClearValue() } CurrentValue = default; } - - /// - /// Gets whether to show the search box. - /// - /// - protected virtual bool CheckFixedSearch() => ShowSearch && IsFixedSearch; } diff --git a/src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor b/src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor index 74842d3a496..8b30ab99f01 100644 --- a/src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor +++ b/src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor @@ -30,7 +30,7 @@ { } -
+
@if (ShowSearch) {
diff --git a/src/BootstrapBlazor/Utils/Utility.cs b/src/BootstrapBlazor/Utils/Utility.cs index a01498f7a5d..74f5ff6285c 100644 --- a/src/BootstrapBlazor/Utils/Utility.cs +++ b/src/BootstrapBlazor/Utils/Utility.cs @@ -532,7 +532,6 @@ public static void CreateComponentByFieldType(this RenderTreeBuilder builder, Co if (item.IsLookup() && item.Items == null) { builder.AddAttribute(110, nameof(Select.ShowSearch), item.ShowSearchWhenSelect); - builder.AddAttribute(111, nameof(Select.IsFixedSearch), item.IsFixedSearchWhenSelect); builder.AddAttribute(115, nameof(Select.Items), item.Lookup); builder.AddAttribute(120, nameof(Select.LookupService), lookupService); builder.AddAttribute(121, nameof(Select.LookupServiceKey), item.LookupServiceKey); @@ -545,7 +544,6 @@ public static void CreateComponentByFieldType(this RenderTreeBuilder builder, Co { builder.AddAttribute(140, nameof(Select.Items), item.Items.Clone()); builder.AddAttribute(150, nameof(Select.ShowSearch), item.ShowSearchWhenSelect); - builder.AddAttribute(151, nameof(Select.IsFixedSearch), item.IsFixedSearchWhenSelect); } // 设置 SkipValidate 参数 diff --git a/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss b/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss index c0aca2d525e..4b4f5402ae2 100644 --- a/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss +++ b/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss @@ -521,7 +521,7 @@ $bb-select-search-padding-right: 30px; $bb-select-search-icon-color: var(--bb-select-search-border-color); $bb-select-search-icon-right: 20px; $bb-select-search-icon-top: 17px; -$bb-select-search-height: 60px; +$bb-select-search-height: 52px; $bb-select-append-width: 30px; $bb-select-append-color: #c0c4cc; From a86e86933e471f109bd9cd41892d26a75917dd03 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 19 Mar 2025 15:25:34 +0800 Subject: [PATCH 2/8] =?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/SelectGenericTest.cs | 18 -------------- test/UnitTest/Components/SelectTest.cs | 24 ------------------- test/UnitTest/Components/SelectTreeTest.cs | 6 ----- 3 files changed, 48 deletions(-) diff --git a/test/UnitTest/Components/SelectGenericTest.cs b/test/UnitTest/Components/SelectGenericTest.cs index 97c5a71c1f4..d07b099d2ab 100644 --- a/test/UnitTest/Components/SelectGenericTest.cs +++ b/test/UnitTest/Components/SelectGenericTest.cs @@ -473,24 +473,6 @@ public void SearchIcon_Ok() Assert.Contains("search-icon", cut.Markup); } - [Fact] - public void IsFixedSearch_Ok() - { - var cut = Context.RenderComponent>(pb => - { - pb.Add(a => a.Items, new SelectedItem[] - { - new("1", "Test1"), - new("2", "Test2") - }); - pb.Add(a => a.Value, "2"); - pb.Add(a => a.ShowSearch, true); - pb.Add(a => a.IsFixedSearch, true); - }); - Assert.Contains("dropdown-menu is-fixed-search", cut.Markup); - Assert.Contains("class=\"icon", cut.Markup); - } - [Fact] public void CustomClass_Ok() { diff --git a/test/UnitTest/Components/SelectTest.cs b/test/UnitTest/Components/SelectTest.cs index 3554a5a3674..ff9f842ca16 100644 --- a/test/UnitTest/Components/SelectTest.cs +++ b/test/UnitTest/Components/SelectTest.cs @@ -566,30 +566,6 @@ public void SearchIcon_Ok() Assert.Contains("search-icon", cut.Markup); } - [Fact] - public void IsFixedSearch_Ok() - { - var cut = Context.RenderComponent>(pb => - { - pb.Add(a => a.Items, new SelectedItem[] - { - new("1", "Test1"), - new("2", "Test2") - }); - pb.Add(a => a.Value, "2"); - pb.Add(a => a.ShowSearch, true); - pb.Add(a => a.IsFixedSearch, true); - }); - Assert.Contains("dropdown-menu is-fixed-search", cut.Markup); - Assert.Contains("class=\"icon search-icon", cut.Markup); - - cut.SetParametersAndRender(pb => - { - pb.Add(a => a.ShowSearch, false); - }); - Assert.DoesNotContain("dropdown-menu is-fixed-search", cut.Markup); - } - [Fact] public void ScrollIntoViewBehavior_Ok() { diff --git a/test/UnitTest/Components/SelectTreeTest.cs b/test/UnitTest/Components/SelectTreeTest.cs index 52b718a65d3..9ebd0473ab0 100644 --- a/test/UnitTest/Components/SelectTreeTest.cs +++ b/test/UnitTest/Components/SelectTreeTest.cs @@ -221,12 +221,6 @@ public void ShowSearch_Ok() 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; } = From 3e5e9321b7276f0ffd60c3bbf675648be67e283f Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 19 Mar 2025 15:25:42 +0800 Subject: [PATCH 3/8] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/Selects.razor.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs index 883a8afe457..0146e9c7f9d 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs @@ -41,16 +41,11 @@ public sealed partial class Selects [NotNull] private IStringLocalizer? LocalizerFoo { get; set; } - private bool _showSearch; - + private bool _showSearch = true; private bool _showPopoverSearch = true; - - private bool _isShowSearchClearable; - - private bool _isFixedSearch; - - private bool _isClearable; - + private bool _isShowSearchClearable = true; + private bool _isFixedSearch = true; + private bool _isClearable = true; private string? _fooName; private readonly List _enumValueDemoItems = [ From 0d80851a14012d36cc16fb57a3a0f271de1395a3 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 19 Mar 2025 15:30:04 +0800 Subject: [PATCH 4/8] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=20IsFixedSea?= =?UTF-8?q?rch=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs | 2 +- src/BootstrapBlazor/Components/Filters/LookupFilter.razor.cs | 2 ++ src/BootstrapBlazor/Components/Filters/TableFilter.razor | 4 +++- src/BootstrapBlazor/Extensions/ITableColumnExtensions.cs | 1 - test/UnitTest/Attributes/AutoGenerateClassTest.cs | 3 --- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs b/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs index a55588c36f4..bb325324e22 100644 --- a/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs +++ b/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs @@ -89,7 +89,7 @@ public interface IEditorItem : ILookup /// /// Gets or sets whether to allow fixed search box within dropdown. Default is false. /// - [Obsolete("已弃用 Departur")] + [Obsolete("已弃用，请删除；Deprecated, please delete")] bool IsFixedSearchWhenSelect { get; set; } /// diff --git a/src/BootstrapBlazor/Components/Filters/LookupFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/LookupFilter.razor.cs index a18f8cd59af..c378a3e2f86 100644 --- a/src/BootstrapBlazor/Components/Filters/LookupFilter.razor.cs +++ b/src/BootstrapBlazor/Components/Filters/LookupFilter.razor.cs @@ -62,6 +62,8 @@ public partial class LookupFilter : ILookup /// 获得 是否为 ShowSearch 呈现模式 默认为 false /// [Parameter] + [ExcludeFromCodeCoverage] + [Obsolete("已弃用，请删除；Deprecated, please delete")] public bool IsFixedSearch { get; set; } [Inject] diff --git a/src/BootstrapBlazor/Components/Filters/TableFilter.razor b/src/BootstrapBlazor/Components/Filters/TableFilter.razor index 53df8ddfa2e..ec94e845dbf 100644 --- a/src/BootstrapBlazor/Components/Filters/TableFilter.razor +++ b/src/BootstrapBlazor/Components/Filters/TableFilter.razor @@ -46,7 +46,9 @@ else } else if (Column.IsLookup()) { - + } else { diff --git a/src/BootstrapBlazor/Extensions/ITableColumnExtensions.cs b/src/BootstrapBlazor/Extensions/ITableColumnExtensions.cs index 13d0182b849..1e0793e9caa 100644 --- a/src/BootstrapBlazor/Extensions/ITableColumnExtensions.cs +++ b/src/BootstrapBlazor/Extensions/ITableColumnExtensions.cs @@ -46,7 +46,6 @@ public static void CopyValue(this ITableColumn dest, IEditorItem source) if (source.Items != null) dest.Items = source.Items; if (source.Lookup != null) dest.Lookup = source.Lookup; if (source.ShowSearchWhenSelect) dest.ShowSearchWhenSelect = source.ShowSearchWhenSelect; - if (source.IsFixedSearchWhenSelect) dest.IsFixedSearchWhenSelect = source.IsFixedSearchWhenSelect; if (source.IsPopover) dest.IsPopover = source.IsPopover; if (source.LookupStringComparison != StringComparison.OrdinalIgnoreCase) dest.LookupStringComparison = source.LookupStringComparison; if (source.LookupServiceKey != null) dest.LookupServiceKey = source.LookupServiceKey; diff --git a/test/UnitTest/Attributes/AutoGenerateClassTest.cs b/test/UnitTest/Attributes/AutoGenerateClassTest.cs index 081be6394fb..a9ac8571a79 100644 --- a/test/UnitTest/Attributes/AutoGenerateClassTest.cs +++ b/test/UnitTest/Attributes/AutoGenerateClassTest.cs @@ -222,9 +222,6 @@ public void AutoGenerateColumn_Ok() attrEditor.ShowSearchWhenSelect = true; Assert.True(attrEditor.ShowSearchWhenSelect); - attrEditor.IsFixedSearchWhenSelect = true; - Assert.True(attrEditor.IsFixedSearchWhenSelect); - attrEditor.IsPopover = true; Assert.True(attrEditor.IsPopover); From 9ee67205c17e52d95c48f1da5c9f5f7b3fe66ef1 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 19 Mar 2025 15:37:16 +0800 Subject: [PATCH 5/8] =?UTF-8?q?refactor:=20=E6=A0=87=E6=B3=A8=E5=B7=B2?= =?UTF-8?q?=E5=BC=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs | 2 ++ src/BootstrapBlazor/Components/EditorForm/EditorItem.cs | 2 ++ src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs | 1 + src/BootstrapBlazor/Components/Select/SelectTree.razor.cs | 2 ++ src/BootstrapBlazor/Components/Table/InternalTableColumn.cs | 2 ++ src/BootstrapBlazor/Components/Table/TableColumn.cs | 2 ++ 6 files changed, 11 insertions(+) diff --git a/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs b/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs index 36c8969c93b..e8a5e8b216d 100644 --- a/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs +++ b/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs @@ -233,6 +233,8 @@ public class AutoGenerateColumnAttribute : AutoGenerateBaseAttribute, ITableColu /// /// /// + [Obsolete("已弃用，请删除；Deprecated, please delete")] + [ExcludeFromCodeCoverage] public bool IsFixedSearchWhenSelect { get; set; } /// diff --git a/src/BootstrapBlazor/Components/EditorForm/EditorItem.cs b/src/BootstrapBlazor/Components/EditorForm/EditorItem.cs index bc850244925..86a2e4c14a8 100644 --- a/src/BootstrapBlazor/Components/EditorForm/EditorItem.cs +++ b/src/BootstrapBlazor/Components/EditorForm/EditorItem.cs @@ -165,6 +165,8 @@ public class EditorItem : ComponentBase, IEditorItem /// /// [Parameter] + [Obsolete("已弃用，请删除；Deprecated, please delete")] + [ExcludeFromCodeCoverage] public bool IsFixedSearchWhenSelect { get; set; } /// diff --git a/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs b/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs index bb325324e22..1bd2474d51d 100644 --- a/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs +++ b/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs @@ -90,6 +90,7 @@ public interface IEditorItem : ILookup /// Gets or sets whether to allow fixed search box within dropdown. Default is false. /// [Obsolete("已弃用，请删除；Deprecated, please delete")] + [ExcludeFromCodeCoverage] bool IsFixedSearchWhenSelect { get; set; } /// diff --git a/src/BootstrapBlazor/Components/Select/SelectTree.razor.cs b/src/BootstrapBlazor/Components/Select/SelectTree.razor.cs index 6656d4d0aa3..1291cb3cabf 100644 --- a/src/BootstrapBlazor/Components/Select/SelectTree.razor.cs +++ b/src/BootstrapBlazor/Components/Select/SelectTree.razor.cs @@ -130,6 +130,8 @@ public partial class SelectTree : IModelEqualityComparer /// 获得/设置 是否固定搜索栏 默认 false 不固定 /// [Parameter] + [Obsolete("已弃用，请删除；Deprecated, please delete")] + [ExcludeFromCodeCoverage] public bool IsFixedSearch { get; set; } /// diff --git a/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs b/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs index 27ec2dee2f3..fd9d63916fc 100644 --- a/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs +++ b/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs @@ -224,6 +224,8 @@ class InternalTableColumn(string fieldName, Type fieldType, string? fieldText = /// /// /// + [Obsolete("已弃用，请删除；Deprecated, please delete")] + [ExcludeFromCodeCoverage] public bool IsFixedSearchWhenSelect { get; set; } /// diff --git a/src/BootstrapBlazor/Components/Table/TableColumn.cs b/src/BootstrapBlazor/Components/Table/TableColumn.cs index de8f1c04c10..69704ba8c7f 100644 --- a/src/BootstrapBlazor/Components/Table/TableColumn.cs +++ b/src/BootstrapBlazor/Components/Table/TableColumn.cs @@ -411,6 +411,8 @@ public class TableColumn : BootstrapComponentBase, ITableColumn /// /// [Parameter] + [Obsolete("已弃用，请删除；Deprecated, please delete")] + [ExcludeFromCodeCoverage] public bool IsFixedSearchWhenSelect { get; set; } /// From 22c84143cf42c4e305b92bd794ce6b36461c4a55 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 19 Mar 2025 15:37:26 +0800 Subject: [PATCH 6/8] =?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/EditorFormTest.cs | 1 - test/UnitTest/Components/TableTest.cs | 1 - test/UnitTest/Extensions/ITableColumnExtensionsTest.cs | 2 -- 3 files changed, 4 deletions(-) diff --git a/test/UnitTest/Components/EditorFormTest.cs b/test/UnitTest/Components/EditorFormTest.cs index 3c85ae28cee..36203771e51 100644 --- a/test/UnitTest/Components/EditorFormTest.cs +++ b/test/UnitTest/Components/EditorFormTest.cs @@ -269,7 +269,6 @@ public void EditorItem_Ok() new("False", "Test-False") }); builder.AddAttribute(index++, nameof(EditorItem.ShowSearchWhenSelect), false); - builder.AddAttribute(index++, nameof(EditorItem.IsFixedSearchWhenSelect), false); builder.AddAttribute(index++, nameof(EditorItem.IsPopover), false); builder.CloseComponent(); }); diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs index 7f8259d6a7a..8fed174b7f6 100644 --- a/test/UnitTest/Components/TableTest.cs +++ b/test/UnitTest/Components/TableTest.cs @@ -5045,7 +5045,6 @@ public void TableColumn_Property() Assert.Equal("test", column.Instance.GroupName); Assert.Equal(1, column.Instance.GroupOrder); Assert.True(column.Instance.ShowSearchWhenSelect); - Assert.True(column.Instance.IsFixedSearchWhenSelect); Assert.False(column.Instance.IsPopover); Assert.NotNull(column.Instance.LookupService); diff --git a/test/UnitTest/Extensions/ITableColumnExtensionsTest.cs b/test/UnitTest/Extensions/ITableColumnExtensionsTest.cs index baedf6b4a4c..91de55e0d53 100644 --- a/test/UnitTest/Extensions/ITableColumnExtensionsTest.cs +++ b/test/UnitTest/Extensions/ITableColumnExtensionsTest.cs @@ -101,7 +101,6 @@ public void CopyValue_Ok() HeaderTextWrap = true, HeaderTextTooltip = "test tooltip", ShowSearchWhenSelect = true, - IsFixedSearchWhenSelect = true, IsPopover = true, ShowCopyColumn = true, Step = "0.01", @@ -166,7 +165,6 @@ public void CopyValue_Ok() Assert.True(col.HeaderTextWrap); Assert.Equal("test tooltip", col.HeaderTextTooltip); Assert.True(col.ShowSearchWhenSelect); - Assert.True(col.IsFixedSearchWhenSelect); Assert.True(col.IsPopover); Assert.True(col.ShowCopyColumn); Assert.Equal("0.01", col.Step); From 5046d7acad5f7b88619ce1b373a65c73ca39489e Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 19 Mar 2025 15:40:07 +0800 Subject: [PATCH 7/8] =?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 --- .../Components/Samples/MultiSelects.razor | 20 ++++--------------- .../Components/Samples/MultiSelects.razor.cs | 2 -- .../Components/Samples/Selects.razor | 20 ++++--------------- .../Components/Samples/Selects.razor.cs | 1 - 4 files changed, 8 insertions(+), 35 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/MultiSelects.razor b/src/BootstrapBlazor.Server/Components/Samples/MultiSelects.razor index 2bc1eb30808..1d29957a846 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/MultiSelects.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/MultiSelects.razor @@ -117,12 +117,6 @@ private enum MultiSelectEnumFoo

@((MarkupString)Localizer["MultiSelectSearchDescription"].Value)

-
- - - - -
@@ -135,12 +129,12 @@ private enum MultiSelectEnumFoo
+ ShowSearch="true" IsClearable="_isClearable" OnSearchTextChanged="@OnSearch">
+ ShowSearch="true" IsClearable="_isClearable">
@@ -313,12 +307,6 @@ private enum MultiSelectEnumFoo
-
- - - - -
@@ -339,7 +327,7 @@ private enum MultiSelectEnumFoo
+ IsClearable="_isClearable">
@@ -352,7 +340,7 @@ private enum MultiSelectEnumFoo
+ IsClearable="_isClearable">
diff --git a/src/BootstrapBlazor.Server/Components/Samples/MultiSelects.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/MultiSelects.razor.cs index 20bf1a380cb..eefde8442f1 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/MultiSelects.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Samples/MultiSelects.razor.cs @@ -120,8 +120,6 @@ private enum MultiSelectEnumFoo private IEnumerable VirtualItems => Foos.Select(i => new SelectedItem(i.Name!, i.Name!)).ToList(); private string? _editString; - - private bool _isFixedSearch = true; private bool _isClearable = true; private bool _showToolbar = true; private bool _showSearch = true; diff --git a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor index 8bc1b2cfefc..b54eedfce0a 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor @@ -323,23 +323,17 @@
-
- - - - -
@@ -440,12 +434,6 @@
-
- - - - -
@@ -459,7 +447,7 @@
+ ShowSearch="_showSearch" IsClearable="_isClearable">
@@ -470,7 +458,7 @@
+ ShowSearch="_showSearch" IsClearable="_isClearable">
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs index 0146e9c7f9d..0603b0eacf6 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs @@ -44,7 +44,6 @@ public sealed partial class Selects private bool _showSearch = true; private bool _showPopoverSearch = true; private bool _isShowSearchClearable = true; - private bool _isFixedSearch = true; private bool _isClearable = true; private string? _fooName; From a62407e41db262e661eca5f90292c6576c592150 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 19 Mar 2025 15:42:14 +0800 Subject: [PATCH 8/8] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/MultiSelects.razor.cs | 8 -------- .../Components/Samples/Selects.razor.cs | 8 -------- src/BootstrapBlazor.Server/Locales/en-US.json | 6 ++---- src/BootstrapBlazor.Server/Locales/zh-CN.json | 6 ++---- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/MultiSelects.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/MultiSelects.razor.cs index eefde8442f1..487e9f396d8 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/MultiSelects.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Samples/MultiSelects.razor.cs @@ -380,14 +380,6 @@ private AttributeItem[] GetAttributes() => DefaultValue = "false" }, new() - { - Name = "IsFixedSearch", - Description = Localizer["MultiSelectsAttribute_IsFixedSearch"], - Type = "bool", - ValueList = "true|false", - DefaultValue = "false" - }, - new() { Name = "ShowToolbar", Description = Localizer["MultiSelectsAttribute_ShowToolbar"], diff --git a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs index 0603b0eacf6..808f941bf71 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Samples/Selects.razor.cs @@ -353,14 +353,6 @@ private AttributeItem[] GetAttributes() => DefaultValue = "false" }, new() - { - Name = "IsFixedSearch", - Description = Localizer["SelectsIsFixedSearch"], - Type = "boolean", - ValueList = "true / false", - DefaultValue = "false" - }, - new() { Name = "IsDisabled", Description = Localizer["SelectsIsDisabled"], diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json index 2ae4a679936..92f21500fce 100644 --- a/src/BootstrapBlazor.Server/Locales/en-US.json +++ b/src/BootstrapBlazor.Server/Locales/en-US.json @@ -3028,8 +3028,7 @@ "MultiSelectVirtualizeTitle": "Virtualize", "MultiSelectVirtualizeIntro": "Set IsVirtualize to true enable virtual scroll for large data", "MultiSelectVirtualizeDescription": "Component virtual scrolling supports two ways of providing data through Items or OnQueryAsync callback methods", - "MultiSelectsAttribute_ShowSearch": "Whether to display the search box", - "MultiSelectsAttribute_IsFixedSearch": "Whether fixed the search box" + "MultiSelectsAttribute_ShowSearch": "Whether to display the search box" }, "BootstrapBlazor.Server.Components.Samples.Radios": { "RadiosTitle": "Radio", @@ -3205,8 +3204,7 @@ "SelectsGenericDesc": "

Please refer to Design Ideas to understand this feature. In this example, by selecting the drop-down box option, the value obtained is the Foo instance, and the value displayed in the text box on the right is the Address value of the Foo attribute

In this example, the ValueEqualityComparer and CustomKeyAttribute parameters are not set, and the [Key] tag of the Id attribute of Foo is used for equality judgment

", "SelectsOnInputChangedCallback": "Callback method for converting input text into corresponding Value in edit mode", "TextConvertToValueCallback": "Callback method when input text changes in edit mode", - "SelectsIsEditable": "Whether editable", - "SelectsIsFixedSearch": "Whether fixed the search box" + "SelectsIsEditable": "Whether editable" }, "BootstrapBlazor.Server.Components.Samples.Sliders": { "SlidersTitle": "Slider", diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json index 53de4fbb5ea..8eba1837aa8 100644 --- a/src/BootstrapBlazor.Server/Locales/zh-CN.json +++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json @@ -3028,8 +3028,7 @@ "MultiSelectVirtualizeTitle": "虚拟滚动", "MultiSelectVirtualizeIntro": "通过设置 IsVirtualize 参数开启组件虚拟功能特性", "MultiSelectVirtualizeDescription": "组件虚拟滚动支持两种形式通过 Items 或者 OnQueryAsync 回调方法提供数据", - "MultiSelectsAttribute_ShowSearch": "是否显示搜索框", - "MultiSelectsAttribute_IsFixedSearch": "是否固定搜索栏" + "MultiSelectsAttribute_ShowSearch": "是否显示搜索框" }, "BootstrapBlazor.Server.Components.Samples.Radios": { "RadiosTitle": "Radio 单选框", @@ -3205,8 +3204,7 @@ "SelectsGenericDesc": "

请参考 设计思路 理解此功能。本例中通过选择下拉框选项，得到的值为 Foo 实例，右侧文本框内显示值为 Foo 属性 Address 值

本例中未设置 ValueEqualityComparer 以及 CustomKeyAttribute 参数，使用 Foo 属性 Id 的 [Key] 标签进行相等判定

", "SelectsOnInputChangedCallback": "编辑模式下输入文本转换为对应 Value 回调方法", "TextConvertToValueCallback": "编辑模式下输入文本变化时回调方法", - "SelectsIsEditable": "是否可编辑", - "SelectsIsFixedSearch": "是否固定搜索栏" + "SelectsIsEditable": "是否可编辑" }, "BootstrapBlazor.Server.Components.Samples.Sliders": { "SlidersTitle": "Slider 滑块",