Merge branch 'main' into refactor-table

Author: ArgoZhang

.fork/custom-commands.json

@@ -0,0 +1,32 @@
+[
+  {
+    "version" : 2
+  },
+  {
+    "action" : {
+      "script" : "git branch -d localBranchName\ngit push gitee.com --delete refs/heads/${ref}",
+      "showOutput" : false,
+      "type" : "sh",
+      "waitForExit" : true
+    },
+    "name" : "Delete All Branch",
+    "refTargets" : [
+      "localbranch",
+      "remotebranch"
+    ],
+    "target" : "ref"
+  },
+  {
+    "action" : {
+      "script" : "git push origin ${ref}\ngit push gitee.com ${ref}",
+      "showOutput" : false,
+      "type" : "sh",
+      "waitForExit" : true
+    },
+    "name" : "Push All Branch",
+    "refTargets" : [
+      "localbranch"
+    ],
+    "target" : "ref"
+  }
+]

.github/workflows/build.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    
+
     steps:
     - uses: actions/checkout@v4
 
@@ -20,7 +20,7 @@ jobs:
         dotnet-version: 9.0.x
 
     - name: Build
-      env: 
+      env:
         NUGET_API_KEY: ${{secrets.NUGET_API_KEY}}
         Bundle: True
       run: |
@@ -35,3 +35,11 @@ jobs:
       uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
+
+    - name: Check Router
+      run: |
+        dotnet test test/UnitTestDocs
+
+    - name: Check Localizer
+      run: |
+        dotnet test test/UnitTest.Localization

.github/workflows/close-stale-issues.yml

@@ -67,7 +67,7 @@
         <div class="d-flex">
             <div class="flex-fill">
                 <p>一套基于 <b>Bootstrap</b> 样式的企业级 <b>Blazor UI</b> 组件库，支持 Server 与 WebAssembly</p>
-                <p>适配移动端支持各种主流浏览器以及移动端，适配 <b>ABP</b>，同时支持 <b>NET6/NET7/NET8</b></p>
+                <p>适配移动端支持各种主流浏览器以及移动端，适配 <b>ABP</b>，同时支持 <b>NET6/NET7/NET8/NET9</b></p>
                 <p></p>
                 <div>已提供项目模板方便快速上手 <a class="connection-link" href="@TemplateUrl" target="_blank">项目模板</a></div>
             </div>

src/BootstrapBlazor.Server/Components/Components/BlazorReconnector.razor

@@ -1,50 +1,10 @@
 @inherits FilterBase
 
