doc(Safari): add theme color for safari on mac (#4909)

A5196060 · ArgoZhang · j4587698 · web-flow · commit 6832424627c9 · 2024-12-21T22:50:46.000+08:00
* doc: 增加主题色

* refactor: 更新颜色

* refactor: 更新位置

* refactor: 变量名变更

* refactor: 重构代码

* refactor: 调整可为空

---------

Signed-off-by: A5196060 &lt;166673003+A5196060@users.noreply.github.com&gt;
Co-authored-by: A5196060 &lt;166673003+A5196060@users.noreply.github.com&gt;
Co-authored-by: Argo-AsicoTech &lt;argo@live.ca&gt;
Co-authored-by: j4587698 &lt;zhuce@jvxiang.com&gt;
Co-authored-by: Mr Lu &lt;ghi.ghi@163.com&gt;
diff --git a/src/BootstrapBlazor.Server/Components/App.razor b/src/BootstrapBlazor.Server/Components/App.razor
@@ -6,14 +6,14 @@
 <html lang="en" data-bs-theme='light'>
 
 <head>
-    <meta name="theme-color" content="#712cf9">
     <meta charset="utf-8" />
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="keywords" content="bootstrapblazor,bootstrap,blazor,wasm,webassembly,UI,netcore,web,assembly">
     <meta name="description" content="基于 Bootstrap 风格的 Blazor UI 组件库，用于研发企业级中后台产品。">
     <meta name="author" content="argo (argo@live.ca)">
+    <meta name="theme-color" content="#712cf9">
     <title>@Localizer["SiteTitle"]</title>
     <base href="/" />
     <link rel="icon" href="favicon.ico" type="image/x-icon">
diff --git a/src/BootstrapBlazor/Components/Checkbox/CheckboxListGeneric.razor b/src/BootstrapBlazor/Components/Checkbox/CheckboxListGeneric.razor
@@ -1,6 +1,6 @@
 ﻿@namespace BootstrapBlazor.Components
 @typeparam TValue
-@inherits ValidateBase<List<TValue?>>
+@inherits ValidateBase<List<TValue>>
 
 @if (IsShowLabel)
 {
@@ -29,7 +29,7 @@ else
                 <Checkbox TValue="bool" IsDisabled="GetDisabledState(item)"
                           ShowAfterLabel="true" ShowLabel="false" ShowLabelTooltip="ShowLabelTooltip"
                           DisplayText="@item.Text" OnBeforeStateChanged="_onBeforeStateChangedCallback!"
-                          Value="@item.Active" OnStateChanged="@((state, v) => OnStateChanged(item, v))"></Checkbox>
+                          Value="@item.Active" OnStateChanged="@((_, v) => OnStateChanged(item, v))"></Checkbox>
             </div>
         }
     </div>
diff --git a/src/BootstrapBlazor/Components/Checkbox/CheckboxListGeneric.razor.cs b/src/BootstrapBlazor/Components/Checkbox/CheckboxListGeneric.razor.cs
@@ -25,7 +25,7 @@ public partial class CheckboxListGeneric<TValue> : IModelEqualityComparer<TValue
     /// <summary>
     /// 获得 组件内部 Checkbox 项目样式
     /// </summary>
-    protected string? CheckboxItemClassString => CssBuilder.Default("checkbox-item")
+    private string? CheckboxItemClassString => CssBuilder.Default("checkbox-item")
         .AddClass(CheckboxItemClass)
         .Build();
 
@@ -97,7 +97,7 @@ public partial class CheckboxListGeneric<TValue> : IModelEqualityComparer<TValue
     /// 获得/设置 SelectedItemChanged 方法
     /// </summary>
     [Parameter]
-    public Func<IEnumerable<SelectedItem<TValue>>, List<TValue?>, Task>? OnSelectedChanged { get; set; }
+    public Func<IEnumerable<SelectedItem<TValue>>, List<TValue>, Task>? OnSelectedChanged { get; set; }
 
     /// <summary>
     /// 获得/设置 最多选中数量
@@ -204,23 +204,23 @@ private async Task<bool> OnBeforeStateChanged(CheckboxState state)
     private async Task OnStateChanged(SelectedItem<TValue> item, bool v)
     {
         item.Active = v;
-        var vals = new List<TValue?>();
+        var items = new List<TValue>();
         if (Value != null)
         {
-            vals.AddRange(Value);
+            items.AddRange(Value);
         }
 
-        var val = vals.Find(i => IsEquals(item.Value));
+        var val = items.Find(i => Equals(item.Value, i));
         if (v && val == null)
         {
-            vals.Add(item.Value);
+            items.Add(item.Value);
         }
         else
         {
-            vals.Remove(val);
+            items.Remove(val!);
         }
 
-        CurrentValue = vals;
+        CurrentValue = items;
 
         if (OnSelectedChanged != null)
         {
diff --git a/src/BootstrapBlazor/Components/Radio/RadioListGeneric.razor.cs b/src/BootstrapBlazor/Components/Radio/RadioListGeneric.razor.cs
@@ -120,7 +120,7 @@ protected override void OnParametersSet()
         var t = NullableUnderlyingType ?? typeof(TValue);
         if (t.IsEnum && Items == null)
         {
-            Items = t.ToSelectList<TValue>((NullableUnderlyingType != null && IsAutoAddNullItem) ? new SelectedItem<TValue>(default, NullItemText) : null);
+            Items = t.ToSelectList<TValue>((NullableUnderlyingType != null && IsAutoAddNullItem) ? new SelectedItem<TValue>(default!, NullItemText) : null);
         }
 
         Items ??= [];
diff --git a/src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor.cs b/src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor.cs
@@ -566,7 +566,7 @@ private async Task OnChange(ChangeEventArgs args)
 
             if (item == null)
             {
-                TValue? val = default;
+                TValue val = default!;
                 if (TextConvertToValueCallback != null)
                 {
                     val = await TextConvertToValueCallback(v);
diff --git a/src/BootstrapBlazor/Components/SelectGeneric/SelectOptionGeneric.cs b/src/BootstrapBlazor/Components/SelectGeneric/SelectOptionGeneric.cs
@@ -58,7 +58,7 @@ protected override void OnInitialized()
         Container?.Add(ToSelectedItem());
     }
 
-    private SelectedItem<TValue> ToSelectedItem() => new(Value, Text ?? "")
+    private SelectedItem<TValue> ToSelectedItem() => new(Value!, Text ?? "")
     {
         Active = Active,
         GroupName = GroupName ?? "",
diff --git a/src/BootstrapBlazor/Misc/SelectedItemOfT.cs b/src/BootstrapBlazor/Misc/SelectedItemOfT.cs
@@ -13,14 +13,14 @@ public class SelectedItem<T>
     /// <summary>
     /// 构造函数
     /// </summary>
-    public SelectedItem() { }
+    public SelectedItem() { Value = default!; }
 
     /// <summary>
     /// 构造函数
     /// </summary>
     /// <param name="value"></param>
     /// <param name="text"></param>
-    public SelectedItem(T? value, string text)
+    public SelectedItem(T value, string text)
     {
         Value = value;
         Text = text;
@@ -34,7 +34,7 @@ public SelectedItem(T? value, string text)
     /// <summary>
     /// 获得/设置 选项值
     /// </summary>
-    public T? Value { get; set; }
+    public T Value { get; set; }
 
     /// <summary>
     /// 获得/设置 是否选中
diff --git a/test/UnitTest/Components/CheckboxListGenericTest.cs b/test/UnitTest/Components/CheckboxListGenericTest.cs
@@ -78,12 +78,12 @@ public void IsVertical_Ok()
     [Fact]
     public async Task NullItem_Ok()
     {
-        var items = new List<SelectedItem<Foo>>()
+        var items = new List<SelectedItem<Foo?>>()
         {
             new(null, "Select ..."),
             new(new Foo() { Id = 2, Name = "Test2" }, "Test 2")
         };
-        var cut = Context.RenderComponent<CheckboxListGeneric<Foo>>(pb =>
+        var cut = Context.RenderComponent<CheckboxListGeneric<Foo?>>(pb =>
         {
             pb.Add(a => a.Items, items);
         });

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public partial class CheckboxListGeneric<TValue> : IModelEqualityComparer<TValue`
`25`	`25`	`/// <summary>`
`26`	`26`	`/// 获得组件内部 Checkbox 项目样式`
`27`	`27`	`/// </summary>`
`28`		`- protected string? CheckboxItemClassString => CssBuilder.Default("checkbox-item")`
	`28`	`+ private string? CheckboxItemClassString => CssBuilder.Default("checkbox-item")`
`29`	`29`	`.AddClass(CheckboxItemClass)`
`30`	`30`	`.Build();`
`31`	`31`
`@@ -97,7 +97,7 @@ public partial class CheckboxListGeneric<TValue> : IModelEqualityComparer<TValue`
`97`	`97`	`/// 获得/设置 SelectedItemChanged 方法`
`98`	`98`	`/// </summary>`
`99`	`99`	`[Parameter]`
`100`		`- public Func<IEnumerable<SelectedItem<TValue>>, List<TValue?>, Task>? OnSelectedChanged { get; set; }`
	`100`	`+ public Func<IEnumerable<SelectedItem<TValue>>, List<TValue>, Task>? OnSelectedChanged { get; set; }`
`101`	`101`
`102`	`102`	`/// <summary>`
`103`	`103`	`/// 获得/设置最多选中数量`
`@@ -204,23 +204,23 @@ private async Task<bool> OnBeforeStateChanged(CheckboxState state)`
`204`	`204`	`private async Task OnStateChanged(SelectedItem<TValue> item, bool v)`
`205`	`205`	`{`
`206`	`206`	`item.Active = v;`
`207`		`- var vals = new List<TValue?>();`
	`207`	`+ var items = new List<TValue>();`
`208`	`208`	`if (Value != null)`
`209`	`209`	`{`
`210`		`- vals.AddRange(Value);`
	`210`	`+ items.AddRange(Value);`
`211`	`211`	`}`
`212`	`212`
`213`		`- var val = vals.Find(i => IsEquals(item.Value));`
	`213`	`+ var val = items.Find(i => Equals(item.Value, i));`
`214`	`214`	`if (v && val == null)`
`215`	`215`	`{`
`216`		`- vals.Add(item.Value);`
	`216`	`+ items.Add(item.Value);`
`217`	`217`	`}`
`218`	`218`	`else`
`219`	`219`	`{`
`220`		`- vals.Remove(val);`
	`220`	`+ items.Remove(val!);`
`221`	`221`	`}`
`222`	`222`
`223`		`- CurrentValue = vals;`
	`223`	`+ CurrentValue = items;`
`224`	`224`
`225`	`225`	`if (OnSelectedChanged != null)`
`226`	`226`	`{`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ protected override void OnParametersSet()`
`120`	`120`	`var t = NullableUnderlyingType ?? typeof(TValue);`
`121`	`121`	`if (t.IsEnum && Items == null)`
`122`	`122`	`{`
`123`		`- Items = t.ToSelectList<TValue>((NullableUnderlyingType != null && IsAutoAddNullItem) ? new SelectedItem<TValue>(default, NullItemText) : null);`
	`123`	`+ Items = t.ToSelectList<TValue>((NullableUnderlyingType != null && IsAutoAddNullItem) ? new SelectedItem<TValue>(default!, NullItemText) : null);`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`Items ??= [];`
Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,7 @@ private async Task OnChange(ChangeEventArgs args)`
`566`	`566`
`567`	`567`	`if (item == null)`
`568`	`568`	`{`
`569`		`- TValue? val = default;`
	`569`	`+ TValue val = default!;`
`570`	`570`	`if (TextConvertToValueCallback != null)`
`571`	`571`	`{`
`572`	`572`	`val = await TextConvertToValueCallback(v);`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ protected override void OnInitialized()`
`58`	`58`	`Container?.Add(ToSelectedItem());`
`59`	`59`	`}`
`60`	`60`
`61`		`- private SelectedItem<TValue> ToSelectedItem() => new(Value, Text ?? "")`
	`61`	`+ private SelectedItem<TValue> ToSelectedItem() => new(Value!, Text ?? "")`
`62`	`62`	`{`
`63`	`63`	`Active = Active,`
`64`	`64`	`GroupName = GroupName ?? "",`
Original file line number	Diff line number	Diff line change
`@@ -78,12 +78,12 @@ public void IsVertical_Ok()`
`78`	`78`	`[Fact]`
`79`	`79`	`public async Task NullItem_Ok()`
`80`	`80`	`{`
`81`		`- var items = new List<SelectedItem<Foo>>()`
	`81`	`+ var items = new List<SelectedItem<Foo?>>()`
`82`	`82`	`{`
`83`	`83`	`new(null, "Select ..."),`
`84`	`84`	`new(new Foo() { Id = 2, Name = "Test2" }, "Test 2")`
`85`	`85`	`};`
`86`		`- var cut = Context.RenderComponent<CheckboxListGeneric<Foo>>(pb =>`
	`86`	`+ var cut = Context.RenderComponent<CheckboxListGeneric<Foo?>>(pb =>`
`87`	`87`	`{`
`88`	`88`	`pb.Add(a => a.Items, items);`
`89`	`89`	`});`