Merge branch 'main' into fix-context

ArgoZhang · ArgoZhang · commit 67e4837c8e5e · 2026-01-13T10:01:18.000+08:00
diff --git a/km-KH.json b/km-KH.json
diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
@@ -23,8 +23,8 @@
     <PackageReference Include="BootstrapBlazor.AntDesignIcon" Version="10.0.0" />
     <PackageReference Include="BootstrapBlazor.Authenticator" Version="10.0.0" />
     <PackageReference Include="BootstrapBlazor.AzureOpenAI" Version="10.0.0" />
-    <PackageReference Include="BootstrapBlazor.AzureTranslator" Version="10.0.0" />
-    <PackageReference Include="BootstrapBlazor.BaiduSpeech" Version="10.0.1" />
+    <PackageReference Include="BootstrapBlazor.AzureTranslator" Version="10.0.1" />
+    <PackageReference Include="BootstrapBlazor.BaiduSpeech" Version="10.0.2" />
     <PackageReference Include="BootstrapBlazor.BaiduOcr" Version="10.0.1" />
     <PackageReference Include="BootstrapBlazor.BarCode" Version="10.0.0" />
     <PackageReference Include="BootstrapBlazor.BarcodeGenerator" Version="10.0.0" />
@@ -78,7 +78,7 @@
     <PackageReference Include="BootstrapBlazor.Tasks.Dashboard" Version="10.0.0" />
     <PackageReference Include="BootstrapBlazor.Topology" Version="10.0.0" />
     <PackageReference Include="BootstrapBlazor.UniverIcon" Version="10.0.0" />
-    <PackageReference Include="BootstrapBlazor.UniverSheet" Version="10.0.6" />
+    <PackageReference Include="BootstrapBlazor.UniverSheet" Version="10.0.8" />
     <PackageReference Include="BootstrapBlazor.Vditor" Version="10.0.2" />
     <PackageReference Include="BootstrapBlazor.VideoPlayer" Version="10.0.0" />
     <PackageReference Include="BootstrapBlazor.WinBox" Version="10.0.0" />
diff --git a/src/BootstrapBlazor.Server/Components/Samples/UniverSheets.razor b/src/BootstrapBlazor.Server/Components/Samples/UniverSheets.razor
@@ -34,6 +34,6 @@
         <Button OnClickWithoutRender="OnPushPluginData" Text="@Localizer["PushButtonText"]"></Button>
     </section>
     <div class="bb-sheet-demo">
-        <UniverSheet @ref="_sheetPlugin" Plugins="_plugins" OnPostDataAsync="OnPostDataAsync"></UniverSheet>
+        <UniverSheet @ref="_sheetPlugin" Plugins="_plugins" OnReadyAsync="OnReadyPushAsync" OnPostDataAsync="OnPostDataAsync"></UniverSheet>
     </div>
 </DemoBlock>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/UniverSheets.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/UniverSheets.razor.cs
@@ -1,4 +1,4 @@
-﻿// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the Apache 2.0 License
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
@@ -46,7 +46,9 @@ protected override async Task OnInitializedAsync()
         }
     }
 
