refactor: 重构代码

Author: ArgoZhang

src/BootstrapBlazor/Components/QueryBuilder/GroupFilterKeyValueAction.cs

@@ -0,0 +1,14 @@
+// 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.Components;
+
+class GroupFilterKeyValueAction : FilterKeyValueAction
+{
+    public GroupFilterKeyValueAction()
+    {
+        FilterLogic = FilterLogic.Or;
+    }
+}

src/BootstrapBlazor/Components/QueryBuilder/QueryBuilder.razor

@@ -6,7 +6,7 @@
     <CascadingValue Value="Value.Filters" IsFixed="true">
         @ChildContent?.Invoke(new TModel())
     </CascadingValue>
-    @if (!Value.HasFilters() && ShowHeader)
+    @if (ShowHeader && Value.Filters.Count == 0)
     {
         @RenderHeader(null, Value)
     }
@@ -17,6 +17,29 @@
 </div>
 
 @code {
+    RenderFragment RenderFilters(FilterKeyValueAction? parent, FilterKeyValueAction filter) =>
+    @<ul class="qb-group">
+        @if (IsShowHeader(filter))
+        {
+            <li class="qb-item">
+                @RenderHeader(parent, filter)
+            </li>
+        }
+        @foreach (var f in filter.Filters)
+        {
+            <li class="qb-item">
+                @if (IsGroup(f))
+                {
+                    @RenderFilters(filter, f)
+                }
+                else
+                {
+                    @RenderFilter(filter, f)
+                }
+            </li>
+        }
+    </ul>;
+
     RenderFragment RenderFilter(FilterKeyValueAction parent, FilterKeyValueAction filter) =>
     @<div class="qb-row">
         <Select Items="_fields" @bind-Value="@filter.FieldKey" />

src/BootstrapBlazor/Components/QueryBuilder/QueryBuilder.razor.cs

@@ -194,7 +194,7 @@ private Task SetFilterLogic(FilterKeyValueAction? parent, FilterKeyValueAction f
 
     private async Task OnAddFilterGroup(FilterKeyValueAction filter)
     {
-        filter.Filters.Add(new FilterKeyValueAction());
+        filter.Filters.Add(new GroupFilterKeyValueAction());
 
         await OnFilterChanged();
     }
@@ -220,38 +220,7 @@ private static Color GetColorByFilter(FilterKeyValueAction filter, FilterLogic l
 
     private readonly List<SelectedItem> _fields = [];
 
-    RenderFragment RenderFilters(FilterKeyValueAction? parent, FilterKeyValueAction filter) => builder =>
-    {
-        var index = 0;
-        builder.OpenElement(index++, "ul");
-        builder.AddAttribute(index++, "class", "qb-group");
-        if (filter.HasFilters() && ShowHeader)
-        {
-            builder.OpenElement(index++, "li");
-            builder.AddAttribute(index++, "class", "qb-item");
-            builder.AddContent(index++, RenderHeader(parent, filter));
-            builder.CloseElement();
-        }
-        foreach (var f in filter.Filters)
-        {
-            if (f.HasFilters())
-            {
-                RenderFilterItem(ref index, RenderFilters(filter, f));
-            }
-            else
-            {
-                RenderFilterItem(ref index, RenderFilter(filter, f));
-            }
-        }
-        builder.CloseElement();
+    private bool IsShowHeader(FilterKeyValueAction filter) => ShowHeader && IsGroup(filter);
 
-        void RenderFilterItem(ref int sequence, RenderFragment fragment)
-        {
-            builder.OpenElement(sequence++, "li");
-            builder.AddAttribute(sequence++, "class", "qb-item");
-            builder.AddAttribute(sequence++, "data-bb-logic", Localizer[filter.FilterLogic.ToString()]);
-            builder.AddContent(sequence++, fragment);
-            builder.CloseElement();
-        }
-    };
+    private static bool IsGroup(FilterKeyValueAction filter) => filter is GroupFilterKeyValueAction || filter.Filters.Count > 0;
 }