Merge branch 'dev-radio-list' into dev

# Conflicts:
#	src/BootstrapBlazor/Components/Radio/RadioListGeneric.razor.cs

Author: ArgoZhang

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

@@ -125,6 +125,13 @@
     </ValidateForm>
 </DemoBlock>
 
+<DemoBlock Title="@Localizer["GenericTitle"]" Introduction="@Localizer["GenericIntro"]" Name="Generic">
+    <RadioListGeneric @bind-Value="@_selectedFoo" Items="@GenericItems" />
+    <section ignore>
+        <div>@_selectedFoo.Name</div>
+    </section>
+</DemoBlock>
+
 <AttributeTable Items="@GetAttributes()" />
 
 <EventTable Items="@GetEvents()" />

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

@@ -3,6 +3,9 @@
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone
 
+using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Wordprocessing;
+
 namespace BootstrapBlazor.Server.Components.Samples;
 
 /// <summary>
@@ -52,6 +55,12 @@ private Task OnSelectedChanged(IEnumerable<SelectedItem> values, string val)
         return Task.CompletedTask;
     }
 
+    [NotNull]
+    private IEnumerable<SelectedItem<Foo>>? GenericItems { get; set; }
+
+    [NotNull]
+    private Foo? _selectedFoo = default;
+
     /// <summary>
     /// OnInitialized 方法
     /// </summary>
@@ -85,6 +94,15 @@ protected override void OnInitialized()
 
         Model = Foo.Generate(LocalizerFoo);
         FooItems = Foo.GetCompleteItems(LocalizerFoo);
+
+        GenericItems = new List<SelectedItem<Foo>>()
+        {
+            new() { Text = Localizer["item1"], Value = new Foo() { Id = 1, Name = LocalizerFoo["Foo.Name", "001"] } },
+            new() { Text = Localizer["item2"], Value = new Foo() { Id = 2, Name = LocalizerFoo["Foo.Name", "002"] } },
+            new() { Text = Localizer["item3"], Value = new Foo() { Id = 3, Name = LocalizerFoo["Foo.Name", "003"] } },
+        };
+
+        _selectedFoo = new Foo() { Id = 1, Name = LocalizerFoo["Foo.Name", "001"] };
     }
 
     private Task OnItemChanged(IEnumerable<SelectedItem> values, SelectedItem val)

src/BootstrapBlazor/Components/Radio/RadioListGeneric.razor.cs

@@ -29,6 +29,12 @@ public partial class RadioListGeneric<TValue> : IModelEqualityComparer<TValue>
     [Parameter]
     public RenderFragment<SelectedItem<TValue>>? ItemTemplate { get; set; }
 
+    /// <summary>
+    /// 获得/设置 是否为按钮样式 默认 false
+    /// </summary>
+    [Parameter]
+    public bool IsButton { get; set; }
+
     /// <summary>
     /// 获得/设置 是否显示边框 默认为 true
     /// </summary>
@@ -58,7 +64,7 @@ public partial class RadioListGeneric<TValue> : IModelEqualityComparer<TValue>
     /// 获得/设置 SelectedItemChanged 方法
     /// </summary>
     [Parameter]
-    public Func<IEnumerable<SelectedItem<TValue>>, TValue, Task>? OnSelectedChanged { get; set; }
+    public Func<TValue, Task>? OnSelectedChanged { get; set; }
 
     /// <summary>
     /// 获得/设置 数据主键标识标签 默认为 <see cref="KeyAttribute"/><code><br /></code>用于判断数据主键标签，如果模型未设置主键时可使用 <see cref="ModelEqualityComparer"/> 参数自定义判断 <code><br /></code>数据模型支持联合主键
@@ -74,6 +80,13 @@ public partial class RadioListGeneric<TValue> : IModelEqualityComparer<TValue>
     [Parameter]
     public Func<TValue, TValue, bool>? ModelEqualityComparer { get; set; }
 
+    /// <summary>
+    /// 获得 当前选项是否被禁用
+    /// </summary>
+    /// <param name="item"></param>
+    /// <returns></returns>
+    private bool GetDisabledState(SelectedItem<TValue> item) => IsDisabled || item.IsDisabled;
+
     private string? GroupName => Id;
 
     private string? ClassString => CssBuilder.Default("radio-list form-control")
@@ -88,8 +101,8 @@ public partial class RadioListGeneric<TValue> : IModelEqualityComparer<TValue>
         .AddClassFromAttributes(AdditionalAttributes)
         .Build();
 
-    private string? GetButtonItemClassString(SelectedItem item) => CssBuilder.Default("btn")
-        .AddClass($"active bg-{Color.ToDescriptionString()}", CurrentValueAsString == item.Value)
+    private string? GetButtonItemClassString(SelectedItem<TValue> item) => CssBuilder.Default("btn")
+        .AddClass($"active bg-{Color.ToDescriptionString()}", Equals(Value, item.Value))
         .Build();
 
     /// <summary>
@@ -109,13 +122,14 @@ protected override void OnParametersSet()
     /// <summary>
     /// 点击选择框方法
     /// </summary>
-    private async Task OnClick(SelectedItem<TValue> item)
+    private async Task OnClick(SelectedItem<TValue?> item)
     {
         if (!IsDisabled)
         {
+            CurrentValue = item.Value;
             if (OnSelectedChanged != null)
             {
-                await OnSelectedChanged(Items, Value);
+                await OnSelectedChanged(Value);
             }
             StateHasChanged();
         }