Merge branch 'main' of https://github.com/dotnetcore/BootstrapBlazor

actions-user · actions-user · commit e8865d7b54c0 · 2025-09-19T01:16:44.000Z
diff --git a/src/BootstrapBlazor.Server/Components/Samples/AutoCompletes.razor b/src/BootstrapBlazor.Server/Components/Samples/AutoCompletes.razor
@@ -6,9 +6,9 @@
 <h4>@Localizer["Description"]</h4>
 
 <DemoBlock Title="@Localizer["Block1Title"]" Introduction="@Localizer["Block1Intro"]" Name="Normal">
-    <section ignore>@Localizer["NormalDescription"]</section>
+    <section ignore>@((MarkupString)Localizer["NormalDescription"].Value)</section>
     <div style="width: 200px;">
-        <AutoComplete Value="@_value" Items="@StaticItems" IsSelectAllTextOnFocus="true"></AutoComplete>
+        <AutoComplete Value="@_value" Items="@StaticItems" IsSelectAllTextOnFocus="true" IsClearable></AutoComplete>
     </div>
 </DemoBlock>
 
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Modbus/ModbusFactories.razor b/src/BootstrapBlazor.Server/Components/Samples/Modbus/ModbusFactories.razor
@@ -68,3 +68,68 @@ private IModbusFactory? ModbusFactory { get; set; }</Pre>
     <li>输入寄存器 (Input Registers) <code>ReadInputRegistersAsync</code></li>
     <li>保持寄存器 (Holding Registers) <code>ReadHoldingRegistersAsync</code> <code>WriteRegisterAsync</code> <code>WriteMultipleRegistersAsync</code></li>
 </ul>
+
+<p>Modbus 协议的最大读取/写入数量限制参考自 Modbus Application Protocol Specification V1.1b3:</p>
+
+<ul class="ul-demo">
+    <li>线圈 (Coils) 最大读取数量: <code>2000</code>, 最大写入数量: <code>1968</code></li>
+    <li>离散输入 (Discrete Inputs) 最大读取数量: <code>2000</code></li>
+    <li>输入寄存器 (Input Registers) 最大读取数量: <code>125</code></li>
+    <li>保持寄存器 (Holding Registers) 最大读取数量: <code>125</code>, 最大写入数量: <code>123</code></li>
+</ul>
+
+<p>项目包含 Benchmark 基准测试工程</p>
+
+<Pre>private const int NumberOfTask = 10;
+private const int TaskNumberOfClient = 10;
+private const int ClientCount = 10;
+
+private async Task InitLongbowModbus()
+{
+    var sc = new ServiceCollection();
+    sc.AddModbusFactory();
+
+    var provider = sc.BuildServiceProvider();
+    var factory = provider.GetRequiredService&lt;IModbusFactory&gt;();
+
+    for (var index = 0; index &lt; ClientCount; index++)
+    {
+        var client = factory.GetOrCreateTcpMaster();
+        await client.ConnectAsync("127.0.0.1", 502);
+        await client.ReadHoldingRegistersAsync(0x01, 0x00, 100);
+
+        _lgbModbusClients.Add(client);
+    }
+}
+
+[Benchmark]
+public async Task LongbowModbus()
+{
+    var tasks = _lgbModbusClients.SelectMany(c =>
+    {
+        var tasks = new List&lt;Task&gt;();
+        for (int i = 0; i &lt; TaskNumberOfClient; i++)
+        {
+            tasks.Add(Task.Run(async () =&gt;
+            {
+                for (int i = 0; i &lt; NumberOfTask; i++)
+                {
+                    var d = await c.ReadHoldingRegistersAsync(1, 0, 100);
+                }
+            }));
+        }
+        return tasks;
+    }).ToList();
+
+    await Task.WhenAll(tasks);
+}</Pre>
+
+<p>共 10 个 <code>Socket</code> 连接，每个连接 10 个并发任务，每个任务进行 10 次 <code>ReadHoldingRegistersAsync</code> 方法调用，每个方法读取 100 个地址数据</p>
+
+<p>Benchmark 结果如下：</p>
+
+    <Pre>| Method            | Mean    | Error    | StdDev   | Allocated |
+|------------------ |--------:|---------:|---------:|----------:|
+| LongbowModbus     | 2.458 s | 0.0488 s | 0.1007 s |   2.11 MB |
+| NModbus           | 4.752 s | 0.1544 s | 0.4552 s |    3.3 MB |
+</Pre>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Sockets/DataEntities.razor b/src/BootstrapBlazor.Server/Components/Samples/Sockets/DataEntities.razor
@@ -75,12 +75,16 @@
     }
 }</Pre>
     <p>此处返回值会与参数 <code>Type = typeof(Foo)</code> 做数据合规检查，如果返回值无法转换为指定 <code>Type</code> 时不进行赋值操作，代码逻辑如下</p>
