diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor index ae5e106a72..ec5ef753df 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor @@ -30,7 +30,7 @@ Icon="@action.Icon" Clicked="async () => await action.Clicked(context)" ConfirmationMessage="() => action.ConfirmationMessage.Invoke(context)" - Visible="async () => await action.Visible?.Invoke(context)" + Visible="async () =>await VisibleCore(action,context)" Text="@action.Text"> } @@ -41,7 +41,7 @@ Clicked="async () => await action.Clicked(context)" Color="@(action.Color!=null ? (Blazorise.Color)action.Color : Blazorise.Color.None)" Icon="@action.Icon" - Visible="async () => await action.Visible?.Invoke(context)" + Visible="async () =>await VisibleCore(action,context)" Text="@action.Text"> } diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor.cs index 85418a79c7..4232cd363b 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor.cs @@ -8,6 +8,8 @@ using Volo.Abp.AspNetCore.Components.Extensibility.TableColumns; using System.Linq; using System.Text.RegularExpressions; using Microsoft.Extensions.Localization; +using System.Threading.Tasks; +using Volo.Abp.AspNetCore.Components.Extensibility.EntityActions; namespace Volo.Abp.BlazoriseUI.Components { @@ -46,5 +48,17 @@ namespace Volo.Abp.BlazoriseUI.Components builder.CloseComponent(); }; } + + protected Task VisibleCore(EntityAction action, TItem item) + { + if (action.Visible != null) + { + return action.Visible.Invoke(item); + } + else + { + return Task.FromResult(true); + } + } } } \ No newline at end of file