+
+
@Body
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor.cs
new file mode 100644
index 0000000000..2464275c2c
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor.cs
@@ -0,0 +1,34 @@
+using System;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Routing;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
+{
+ public partial class MainLayout : IDisposable
+ {
+ [Inject] private NavigationManager NavigationManager { get; set; }
+
+ private bool IsCollapseShown { get; set; }
+
+ protected override void OnInitialized()
+ {
+ NavigationManager.LocationChanged += OnLocationChanged;
+ }
+
+ private void ToggleCollapse()
+ {
+ IsCollapseShown = !IsCollapseShown;
+ }
+
+ public void Dispose()
+ {
+ NavigationManager.LocationChanged -= OnLocationChanged;
+ }
+
+ private void OnLocationChanged(object sender, LocationChangedEventArgs e)
+ {
+ IsCollapseShown = false;
+ StateHasChanged();
+ }
+ }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor
index c3ada520dc..b35ec8ba2e 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor
@@ -2,50 +2,6 @@
{
foreach (var menuItem in Menu.Items)
{
- var elementId = menuItem.ElementId ?? "MenuItem_" + menuItem.Name.Replace(".", "_");
- var cssClass = string.IsNullOrEmpty(menuItem.CssClass) ? string.Empty : menuItem.CssClass;
- var disabled = menuItem.IsDisabled ? "disabled" : string.Empty;
- var url = string.IsNullOrEmpty(menuItem.Url) ? "#" : menuItem.Url;
- if (menuItem.IsLeaf)
- {
- if (menuItem.Url != null)
- {
-
-
- @if (menuItem.Icon != null)
- {
- if (menuItem.Icon.StartsWith("fa"))
- {
-
- }
- }
- @menuItem.DisplayName
-
-
- }
- }
- else
- {
-
-
-
-
- @foreach (var childMenuItem in menuItem.Items)
- {
-
- }
-
-
-
- }
+
}
}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor.cs
index e47603e163..1779d73d28 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor.cs
@@ -6,22 +6,14 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
{
public partial class NavMenu
{
- [Inject] protected IMenuManager MenuManager { get; set; }
+ [Inject]
+ protected IMenuManager MenuManager { get; set; }
protected ApplicationMenu Menu { get; set; }
- private bool collapseNavMenu = true;
-
- private string NavMenuCssClass => collapseNavMenu ? "collapse" : null;
-
- protected override async Task OnInitializedAsync()
+ protected async override Task OnInitializedAsync()
{
Menu = await MenuManager.GetAsync(StandardMenus.Main);
}
-
- private void ToggleNavMenu()
- {
- collapseNavMenu = !collapseNavMenu;
- }
}
}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenuItem.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor
similarity index 82%
rename from framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenuItem.razor
rename to framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor
index 338ce7b464..4e75e26b50 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenuItem.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor
@@ -24,7 +24,7 @@
else
{