refactor: 调整属性名称

Author: ArgoZhang

src/BootstrapBlazor.Server/Components/Samples/Searches.razor

@@ -41,11 +41,12 @@
            Introduction="@Localizer["SearchesItemTemplateIntro"]"
            Name="ItemTemplate">
     <Search PlaceHolder="@Localizer["SearchesPlaceHolder"]"
+            OnGetDisplayText="OnGetDisplayText"
             OnSearch="@OnSearchFoo">
         <ItemTemplate>
             <div class="search-result">
                 <div class="search-result-avatar">
-                    <img src="@WebsiteOption.CurrentValue.GetAvatarUrl(context.Id)" />
+                    <img src="@WebsiteOption.CurrentValue.GetAvatarUrl(context.Id)" alt="avatar" />
                 </div>
                 <div class="search-result-main">
                     <div class="search-result-name">@context.Name</div>
@@ -63,7 +64,7 @@
            Introduction="@Localizer["SearchesKeyboardsIntro"]"
            Name="keyboards">
     <Search PlaceHolder="@Localizer["SearchesPlaceHolder"]"
-            IsOnInputTrigger="false"
+            IsTriggerSearchByInput="false"
             OnSearch="@OnKeyboardSearch" />
     <ConsoleLogger @ref="KeyboardLogger" />
 </DemoBlock>
@@ -72,7 +73,7 @@
            Introduction="@Localizer["SearchesValidateFormIntro"]"
            Name="ValidateForm">
     <ValidateForm Model="@Model">
-        <Search IsOnInputTrigger="true" @bind-Value="Model.Name" />
+        <Search @bind-Value="Model.Name" />
     </ValidateForm>
 </DemoBlock>
 

src/BootstrapBlazor.Server/Components/Samples/Searches.razor.cs

@@ -52,7 +52,9 @@ private Task<IEnumerable<string>> OnKeyboardSearch(string searchText)
         return Task.FromResult<IEnumerable<string>>([$"{searchText}1", $"{searchText}12", $"{searchText}123"]);
     }
 
-    private Foo Model { get; set; } = new Foo() { Name = "" };
+    private Foo Model { get; } = new() { Name = "" };
+
+    private string? OnGetDisplayText(Foo foo) => foo.Name;
 
     private async Task<IEnumerable<Foo>> OnSearchFoo(string searchText)
     {

src/BootstrapBlazor/Components/Search/Search.razor

@@ -11,7 +11,7 @@
                data-bb-skip-esc="@SkipEscString" data-bb-skip-enter="@SkipEnterString"
                data-bb-scroll-behavior="@ScrollIntoViewBehaviorString"
                data-bb-input="@UseInputString"
-               value="@CurrentValueAsString"
+               value="@_displayText"
                placeholder="@PlaceHolder" disabled="@Disabled" @ref="FocusElement" />
         @if (ShowClearButton)
         {

src/BootstrapBlazor/Components/Search/Search.razor.cs

@@ -71,7 +71,7 @@ public partial class Search<TValue>
     /// 获得/设置 搜索模式是否为输入即触发 默认 true 值为 false 时需要点击搜索按钮触发
     /// </summary>
     [Parameter]
-    public bool IsOnInputTrigger { get; set; } = true;
+    public bool IsTriggerSearchByInput { get; set; } = true;
 
     /// <summary>
     /// 获得/设置 点击搜索按钮时回调委托
@@ -100,9 +100,9 @@ public partial class Search<TValue>
         .AddClassFromAttributes(AdditionalAttributes)
         .Build();
 
-    private string? UseInputString => IsOnInputTrigger ? null : "false";
+    private string? UseInputString => IsTriggerSearchByInput ? null : "false";
 
-    private string? ShowDropdownListOnFocusString => IsOnInputTrigger ? "true" : null;
+    private string? ShowDropdownListOnFocusString => IsTriggerSearchByInput ? "true" : null;
 
     [NotNull]
     private string? ButtonIcon { get; set; }
@@ -129,24 +129,7 @@ protected override void OnParametersSet()
         FilterItems ??= [];
     }
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    /// <param name="firstRender"></param>
-    /// <returns></returns>
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        await base.OnAfterRenderAsync(firstRender);
-
-        if (_show)
-        {
-            _show = false;
-            await InvokeVoidAsync("showList", Id);
-        }
-    }
-
     private string _displayText = "";
