DataGrid: determine the filter method based on column type

Author: stsrki

Source/Extensions/Blazorise.DataGrid/DataGrid.razor.cs

@@ -2508,7 +2508,7 @@ where column.CustomFilter( cellRealValue, column.Filter.SearchValue )
                         query = from item in query
                                 let cellRealValue = column.GetValue( item )
                                 let cellStringValue = cellRealValue == null ? string.Empty : cellRealValue.ToString()
-                                where CompareFilterRangeValues( cellStringValue, stringSearchValue1, stringSearchValue2, column.GetFilterMethod(), column.ColumnType, column.GetValueType( item ) )
+                                where CompareFilterRangeValues( cellStringValue, stringSearchValue1, stringSearchValue2, currentFilterMode, column.ColumnType, column.GetValueType( item ) )
                                 select item;
 
                         continue;
@@ -2522,7 +2522,7 @@ where CompareFilterRangeValues( cellStringValue, stringSearchValue1, stringSearc
                     query = from item in query
                             let cellRealValue = column.GetValue( item )
                             let cellStringValue = cellRealValue == null ? string.Empty : cellRealValue.ToString()
-                            where CompareFilterValues( cellStringValue, stringSearchValue, column.GetFilterMethod(), column.ColumnType, column.GetValueType( item ) )
+                            where CompareFilterValues( cellStringValue, stringSearchValue, currentFilterMode, column.ColumnType, column.GetValueType( item ) )
                             select item;
                 }
             }
@@ -3625,9 +3625,9 @@ public IReadOnlyList<DataGridBatchEditItem<TItem>> BatchChanges
     [Parameter] public int MaxPaginationLinks { get => paginationContext.MaxPaginationLinks; set => paginationContext.MaxPaginationLinks = value; }
 
     /// <summary>
-    /// Defines the filter method when searching the cell values.
+    /// Defines the filter method to be applied when filtering data in the grid.
     /// </summary>
-    [Parameter] public DataGridFilterMethod FilterMethod { get; set; } = DataGridFilterMethod.Contains;
+    [Parameter] public DataGridFilterMethod FilterMethod { get; set; }
 
     /// <summary>
     /// Gets or sets currently selected row.

Source/Extensions/Blazorise.DataGrid/DataGridCheckColumn.cs

@@ -2,5 +2,11 @@
 
 public class DataGridCheckColumn<TItem> : DataGridColumn<TItem>
 {
-    public override DataGridColumnType ColumnType => DataGridColumnType.Check;
+    /// <inheritdoc/>
+    internal override DataGridColumnFilterMethod GetDefaultFilterMethod()
+        => DataGridColumnFilterMethod.Equals;
+
+    /// <inheritdoc/>
+    public override DataGridColumnType ColumnType
+        => DataGridColumnType.Check;
 }

Source/Extensions/Blazorise.DataGrid/DataGridColumn.cs

@@ -119,7 +119,6 @@ private void InitializeDefaults()
         Filter?.Subscribe( OnSearchValueChanged );
     }
 
-
     /// <summary>
     /// Provides a way to generate column specific dependencies outside the Blazor engine.
     /// </summary>
@@ -428,9 +427,16 @@ internal DataGridColumnFilterMethod GetDataGridFilterMethodAsColumn()
             : ParentDataGrid.FilterMethod == DataGridFilterMethod.EndsWith ? DataGridColumnFilterMethod.EndsWith
             : ParentDataGrid.FilterMethod == DataGridFilterMethod.Equals ? DataGridColumnFilterMethod.Equals
             : ParentDataGrid.FilterMethod == DataGridFilterMethod.NotEquals ? DataGridColumnFilterMethod.NotEquals
-            : DataGridColumnFilterMethod.Contains;
+            : GetDefaultFilterMethod();
     }
 
+    /// <summary>
+    /// Retrieves the default filter method for the column.
+    /// </summary>
+    /// <returns>The default <see cref="DataGridColumnFilterMethod"/> used for filtering, which is <see cref="DataGridColumnFilterMethod.Contains"/>.</returns>
+    internal virtual DataGridColumnFilterMethod GetDefaultFilterMethod()
+        => DataGridColumnFilterMethod.Contains;
+
     #endregion
 
     #region Properties

Source/Extensions/Blazorise.DataGrid/DataGridDateColumn.cs

@@ -8,7 +8,13 @@ namespace Blazorise.DataGrid;
 
 public class DataGridDateColumn<TItem> : DataGridColumn<TItem>
 {
-    public override DataGridColumnType ColumnType => DataGridColumnType.Date;
+    /// <inheritdoc/>
+    internal override DataGridColumnFilterMethod GetDefaultFilterMethod()
+        => DataGridColumnFilterMethod.Equals;
+
+    /// <inheritdoc/>
+    public override DataGridColumnType ColumnType
+        => DataGridColumnType.Date;
 
     /// <summary>
     /// Hints at the type of data that might be entered by the user while editing the element or its contents.

Source/Extensions/Blazorise.DataGrid/DataGridNumericColumn.cs

@@ -10,10 +10,13 @@ namespace Blazorise.DataGrid;
 /// <typeparam name="TItem">Type parameter for the model displayed in the <see cref="DataGrid{TItem}"/>.</typeparam>
 public class DataGridNumericColumn<TItem> : DataGridColumn<TItem>
 {
-    /// <summary>
-    /// Gets the column type.
-    /// </summary>
-    public override DataGridColumnType ColumnType => DataGridColumnType.Numeric;
+    /// <inheritdoc/>
+    internal override DataGridColumnFilterMethod GetDefaultFilterMethod()
+        => DataGridColumnFilterMethod.Equals;
+
+    /// <inheritdoc/>
+    public override DataGridColumnType ColumnType
+        => DataGridColumnType.Numeric;
 
     /// <summary>
     /// Specifies the interval between valid values.

Source/Extensions/Blazorise.DataGrid/Enums/DataGridFilterMethod.cs

@@ -5,9 +5,33 @@
 /// </summary>
 public enum DataGridFilterMethod
 {
+    /// <summary>
+    /// Defaults to the column specific default filter method.
+    /// </summary>
+    Default,
+
+    /// <summary>
+    /// Determines whether the specified substring occurs within this string.
+    /// </summary>
     Contains,
+
+    /// <summary>
+    /// Determines whether the beginning of this string matches the specified substring.
+    /// </summary>
     StartsWith,
+
+    /// <summary>
+    /// Determines whether the end of this string matches the specified substring.
+    /// </summary>
     EndsWith,
+
+    /// <summary>
+    /// Determines whether two values are equal.
+    /// </summary>
     Equals,
+
+    /// <summary>
+    /// Determines whether the specified values are not equal.
+    /// </summary>
     NotEquals,
 }