Merge branch 'refactor-module' into fix-driverjs

ArgoZhang · Koreets61 · ArgoZhang · commit abdb7bbfd823 · 2025-02-03T11:26:28.000+08:00
Co-Authored-By: Alexander Mun &lt;koreets61@gmail.com&gt;
diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor.AntDesignIcon" Version="9.0.0" />
+    <PackageReference Include="BootstrapBlazor.AntDesignIcon" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.AzureOpenAI" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.AzureTranslator" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.BaiduSpeech" Version="9.0.0" />
@@ -33,22 +33,22 @@
     <PackageReference Include="BootstrapBlazor.Dock" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.DockView" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.DriverJs" Version="9.0.1" />
-    <PackageReference Include="BootstrapBlazor.ElementIcon" Version="9.0.0" />
+    <PackageReference Include="BootstrapBlazor.ElementIcon" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.FileViewer" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.0.2" />
     <PackageReference Include="BootstrapBlazor.Gantt" Version="9.0.2" />
     <PackageReference Include="BootstrapBlazor.Holiday" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.Html2Pdf" Version="9.0.1" />
-    <PackageReference Include="BootstrapBlazor.IconPark" Version="9.0.0" />
+    <PackageReference Include="BootstrapBlazor.IconPark" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.ImageCropper" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.Markdown" Version="9.0.1" />
-    <PackageReference Include="BootstrapBlazor.MaterialDesign" Version="9.0.0" />
+    <PackageReference Include="BootstrapBlazor.MaterialDesign" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.MeiliSearch" Version="9.1.7" />
     <PackageReference Include="BootstrapBlazor.Mermaid" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.MindMap" Version="9.1.3" />
     <PackageReference Include="BootstrapBlazor.MouseFollower" Version="9.0.1" />
-    <PackageReference Include="BootstrapBlazor.OctIcon" Version="9.0.0" />
+    <PackageReference Include="BootstrapBlazor.OctIcon" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.PdfReader" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.Player" Version="9.0.0" />
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Icons/AntDesignIcons.razor b/src/BootstrapBlazor.Server/Components/Samples/Icons/AntDesignIcons.razor
@@ -22,6 +22,10 @@
 
 <Pre>&lt;link href="_content/BootstrapBlazor.AntDesignIcon/BootstrapBlazor.AntDesignIcon.bundle.scp.css" rel="stylesheet"&gt;</Pre>
 
-<Pre>&lt;AntDesignIcon Category="AntDesignIconCategory.Outlined" Name="account-book"&gt;&lt;AntDesignIcon&gt;</Pre>
+<div class="mb-2">
+    <AntDesignIcon Category="AntDesignIconCategory.Outlined" Name="github"></AntDesignIcon>
+</div>
+
+<Pre>&lt;AntDesignIcon Category="AntDesignIconCategory.Outlined" Name="github"&gt;&lt;/AntDesignIcon&gt;</Pre>
 
 <div>@((MarkupString)Localizer["Icons"].Value)</div>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Icons/BootstrapIcons.razor b/src/BootstrapBlazor.Server/Components/Samples/Icons/BootstrapIcons.razor
@@ -14,6 +14,10 @@
 
 <Pre>&lt;link href="_content/BootstrapBlazor.BootstrapIcon/css/bootstrap.min.css" rel="stylesheet"&gt;</Pre>
 
-<Pre>&lt;i class="bi bi-save"&gt;&lt;/i&gt;</Pre>
+<div class="mb-2">
+    <i class="bi bi-github"></i>
+</div>
+
+<Pre>&lt;i class="bi bi-github"&gt;&lt;/i&gt;</Pre>
 
 <div>@((MarkupString)Localizer["Icons"].Value)</div>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Icons/ElementIcons.razor b/src/BootstrapBlazor.Server/Components/Samples/Icons/ElementIcons.razor
@@ -22,6 +22,10 @@
 
 <Pre>&lt;link href="_content/BootstrapBlazor.ElementIcon/BootstrapBlazor.ElementIcon.bundle.scp.css" rel="stylesheet"&gt;</Pre>
 
-<Pre>&lt;ElementIcon Name="add-location"&gt;&lt;ElementIcon&gt;</Pre>
+<div class="mb-2">
+    <ElementIcon Name="upload-filled"></ElementIcon>
+</div>
+
+<Pre>&lt;ElementIcon Name="upload-filled"&gt;&lt;/ElementIcon&gt;</Pre>
 
 <div>@((MarkupString)Localizer["Icons"].Value)</div>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Icons/FAIcons.razor b/src/BootstrapBlazor.Server/Components/Samples/Icons/FAIcons.razor
@@ -14,6 +14,10 @@
 
 <Pre>&lt;link href="_content/BootstrapBlazor.FontAwesome/css/font-awesome.min.css" rel="stylesheet"&gt;</Pre>
 
-<Pre>&lt;i class="fa-solid fa-home"&gt;&lt;/i&gt;</Pre>
+<div class="mb-2">
+    <i class="fa-brands fa-github"></i>
+</div>
+
+<Pre>&lt;i class="fa-brands fa-github"&gt;&lt;/i&gt;</Pre>
 
 <div>@((MarkupString)Localizer["Icons"].Value)</div>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Icons/IconParks.razor b/src/BootstrapBlazor.Server/Components/Samples/Icons/IconParks.razor
@@ -22,6 +22,10 @@
 
 <Pre>&lt;link href="_content/BootstrapBlazor.IconPark/BootstrapBlazor.IconPark.bundle.scp.css" rel="stylesheet"&gt;</Pre>
 
