diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor
index ec5ef753df..f5e4da45ee 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor
@@ -26,11 +26,11 @@
{
}
@@ -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 VisibleCore(action,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 4232cd363b..a79a64752b 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor.cs
@@ -49,16 +49,15 @@ namespace Volo.Abp.BlazoriseUI.Components
};
}
- protected Task VisibleCore(EntityAction action, TItem item)
+ protected async Task VisibleCore(EntityAction action, TItem item)
{
+ var isVisible = true;
if (action.Visible != null)
{
- return action.Visible.Invoke(item);
- }
- else
- {
- return Task.FromResult(true);
+ isVisible = await action.Visible.Invoke(item);
}
+
+ return isVisible;
}
}
}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/EntityAction.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/EntityAction.razor.cs
index 5ed509aa75..df57f86f64 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/EntityAction.razor.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/EntityAction.razor.cs
@@ -52,8 +52,7 @@ namespace Volo.Abp.BlazoriseUI.Components
await base.OnInitializedAsync();
await SetDefaultValuesAsync();
IsEntityActionVisible = await Visible?.Invoke();
-
- if (!RequiredPolicy.IsNullOrEmpty() && !IsEntityActionVisible)
+ if (!RequiredPolicy.IsNullOrEmpty() && IsEntityActionVisible)
{
IsEntityActionVisible = await AuthorizationService.IsGrantedAsync(RequiredPolicy);
}