Basic theme #830 : added partialview for recursion

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml

@@ -1,43 +1,39 @@
 @using Volo.Abp.UI.Navigation
 @model ApplicationMenu
+
 @foreach (var menuItem in Model.Items)
 {
     var elementId = string.IsNullOrEmpty(menuItem.ElementId) ? string.Empty : $"id=\"{menuItem.ElementId}\"";
     var cssClass = string.IsNullOrEmpty(menuItem.CssClass) ? string.Empty : menuItem.CssClass;
     var disabled = menuItem.IsDisabled ? "disabled" : string.Empty;
-
     if (menuItem.IsLeaf)
     {
-        if (menuItem.Url == null)
+        @if (menuItem.Url != null)
         {
-            continue;
-        }
-
-        <li class="nav-item @cssClass @disabled" @elementId>
-            <a class="nav-link" href="@(menuItem.Url ?? "#")">
-                @if (menuItem.Icon != null)
-                {
-                    if (menuItem.Icon.StartsWith("fa"))
+            <li class="nav-item @cssClass @disabled" @elementId>
+                <a class="nav-link" href="@(menuItem.Url ?? "#")">
+                    @if (menuItem.Icon != null)
                     {
-                        <i class="@menuItem.Icon"></i>
+                        if (menuItem.Icon.StartsWith("fa"))
+                        {
+                            <i class="@menuItem.Icon"></i>
+                        }
                     }
-                }
-                @menuItem.DisplayName
-            </a> @*<span class="sr-only">(current)</span>*@
-        </li>
+                    @menuItem.DisplayName
+                </a>
+            </li>
+        }
     }
     else
     {
-        <li class="nav-item dropdown">
+        <nav-item class="dropdown">
             <a class="nav-link dropdown-toggle" href="#" id="Menu_@(menuItem.Name)" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">@menuItem.DisplayName</a>
             <div class="dropdown-menu" aria-labelledby="Menu_@(menuItem.Name)">
                 @foreach (var childMenuItem in menuItem.Items)
                 {
-                    <a class="dropdown-item @cssClass @disabled" href="@(childMenuItem.Url ?? "#")" @Html.Raw(elementId)>
-                        @childMenuItem.DisplayName
-                    </a>
+                    @await Html.PartialAsync("~/Themes/Basic/Components/Menu/_MenuItem.cshtml", childMenuItem)
                 }
             </div>
-        </li>
+        </nav-item>
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml

@@ -0,0 +1,37 @@
+@using Volo.Abp.UI.Navigation
+@model ApplicationMenuItem
+@{
+    var elementId = string.IsNullOrEmpty(Model.ElementId) ? string.Empty : $"id=\"{Model.ElementId}\"";
+    var cssClass = string.IsNullOrEmpty(Model.CssClass) ? string.Empty : Model.CssClass;
+    var disabled = Model.IsDisabled ? "disabled" : string.Empty;
+}
+@if (Model.IsLeaf)
+{
+    @if (Model.Url != null)
+    {
+        <a class="dropdown-item @cssClass @disabled" href="@(Model.Url ?? "#")" @Html.Raw(elementId)>
+            @Model.DisplayName
+        </a>
+    }
+}
+else
+{
+    @*<li class="dropdown-submenu">
+        <a role="button" class="btn dropdown-toggle" data-toggle="dropdown"
+                aria-haspopup="true" aria-expanded="false">
+            <span class="lp-icon">
+                <i class="@(Model.Icon ?? "")"></i>
+            </span>
+            <span class="lp-text">
+                @Model.DisplayName
+            </span>
+        </a>
+        <div class="dropdown-menu">
+            @foreach (var childMenuItem in Model.Items)
+            {
+                @await Html.PartialAsync("~/Themes/Basic/Components/Menu/_MenuItem.cshtml", childMenuItem)
+            }
+        </div>
+    </li>*@
+
+}