feat(Dialog): support call show OnAfterRender lifecycle (#4343)

* refactor: 增加脚本加载阻塞逻辑

* refactor: 代码重构

* chore: bump version 8.9.4-beta01

* refactor: 移除基类脚本调用

* Revert "refactor: 代码重构"

This reverts commit 789d4b4.

* Revert "refactor: 增加脚本加载阻塞逻辑"

This reverts commit e9baf2f.

* feat: 增加加载与初始化阻塞类

* feat: 支持 OnAfterRender 中弹窗

Author: ArgoZhang

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>8.9.3</Version>
+    <Version>8.9.4-beta01</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">

src/BootstrapBlazor/Components/BaseComponents/BootstrapModuleComponentBase.cs

@@ -36,6 +36,16 @@ public abstract class BootstrapModuleComponentBase : IdComponentBase, IAsyncDisp
     /// </summary>
     protected DotNetObjectReference<BootstrapModuleComponentBase>? Interop { get; set; }
 
+    /// <summary>
+    /// 获得/设置 Module 是否加载完成
+    /// </summary>
+    protected TaskCompletionSource ModuleLoadTask { get; } = new();
+
+    /// <summary>
+    /// 获得/设置 Module 是否初始化完成
+    /// </summary>
+    protected TaskCompletionSource ModuleInitTask { get; } = new();
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -55,11 +65,13 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         if (firstRender && !string.IsNullOrEmpty(ModulePath))
         {
             Module ??= await JSRuntime.LoadModule(ModulePath);
+            ModuleLoadTask.SetResult();
 
             if (AutoInvokeInit)
             {
                 await InvokeInitAsync();
             }
+            ModuleInitTask.SetResult();
         }
     }
 

src/BootstrapBlazor/Components/Modal/Modal.razor.cs

@@ -176,13 +176,21 @@ public async Task CloseCallback()
     /// <summary>
     /// 弹窗状态切换方法
     /// </summary>
-    public Task Toggle() => InvokeVoidAsync("execute", Id, "toggle");
+    public async Task Toggle()
+    {
+        await ModuleInitTask.Task;
+        await InvokeVoidAsync("execute", Id, "toggle");
+    }
 
     /// <summary>
     /// 显示弹窗方法
     /// </summary>
     /// <returns></returns>
-    public Task Show() => InvokeVoidAsync("execute", Id, "show");
+    public async Task Show()
+    {
+        await ModuleInitTask.Task;
+        await InvokeVoidAsync("execute", Id, "show");
+    }
 
     /// <summary>
     /// 关闭当前弹窗方法

src/BootstrapBlazor/Components/Table/TableToolbarButton.cs

@@ -55,9 +55,9 @@ protected override void OnInitialized()
     /// </summary>
     /// <param name="disposing"></param>
     /// <returns></returns>
-    protected override async ValueTask DisposeAsync(bool disposing)
+    protected override ValueTask DisposeAsync(bool disposing)
     {
         Toolbar?.RemoveButton(this);
-        await base.DisposeAsync(disposing);
+        return ValueTask.CompletedTask;
     }
 }

src/BootstrapBlazor/Components/Table/TableToolbarPopConfirmButton.cs

@@ -73,9 +73,9 @@ protected override void OnParametersSet()
     /// </summary>
     /// <param name="disposing"></param>
     /// <returns></returns>
-    protected override async ValueTask DisposeAsync(bool disposing)
+    protected override ValueTask DisposeAsync(bool disposing)
     {
         Toolbar?.RemoveButton(this);
-        await base.DisposeAsync(disposing);
+        return ValueTask.CompletedTask;
     }
 }