整理左侧菜单

0fb05506 · fengshuonan · 39556526 · 0fb05506 · 0fb05506 · 0fb05506
Commit 0fb05506 authored Oct 30, 2018 by fengshuonan
4 changed files
--- a/src/main/java/cn/stylefeng/guns/modular/system/controller/DashboardController.java
+++ b/src/main/java/cn/stylefeng/guns/modular/system/controller/DashboardController.java
@@ -54,14 +54,16 @@ public class DashboardController extends BaseController {
        model.addAttribute("noticeList", notices);

        //获取菜单列表
-        List<MenuNode> menus = menuService.getMenusByRoleIds(CollectionUtil.newArrayList(1));
-        List<MenuNode> titles = MenuNode.buildTitle(menus);
-        titles = ApiMenuFilter.build(titles);
+        List<MenuNode> tempMenus = menuService.getMenusByRoleIds(CollectionUtil.newArrayList(1));
+        List<MenuNode> menus = MenuNode.buildTitle(tempMenus);
+        menus = ApiMenuFilter.build(menus);

-        model.addAttribute("titles", titles);
+        model.addAttribute("menus", menus);

        //获取用户头像
-        model.addAttribute("avatar", "12.jpg");
+        model.addAttribute("name", "stylefeng");
+        model.addAttribute("avatar", "/assets/images/users/1.jpg");
+        model.addAttribute("email", "sn93@qq.com");

        return "/dashboard.html";
    }

--- a/src/main/webapp/WEB-INF/common/_container.html
+++ b/src/main/webapp/WEB-INF/common/_container.html
@@ -8,6 +8,13 @@
 @ * otherJs        :  引用这个layout的其他加载js
 @ * title          :  页面的标题
 @ * layoutContent  :  主页面的html内容
+@ *
+@ *      下面的需要从后台返回
+@ *
+@ * menus          :  菜单列表的集合
+@ * name           :  姓名
+@ * avatar         :  头像
+@ * email          :  邮箱
 @ **/
 <head>
    <meta charset="utf-8">
@@ -67,7 +74,7 @@
    @include("/common/_sidebar.html"){}

    <!-- 主页正式内容开始 -->
-    @include("/common/_content.html",{layoutContent:layoutContent}){}
+    @include("/common/_content.html"){}

 </div>
 <!-- jquery -->

--- a/src/main/webapp/WEB-INF/common/_sidebar.html
+++ b/src/main/webapp/WEB-INF/common/_sidebar.html
@@ -2,7 +2,7 @@
    <div class="scroll-sidebar">
        <nav class="sidebar-nav">
            <ul id="sidebarnav">
-                @for(title in titles){
+                @for(title in menus){
                    @if(tool.isEmpty(title.children)){
                        <li>
                            <a href="${ctxPath}${title.url}"><i class="mdi ${title.icon}"></i>${title.name}</a>

--- a/src/main/webapp/WEB-INF/common/_top_header.html
+++ b/src/main/webapp/WEB-INF/common/_top_header.html
@@ -48,15 +48,15 @@
            <ul class="navbar-nav my-lg-0">
                <li class="nav-item dropdown">
                    <a class="nav-link dropdown-toggle text-muted waves-effect waves-dark" href="" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><img
-                            src="../assets/images/users/1.jpg" alt="user" class="profile-pic"/></a>
+                            src="${avatar}" alt="user" class="profile-pic"/></a>
                    <div class="dropdown-menu dropdown-menu-right animated flipInY">
                        <ul class="dropdown-user">
                            <li>
                                <div class="dw-user-box">
-                                    <div class="u-img"><img src="../assets/images/users/1.jpg" alt="user"></div>
+                                    <div class="u-img"><img src="${avatar}" alt="user"></div>
                                    <div class="u-text">
-                                        <h4>stylefeng</h4>
-                                        <p class="text-muted">sn93\@qq.com</p><a href="profile.html" class="btn btn-rounded btn-danger btn-sm">个人信息</a></div>
+                                        <h4>${name!}</h4>
+                                        <p class="text-muted">${email!}</p><a href="profile.html" class="btn btn-rounded btn-danger btn-sm">个人信息</a></div>
                                </div>
                            </li>
                            <li role="separator" class="divider"></li>