diff --git a/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/AbpProWebBlazorServerModule.cs b/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/AbpProWebBlazorServerModule.cs index a6282295..d5904a8d 100644 --- a/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/AbpProWebBlazorServerModule.cs +++ b/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/AbpProWebBlazorServerModule.cs @@ -1,4 +1,5 @@ -using Lion.AbpPro.Web.Blazor.Server.Data; +using Lion.AbpPro.Blazor.Layout.AntDesignTheme; +using Lion.AbpPro.Web.Blazor.Server.Data; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -10,7 +11,8 @@ using Volo.Abp.Modularity; namespace Lion.AbpPro.Web.Blazor.Server { [DependsOn(typeof(AbpAutofacModule), - typeof(AbpAspNetCoreSerilogModule))] + typeof(AbpAspNetCoreSerilogModule), + typeof(AbpProBlazorLayoutAntDesignThemeModule))] public class AbpProWebBlazorServerModule:AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) diff --git a/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/App.razor b/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/App.razor index 3c61b53a..19453cbb 100644 --- a/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/App.razor +++ b/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/App.razor @@ -8,3 +8,4 @@ + \ No newline at end of file diff --git a/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/Pages/Index.razor b/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/Pages/Index.razor index e54d9143..e81207cb 100644 --- a/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/Pages/Index.razor +++ b/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/Pages/Index.razor @@ -3,5 +3,5 @@

Hello, world!

Welcome to your new app. - + diff --git a/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/Pages/_Host.cshtml b/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/Pages/_Host.cshtml index 4d0f2560..c93e7128 100644 --- a/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/Pages/_Host.cshtml +++ b/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.Server/Pages/_Host.cshtml @@ -15,6 +15,8 @@ + + diff --git a/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.WebAssembly/App.razor b/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.WebAssembly/App.razor index 784c50f4..9bb5f722 100644 --- a/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.WebAssembly/App.razor +++ b/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.WebAssembly/App.razor @@ -10,3 +10,5 @@ + + \ No newline at end of file diff --git a/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.WebAssembly/wwwroot/index.html b/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.WebAssembly/wwwroot/index.html index d875f8c6..9687571e 100644 --- a/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.WebAssembly/wwwroot/index.html +++ b/aspnet-core/services/host/Lion.AbpPro.Web.Blazor.WebAssembly/wwwroot/index.html @@ -9,6 +9,8 @@ + + diff --git a/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/AbpProBlazorLayoutAntDesignThemeModule.cs b/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/AbpProBlazorLayoutAntDesignThemeModule.cs index 581140d9..bcb2d05f 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/AbpProBlazorLayoutAntDesignThemeModule.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/AbpProBlazorLayoutAntDesignThemeModule.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; using Volo.Abp.Modularity; @@ -13,11 +14,7 @@ namespace Lion.AbpPro.Blazor.Layout.AntDesignTheme public override void ConfigureServices(ServiceConfigurationContext context) { - - Configure(options => - { - options.AdditionalAssemblies.Add(typeof(AbpProBlazorLayoutAntDesignThemeModule).Assembly); - }); + context.Services.AddAntDesign(); } } } diff --git a/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/Lion.AbpPro.Blazor.Layout.AntDesignTheme.csproj b/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/Lion.AbpPro.Blazor.Layout.AntDesignTheme.csproj index 5b7917d0..f8c79854 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/Lion.AbpPro.Blazor.Layout.AntDesignTheme.csproj +++ b/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/Lion.AbpPro.Blazor.Layout.AntDesignTheme.csproj @@ -10,6 +10,7 @@ + diff --git a/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/Pages/Test.razor b/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/Pages/Test.razor index b0928c2b..1e842968 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/Pages/Test.razor +++ b/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/Pages/Test.razor @@ -1,5 +1,5 @@ @page "/Test" -

Test

+ @code { diff --git a/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/_Imports.razor b/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/_Imports.razor index 77285129..38387a89 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/_Imports.razor +++ b/aspnet-core/services/src/Lion.AbpPro.Blazor.Layout.AntDesignTheme/_Imports.razor @@ -1 +1,2 @@ @using Microsoft.AspNetCore.Components.Web +@using AntDesign \ No newline at end of file