-    private bool _show;
     /// <summary>
     /// 点击搜索按钮时触发此方法
     /// </summary>
@@ -165,9 +148,10 @@ private async Task OnSearchClick()
             {
                 _displayText = "";
             }
-            if (IsOnInputTrigger == false)
+
+            if (IsTriggerSearchByInput == false)
             {
-                _show = true;
+                await InvokeVoidAsync("showList", Id);
             }
             StateHasChanged();
         }

test/UnitTest/Components/SearchTest.cs

@@ -14,13 +14,6 @@ public void Items_Ok()
         Assert.Contains("<div class=\"search auto-complete\"", cut.Markup);
         var menus = cut.FindAll(".dropdown-item");
         Assert.Single(menus);
-
-        cut.SetParametersAndRender(pb =>
-        {
-            pb.Add(a => a.ShowNoDataTip, false);
-        });
-        menus = cut.FindAll(".dropdown-item");
-        Assert.Empty(menus);
     }
 
     [Fact]
@@ -73,11 +66,11 @@ public void IsOnInputTrigger_Ok()
     {
         var cut = Context.RenderComponent<Search<string>>(builder =>
         {
-            builder.Add(s => s.IsOnInputTrigger, true);
+            builder.Add(s => s.IsTriggerSearchByInput, true);
         });
         cut.DoesNotContain("data-bb-input");
 
-        cut.SetParametersAndRender(pb => pb.Add(a => a.IsOnInputTrigger, false));
+        cut.SetParametersAndRender(pb => pb.Add(a => a.IsTriggerSearchByInput, false));
         cut.Contains("data-bb-input=\"false\"");
     }
 
@@ -91,8 +84,8 @@ public async Task OnSearchClick_Ok()
             builder.Add(s => s.SearchButtonIcon, "fa-fw fa-solid fa-magnifying-glass");
             builder.Add(s => s.SearchButtonText, "SearchText");
             builder.Add(s => s.SearchButtonColor, Color.Warning);
-            builder.Add(s => s.IsOnInputTrigger, false);
             builder.Add(s => s.IsAutoClearAfterSearch, true);
+            builder.Add(s => s.IsTriggerSearchByInput, false);
             builder.Add(a => a.OnSearch, async v =>
             {
                 val = v;
@@ -105,10 +98,11 @@ public async Task OnSearchClick_Ok()
 
         var button = cut.Find(".fa-magnifying-glass");
         await cut.InvokeAsync(() => button.Click());
-        await Task.Delay(10);
-
-        menus = cut.FindAll(".dropdown-item");
-        Assert.Equal(2, menus.Count);
+        cut.WaitForState(() =>
+        {
+            menus = cut.FindAll(".dropdown-item");
+            return menus.Count == 2;
+        });
     }
 
     [Fact]
@@ -135,4 +129,25 @@ public async Task OnClearClick_Ok()
         await cut.InvokeAsync(() => button.Click());
         Assert.True(ret);
     }
+
+    [Fact]
+    public async Task OnSelectedItemChanged_Ok()
+    {
+        var items = new List<string?>() { null, "test1", "test2" };
+        var selectedItem = "";
+        var cut = Context.RenderComponent<Search<string?>>(pb =>
+        {
+            pb.Add(a => a.OnSelectedItemChanged, v => { selectedItem = v; return Task.CompletedTask; });
+            pb.Add(a => a.OnSearch, async v =>
+            {
+                await Task.Delay(1);
+                return items;
+            });
+        });
+        await cut.InvokeAsync(() => cut.Instance.TriggerOnChange("t"));
+
+        var item = cut.Find(".dropdown-item");
+        await cut.InvokeAsync(() => item.Click());
+        Assert.Null(selectedItem);
+    }
 }