Merge pull request #16606 from abpframework/AbpExtensibleDataGrid

Set correct `Field` of `component` of `column`.
2 years ago · 13325e0945
parent 37d84017c8 b71377180d
commit 13325e0945
1 changed files with 16 additions and 5 deletions
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor
@ -72,11 +72,22 @@
                {
                    @if (column.Component != null)
                    {
-                        <DataGridColumn TItem="TItem" Field="@typeof(TItem).GetProperties().First().Name" Caption="@column.Title">
-                            <DisplayTemplate>
-                                @RenderCustomTableColumnComponent(column.Component, context)
-                            </DisplayTemplate>
-                        </DataGridColumn>
+                        @if (column.ValueConverter == null)
+                        {
+                            <DataGridColumn TItem="TItem" Field="@column.Data" Caption="@column.Title" Sortable="@column.Sortable" DisplayFormat="@column.DisplayFormat" DisplayFormatProvider="@column.DisplayFormatProvider" >
+                                <DisplayTemplate>
+                                    @RenderCustomTableColumnComponent(column.Component, context)
+                                </DisplayTemplate>
+                            </DataGridColumn>
+                        }
+                        else
+                        {
+                            <DataGridColumn TItem="TItem" Field="@column.Data" Caption="@column.Title" Sortable="@column.Sortable">
+                                <DisplayTemplate>
+                                    @RenderCustomTableColumnComponent(column.Component, context)
+                                </DisplayTemplate>
+                            </DataGridColumn>
+                        }
                    }
                    else
                    {