-    <Pre>var attr = p.GetCustomAttribute&lt;DataPropertyConverterAttribute&gt;(false) ?? GetPropertyConverterAttribute(p);
+    <Pre>var attr = p.GetCustomAttribute&lt;DataPropertyConverterAttribute&gt;(false);
 if (attr is { Type: not null })
 {
     var value = attr.ConvertTo(data);
     var valueType = value?.GetType();
-    if (p.PropertyType.IsAssignableFrom(valueType))
+    if (value == null && IsNullable(p.PropertyType))
+    {
+        p.SetValue(entity, null);
+    }
+    else if (p.PropertyType.IsAssignableFrom(valueType))
     {
         p.SetValue(entity, value);
     }
diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json
@@ -2121,7 +2121,7 @@
     "OnSelectedItemChangedTitle": "OnSelectedItemChanged",
     "OnSelectedItemChangedIntro": "Click the dropdown item or <kbd>Enter</kbd> trigger the callback",
     "OnValueChanged": "Callback for the Value changed",
-    "NormalDescription": "In this example, type 123 strings to display the viewing effect, automatically give the component initialization to the auto-prompt dataset, and the dataset does not change",
+    "NormalDescription": "In this example, type 123 strings to display the viewing effect, automatically give the component initialization to the auto-prompt dataset, and the dataset does not change. Enable the clear button by setting <code>IsClearable</code>",
     "LikeMatchDescription": "In this example, type the abc string to display the viewing effect and select all matches in the collection that contain abc and have the same case",
     "NoDataTipDescription": "In this example, type 567 strings because the autocomplete information center does not display custom prompt information - <code>the data you want is not found</code>",
     "NoDataTip": "There is nothing",
diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json
@@ -2121,7 +2121,7 @@
     "OnSelectedItemChangedTitle": "下拉菜单选选中回调",
     "OnSelectedItemChangedIntro": "点击下拉菜单或者 <kbd>Enter</kbd> 回车时触发此回调方法",
     "OnValueChanged": "Value 改变时回调方法",
-    "NormalDescription": "本例中请键入 123 字符串显示查看效果，自动完成组件初始化时给了自动提示数据集并且数据集无变化",
+    "NormalDescription": "本例中请键入 123 字符串显示查看效果，自动完成组件初始化时给了自动提示数据集并且数据集无变化，通过设置 <code>IsClearable</code> 开启清空小按钮",
     "LikeMatchDescription": "本例中请键入 123 字符串显示查看效果，自动完成组件初始化时给了自动提示数据集并且数据集无变化",
     "NoDataTipDescription": "本例中请键入 567 字符串由于自动完成信息中心无数据显示自定义提示信息 - <code>没有找到你想要的数据</code>",
     "NoDataTip": "没有找到你想要的数据",
diff --git a/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor b/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor
@@ -5,7 +5,7 @@
 {
     <BootstrapLabel required="@Required" for="@InputId" ShowLabelTooltip="ShowLabelTooltip" Value="@DisplayText"/>
 }
-<div class="auto-complete" id="@Id">
+<div class="@ClassString" id="@Id">
     <input @attributes="AdditionalAttributes" id="@InputId" class="@ClassName" autocomplete="off" type="text"
            data-bs-toggle="@ToggleString" data-bs-placement="@PlacementString"
            data-bs-offset="@OffsetString" data-bs-custom-class="@CustomClassString"
@@ -15,6 +15,10 @@
            placeholder="@PlaceHolder" disabled="@Disabled" @ref="FocusElement"/>
     <span class="form-select-append"><i class="@Icon"></i></span>
     <span class="form-select-append ac-loading"><i class="@LoadingIcon"></i></span>
+    @if (GetClearable())
+    {
+        <span class="@ClearClassString"><i class="@ClearIcon"></i></span>
+    }
     <RenderTemplate @ref="_dropdown">
         @RenderDropdown
     </RenderTemplate>
diff --git a/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs b/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs
@@ -68,6 +68,19 @@ public partial class AutoComplete
     [Parameter]
     public bool ShowNoDataTip { get; set; } = true;
 
+    /// <summary>
+    /// Gets or sets whether the select component is clearable. Default is false.
+    /// </summary>
+    [Parameter]
+    public bool IsClearable { get; set; }
+
+    /// <summary>
+    /// Gets or sets the right-side clear icon. Default is fa-solid fa-angle-up.
+    /// </summary>
+    [Parameter]
+    [NotNull]
+    public string? ClearIcon { get; set; }
+
     /// <summary>
     /// IStringLocalizer service instance
     /// </summary>
@@ -85,6 +98,19 @@ public partial class AutoComplete
     [NotNull]
     private RenderTemplate? _dropdown = null;
 
+    private string? ClassString => CssBuilder.Default("auto-complete")
+        .AddClass("is-clearable", IsClearable)
+        .Build();
+
+    /// <summary>
+    /// Gets the clear icon class string.
+    /// </summary>
+    private string? ClearClassString => CssBuilder.Default("clear-icon")
+        .AddClass($"text-{Color.ToDescriptionString()}", Color != Color.None)
+        .AddClass($"text-success", IsValid.HasValue && IsValid.Value)
+        .AddClass($"text-danger", IsValid.HasValue && !IsValid.Value)
+        .Build();
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -117,6 +143,7 @@ protected override void OnParametersSet()
         PlaceHolder ??= Localizer[nameof(PlaceHolder)];
         Icon ??= IconTheme.GetIconByKey(ComponentIcons.AutoCompleteIcon);
         LoadingIcon ??= IconTheme.GetIconByKey(ComponentIcons.LoadingIcon);
+        ClearIcon ??= IconTheme.GetIconByKey(ComponentIcons.SelectClearIcon);
     }
 
     /// <summary>
