Skip to content

Commit 9c1ee0c

Browse files
committed
refactor: 移除 IOptionsMonitor 使用
1 parent acdf1cd commit 9c1ee0c

File tree

5 files changed

+12
-25
lines changed

5 files changed

+12
-25
lines changed

src/BootstrapBlazor.Server/Components/Components/CultureChooser.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<span>@Label</span>
55
<Select Value="@SelectedCulture" OnSelectedItemChanged="@SetCulture">
66
<Options>
7-
@foreach (var kv in BootstrapOptions.CurrentValue.GetSupportedCultures())
7+
@foreach (var kv in BootstrapOptions.Value.GetSupportedCultures())
88
{
99
<SelectOption Text="@GetDisplayName(kv)" Value="@kv.Name" />
1010
}

src/BootstrapBlazor.Server/Components/Components/CultureChooser.razor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public partial class CultureChooser
1616
{
1717
[Inject]
1818
[NotNull]
19-
private IOptionsMonitor<BootstrapBlazorOptions>? BootstrapOptions { get; set; }
19+
private IOptions<BootstrapBlazorOptions>? BootstrapOptions { get; set; }
2020

2121
[Inject]
2222
[NotNull]

src/BootstrapBlazor.Server/Components/Pages/Localization.razor

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,11 @@ builder.Services.AddServerSideBlazor();
7777
builder.Services.AddBootstrapBlazor();
7878

7979
// @Localizer["N26"]
80-
builder.Services.AddRequestLocalization&lt;IOptionsMonitor&lt;BootstrapBlazorOptions&gt;&gt;((localizerOption, blazorOption)=>
80+
builder.Services.AddRequestLocalization&lt;IOptions&lt;BootstrapBlazorOptions&gt;&gt;((localizerOption, blazorOption)=>
8181
{
82-
blazorOption.OnChange(op => Invoke(op));
83-
Invoke(blazorOption.CurrentValue);
84-
85-
void Invoke(BootstrapBlazorOptions option)
86-
{
87-
var supportedCultures = option.GetSupportedCultures();
88-
localizerOption.SupportedCultures = supportedCultures;
89-
localizerOption.SupportedUICultures = supportedCultures;
90-
}
82+
var supportedCultures = blazorOption.Value.GetSupportedCultures();
83+
localizerOption.SupportedCultures = supportedCultures;
84+
localizerOption.SupportedUICultures = supportedCultures;
9185
});
9286

9387
var app = builder.Build();

src/BootstrapBlazor.Server/Components/Samples/Dispatches.razor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public partial class Dispatches
2222

2323
[Inject]
2424
[NotNull]
25-
private IOptionsMonitor<BootstrapBlazorOptions>? Options { get; set; }
25+
private IOptions<BootstrapBlazorOptions>? Options { get; set; }
2626

2727
private async Task OnDispatch()
2828
{
@@ -36,7 +36,7 @@ private async Task OnDispatch()
3636
var clientInfo = await ClientService.GetClientInfo();
3737
if (clientInfo.Ip != null)
3838
{
39-
var provider = IpLocatorFactory.Create(Options.CurrentValue.IpLocatorOptions.ProviderName);
39+
var provider = IpLocatorFactory.Create(Options.Value.IpLocatorOptions.ProviderName);
4040
var location = await provider.Locate(clientInfo.Ip);
4141
message = $"{message} {location}";
4242
}

src/BootstrapBlazor.Server/Extensions/ServiceCollectionExtensions.cs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,11 @@ public static IServiceCollection AddBootstrapBlazorServerService(this IServiceCo
2222
services.AddLogging(logging => logging.AddFileLogger());
2323

2424
// 增加多语言支持配置信息
25-
services.AddRequestLocalization<IOptionsMonitor<BootstrapBlazorOptions>>((localizerOption, blazorOption) =>
25+
services.AddRequestLocalization<IOptions<BootstrapBlazorOptions>>((localizerOption, blazorOption) =>
2626
{
27-
blazorOption.OnChange(Invoke);
28-
Invoke(blazorOption.CurrentValue);
29-
return;
30-
31-
void Invoke(BootstrapBlazorOptions option)
32-
{
33-
var supportedCultures = option.GetSupportedCultures();
34-
localizerOption.SupportedCultures = supportedCultures;
35-
localizerOption.SupportedUICultures = supportedCultures;
36-
}
27+
var supportedCultures = blazorOption.Value.GetSupportedCultures();
28+
localizerOption.SupportedCultures = supportedCultures;
29+
localizerOption.SupportedUICultures = supportedCultures;
3730
});
3831

3932
services.AddControllers();

0 commit comments

Comments
 (0)