Introduce AbpBlazorRouterOptions and move App.razor to the Volo.Abp.A…

…spNetCore.Components.WebAssembly.BasicTheme
cuirunxing · Sep 13, 2020 · 7d1a705 · 7d1a705
1 parent fde73f8
commit 7d1a705
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 6 deletions.
diff --git a/...NetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicTheme.cs b/...NetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicTheme.cs
@@ -1,4 +1,5 @@
 using Volo.Abp.AspNetCore.Components.WebAssembly.Theming;
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme
@@ -8,6 +9,12 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme
         )]
     public class AbpAspNetCoreComponentsWebAssemblyBasicThemeModule : AbpModule
     {
-
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpRouterOptions>(options =>
+            {
+                options.AdditionalAssemblies.Add(typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule).Assembly);
+            });
+        }
     }
 }
diff --git a/...ompanyName.MyProjectName.Blazor/App.razor → ...ssembly.BasicTheme/Themes/Basic/App.razor b/...ompanyName.MyProjectName.Blazor/App.razor → ...ssembly.BasicTheme/Themes/Basic/App.razor
@@ -1,9 +1,9 @@
-@using Volo.Abp.Identity.Blazor
-@using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme
-@using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
+@using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing
+@using Microsoft.Extensions.Options
+@inject IOptions<AbpRouterOptions> RouterOptions
 <CascadingAuthenticationState>
-    <Router AppAssembly="@typeof(Program).Assembly"
-            AdditionalAssemblies="new []{ typeof(AbpIdentityBlazorModule).Assembly, typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule).Assembly }">
+    <Router AppAssembly="RouterOptions.Value.AppAssembly"
+            AdditionalAssemblies="RouterOptions.Value.AdditionalAssemblies">
         <Found Context="routeData">
             <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
                 <NotAuthorized>

diff --git a/.../src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/AbpBlazorRouterOptions.cs b/.../src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/AbpBlazorRouterOptions.cs
@@ -0,0 +1,16 @@
+using System.Reflection;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing
+{
+    public class AbpRouterOptions
+    {
+        public Assembly AppAssembly { get; set; }
+
+        public RouterAssemblyList AdditionalAssemblies { get; }
+
+        public AbpRouterOptions()
+        {
+            AdditionalAssemblies = new RouterAssemblyList();
+        }
+    }
+}
diff --git a/...work/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/RouterAssemblyList.cs b/...work/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/RouterAssemblyList.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing
+{
+    public class RouterAssemblyList : List<Assembly>
+    {
+
+    }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement.Blazor;
@@ -26,6 +27,11 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             {
                 options.MenuContributors.Add(new AbpIdentityWebMainMenuContributor());
             });
+
+            Configure<AbpRouterOptions>(options =>
+            {
+                options.AdditionalAssemblies.Add(typeof(AbpIdentityBlazorModule).Assembly);
+            });
         }
     }
 }
diff --git a/...lates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/...lates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
@@ -9,6 +9,8 @@
 using Volo.Abp;
 using Volo.Abp.Autofac;
 using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme;
+using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic;
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.Identity.Blazor;
@@ -31,10 +33,19 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             ConfigureAuthentication(builder);
             ConfigureHttpClient(context, environment);
             ConfigureBlazorise(context);
+            ConfigureRouter(context);
             ConfigureUI(builder);
             ConfigureMenu(context);
         }
 
+        private void ConfigureRouter(ServiceConfigurationContext context)
+        {
+            Configure<AbpRouterOptions>(options =>
+            {
+                options.AppAssembly = typeof(MyProjectNameBlazorModule).Assembly;
+            });
+        }
+
         private void ConfigureMenu(ServiceConfigurationContext context)
         {
             Configure<AbpNavigationOptions>(options =>