-<Select Items="@Items" @bind-Value="@Value" OnSelectedItemChanged="_ => OnFilterValueChanged()"></Select>
+@if (IsHeaderRow)
+{
 
-@code {
-    private int Value = 10;
-
-    /// <summary>
-    /// OnInitialized 方法
-    /// </summary>
-    protected override void OnInitialized()
-    {
-        base.OnInitialized();
-
-        if (TableFilter != null) TableFilter.ShowMoreButton = false;
-
-        Items = new SelectedItem[]
-        {
-            new SelectedItem { Value = "10", Text = "大于 10" },
-            new SelectedItem { Value = "50", Text = "大于 50" },
-            new SelectedItem { Value = "100", Text = "大于 100" }
-        };
-    }
-
-    /// <summary>
-    /// 重置过滤条件方法
-    /// </summary>
-    public override void Reset()
-    {
-        Value = 10;
-
-        StateHasChanged();
-    }
-
-    /// <summary>
-    /// 生成过滤条件方法
-    /// </summary>
-    /// <returns></returns>
-    public override FilterKeyValueAction GetFilterConditions()
-    {
-        var filter = new FilterKeyValueAction() { Filters = new() };
-        filter.Filters.Add(new FilterKeyValueAction()
-        {
-            FieldKey = FieldKey,
-            FieldValue = Value,
-            FilterAction = FilterAction.GreaterThan
-        });
-        return filter;
-    }
+}
+else
+{
+    <Select Items="@_items" @bind-Value="@Value"></Select>
 }

src/BootstrapBlazor.Server/Components/Components/CustomerFilter.razor

@@ -0,0 +1,50 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License
+// See the LICENSE file in the project root for more information.
+// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Server.Components.Components;
+
+/// <summary>
+/// 
+/// </summary>
+public partial class CustomerFilter
+{
+    private int? Value;
+
+    private readonly IEnumerable<SelectedItem> _items = new SelectedItem[]
+    {
+        new() { Value = "", Text = "请选择 ..." },
+        new() { Value = "10", Text = "大于 10" },
+        new() { Value = "50", Text = "大于 50" },
+        new() { Value = "80", Text = "大于 80" }
+    };
+
+    /// <summary>
+    /// 重置过滤条件方法
+    /// </summary>
+    public override void Reset()
+    {
+        Value = null;
+        StateHasChanged();
+    }
+
+    /// <summary>
+    /// 生成过滤条件方法
+    /// </summary>
+    /// <returns></returns>
+    public override FilterKeyValueAction GetFilterConditions()
+    {
+        var filter = new FilterKeyValueAction();
+        if (Value != null)
+        {
+            filter.Filters.Add(new FilterKeyValueAction()
+            {
+                FieldKey = FieldKey,
+                FieldValue = Value.Value,
+                FilterAction = FilterAction.GreaterThan
+            });
+        }
+        return filter;
+    }
+}

src/BootstrapBlazor.Server/Components/Components/CustomerFilter.razor.cs

@@ -224,7 +224,7 @@
 
 <DemoBlock Title="@Localizer["ClearableTitle"]"
            Introduction="@Localizer["ClearableIntro"]"
-           Name="OnInput">
+           Name="IsClearable">
     <div class="row g-3">
         <div class="col-12 col-sm-6">
             <BootstrapInput Value="Model.Name" IsClearable="true" ShowLabel="true" DisplayText="Clearable" />

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

@@ -24,6 +24,10 @@ private MessageService? MessageService { get; set; }
     <Message @ref="Message" Placement="Placement.Bottom" />
 </DemoBlock>
 
+<DemoBlock Title="@Localizer["MessagesAsyncTitle"]" Introduction="@Localizer["MessagesAsyncIntro"]" Name="Async">
+    <Button IsAsync="true" OnClick="@ShowAsyncMessage" Text="@Localizer["MessagesAsyncText"]"></Button>
+</DemoBlock>
+
 <DemoBlock Title="@Localizer["MessagesIconTitle"]" Introduction="@Localizer["MessagesIconIntro"]" Name="Icon">
     <button class="btn btn-primary" @onclick="@ShowIconMessage">@Localizer["MessagesMessagePrompt"]</button>
 </DemoBlock>

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

@@ -16,6 +16,8 @@ public sealed partial class Messages
     [NotNull]
     private Message? Message1 { get; set; }
 
+    private readonly MessageOption _option = new();
+
     private async Task ShowMessage()
     {
         Message.SetPlacement(Placement.Top);
@@ -25,6 +27,28 @@ await MessageService.Show(new MessageOption()
         });
     }
 
