✨ 添加Blaozr实现

4 years ago · 5b488291ba
10 changed files with 17 additions and 9 deletions
--- 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)
--- 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 @@
        </LayoutView>
    </NotFound>
 </Router>
+<AntContainer /> 
--- 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 @@
 <h1>Hello, world!</h1>

 Welcome to your new app.
-
+<Button Type="primary">Hello World!</Button>
 <SurveyPrompt Title="How is Blazor working for you?" />
--- 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 @@
    <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
    <link href="css/site.css" rel="stylesheet" />
    <link href="Lion.AbpPro.Web.Blazor.Server.styles.css" rel="stylesheet" />
+    <link href="_content/AntDesign/css/ant-design-blazor.css" rel="stylesheet">
+    <script src="_content/AntDesign/js/ant-design-blazor.js"></script>
 </head>
 <body>
    <component type="typeof(App)" render-mode="ServerPrerendered" />
--- 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 @@
        </LayoutView>
    </NotFound>
 </Router>
+
+<AntContainer />
--- 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 @@
    <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
    <link href="css/app.css" rel="stylesheet" />
    <link href="Lion.AbpPro.Web.Blazor.WebAssembly.styles.css" rel="stylesheet" />
+    <link href="_content/AntDesign/css/ant-design-blazor.css" rel="stylesheet">
+    <script src="_content/AntDesign/js/ant-design-blazor.js"></script>    
 </head>

 <body>
--- 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<AbpRouterOptions>(options =>
-            {
-                options.AdditionalAssemblies.Add(typeof(AbpProBlazorLayoutAntDesignThemeModule).Assembly);
-            });
+            context.Services.AddAntDesign();
        }
    }
 }
--- 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 @@
  </ItemGroup>

  <ItemGroup>
+      <PackageReference Include="AntDesign" Version="0.10.2" />
      <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(MicrosoftVersion)" />
 	  <PackageReference Include="Volo.Abp.AspNetCore.Components.Web.Theming" Version="$(AbpPackageVersion)" />
 	  <PackageReference Include="Volo.Abp.Core" Version="$(AbpPackageVersion)" />
--- 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"
-<h3>Test</h3>
+<Button Type="primary">Hello World!</Button>

@code {

--- 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