Merge branch 'test-pr' into dev-tiansfather

# Conflicts:
#	src/BootstrapBlazor/Extensions/ITableColumnExtensions.cs

Co-authored-by: chengKun <[email protected]>
Co-authored-by: Frost Autumn <[email protected]>

Author: 3 people

src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj

@@ -47,11 +47,11 @@
     <PackageReference Include="BootstrapBlazor.Markdown" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.MaterialDesign" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.MaterialDesign.Extensions" Version="9.0.0" />
-    <PackageReference Include="BootstrapBlazor.MeiliSearch" Version="9.0.8" />
+    <PackageReference Include="BootstrapBlazor.MeiliSearch" Version="9.0.10" />
     <PackageReference Include="BootstrapBlazor.Mermaid" Version="9.0.2" />
     <PackageReference Include="BootstrapBlazor.MindMap" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.MouseFollower" Version="9.0.1" />
-    <PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.0" />
+    <PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.PdfReader" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.Player" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.SignaturePad" Version="9.0.0" />

src/BootstrapBlazor.Server/Components/Components/CultureChooser.razor.css

@@ -14,7 +14,7 @@
     }
 
     .culture-selector ::deep .select {
-        width: 210px;
+        width: var(--bb-header-select-width);
     }
 
 ::deep .form-control {

src/BootstrapBlazor.Server/Components/Components/Header.razor.css

@@ -63,6 +63,11 @@
         border-radius: var(--bs-border-radius);
     }
 
+::deep .bb-g-search {
+    width: var(--bb-header-select-width);
+    margin-bottom: var(--bb-header-search-margin-bottom);
+}
+
 @media (min-width: 768px) {
     .navbar-header {
         position: sticky;

src/BootstrapBlazor.Server/Components/Components/RebootCountDown.razor

@@ -1,3 +1,3 @@
 <div class="bb-reboot-clock">
-    <FlipClock ViewMode="FlipClockViewMode.CountDown" ShowHour="false" StartValue="TimeSpan.FromMinutes(2)"></FlipClock>
+    <FlipClock ViewMode="FlipClockViewMode.CountDown" ShowHour="false" StartValue="TimeSpan.FromSeconds(140)"></FlipClock>
 </div>

src/BootstrapBlazor.Server/Components/Pages/Localization.razor

@@ -240,8 +240,8 @@ public class CultureController : Controller
         // @Localizer["N49"]
         options.AdditionalJsonFiles = new string[]
         {
-            @@"D:\Argo\src\BootstrapBlazor\src\BootstrapBlazor.Shared\Locales\zh-TW.json",
-            @@"D:\Argo\src\BootstrapBlazor\src\BootstrapBlazor.Shared\Locales\zh-CN.json"
+            @@"D:\Argo\src\BootstrapBlazor\src\BootstrapBlazor.Server\Locales\zh-TW.json",
+            @@"D:\Argo\src\BootstrapBlazor\src\BootstrapBlazor.Server\Locales\zh-CN.json"
         };
     });
 }

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

@@ -13,7 +13,7 @@ public sealed partial class Cascaders
     /// <summary>
     /// Foo 类为Demo测试用，如有需要请自行下载源码查阅
     /// Foo class is used for Demo test, please download the source code if necessary
-    /// https://gitee.com/LongbowEnterprise/BootstrapBlazor/blob/main/src/BootstrapBlazor.Shared/Data/Foo.cs
+    /// https://gitee.com/LongbowEnterprise/BootstrapBlazor/blob/main/src/BootstrapBlazor.Server/Data/Foo.cs
     /// </summary>
     private Foo Model { get; set; } = new Foo();
 

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

@@ -120,6 +120,19 @@
     </ValidateForm>
 </DemoBlock>
 
+<DemoBlock Title="@Localizer["GenericTitle"]" Introduction="@Localizer["GenericIntro"]" Name="Generic">
+    <CheckboxListGeneric @bind-Value="@_selectedFoos" Items="@GenericItems" />
+    <section ignore>
+        @if (_selectedFoos != null)
+        {
+            foreach (var item in _selectedFoos)
+            {
+                <div>@item.Name</div>
+            }
+        }
+    </section>
+</DemoBlock>
+
 <AttributeTable Items="@GetAttributes()" />
 
 <EventTable Items="@GetEvents()" />

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

@@ -37,6 +37,11 @@ public partial class CheckboxLists
     [NotNull]
     private IEnumerable<SelectedItem>? Items5 { get; set; }
 
+    [NotNull]
+    private IEnumerable<SelectedItem<Foo>>? GenericItems { get; set; }
+
+    private List<Foo>? _selectedFoos;
+
     /// <summary>
     /// OnInitialized method
     /// </summary>
@@ -89,6 +94,22 @@ protected override void OnInitialized()
         FooItems = Foo.GenerateHobbies(LocalizerFoo);
     }
 
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    /// <returns></returns>
+    protected override async Task OnInitializedAsync()
+    {
+        await base.OnInitializedAsync();
+
+        GenericItems = new List<SelectedItem<Foo>>()
+        {
+            new() { Text = Localizer["item1"], Value = new Foo() { Name = LocalizerFoo["Foo.Name", "001"] } },
+            new() { Text = Localizer["item2"], Value = new Foo() { Name = LocalizerFoo["Foo.Name", "002"] } },
+            new() { Text = Localizer["item3"], Value = new Foo() { Name = LocalizerFoo["Foo.Name", "003"] } },
+        };
+    }
+
     [NotNull]
     private Foo? Model { get; set; }
 

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

@@ -13,7 +13,7 @@ public partial class ColorPickers
     /// <summary>
     /// Foo 类为Demo测试用，如有需要请自行下载源码查阅
     /// Foo class is used for Demo test, please download the source code if necessary
-    /// https://gitee.com/LongbowEnterprise/BootstrapBlazor/blob/main/src/BootstrapBlazor.Shared/Data/Foo.cs
+    /// https://gitee.com/LongbowEnterprise/BootstrapBlazor/blob/main/src/BootstrapBlazor.Server/Data/Foo.cs
     /// </summary>
     [NotNull]
     private Foo? Dummy { get; set; } = new Foo() { Name = "#DDDDDD" };

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

@@ -114,7 +114,7 @@ protected override void OnInitialized()
     /// <summary>
     /// Foo 类为Demo测试用，如有需要请自行下载源码查阅
     /// Foo class is used for Demo test, please download the source code if necessary
-    /// https://gitee.com/LongbowEnterprise/BootstrapBlazor/blob/main/src/BootstrapBlazor.Shared/Data/Foo.cs
+    /// https://gitee.com/LongbowEnterprise/BootstrapBlazor/blob/main/src/BootstrapBlazor.Server/Data/Foo.cs
     /// </summary>
     private class ValidateFormRangeFoo : Foo
     {