feat(MultiFilter): keep selected item when AlwaysTriggerGetItems is t…

…rue (#3800) * fix: 修复逻辑判断错误 * feat: 增加保持选项功能 * chore: bump version 8.7.1-beta08 * test: 更新单元测试
dotnetcore · Jul 6, 2024 · bb50e0b · bb50e0b
1 parent 4affe60
commit bb50e0b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>8.7.1-beta07</Version>
+    <Version>8.7.1-beta08</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">

diff --git a/src/BootstrapBlazor/Components/Filters/MultiFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/MultiFilter.razor.cs
@@ -152,15 +152,30 @@ public override FilterKeyValueAction GetFilterConditions()
     }
 
     /// <summary>
-    /// Javascript 回调方法
+    /// JavaScript 回调方法
     /// </summary>
     /// <returns></returns>
     [JSInvokable]
     public async Task TriggerGetItemsCallback()
     {
         if (OnGetItemsAsync != null)
         {
-            _source = await OnGetItemsAsync();
+            var items = await OnGetItemsAsync();
+            if (_source != null)
+            {
+                var selectedItems = _source.Where(i => i.Active).ToList();
+                if (selectedItems.Count > 0)
+                {
+                    foreach (var item in items)
+                    {
+                        if (selectedItems.Find(i => item.Value == i.Value) != null)
+                        {
+                            item.Active = true;
+                        }
+                    }
+                }
+            }
+            _source = items;
             StateHasChanged();
         }
     }

diff --git a/src/BootstrapBlazor/Components/Filters/MultiFilter.razor.js b/src/BootstrapBlazor/Components/Filters/MultiFilter.razor.js
@@ -13,7 +13,7 @@ export function init(id, options) {
         const popoverEl = filterEl.querySelector('i[data-bs-toggle="bb.dropdown"]');
         if (popoverEl) {
             EventHandler.on(popoverEl, 'show.bs.popover', () => {
-                if (alwaysTrigger === true) {
+                if (alwaysTrigger === false) {
                     EventHandler.off(popoverEl, 'show.bs.popover');
                 }
                 invoker.invokeMethodAsync(callback);

diff --git a/test/UnitTest/Components/TableFilterTest.cs b/test/UnitTest/Components/TableFilterTest.cs
@@ -118,6 +118,11 @@ public async Task MultiFilter_Ok()
         });
         cut.Contains("loading-template-test");
         await cut.InvokeAsync(() => filter.Instance.TriggerGetItemsCallback());
+
+        // 选中数据
+        var checkItems = cut.FindComponents<Checkbox<bool>>();
+        await cut.InvokeAsync(() => checkItems[1].Instance.SetValue(true));
+        await cut.InvokeAsync(() => filter.Instance.TriggerGetItemsCallback());
     }
 
     [Fact]