Merge pull request #18783 from abpframework/liangshiwei/customMenu

Check if the type is a component before rendering
abpframework · Jan 18, 2024 · 468715c · 468715c
2 parents 029fd92 + 75598e7
commit 468715c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/...rc/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor b/...rc/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor
@@ -8,7 +8,7 @@
 }
 @if (MenuItem.IsLeaf)
 {
-    if (customComponentType != null)
+    if (customComponentType != null && typeof(ComponentBase).IsAssignableFrom(customComponentType))
     {
         <DynamicComponent Type="@customComponentType" />
     }
@@ -32,7 +32,7 @@ else
 {
     <li class="nav-item">
         <div class="dropdown">
-            @if (customComponentType != null)
+            @if (customComponentType != null && typeof(ComponentBase).IsAssignableFrom(customComponentType))
             {
                 <DynamicComponent Type="@customComponentType" />
             }

diff --git a/...c/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor b/...c/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor
@@ -8,7 +8,7 @@
 }
 @if (MenuItem.IsLeaf)
 {
-    if (customComponentType != null)
+    if (customComponentType != null && typeof(ComponentBase).IsAssignableFrom(customComponentType))
     {
         <DynamicComponent Type="@customComponentType" />
     }
@@ -28,7 +28,7 @@
 else
 {
     <div class="dropdown-submenu">
-        @if (customComponentType != null)
+        @if (customComponentType != null && typeof(ComponentBase).IsAssignableFrom(customComponentType))
         {
             <DynamicComponent Type="@customComponentType" />
         }

diff --git a/...me/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml b/...me/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml
@@ -10,7 +10,7 @@
 
     if (menuItem.IsLeaf)
     {
-        if (customComponentType != null)
+        if (customComponentType != null && typeof(ViewComponent).IsAssignableFrom(customComponentType))
         {
             @(await Component.InvokeAsync(customComponentType))
         }
@@ -34,7 +34,7 @@
     {
         <li class="nav-item">
             <div class="dropdown">
-                @if (customComponentType != null)
+                @if (customComponentType != null && typeof(ViewComponent).IsAssignableFrom(customComponentType))
                 {
                     @(await Component.InvokeAsync(customComponentType))
                 }

diff --git a/.../src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml b/.../src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml
@@ -10,7 +10,7 @@
 }
 @if (Model.IsLeaf)
 {
-    if (customComponentType != null)
+    if (customComponentType != null && typeof(ViewComponent).IsAssignableFrom(customComponentType))
     {
         @(await Component.InvokeAsync(customComponentType))
     }
@@ -31,10 +31,10 @@
 else
 {
     <div class="dropdown-submenu">
-        @if (customComponentType != null)
-         {
+        @if (customComponentType != null && typeof(ViewComponent).IsAssignableFrom(customComponentType))
+        {
              @(await Component.InvokeAsync(customComponentType))
-         }
+        }
         else
         {
             <a role="button" class="btn dropdown-toggle" data-bs-toggle="dropdown"