@@ -125,6 +152,12 @@ protected override void OnParametersSet()
     /// <returns></returns>
     protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Interop, Value);
 
+    /// <summary>
+    /// Gets whether show the clear button.
+    /// </summary>
+    /// <returns></returns>
+    private bool GetClearable() => IsClearable && !IsDisabled;
+
     /// <summary>
     /// Callback method when a candidate item is clicked
     /// </summary>
diff --git a/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.js b/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.js
@@ -133,6 +133,11 @@ export function init(id, invoke) {
         EventHandler.on(document, 'click', ac.closePopover);
         EventHandler.on(document, 'keyup', ac.keyup);
     });
+
+    EventHandler.on(el, 'click', '.clear-icon', e => {
+        input.value = '';
+        invoke.invokeMethodAsync('TriggerFilter', '');
+    });
 }
 
 const handlerKeyup = (ac, e) => {
@@ -188,7 +193,7 @@ export function dispose(id) {
     Data.remove(id)
 
     if (ac) {
-        const { popover, input, menu } = ac;
+        const { el, popover, input, menu } = ac;
         if (popover) {
             Popover.dispose(popover)
             if (input) {
@@ -198,6 +203,8 @@ export function dispose(id) {
         EventHandler.off(menu, 'click');
         EventHandler.off(input, 'keyup');
         Input.dispose(input);
+
+        EventHandler.off(el, 'click');
     }
 
     const { AutoComplete } = window.BootstrapBlazor;
diff --git a/src/BootstrapBlazor/Components/Select/SelectObject.razor.cs b/src/BootstrapBlazor/Components/Select/SelectObject.razor.cs
@@ -79,7 +79,7 @@ public partial class SelectObject<TItem>
     /// </summary>
     private string? ClassName => CssBuilder.Default("select select-object dropdown")
         .AddClass("disabled", IsDisabled)
-        .AddClass("cls", IsClearable)
+        .AddClass("is-clearable", IsClearable)
         .AddClassFromAttributes(AdditionalAttributes)
         .Build();
 
diff --git a/src/BootstrapBlazor/Components/Select/SelectTable.razor.cs b/src/BootstrapBlazor/Components/Select/SelectTable.razor.cs
@@ -96,7 +96,7 @@ namespace BootstrapBlazor.Components;
     /// </summary>
     private string? ClassName => CssBuilder.Default("select select-table dropdown")
         .AddClass("disabled", IsDisabled)
-        .AddClass("cls", IsClearable)
+        .AddClass("is-clearable", IsClearable)
         .AddClassFromAttributes(AdditionalAttributes)
         .Build();
 
diff --git a/src/BootstrapBlazor/Components/SelectGeneric/MultiSelectGeneric.razor b/src/BootstrapBlazor/Components/SelectGeneric/MultiSelectGeneric.razor
@@ -23,7 +23,7 @@
                     if (ShowCloseButton)
                     {
                         <div class="multi-select-item-group">
-                            <DynamicElement TagName="span" class="multi-select-close"
+                            <DynamicElement TagName="span" class="multi-select-close" data-bb-val="@GetValueString(item)"
                                             TriggerClick="@(!IsPopover)" OnClick="() => ToggleRow(item)">
                                 <i class="@CloseButtonIcon"></i>
                             </DynamicElement>
@@ -127,7 +127,7 @@
 
 @code {
     RenderFragment<SelectedItem<TValue>> RenderRow => item =>
-    @<DynamicElement OnClick="() => ToggleRow(item)" TriggerClick="@CheckCanTrigger(item)" class="@GetItemClassString(item)">
+    @<DynamicElement OnClick="() => ToggleItem(item)" TriggerClick="@CheckCanTrigger(item)" class="@GetItemClassString(item)">
         <div class="multi-select-item">
             <div class="form-check">
                 <input class="form-check-input" type="checkbox" disabled="@CheckCanSelect(item)" checked="@GetCheckedString(item)" />
diff --git a/src/BootstrapBlazor/Components/SelectGeneric/MultiSelectGeneric.razor.cs b/src/BootstrapBlazor/Components/SelectGeneric/MultiSelectGeneric.razor.cs
@@ -385,7 +385,7 @@ public async Task ConfirmSelectedItem(int index)
         var rows = Rows;
         if (index < rows.Count)
         {
-            await ToggleRow(rows[index]);
+            await ToggleItem(rows[index]);
             StateHasChanged();
         }
     }
@@ -395,28 +395,45 @@ public async Task ConfirmSelectedItem(int index)
     /// </summary>
     /// <returns></returns>
     [JSInvokable]
-    public async Task ToggleRow(SelectedItem<TValue> val)
+    public async Task ToggleRow(string val)
     {
-        if (!IsDisabled)
+        if (int.TryParse(val, out var index) && index >= 0 && index < SelectedItems.Count)
         {
-            var item = SelectedItems.FirstOrDefault(i => Equals(i.Value, val.Value));
-            if (item != null)
-            {
-                SelectedItems.Remove(item);
-            }
-            else
+            var item = SelectedItems[index];
+            await ToggleRow(item);
+        }
+    }
+
+    private async Task ToggleRow(SelectedItem<TValue> item)
+    {
+        SelectedItems.Remove(item);
+
+        _isToggle = true;
+        // 更新选中值
+        await SetValue();
+    }
+
+    private string? GetValueString(SelectedItem<TValue> item) => IsPopover ? SelectedItems.IndexOf(item).ToString() : null;
+
+    private async Task ToggleItem(SelectedItem<TValue> val)
+    {
+        var item = SelectedItems.FirstOrDefault(i => Equals(i.Value, val.Value));
+        if (item != null)
+        {
+            SelectedItems.Remove(item);
+        }
+        else
+        {
+            var d = Rows.FirstOrDefault(i => Equals(i.Value, val.Value));
+            if (d != null)
             {
-                var d = Rows.FirstOrDefault(i => Equals(i.Value, val.Value));
-                if (d != null)
-                {
-                    SelectedItems.Add(d);
-                }
+                SelectedItems.Add(d);
             }
-
-            _isToggle = true;
-            // 更新选中值
-            await SetValue();
         }
+
+        _isToggle = true;
+        // 更新选中值
+        await SetValue();
     }
 
     private int _min;
diff --git a/test/UnitTest/Components/AutoCompleteTest.cs b/test/UnitTest/Components/AutoCompleteTest.cs
@@ -54,6 +54,35 @@ public void Value_Ok()
         Assert.Equal(2, menus.Count);
     }
 
+    [Fact]
+    public void IsClearable_Ok()
+    {
+        var cut = Context.RenderComponent<AutoComplete>();
+        Assert.DoesNotContain("clear-icon", cut.Markup);
+
+        cut.SetParametersAndRender(pb => pb.Add(a => a.IsClearable, true));
+        cut.Contains("clear-icon");
+
+        // Color
+        cut.SetParametersAndRender(pb => pb.Add(a => a.Color, Color.Danger));
+        cut.Contains("clear-icon text-danger");
+
+        // 反射 Validate
+        var classStringProperty = cut.Instance.GetType().GetProperty("ClearClassString", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+        Assert.NotNull(classStringProperty);
+
+        var validProperty = cut.Instance.GetType().GetProperty("IsValid", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+        Assert.NotNull(validProperty);
+
+        validProperty.SetValue(cut.Instance, true);
+        var validClassString = classStringProperty.GetValue(cut.Instance);
+        Assert.Equal("clear-icon text-danger text-success", validClassString);
+
+        validProperty.SetValue(cut.Instance, false);
+        validClassString = classStringProperty.GetValue(cut.Instance);
+        Assert.Equal("clear-icon text-danger text-danger", validClassString);
+    }
+
     [Fact]
     public void Debounce_Ok()
     {

Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,16 @@`
`75`	`75`	`}`
`76`	`76`	`}</Pre>`
`77`	`77`	`<p>此处返回值会与参数 <code>Type = typeof(Foo)</code> 做数据合规检查，如果返回值无法转换为指定 <code>Type</code> 时不进行赋值操作，代码逻辑如下</p>`
`78`		`- <Pre>var attr = p.GetCustomAttribute<DataPropertyConverterAttribute>(false) ?? GetPropertyConverterAttribute(p);`
	`78`	`+ <Pre>var attr = p.GetCustomAttribute<DataPropertyConverterAttribute>(false);`
`79`	`79`	`if (attr is { Type: not null })`
`80`	`80`	`{`
`81`	`81`	`var value = attr.ConvertTo(data);`
`82`	`82`	`var valueType = value?.GetType();`
`83`		`- if (p.PropertyType.IsAssignableFrom(valueType))`
	`83`	`+ if (value == null && IsNullable(p.PropertyType))`
	`84`	`+ {`
	`85`	`+ p.SetValue(entity, null);`
	`86`	`+ }`
	`87`	`+ else if (p.PropertyType.IsAssignableFrom(valueType))`
`84`	`88`	`{`
`85`	`89`	`p.SetValue(entity, value);`
`86`	`90`	`}`