refactor: enhance navigation handling and breadcrumb functionality in layout components (#809)

Author: wzh425

src/Masa.Stack.Components/Infrastructure/MicroFrontendNavigationManager.cs

@@ -1,4 +1,4 @@
-// Copyright (c) MASA Stack All rights reserved.
+// Copyright (c) MASA Stack All rights reserved.
 // Licensed under the Apache License. See LICENSE.txt in the project root for license information.
 
 namespace Masa.Stack.Components.Infrastructure;
@@ -9,6 +9,13 @@ public class MicroFrontendNavigationManager : NavigationManager
 
     public readonly NavigationManager OriginalNavigationManager;
 
+    /// <summary>
+    /// 与注册时 <c>microFrontend: true</c> 一致：<see cref="ProjectPrefix"/> 为 <c>/{project}/</c>；
+    /// 独立应用为 <c>false</c>（前缀为 <c>/</c>）。
+    /// </summary>
+    public bool IsMicroFrontend =>
+        !string.IsNullOrEmpty(ProjectPrefix) && !string.Equals(ProjectPrefix, "/", StringComparison.Ordinal);
+
     public new event EventHandler<LocationChangedEventArgs> LocationChanged
     {
         add => OriginalNavigationManager.LocationChanged += value;
@@ -28,7 +35,7 @@ public MicroFrontendNavigationManager(NavigationManager navigationManager, strin
 
     protected override void NavigateToCore(string uri, NavigationOptions options)
     {
-        if (_microFrontend && !IsAbsoluteUrl(uri) && uri.StartsWith("/") && !uri.StartsWith(ProjectPrefix, StringComparison.OrdinalIgnoreCase))
+        if (IsMicroFrontend && !IsAbsoluteUrl(uri) && uri.StartsWith("/") && !uri.StartsWith(ProjectPrefix, StringComparison.OrdinalIgnoreCase))
         {
             uri = $"{ProjectPrefix}{uri.TrimStart("/")}";
         }
@@ -43,11 +50,4 @@ private bool IsAbsoluteUrl(string url)
         return System.Uri.TryCreate(url, UriKind.Absolute, out result) && (result.Scheme == System.Uri.UriSchemeHttp || result.Scheme == System.Uri.UriSchemeHttps);
     }
 
-    private bool _microFrontend
-    {
-        get
-        {
-            return !string.IsNullOrEmpty(ProjectPrefix) && ProjectPrefix != "/";
-        }
-    }
 }

src/Masa.Stack.Components/Infrastructure/NavigationUrlHelper.cs

@@ -2,51 +2,23 @@ namespace Masa.Stack.Components;
 
 internal static class NavigationUrlHelper
 {
-    public static string BuildHref(string? url, string projectPrefix, Uri currentUri)
+    /// <summary>
+    /// 相对路径会按 <paramref name="projectPrefix"/> 补全；以 http:// 或 https:// 开头的菜单 URL 原样返回，由浏览器处理。
+    /// </summary>
+    public static string BuildHref(string? url, string projectPrefix)
     {
         if (string.IsNullOrEmpty(url))
         {
             return projectPrefix;
         }
-        
-        if (TryBuildHrefFromAbsoluteUrl(url, projectPrefix, currentUri, out var absoluteHref))
-        {
-            return absoluteHref;
-        }
-
-        return BuildHrefFromRelativeUrl(url, projectPrefix);
-    }
-
-    private static bool TryBuildHrefFromAbsoluteUrl(string url, string projectPrefix, Uri currentUri, out string href)
-    {
-        href = string.Empty;
-
-        if (!url.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&
-            !url.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
-        {
-            return false;
-        }
 
-        if (!Uri.TryCreate(url, UriKind.Absolute, out var absoluteUri))
+        if (url.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
+            url.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
         {
-            return false;
-        }
-
-        if (!IsSameOrigin(absoluteUri, currentUri))
-        {
-            href = url;
-            return true;
+            return url;
         }
 
-        href = EnsureProjectPrefix(absoluteUri.PathAndQuery + absoluteUri.Fragment, projectPrefix);
-        return true;
-    }
-
-    private static bool IsSameOrigin(Uri targetUri, Uri currentUri)
-    {
-        return string.Equals(targetUri.Host, currentUri.Host, StringComparison.OrdinalIgnoreCase) &&
-               targetUri.Port == currentUri.Port &&
-               string.Equals(targetUri.Scheme, currentUri.Scheme, StringComparison.OrdinalIgnoreCase);
+        return BuildHrefFromRelativeUrl(url, projectPrefix);
     }
 
     private static string BuildHrefFromRelativeUrl(string url, string projectPrefix)

src/Masa.Stack.Components/MasaComponentBase.cs

@@ -64,9 +64,6 @@ protected string GetIsDisplayStyle(bool show)
         return show ? "" : "display:none !important;";
     }
 
-    protected string BuildHref(string? url)
-    {
-        var currentUri = NavigationManager.OriginalNavigationManager.ToAbsoluteUri(NavigationManager.Uri);
-        return NavigationUrlHelper.BuildHref(url, NavigationManager.ProjectPrefix, currentUri);
-    }
+    protected string BuildHref(string? url) =>
+        NavigationUrlHelper.BuildHref(url, NavigationManager.ProjectPrefix);
 }

src/Masa.Stack.Components/Shared/Layouts/Components/Breadcrumbs.razor.cs

@@ -1,4 +1,4 @@
-using System.Web;
+using System.Web;
 
 namespace Masa.Stack.Components.Layouts
 {
@@ -8,7 +8,16 @@ public partial class Breadcrumbs : MasaComponentBase
 
         [Parameter, EditorRequired] public List<Nav> FlattenedNavs { get; set; } = new();
 
+        /// <summary>
+        /// 微前端（<c>microFrontend: true</c>）时在面包屑路径最前增加当前模块项目展示名。
+        /// </summary>
+        [Parameter] public bool PrependModuleProjectBreadcrumb { get; set; }
+
+        [Parameter] public string? ModuleProjectDisplayName { get; set; }
+
         private List<Nav>? _previousFlattenedNavs;
+        private bool _previousPrependModuleProjectBreadcrumb;
+        private string? _previousModuleProjectDisplayName;
         private string? _prevLocation;
         private Action? _updateLastBreadcrumb;
 
@@ -24,9 +33,13 @@ protected override void OnParametersSet()
         {
             base.OnParametersSet();
 
-            if (_previousFlattenedNavs != FlattenedNavs)
+            if (_previousFlattenedNavs != FlattenedNavs
+                || _previousPrependModuleProjectBreadcrumb != PrependModuleProjectBreadcrumb
+                || _previousModuleProjectDisplayName != ModuleProjectDisplayName)
             {
                 _previousFlattenedNavs = FlattenedNavs;
+                _previousPrependModuleProjectBreadcrumb = PrependModuleProjectBreadcrumb;
+                _previousModuleProjectDisplayName = ModuleProjectDisplayName;
                 UpdateItems();
             }
         }
@@ -146,6 +159,16 @@ string GetIntersection(string left, string right)
                 });
             }
 
+            if (PrependModuleProjectBreadcrumb && !string.IsNullOrWhiteSpace(ModuleProjectDisplayName))
+            {
+                Items.Insert(0, new BreadcrumbItem()
+                {
+                    Exact = true,
+                    Text = ModuleProjectDisplayName,
+                    Href = null
+                });
+            }
+
             if (_updateLastBreadcrumb != null)
             {
                 _updateLastBreadcrumb();

src/Masa.Stack.Components/Shared/Layouts/SLayout.razor

@@ -46,7 +46,10 @@
                             </ActivatorContent>
                         </GlobalNavigation>
                     }
-                    <Breadcrumbs FlattenedNavs="FlattenedAllNavs" @ref="BreadcrumbsComp"></Breadcrumbs>
+                    <Breadcrumbs FlattenedNavs="FlattenedAllNavs"
+                                 PrependModuleProjectBreadcrumb="NavigationManager.IsMicroFrontend"
+                                 ModuleProjectDisplayName="@BreadcrumbModuleName"
+                                 @ref="BreadcrumbsComp"></Breadcrumbs>
                     <MSpacer />
                     <Languages OnChange="() => { }" />
                     <MSheet Class="d-flex align-center justify-space-around rounded-6 pa-1 mr-n4" Width="100">

src/Masa.Stack.Components/Shared/Layouts/SLayout.razor.cs

@@ -80,6 +80,10 @@ public partial class SLayout
     [Parameter]
     public bool UseSappNav { get; set; }
 
+    /// <summary>微前端时面包屑最前的模块名（Stack 项目枚举名）。</summary>
+    private string? BreadcrumbModuleName =>
+        NavigationManager.IsMicroFrontend ? ProjectApp.Project.ToString() : null;
+
     private Breadcrumbs? _breadcrumbsComp;
     private Action? _breadcrumbSetCallback;
 

src/Masa.Stack.Components/wwwroot/css/app.css

@@ -114,7 +114,7 @@ h1:focus {
 
         .masa-stack-components .global-nav .global-nav-app-box .app-entry-web-full-icon {
             max-width: 100%;
-            max-height: 100%;
+            max-height: 50px;
             width: auto;
             height: auto;
             object-fit: contain;