-    private async Task OnReadyAsync() => await ToastService.Information(Localizer["ToastOnReadyTitle"], Localizer["ToastOnReadyContent"]);
+    private Task OnReadyAsync() => ToastService.Information(Localizer["ToastOnReadyTitle"], Localizer["ToastOnReadyContent"]);
+
+    private Task OnReadyPushAsync() => OnPushPluginData();
 
     private static Task<UniverSheetData> OnPostDataAsync(UniverSheetData data)
     {
diff --git a/src/BootstrapBlazor.Server/Components/Samples/UniverSheets.razor.css b/src/BootstrapBlazor.Server/Components/Samples/UniverSheets.razor.css
@@ -1,4 +1,4 @@
-﻿.bb-sheet-demo {
+.bb-sheet-demo {
     height: 290px;
     width: 100%;
     border: 1px solid var(--bs-border-color);
diff --git a/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs b/src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs
@@ -5,7 +5,6 @@
 
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using System.Reflection;
 
@@ -32,10 +31,6 @@ class BootstrapBlazorErrorBoundary : ErrorBoundaryBase
     [NotNull]
     private NavigationManager? NavigationManager { get; set; }
 
-    [Inject]
-    [NotNull]
-    private IHostEnvironment? HostEnvironment { get; set; }
-
     /// <summary>
     /// 获得/设置 自定义错误处理回调方法
     /// </summary>
@@ -161,16 +156,8 @@ public async Task RenderException(Exception exception, IHandlerException? handle
 
         if (handler != null)
         {
-            if (HostEnvironment.IsDevelopment())
-            {
-                // IHandlerException 处理异常逻辑
-                await handler.HandlerExceptionAsync(exception, ExceptionContent);
-            }
-            else
-            {
-                // 非开发模式下弹窗提示错误信息
-                await ToastService.Error(ToastTitle, exception.Message);
-            }
+            // 非开发模式下弹窗提示错误信息
+            await ToastService.Error(ToastTitle, exception.Message);
             return;
         }
 
diff --git a/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs b/src/BootstrapBlazor/Components/ErrorLogger/ErrorLogger.cs
@@ -66,7 +66,7 @@ public class ErrorLogger : ComponentBase, IErrorLogger
     /// Gets or sets the callback function to be invoked during initialization.
     /// </summary>
     [Parameter]
-    public Func<ErrorLogger, Task>? OnInitializedCallback { get; set; }
+    public Func<IErrorLogger, Task>? OnInitializedCallback { get; set; }
 
     [NotNull]
     private BootstrapBlazorErrorBoundary? _errorBoundary = default;
diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
@@ -683,9 +683,9 @@ private async Task ToggleSidebar()
         await TriggerCollapseChanged();
     }
 
-    private ErrorLogger? _errorLogger;
+    private IErrorLogger? _errorLogger;
 
-    private Task OnErrorLoggerInitialized(ErrorLogger logger)
+    private Task OnErrorLoggerInitialized(IErrorLogger logger)
     {
         _errorLogger = logger;
         _errorLogger.Register(this);
diff --git a/src/BootstrapBlazor/Components/Tab/TabItemContent.cs b/src/BootstrapBlazor/Components/Tab/TabItemContent.cs
@@ -1,4 +1,4 @@
-﻿// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the Apache 2.0 License
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
@@ -28,7 +28,7 @@ class TabItemContent : IComponent, IHandlerException, IDisposable
     [NotNull]
     private IOptionsMonitor<BootstrapBlazorOptions>? Options { get; set; }
 
-    private ErrorLogger? _logger;
+    private IErrorLogger? _logger;
 
     private RenderHandle _renderHandle;
 
@@ -64,7 +64,7 @@ private void BuildRenderTree(RenderTreeBuilder builder)
         // TabItem 不需要 Toast 提示错误信息
         builder.AddAttribute(3, nameof(ErrorLogger.ShowToast), false);
         builder.AddAttribute(4, nameof(ErrorLogger.ToastTitle), TabSet.ErrorLoggerToastTitle);
-        builder.AddAttribute(5, nameof(ErrorLogger.OnInitializedCallback), new Func<ErrorLogger, Task>(logger =>
+        builder.AddAttribute(5, nameof(ErrorLogger.OnInitializedCallback), new Func<IErrorLogger, Task>(logger =>
         {
             _logger = logger;
             _logger.Register(this);
diff --git a/src/BootstrapBlazor/Directory.Build.props b/src/BootstrapBlazor/Directory.Build.props
@@ -36,7 +36,6 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET8Version)" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET6Version)" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(NET8Version)" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(NET8Version)" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(NET8Version)" />
   </ItemGroup>
 
@@ -47,7 +46,6 @@
     <PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET7Version)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET8Version)" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(NET8Version)" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(NET8Version)" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(NET8Version)" />
   </ItemGroup>
 
@@ -57,7 +55,6 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(NET10Version)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET10Version)" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(NET10Version)" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(NET10Version)" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET8Version)" />
   </ItemGroup>
 
@@ -67,7 +64,6 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(NET10Version)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET10Version)" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(NET10Version)" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(NET10Version)" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET9Version)" />
   </ItemGroup>
 
@@ -77,7 +73,6 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(NET10Version)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET10Version)" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(NET10Version)" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(NET10Version)" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET10Version)" />
   </ItemGroup>
   
diff --git a/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs b/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs
@@ -1,11 +1,10 @@
-﻿// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the Apache 2.0 License
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Hosting;
 using System.Globalization;
 
 namespace Microsoft.Extensions.DependencyInjection;
@@ -37,9 +36,6 @@ public static IServiceCollection AddBootstrapBlazor(this IServiceCollection serv
         services.TryAddSingleton<IZipArchiveService, DefaultZipArchiveService>();
         services.TryAddSingleton(typeof(IDispatchService<>), typeof(DefaultDispatchService<>));
 
-        // 增加 IHostEnvironment 服务
-        services.TryAddSingleton<IHostEnvironment, MockWasmHostEnvironment>();
-
         // 增加 OtpOptions 配置支持
         services.AddOptionsMonitor<OtpOptions>();
 
diff --git a/src/BootstrapBlazor/Extensions/HostEnvironmentExtensions.cs b/src/BootstrapBlazor/Extensions/HostEnvironmentExtensions.cs
diff --git a/src/BootstrapBlazor/Services/MockWasmHostEnvironment.cs b/src/BootstrapBlazor/Services/MockWasmHostEnvironment.cs
diff --git a/test/UnitTest/Extensions/HostEnvironmentExtensionsTest.cs b/test/UnitTest/Extensions/HostEnvironmentExtensionsTest.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Licensed to the .NET Foundation under one or more agreements.`
	`1`	`+// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the Apache 2.0 License`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`	`// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone`
`@@ -46,7 +46,9 @@ protected override async Task OnInitializedAsync()`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`- private async Task OnReadyAsync() => await ToastService.Information(Localizer["ToastOnReadyTitle"], Localizer["ToastOnReadyContent"]);`
	`49`	`+ private Task OnReadyAsync() => ToastService.Information(Localizer["ToastOnReadyTitle"], Localizer["ToastOnReadyContent"]);`
	`50`	`+`
	`51`	`+ private Task OnReadyPushAsync() => OnPushPluginData();`
`50`	`52`
`51`	`53`	`private static Task<UniverSheetData> OnPostDataAsync(UniverSheetData data)`
`52`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.bb-sheet-demo {`
	`1`	`+.bb-sheet-demo {`
`2`	`2`	`height: 290px;`
`3`	`3`	`width: 100%;`
`4`	`4`	`border: 1px solid var(--bs-border-color);`
Original file line number	Diff line number	Diff line change
`@@ -683,9 +683,9 @@ private async Task ToggleSidebar()`
`683`	`683`	`await TriggerCollapseChanged();`
`684`	`684`	`}`
`685`	`685`
`686`		`- private ErrorLogger? _errorLogger;`
	`686`	`+ private IErrorLogger? _errorLogger;`
`687`	`687`
`688`		`- private Task OnErrorLoggerInitialized(ErrorLogger logger)`
	`688`	`+ private Task OnErrorLoggerInitialized(IErrorLogger logger)`
`689`	`689`	`{`
`690`	`690`	`_errorLogger = logger;`
`691`	`691`	`_errorLogger.Register(this);`