diff --git a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiMessageService.cs b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiMessageService.cs index f22ec3b653..3e83166191 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiMessageService.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiMessageService.cs @@ -69,16 +69,16 @@ namespace Volo.Abp.BlazoriseUI return Task.CompletedTask; } - public async Task ConfirmAsync(string message, string title = null, Action options = null) + public Task ConfirmAsync(string message, string title = null, Action options = null) { var uiMessageOptions = CreateDefaultOptions(); options?.Invoke(uiMessageOptions); var callback = new TaskCompletionSource(); - MessageReceived?.Invoke(this, new UiMessageEventArgs(UiMessageType.Confirmation, message, title, uiMessageOptions)); + MessageReceived?.Invoke(this, new UiMessageEventArgs(UiMessageType.Confirmation, message, title, uiMessageOptions, callback)); - return await callback.Task; + return callback.Task; } protected virtual UiMessageOptions CreateDefaultOptions() diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs index 0724ee6c97..c39cb6f880 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs @@ -45,24 +45,16 @@ namespace MyCompanyName.MyProjectName.Blazor.Pages return UiMessageService.ErrorAsync( "This is the Error message", "Error" ); } - Task OnConfirmTestClicked() + async Task OnConfirmTestClicked() { - return UiMessageService.ConfirmAsync( "Are you sure you want to delete the item?", "Confirm", options => + if ( await UiMessageService.ConfirmAsync( "Are you sure you want to delete the item?", "Confirm", options => { options.CancelButtonText = "Do not delete it"; options.ConfirmButtonText = "Yes I'm sure"; - } ) - .ContinueWith( result => - { - if ( result.Result ) - { - Console.WriteLine( "Confirmed" ); - } - else - { - Console.WriteLine( "Cancelled" ); - } - } ); + } ) ) + { + Console.WriteLine( "Confirmed" ); + } } [Inject] IUiMessageService UiMessageService { get; set; }