Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DataGrid : Workaround for DatePicker being set to null no matter what when filter is set through Parameter FilterSearchValue #5838

Merged
merged 3 commits into from
Nov 13, 2024
Merged

DataGrid : Workaround for DatePicker being set to null no matter what when filter is set through Parameter FilterSearchValue #5838

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f1f21d
Workaround for DatePicker being set to null no matter what when filte…
David-Moreira Nov 12, 2024
6292cd8
Merge branch 'master' into 5825-datagrid-selecting-date-in-filter-doe…
stsrki Nov 13, 2024
3d04dd5
Rename enums
stsrki Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/Extensions/Blazorise.DataGrid/DataGrid.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
}
else
{
<_DataGridCellFilter Column="column" FilterSearchValue="@column.Filter.SearchValue" OnFilterChanged="@((newValue) => OnFilterChanged(column, newValue))" />
<_DataGridCellFilter Column="column" OnFilterChanged="@((newValue) => OnFilterChanged(column, newValue))" />
}
</TableHeaderCell>
}
Expand Down
11 changes: 11 additions & 0 deletions Source/Extensions/Blazorise.DataGrid/Enums/DataGridCellFilterType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
namespace Blazorise.DataGrid;

/// <summary>
/// Defines the DataGrid cell filter type.
/// </summary>
public enum DataGridCellFilterType
{
Single,
Range1,
stsrki marked this conversation as resolved.
Show resolved Hide resolved
Range2
}
65 changes: 59 additions & 6 deletions Source/Extensions/Blazorise.DataGrid/_DataGridCellFilter.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,86 @@
@{
if ( Column is DataGridNumericColumn<TItem> numericColumn )
{
<_DataGridCellNumericEdit Column="@numericColumn" CellValue="@FilterSearchValue" CellValueChanged="@OnFilterChanged"></_DataGridCellNumericEdit>
<_DataGridCellNumericEdit Column="@numericColumn" CellValue="@GetSearchValue()" CellValueChanged="@FilterChanged"></_DataGridCellNumericEdit>

}
else if ( Column is DataGridSelectColumn<TItem> selectColumn )
{
<_DataGridCellSelectEdit Column="@selectColumn" CellValue="@FilterSearchValue" CellValueChanged="@OnFilterChanged"></_DataGridCellSelectEdit>
<_DataGridCellSelectEdit Column="@selectColumn" CellValue="@GetSearchValue()" CellValueChanged="@FilterChanged"></_DataGridCellSelectEdit>

}
else if ( Column is DataGridCheckColumn<TItem> checkColumn )
{
<_DataGridCellCheckEdit Column="@checkColumn" CellValue="@FilterSearchValue" CellValueChanged="@OnFilterChanged"></_DataGridCellCheckEdit>
<_DataGridCellCheckEdit Column="@checkColumn" CellValue="@GetSearchValue()" CellValueChanged="@FilterChanged"></_DataGridCellCheckEdit>

}
else if ( Column is DataGridDateColumn<TItem> dateColumn )
{
<_DataGridCellDatePicker Column="@dateColumn" CellValue="@FilterSearchValue" CellValueChanged="@OnFilterChanged"></_DataGridCellDatePicker>
<_DataGridCellDatePicker Column="@dateColumn" CellValue="@GetSearchValue()" CellValueChanged="@FilterChanged"></_DataGridCellDatePicker>

}
else
{
<TextEdit Text="@FilterSearchValue?.ToString()" TextChanged="@((value) => OnFilterChanged.InvokeAsync(value))" />
<TextEdit Text="@GetSearchValueAsString()" TextChanged="@((newValue) => FilterChanged(newValue))" />
}
}
@code {
[Parameter] public DataGridColumn<TItem> Column { get; set; }

[Parameter] public EventCallback<object> OnFilterChanged { get; set; }

[Parameter] public object FilterSearchValue { get; set; }
/// <summary>
/// Workaround for an issue with the DatePicker setting the value to null if we try to set FilterValue as a Parameter.
/// </summary>
[Parameter] public DataGridCellFilterType CellFilterType { get; set; } = DataGridCellFilterType.Single;

private Task FilterChanged( object newValue )
{
return OnFilterChanged.InvokeAsync( newValue );
}

private string GetSearchValueAsString()
{
if ( CellFilterType == DataGridCellFilterType.Single )
{
return Column.Filter.SearchValue?.ToString();
}
else if ( CellFilterType == DataGridCellFilterType.Range1 )
{
return GetFilterValue1()?.ToString();
}
else if ( CellFilterType == DataGridCellFilterType.Range2 )
{
return GetFilterValue2()?.ToString();
}
return default;
}

private object GetSearchValue()
{
if ( CellFilterType == DataGridCellFilterType.Single )
{
return Column.Filter.SearchValue;
}
else if ( CellFilterType == DataGridCellFilterType.Range1 )
{
return GetFilterValue1();
}
else if ( CellFilterType == DataGridCellFilterType.Range2 )
{
return GetFilterValue2();
}
return default;
}

private object GetFilterValue1()
{
return ( Column.Filter.SearchValue as object[] )?[0];
}

private object GetFilterValue2()
{
return ( Column.Filter.SearchValue as object[] )?[1];
}

}
6 changes: 3 additions & 3 deletions Source/Extensions/Blazorise.DataGrid/_DataGridMenuFilter.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
<Field @key=filterMethod>
@if ( filterMethod == DataGridColumnFilterMethod.Between )
{
<_DataGridCellFilter Column="Column" FilterSearchValue="@GetFilterValue1()" OnFilterChanged="@SetFilterValue1" />
<_DataGridCellFilter Column="Column" FilterSearchValue="@GetFilterValue2()" OnFilterChanged="@SetFilterValue2" />
<_DataGridCellFilter Column="Column" CellFilterType="DataGridCellFilterType.Range1" OnFilterChanged="@SetFilterValue1" />
<_DataGridCellFilter Column="Column" CellFilterType="DataGridCellFilterType.Range2" OnFilterChanged="@SetFilterValue2" />
}
else
{
<_DataGridCellFilter Column="Column" FilterSearchValue="Column.Filter.SearchValue" OnFilterChanged="@((newValue) => Column.Filter.SearchValue = newValue)" />
<_DataGridCellFilter Column="Column" OnFilterChanged="@((newValue) => Column.Filter.SearchValue = newValue)" />
}
</Field>
</Column>
Expand Down
Loading