refactor: 移除 IsFixedSearch 参数

Author: ArgoZhang

src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs

@@ -89,6 +89,7 @@ public interface IEditorItem : ILookup
     /// <summary>
     /// Gets or sets whether to allow fixed search box within dropdown. Default is false.
     /// </summary>
+    [Obsolete("已弃用 Departur")]
     bool IsFixedSearchWhenSelect { get; set; }
 
     /// <summary>

src/BootstrapBlazor/Components/Select/MultiSelect.razor

@@ -53,7 +53,7 @@
     {
         <span class="@ClearClassString" @onclick="OnClearValue"><i class="@ClearableIcon"></i></span>
     }
-    <div class="@MultipleDropdownMenuClassString">
+    <div class="@DropdownMenuClassString">
         @if (ShowSearch)
         {
             <div class="dropdown-menu-search">

src/BootstrapBlazor/Components/Select/MultiSelect.razor.cs

@@ -20,7 +20,7 @@ public partial class MultiSelect<TValue>
         .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<SelectedItem> GetRowsByItems()
         return items;
     }
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <returns></returns>
-    protected override bool CheckFixedSearch() => ShowToolbar ? true : base.CheckFixedSearch();
-
     /// <summary>
     /// 客户端回车回调方法
     /// </summary>

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));
         }
     }
 

src/BootstrapBlazor/Components/Select/Select.razor

@@ -30,7 +30,7 @@
         {
             <span class="@ClearClassString" @onclick="OnClearValue"><i class="@ClearIcon"></i></span>
         }
-        <div class="@DropdownMenuClassString">
+        <div class="dropdown-menu">
             @if (ShowSearch)
             {
                 <div class="dropdown-menu-search">

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);
     }

src/BootstrapBlazor/Components/Select/SelectBase.cs

@@ -23,12 +23,6 @@ public abstract class SelectBase<TValue> : PopoverSelectBase<TValue>
     [Parameter]
     public bool ShowSearch { get; set; }
 
-    /// <summary>
-    /// Gets or sets whether the search bar in the dropdown is fixed. Default is false.
-    /// </summary>
-    [Parameter]
-    public bool IsFixedSearch { get; set; }
-
     /// <summary>
     /// Gets or sets the search icon.
     /// </summary>
@@ -168,13 +162,6 @@ public abstract class SelectBase<TValue> : PopoverSelectBase<TValue>
         .AddClass($"text-danger", IsValid.HasValue && !IsValid.Value)
         .Build();
 
-    /// <summary>
-    /// Gets the dropdown menu class string.
-    /// </summary>
-    protected string? DropdownMenuClassString => CssBuilder.Default("dropdown-menu shadow")
-        .AddClass("is-fixed-search", CheckFixedSearch())
-        .Build();
-
     /// <summary>
     /// Gets the clear icon class string.
     /// </summary>
@@ -243,10 +230,4 @@ protected virtual async Task OnClearValue()
         }
         CurrentValue = default;
     }
-
-    /// <summary>
-    /// Gets whether to show the search box.
-    /// </summary>
-    /// <returns></returns>
-    protected virtual bool CheckFixedSearch() => ShowSearch && IsFixedSearch;
 }

src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor

@@ -30,7 +30,7 @@
         {
             <span class="@ClearClassString" @onclick="OnClearValue"><i class="@ClearIcon"></i></span>
         }
-        <div class="@DropdownMenuClassString">
+        <div class="dropdown-menu">
             @if (ShowSearch)
             {
                 <div class="dropdown-menu-search">

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<SelectedItem>.ShowSearch), item.ShowSearchWhenSelect);
-            builder.AddAttribute(111, nameof(Select<SelectedItem>.IsFixedSearch), item.IsFixedSearchWhenSelect);
             builder.AddAttribute(115, nameof(Select<SelectedItem>.Items), item.Lookup);
             builder.AddAttribute(120, nameof(Select<SelectedItem>.LookupService), lookupService);
             builder.AddAttribute(121, nameof(Select<SelectedItem>.LookupServiceKey), item.LookupServiceKey);
@@ -545,7 +544,6 @@ public static void CreateComponentByFieldType(this RenderTreeBuilder builder, Co
         {
             builder.AddAttribute(140, nameof(Select<SelectedItem>.Items), item.Items.Clone());
             builder.AddAttribute(150, nameof(Select<SelectedItem>.ShowSearch), item.ShowSearchWhenSelect);
-            builder.AddAttribute(151, nameof(Select<SelectedItem>.IsFixedSearch), item.IsFixedSearchWhenSelect);
         }
 
         // 设置 SkipValidate 参数

src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss

@@ -517,7 +517,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;