From 2f0c593130dc782a3f8365e2b300d95aa1ead39a Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 8 Jun 2026 10:41:28 +0800 Subject: [PATCH 1/2] Render attached component in Basic theme user menu --- .../Themes/Basic/LoginDisplay.razor | 11 ++++++++++- .../Themes/Basic/LoginDisplay.razor | 10 +++++++++- .../Themes/Basic/LoginDisplay.razor | 11 ++++++++++- .../Themes/Basic/LoginDisplay.razor | 10 +++++++++- 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor index fe01c0d5bb..f3b2c41779 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor @@ -1,6 +1,7 @@ @namespace Volo.Abp.AspNetCore.Components.Server.BasicTheme.Themes.Basic @using Volo.Abp.Users @using Volo.Abp.MultiTenancy +@using Volo.Abp.UI.Navigation @using Microsoft.Extensions.Localization @using global::Localization.Resources.AbpUi @inject ICurrentUser CurrentUser @@ -26,7 +27,15 @@ { @foreach (var menuItem in Menu.Items) { - @menuItem.DisplayName + var componentType = menuItem.GetComponentTypeOrDefault(); + if (componentType != null) + { + + } + else + { + @menuItem.DisplayName + } } } diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor index a48e7971dd..ee05fab1c8 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor @@ -32,7 +32,15 @@ { @foreach (var menuItem in Menu.Items) { - @menuItem.DisplayName + var componentType = menuItem.GetComponentTypeOrDefault(); + if (componentType != null) + { + + } + else + { + @menuItem.DisplayName + } } } diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor index b961dc6e6b..3fcd75ab8e 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor @@ -2,6 +2,7 @@ @using global::Localization.Resources.AbpUi @using Microsoft.Extensions.Options @using Volo.Abp.AspNetCore.Components.Web +@using Volo.Abp.UI.Navigation @inherits AbpComponentBase @inject IJSRuntime JsRuntime @inject NavigationManager Navigation @@ -26,7 +27,15 @@ { @foreach (var menuItem in Menu.Items) { - @menuItem.DisplayName + var componentType = menuItem.GetComponentTypeOrDefault(); + if (componentType != null) + { + + } + else + { + @menuItem.DisplayName + } } } diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor index 44972ae16a..b0cfdd4963 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor @@ -35,7 +35,15 @@ { @foreach (var menuItem in Menu.Items) { - @menuItem.DisplayName + var componentType = menuItem.GetComponentTypeOrDefault(); + if (componentType != null) + { + + } + else + { + @menuItem.DisplayName + } } } From feffa45a23f56e000dd0f60a21801b08d125cf5d Mon Sep 17 00:00:00 2001 From: Ma Liming Date: Mon, 8 Jun 2026 11:55:06 +0800 Subject: [PATCH 2/2] Update build-and-test.yml --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index b1bc675156..6c3dce1854 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -86,7 +86,7 @@ jobs: - name: Codecov if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository }} - uses: codecov/codecov-action@v5 + uses: codecov/codecov-action@v7 with: use_oidc: true fail_ci_if_error: true