Browse Source

visibility fix.

pull/6647/head
Ilkay Ilknur 5 years ago
parent
commit
5e60fa535e
  1. 6
      framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor
  2. 11
      framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor.cs
  3. 3
      framework/src/Volo.Abp.BlazoriseUI/Components/EntityAction.razor.cs

6
framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor

@ -26,11 +26,11 @@
{
<EntityAction TItem="TItem"
RequiredPolicy="@action.RequiredPolicy"
Color="@(action.Color!=null ? (Blazorise.Color)action.Color : Blazorise.Color.None)"
Color="@(action.Color!=null ? (Blazorise.Color)action.Color : Blazorise.Color.Primary)"
Icon="@action.Icon"
Clicked="async () => await action.Clicked(context)"
ConfirmationMessage="() => action.ConfirmationMessage.Invoke(context)"
Visible="async () =>await VisibleCore(action,context)"
Visible="async () => await VisibleCore(action, context)"
Text="@action.Text">
</EntityAction>
}
@ -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">
</EntityAction>
}

11
framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor.cs

@ -49,16 +49,15 @@ namespace Volo.Abp.BlazoriseUI.Components
};
}
protected Task<bool> VisibleCore(EntityAction action, TItem item)
protected async Task<bool> 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;
}
}
}

3
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);
}

Loading…
Cancel
Save