DataGrid CheckBoxList filter values collection will respect filters a…

…pplied to other columns
radzenhq · Jun 28, 2024 · c08a598 · c08a598
1 parent 340483b
commit c08a598
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Radzen.Blazor/RadzenDataGrid.razor.cs b/Radzen.Blazor/RadzenDataGrid.razor.cs
@@ -859,6 +859,14 @@ await Filter.InvokeAsync(new DataGridColumnFilterEventArgs<TItem>()
                         LogicalFilterOperator = column.GetLogicalFilterOperator()
                     });
 
+                    if (FilterMode == FilterMode.CheckBoxList)
+                    {
+                        allColumns.ToList().ForEach(c =>
+                        {
+                            c.ClearFilterValues();
+                        });
+                    }
+
                     SaveSettings();
 
                     if (LoadData.HasDelegate && IsVirtualizationAllowed())

diff --git a/Radzen.Blazor/RadzenDataGridColumn.razor.cs b/Radzen.Blazor/RadzenDataGridColumn.razor.cs
@@ -992,11 +992,15 @@ internal IEnumerable GetFilterValues()
                     property = $@"({property} == null ? """" : {property})";
                 }
 
-                filterValues = Grid.Data.AsQueryable().Select(DynamicLinqCustomTypeProvider.ParsingConfig, property).Distinct().Cast(propertyType ?? typeof(object));
+                filterValues = Grid.Data.AsQueryable().Where<TItem>(Grid.allColumns.Where(c => c != this)).Select(DynamicLinqCustomTypeProvider.ParsingConfig, property).Distinct().Cast(propertyType ?? typeof(object));
             }
 
             return filterValues;
         }
+        internal void ClearFilterValues()
+        {
+            filterValues = null;
+        }
 
         /// <summary>
         /// Get column filter operator.
@@ -1129,7 +1133,7 @@ public async Task SetCustomFilterExpressionAsync(string value)
         /// </summary>
         public void ClearFilters()
         {
-            filterValues = null;
+            ClearFilterValues();
             SetFilterValue(null);
             SetFilterValue(null, false);
             SetFilterOperator(null);