-<Pre>&lt;ByteDanceIcon Name="abdominal"&gt;&lt;ByteDanceIcon&gt;</Pre>
+<div class="mb-2">
+    <ByteDanceIcon Name="github"></ByteDanceIcon>
+</div>
+
+<Pre>&lt;ByteDanceIcon Name="github"&gt;&lt;/ByteDanceIcon&gt;</Pre>
 
 <div>@((MarkupString)Localizer["Icons"].Value)</div>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Icons/MaterialDesignIcons.razor b/src/BootstrapBlazor.Server/Components/Samples/Icons/MaterialDesignIcons.razor
@@ -14,6 +14,10 @@
 
 <Pre>&lt;link href="_content/BootstrapBlazor.MaterialDesign/css/md.min.css" rel="stylesheet"&gt;</Pre>
 
-<Pre>&lt;i class="mdi mdi-ab-testing"&gt;&lt;/i&gt;</Pre>
+<div class="mb-2">
+    <i class="mdi mdi-github"></i>
+</div>
+
+<Pre>&lt;i class="mdi mdi-github"&gt;&lt;/i&gt;</Pre>
 
 <div>@((MarkupString)Localizer["Icons"].Value)</div>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Icons/OctIcons.razor b/src/BootstrapBlazor.Server/Components/Samples/Icons/OctIcons.razor
@@ -22,6 +22,10 @@
 
 <Pre>&lt;link href="_content/BootstrapBlazor.OctIcon/BootstrapBlazor.OctIcon.bundle.scp.css" rel="stylesheet"&gt;</Pre>
 
-<Pre>&lt;OctIcon Name="accessibility-16"&gt;&lt;OctIcon&gt;</Pre>
+<div class="mb-2">
+    <OctIcon Name="mark-github-16"></OctIcon>
+</div>
+
+<Pre>&lt;OctIcon Name="mark-github-16"&gt;&lt;/OctIcon&gt;</Pre>
 
 <div>@((MarkupString)Localizer["Icons"].Value)</div>
diff --git a/src/BootstrapBlazor/Extensions/JSModuleExtensions.cs b/src/BootstrapBlazor/Extensions/JSModuleExtensions.cs
@@ -18,14 +18,21 @@ public static class JSModuleExtensions
     /// <returns>A <see cref="Task"/><![CDATA[<]]><see cref="JSModule"/><![CDATA[>]]> 模块加载器</returns>
     public static Task<JSModule> LoadUtility(this IJSRuntime jsRuntime, string? version = null) => LoadModuleByName(jsRuntime, "utility", version);
 
-    internal static Task<JSModule> LoadModuleByName(this IJSRuntime jsRuntime, string moduleName, string? version = null)
+    /// <summary>
+    /// 通过名称导入内置脚本模块
+    /// </summary>
+    /// <param name="jsRuntime"></param>
+    /// <param name="moduleName"></param>
+    /// <param name="version"></param>
+    /// <returns>A <see cref="Task"/><![CDATA[<]]><see cref="JSModule"/><![CDATA[>]]> 模块加载器</returns>
+    public static Task<JSModule> LoadModuleByName(this IJSRuntime jsRuntime, string moduleName, string? version = null)
     {
         var fileName = $"./_content/BootstrapBlazor/modules/{moduleName}.js";
         return LoadModule(jsRuntime, fileName, version);
     }
 
     /// <summary>
-    /// IJSRuntime 扩展方法 动态加载脚本 脚本目录为 modules
+    /// IJSRuntime 扩展方法 动态加载脚本
     /// </summary>
     /// <param name="jsRuntime"></param>
     /// <param name="fileName"></param>
diff --git a/src/BootstrapBlazor/Services/WebClientService.cs b/src/BootstrapBlazor/Services/WebClientService.cs
@@ -39,13 +39,14 @@ public async Task<ClientInfo> GetClientInfo()
         {
             RequestUrl = navigation.Uri
         };
-        _jsModule ??= await runtime.LoadModule("./_content/BootstrapBlazor/modules/client.js");
-        _interop ??= DotNetObjectReference.Create(this);
-        await _jsModule.InvokeVoidAsync("ping", "ip.axd", _interop, nameof(SetData));
 
-        // 等待 SetData 方法执行完毕
         try
         {
+            _jsModule ??= await runtime.LoadModuleByName("client");
+            _interop ??= DotNetObjectReference.Create(this);
+            await _jsModule.InvokeVoidAsync("ping", "ip.axd", _interop, nameof(SetData));
+
+            // 等待 SetData 方法执行完毕
             await _taskCompletionSource.Task.WaitAsync(TimeSpan.FromSeconds(3));
         }
         catch (TimeoutException) { }

Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,14 @@ public async Task<ClientInfo> GetClientInfo()`
`39`	`39`	`{`
`40`	`40`	`RequestUrl = navigation.Uri`
`41`	`41`	`};`
`42`		`- _jsModule ??= await runtime.LoadModule("./_content/BootstrapBlazor/modules/client.js");`
`43`		`- _interop ??= DotNetObjectReference.Create(this);`
`44`		`- await _jsModule.InvokeVoidAsync("ping", "ip.axd", _interop, nameof(SetData));`
`45`	`42`
`46`		`- // 等待 SetData 方法执行完毕`
`47`	`43`	`try`
`48`	`44`	`{`
	`45`	`+ _jsModule ??= await runtime.LoadModuleByName("client");`
	`46`	`+ _interop ??= DotNetObjectReference.Create(this);`
	`47`	`+ await _jsModule.InvokeVoidAsync("ping", "ip.axd", _interop, nameof(SetData));`
	`48`	`+`
	`49`	`+ // 等待 SetData 方法执行完毕`
`49`	`50`	`await _taskCompletionSource.Task.WaitAsync(TimeSpan.FromSeconds(3));`
`50`	`51`	`}`
`51`	`52`	`catch (TimeoutException) { }`