refactor: 精简代码

Author: ArgoZhang

src/BootstrapBlazor/Components/Dropdown/Dropdown.razor

@@ -57,43 +57,7 @@
         }
         else
         {
-			<CascadingValue Value="_items" IsFixed="true">
-				@ItemsTemplate
-			</CascadingValue>
-			<RenderTemplate>
-				@foreach(var item in _items)
-				{
-                    switch (item)
-                    {
-                        case DropdownDivider:
-                            <Divider></Divider>
-                            break;
-                        case DropdownItem t:
-                        {
-                            var disabled = GetItemTriggerClick(t);
-                            if (t.ChildContent != null)
-                            {
-                                <div class="@GetItemClassString(disabled)">
-                                    @t.ChildContent
-                                </div>
-                            }
-                            else
-                            {
-                                <DynamicElement @key="t" class="@GetItemClassString(disabled)"
-                                                TriggerClick="!disabled" OnClick="() => OnClickItem(t)">
-                                    <i class="@GetItemIconString(t)"></i>
-                                    <span>@t.Text</span>
-                                </DynamicElement>
-                            }
-
-                            break;
-                        }
-                        default:
-                            <DynamicComponent Type="item.GetType()"></DynamicComponent>
-                            break;
-                    }
-                }
-			</RenderTemplate>
+			@ItemsTemplate
 		}
     </div>
 </div>

src/BootstrapBlazor/Components/Dropdown/Dropdown.razor.cs

@@ -292,22 +292,4 @@ private async Task HandlerClick()
             await OnClick.InvokeAsync();
         }
     }
-
-    private static string? GetItemIconString(DropdownItem item) => CssBuilder.Default("dropdown-item-icon")
-        .AddClass(item.Icon, !string.IsNullOrEmpty(item.Icon))
-        .Build();
-
-    private static string? GetItemClassString(bool disabled) => CssBuilder.Default("dropdown-item")
-        .AddClass("disabled", disabled)
-        .Build();
-
-    private static bool GetItemTriggerClick(DropdownItem item) => item.OnDisabledCallback?.Invoke(item) ?? item.Disabled;
-
-    private static async Task OnClickItem(DropdownItem item)
-    {
-        if (item.OnClick != null)
-        {
-            await item.OnClick();
-        }
-    }
 }

src/BootstrapBlazor/Components/Dropdown/DropdownItem.razor

@@ -0,0 +1,16 @@
+@namespace BootstrapBlazor.Components
+
+@if (ChildContent != null)
+{
+    <div class="@ItemClassString">
+        @t.ChildContent
+    </div>
+}
+else
+{
+    <DynamicElement class="@ItemClassString"
+                    TriggerClick="CanTriggerClick" OnClick="OnClickItem">
+        <i class="@ItemIconString"></i>
+        <span>@Text</span>
+    </DynamicElement>
+}

…azor/Components/Dropdown/DropdownItem.cs …omponents/Dropdown/DropdownItem.razor.cssrc/BootstrapBlazor/Components/Dropdown/DropdownItem.cs renamed to src/BootstrapBlazor/Components/Dropdown/DropdownItem.razor.cs src/BootstrapBlazor/Components/Dropdown/DropdownItem.cs renamed to src/BootstrapBlazor/Components/Dropdown/DropdownItem.razor.cs

@@ -8,7 +8,7 @@ namespace BootstrapBlazor.Components;
 /// <summary>
 /// DropdownItem 组件
 /// </summary>
-public class DropdownItem : ComponentBase, IDisposable
+public partial class DropdownItem
 {
     /// <summary>
     /// 获得/设置 显示文本
@@ -32,7 +32,7 @@ public class DropdownItem : ComponentBase, IDisposable
     /// 获得/设置 是否被禁用回调方法 默认 null 优先级高于 <see cref="Disabled"/>
     /// </summary>
     [Parameter]
-    public Func<DropdownItem, bool>? OnDisabledCallback { get; set; }
+    public Func<bool>? OnDisabledCallback { get; set; }
 
     /// <summary>
     /// 获得/设置 点击回调方法 默认 null
@@ -46,45 +46,21 @@ public class DropdownItem : ComponentBase, IDisposable
     [Parameter]
     public RenderFragment? ChildContent { get; set; }
 
-    [CascadingParameter]
-    [NotNull]
-    private List<ComponentBase>? Items { get; set; }
+    private string? ItemIconString => CssBuilder.Default("dropdown-item-icon")
+        .AddClass(Icon, !string.IsNullOrEmpty(Icon))
+        .Build();
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    protected override void OnInitialized()
-    {
-        base.OnInitialized();
+    private string? ItemClassString => CssBuilder.Default("dropdown-item")
+        .AddClass("disabled", CanTriggerClick)
+        .Build();
 
-        Items.Add(this);
-    }
+    private bool CanTriggerClick => OnDisabledCallback?.Invoke() ?? Disabled;
 
-    private bool _disposedValue;
-
-    /// <summary>
-    /// 释放资源方法
-    /// </summary>
-    /// <param name="disposing"></param>
-    protected virtual void Dispose(bool disposing)
+    private async Task OnClickItem()
     {
-        if (!_disposedValue)
+        if (OnClick != null)
         {
-            if (disposing)
-            {
-                Items.Remove(this);
-            }
-
-            _disposedValue = true;
+            await OnClick();
         }
     }
-
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    public void Dispose()
-    {
-        Dispose(true);
-        GC.SuppressFinalize(this);
-    }
 }