starred/radzen-blazor
1
0
Fork 0
mirror of https://github.com/radzenhq/radzen-blazor.git synced 2026-02-04 05:35:44 +00:00
Code Issues 1.3k Packages Projects Releases 22 Wiki Activity

DataGrid wrong column grouped in some cases with composite columns

Browse Source
This commit is contained in:
Vladimir Enchev
2024-10-17 09:39:12 +03:00
parent ba06a72326
commit d63117a17a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Radzen.Blazor/RadzenDataGrid.razor.cs
View File

@@ -1587,10 +1587,12 @@ namespace Radzen.Blazor
}
int? indexOfColumnToReoder;
string uniqueIDOfColumnToReoder;
internal async Task StartColumnReorder(MouseEventArgs args, int columnIndex)
internal async Task StartColumnReorder(MouseEventArgs args, int columnIndex, string uniqueID)
{
indexOfColumnToReoder = columnIndex;
uniqueIDOfColumnToReoder = uniqueID;
await JSRuntime.InvokeVoidAsync("Radzen.startColumnReorder", getColumnUniqueId(columnIndex));
}
@@ -3099,12 +3101,12 @@ namespace Radzen.Blazor
internal async Task EndColumnDropToGroup()
{
if(indexOfColumnToReoder != null && AllowGrouping)
if(indexOfColumnToReoder != null && uniqueIDOfColumnToReoder != null && AllowGrouping)
{
var functionName = $"Radzen['{getColumnUniqueId(indexOfColumnToReoder.Value)}end']";
await JSRuntime.InvokeVoidAsync("eval", $"{functionName} && {functionName}()");
var column = allColumns.Where(c => c.Visible).ToList().ElementAtOrDefault(indexOfColumnToReoder.Value);
var column = allColumns.Where(c => (c.UniqueID ?? c.Property) == uniqueIDOfColumnToReoder).FirstOrDefault();
if (column != null && column.Groupable && !string.IsNullOrEmpty(column.GetGroupProperty()))
{
@@ -3125,6 +3127,7 @@ namespace Radzen.Blazor
}
indexOfColumnToReoder = null;
uniqueIDOfColumnToReoder = null;
}
}

2
Radzen.Blazor/RadzenDataGridHeaderCell.razor
View File

@@ -15,7 +15,7 @@
<span id="@(Grid.getColumnUniqueId(ColumnIndex) + "-drag")" class="rz-column-drag"
@onclick:preventDefault="true" @onclick:stopPropagation="true"
@onmousedown:preventDefault="true"
@onmousedown=@(args => Grid.StartColumnReorder(args, ColumnIndex))></span>
@onmousedown=@(args => Grid.StartColumnReorder(args, ColumnIndex, Column.UniqueID ?? Column.Property))></span>
}
<span class="rz-column-title" title="@(Grid.ShowColumnTitleAsTooltip ? @Column.GetTitle() : Column.HeaderTooltip)">
@if (Column.HeaderTemplate != null)