fix(Filter): preserve programmatic filter conditions (#8549)

* fix(Filter): synchronize filter count updates

* test: 补充单元测试

* test: 更新单元测试

* chore: bump version 11.0.2-beta01

Author: ArgoZhang

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>11.0.1</Version>
+    <Version>11.0.2-beta01</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor.cs

@@ -55,7 +55,7 @@ public override void Reset()
         _value2 = null;
         _action1 = FilterAction.GreaterThanOrEqual;
         _action2 = FilterAction.LessThanOrEqual;
-        Count = 0;
+        SetCount(0);
         Logic = FilterLogic.And;
         StateHasChanged();
     }
@@ -97,7 +97,6 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
 
         if (filter.Filters.Count > 1)
         {
-            Count = 1;
             FilterKeyValueAction second = filter.Filters[1];
             if (second.FieldValue is DateTime value2)
             {

src/BootstrapBlazor/Components/Filters/EnumFilter.razor.cs

@@ -54,7 +54,7 @@ public override void Reset()
     {
         _value1 = "";
         _value2 = "";
-        Count = 0;
+        SetCount(0);
         StateHasChanged();
     }
 
@@ -108,7 +108,6 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
 
         if (filter.Filters.Count > 1)
         {
-            Count = 1;
             FilterKeyValueAction second = filter.Filters[1];
             if (IsNullFilterAction(second.FilterAction))
             {

src/BootstrapBlazor/Components/Filters/FilterBase.cs

@@ -125,6 +125,12 @@ private protected IEnumerable<SelectedItem> AddNullFilterValues(IEnumerable<Sele
         FilterAction = action
     };
 
+    private protected void SetCount(int count)
+    {
+        Count = count;
+        FilterContext?.CountChanged?.Invoke(count);
+    }
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -195,5 +201,9 @@ protected virtual async Task OnFilterAsync()
     /// <inheritdoc cref="IFilterAction.SetFilterConditionsAsync(FilterKeyValueAction)"/>
     /// </summary>
     /// <param name="filter"></param>
-    public virtual Task SetFilterConditionsAsync(FilterKeyValueAction filter) => OnFilterAsync();
+    public virtual Task SetFilterConditionsAsync(FilterKeyValueAction filter)
+    {
+        SetCount(filter.Filters.Count > 1 ? 1 : 0);
+        return OnFilterAsync();
+    }
 }

src/BootstrapBlazor/Components/Filters/FilterContext.cs

@@ -28,4 +28,6 @@ public class FilterContext
     /// <para lang="en">Gets or sets the filter counter. Default is 0</para>
     /// </summary>
     public int Count { get; set; }
+
+    internal Action<int>? CountChanged { get; set; }
 }

src/BootstrapBlazor/Components/Filters/FilterProvider.razor.cs

@@ -152,9 +152,19 @@ private void OnClickMinus()
         }
     }
 
+    private void OnCountChanged(int count)
+    {
+        if (Count != count)
+        {
+            Count = count;
+            StateHasChanged();
+        }
+    }
+
     private FilterContext FilterContext => new()
     {
         Count = Count,
+        CountChanged = OnCountChanged,
         FieldKey = FieldKey,
         IsHeaderRow = IsHeaderRow
     };

src/BootstrapBlazor/Components/Filters/NumberFilter.razor.cs

@@ -57,7 +57,7 @@ public override void Reset()
         _value2 = default;
         _action1 = FilterAction.GreaterThanOrEqual;
         _action2 = FilterAction.LessThanOrEqual;
-        Count = 0;
+        SetCount(0);
         Logic = FilterLogic.And;
         StateHasChanged();
     }
@@ -99,7 +99,6 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
 
         if (filter.Filters.Count > 1)
         {
-            Count = 1;
             FilterKeyValueAction second = filter.Filters[1];
             if (second.FieldValue is TType value2)
             {

src/BootstrapBlazor/Components/Filters/RegexFilter.razor.cs

@@ -64,7 +64,7 @@ public override void Reset()
         _action1 = FilterAction.Match;
         _action2 = FilterAction.Match;
         Logic = FilterLogic.Or;
-        Count = 0;
+        SetCount(0);
         StateHasChanged();
     }
 
@@ -105,7 +105,6 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
 
         if (filter.Filters.Count > 1)
         {
-            Count = 1;
             FilterKeyValueAction second = filter.Filters[1];
             if (second.FieldValue is string value2)
             {
@@ -116,7 +115,7 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
                 _value2 = null;
             }
             _action2 = second.FilterAction;
-            Logic = second.FilterLogic;
+            Logic = filter.FilterLogic;
         }
         await base.SetFilterConditionsAsync(filter);
     }

src/BootstrapBlazor/Components/Filters/StringFilter.razor.cs

@@ -66,7 +66,7 @@ public override void Reset()
         _action1 = FilterAction.Contains;
         _action2 = FilterAction.Contains;
         Logic = FilterLogic.Or;
-        Count = 0;
+        SetCount(0);
         StateHasChanged();
     }
 
@@ -107,7 +107,6 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
 
         if (filter.Filters.Count > 1)
         {
-            Count = 1;
             FilterKeyValueAction second = filter.Filters[1];
             if (second.FieldValue is string value2)
             {
@@ -118,7 +117,7 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
                 _value2 = null;
             }
             _action2 = second.FilterAction;
-            Logic = second.FilterLogic;
+            Logic = filter.FilterLogic;
         }
         await base.SetFilterConditionsAsync(filter);
     }

test/UnitTest/Components/ContextMenuTest.cs

@@ -12,6 +12,46 @@ namespace UnitTest.Components;
 
 public class ContextMenuTest : BootstrapBlazorTestBase
 {
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task Show_Ok(bool hasCallback)
+    {
+        var contextItem = new object();
+        var callbackCompleted = false;
+        var cut = Context.Render<ContextMenuZone>(pb =>
+        {
+            pb.AddChildContent<ContextMenu>(builder =>
+            {
+                if (hasCallback)
+                {
+                    builder.Add(a => a.OnBeforeShowCallback, async value =>
+                    {
+                        Assert.Same(contextItem, value);
+                        await Task.Yield();
+                        callbackCompleted = true;
+                    });
+                }
+            });
+        });
+        var menu = cut.FindComponent<ContextMenu>();
+        var renderCount = menu.RenderCount;
+        var method = typeof(ContextMenu).GetMethod("Show", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+        Assert.NotNull(method);
+
+        await cut.InvokeAsync(async () =>
+        {
+            var task = Assert.IsAssignableFrom<Task>(method.Invoke(menu.Instance, [new MouseEventArgs(), contextItem]));
+            await task;
+        });
+
+        Assert.Equal(hasCallback, callbackCompleted);
+        var field = typeof(ContextMenu).GetField("_contextItem", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+        Assert.NotNull(field);
+        Assert.Same(contextItem, field.GetValue(menu.Instance));
+        Assert.True(menu.RenderCount > renderCount);
+    }
+
     [Fact]
     public async Task ContextMenu_Ok()
     {