+    private async Task ShowAsyncMessage()
+    {
+        _option.ForceDelay = true;
+        _option.IsAutoHide = false;
+        _option.Delay = 3000;
+        _option.Content = Localizer["MessagesAsyncDemoStep1Text"];
+        _option.Color = Color.Info;
+        await MessageService.Show(_option);
+
+        await Task.Delay(3000);
+        _option.Content = Localizer["MessagesAsyncDemoStep2Text"];
+        _option.IsAutoHide = true;
+        _option.Color = Color.Info;
+        await MessageService.Show(_option);
+
+        await Task.Delay(2000);
+        _option.Content = Localizer["MessagesAsyncDemoStep3Text"];
+        _option.Color = Color.Success;
+
+        await MessageService.Show(_option);
+    }
+
     private async Task ShowIconMessage()
     {
         await MessageService.Show(new MessageOption()

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

@@ -97,7 +97,7 @@
                 <div class="d-flex">
                     <div class="flex-fill">
                         <p>基于 <b>Bootstrap</b> 样式的 <b>Blazor UI</b> 组件库</p>
-                        <p>适配移动端支持各种主流浏览器，适配 <b>ABP</b>，同时支持 <b>NET6/NET7/NET8</b>，交流群 <b>795206915</b></p>
+                        <p>适配移动端支持各种主流浏览器，适配 <b>ABP</b>，同时支持 <b>NET6/NET7/NET8/NET9</b>，交流群 <b>795206915</b></p>
                         <p>已提供项目模板方便快速上手 <a class="connection-link" href="@TemplateUrl">项目模板</a></p>
                     </div>
                     <div class="connection-body-tail d-none d-sm-block"></div>
@@ -126,7 +126,7 @@
                 &lt;div class="d-flex"&gt;
                     &lt;div class="flex-fill"&gt;
                         &lt;div class="mb-2"&gt;基于 &lt;b&gt;Bootstrap&lt;/b&gt; 样式的 &lt;b&gt;Blazor UI&lt;/b&gt; 组件库&lt;/div&gt;
-                        &lt;div class="mb-2"&gt;适配移动端支持各种主流浏览器，适配 &lt;b&gt;ABP&lt;/b&gt;，同时支持 &lt;b&gt;NET6/NET7/NET8&lt;/b&gt;，交流群 &lt;b&gt;795206915&lt;/b&gt;&lt;/div&gt;
+                        &lt;div class="mb-2"&gt;适配移动端支持各种主流浏览器，适配 &lt;b&gt;ABP&lt;/b&gt;，同时支持 &lt;b&gt;NET6/NET7/NET8/NET9&lt;/b&gt;，交流群 &lt;b&gt;795206915&lt;/b&gt;&lt;/div&gt;
                         &lt;div&gt;已提供项目模板方便快速上手 &lt;a class="connection-link" href="@TemplateUrl"&gt;项目模板&lt;/a&gt;&lt;/div&gt;
                     &lt;/div&gt;
                     &lt;div class="connection-body-tail d-none d-sm-block"&gt;&lt;/div&gt;
@@ -187,7 +187,7 @@
                 &lt;div class="d-flex"&gt;
                     &lt;div class="flex-fill"&gt;
                         &lt;div class="mb-2"&gt;基于 &lt;b&gt;Bootstrap&lt;/b&gt; 样式的 &lt;b&gt;Blazor UI&lt;/b&gt; 组件库&lt;/div&gt;
-                        &lt;div class="mb-2"&gt;适配移动端支持各种主流浏览器，适配 &lt;b&gt;ABP&lt;/b&gt;，同时支持 &lt;b&gt;NET6/NET7/NET8&lt;/b&gt;，交流群 &lt;b&gt;795206915&lt;/b&gt;&lt;/div&gt;
+                        &lt;div class="mb-2"&gt;适配移动端支持各种主流浏览器，适配 &lt;b&gt;ABP&lt;/b&gt;，同时支持 &lt;b&gt;NET6/NET7/NET8/NET9&lt;/b&gt;，交流群 &lt;b&gt;795206915&lt;/b&gt;&lt;/div&gt;
                         &lt;div&gt;已提供项目模板方便快速上手 &lt;a class="connection-link" href="@TemplateUrl"&gt;项目模板&lt;/a&gt;&lt;/div&gt;
                     &lt;/div&gt;
                     &lt;div class="connection-body-tail d-none d-sm-block"&gt;&lt;/div&gt;
@@ -248,7 +248,7 @@
                 &lt;div class="d-flex"&gt;
                     &lt;div class="flex-fill"&gt;
                         &lt;div class="mb-2"&gt;基于 &lt;b&gt;Bootstrap&lt;/b&gt; 样式的 &lt;b&gt;Blazor UI&lt;/b&gt; 组件库&lt;/div&gt;
-                        &lt;div class="mb-2"&gt;适配移动端支持各种主流浏览器，适配 &lt;b&gt;ABP&lt;/b&gt;，同时支持 &lt;b&gt;NET6/NET7/NET8&lt;/b&gt;，交流群 &lt;b&gt;795206915&lt;/b&gt;&lt;/div&gt;
+                        &lt;div class="mb-2"&gt;适配移动端支持各种主流浏览器，适配 &lt;b&gt;ABP&lt;/b&gt;，同时支持 &lt;b&gt;NET6/NET7/NET8/NET9&lt;/b&gt;，交流群 &lt;b&gt;795206915&lt;/b&gt;&lt;/div&gt;
                         &lt;div&gt;已提供项目模板方便快速上手 &lt;a class="connection-link" href="@TemplateUrl"&gt;项目模板&lt;/a&gt;&lt;/div&gt;
                     &lt;/div&gt;
                     &lt;div class="connection-body-tail d-none d-sm-block"&gt;&lt;/div&gt;