From 109bb411a1df26b104e23f6bfbc7bd38ec9ed57a Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Mon, 24 Jan 2022 02:10:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=B9=E6=B3=95=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Extensions/BootstrapBlazorServiceCollectionExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs b/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs index 682f2894c..945d5bb44 100644 --- a/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs +++ b/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs @@ -75,7 +75,7 @@ public static class BootstrapBlazorServiceCollectionExtensions /// /// /// - public static IServiceCollection ConfigIPLocatorOption(this IServiceCollection services, Action locatorAction) + public static IServiceCollection ConfigureIPLocatorOption(this IServiceCollection services, Action locatorAction) { services.Configure(options => { -- Gitee From 310b7e37ff4f14669d59421a6e0f941c30f92b6f Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Mon, 24 Jan 2022 02:15:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20ConfigureBoots?= =?UTF-8?q?trapBlazorOption=20=E9=85=8D=E7=BD=AE=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tstrapBlazorServiceCollectionExtensions.cs | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs b/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs index 945d5bb44..de53e0a5d 100644 --- a/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs +++ b/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs @@ -88,4 +88,27 @@ public static class BootstrapBlazorServiceCollectionExtensions }); return services; } + + /// + /// + /// + /// + /// + /// + public static IServiceCollection ConfigureBootstrapBlazorOption(this IServiceCollection services, Action options) + { + services.Configure(op => + { + options(op); + + // 设置默认文化信息 + if (op.DefaultCultureInfo != null) + { + var culture = new CultureInfo(op.DefaultCultureInfo); + CultureInfo.DefaultThreadCurrentCulture = culture; + CultureInfo.DefaultThreadCurrentUICulture = culture; + } + }); + return services; + } } -- Gitee From b093a1e1debb4a9de7210f268caa54310074e2d5 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Mon, 24 Jan 2022 02:16:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20Json=20?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=8C=96=E9=85=8D=E7=BD=AE=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BootstrapBlazorServiceCollectionExtensions.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs b/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs index de53e0a5d..67512624a 100644 --- a/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs +++ b/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs @@ -111,4 +111,10 @@ public static class BootstrapBlazorServiceCollectionExtensions }); return services; } + + public static IServiceCollection ConfigureJsonLocalizationOptions(this IServiceCollection services, Action localizationAction) + { + services.Configure(localizationAction); + return services; + } } -- Gitee From ddb6a109655ea3465dc2c1bf7aab83e1f6105b4b Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Mon, 24 Jan 2022 02:28:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tstrapBlazorServiceCollectionExtensions.cs | 33 ++++++------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs b/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs index 67512624a..a5654b3b5 100644 --- a/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs +++ b/src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs @@ -51,18 +51,7 @@ public static class BootstrapBlazorServiceCollectionExtensions services.TryAddScoped(); services.TryAddSingleton, ConfigureOptions>(); - services.Configure(options => - { - configureOptions?.Invoke(options); - - // 设置默认文化信息 - if (options.DefaultCultureInfo != null) - { - var culture = new CultureInfo(options.DefaultCultureInfo); - CultureInfo.DefaultThreadCurrentCulture = culture; - CultureInfo.DefaultThreadCurrentUICulture = culture; - } - }); + services.ConfigureBootstrapBlazorOption(configureOptions); services.TryAddSingleton(); services.TryAddSingleton, ConfigureOptions>(); @@ -77,15 +66,7 @@ public static class BootstrapBlazorServiceCollectionExtensions /// public static IServiceCollection ConfigureIPLocatorOption(this IServiceCollection services, Action locatorAction) { - services.Configure(options => - { - locatorAction(options); - - if (options.LocatorFactory == null) - { - options.LocatorFactory = provider => new BaiDuIPLocator(); - } - }); + services.Configure(locatorAction); return services; } @@ -95,11 +76,11 @@ public static class BootstrapBlazorServiceCollectionExtensions /// /// /// - public static IServiceCollection ConfigureBootstrapBlazorOption(this IServiceCollection services, Action options) + public static IServiceCollection ConfigureBootstrapBlazorOption(this IServiceCollection services, Action? options = null) { services.Configure(op => { - options(op); + options?.Invoke(op); // 设置默认文化信息 if (op.DefaultCultureInfo != null) @@ -112,6 +93,12 @@ public static class BootstrapBlazorServiceCollectionExtensions return services; } + /// + /// + /// + /// + /// + /// public static IServiceCollection ConfigureJsonLocalizationOptions(this IServiceCollection services, Action localizationAction) { services.Configure(localizationAction); -- Gitee