From 4fee3dbfa8fcf34a3091d649b769b4fbc3525d4a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 26 Jul 2019 19:00:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A7=E8=8F=9C=E5=8D=95href=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/static/ruoyi/index.js        | 2 +-
 ruoyi-admin/src/main/resources/templates/index.html         | 6 +++---
 .../src/main/resources/templates/system/menu/add.html       | 5 ++++-
 .../src/main/resources/templates/system/menu/edit.html      | 5 ++++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/index.js b/ruoyi-admin/src/main/resources/static/ruoyi/index.js
index 6cde2b7f..04f67f3d 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/index.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/index.js
@@ -217,7 +217,7 @@ $(function() {
         dataIndex = $(this).data('index'),
         menuName = $.trim($(this).text()),
         flag = true;
-        $(".nav ul li").removeClass("selected");
+        $(".nav ul li, .nav li").removeClass("selected");
         $(this).parent("li").addClass("selected");
         if (dataUrl == undefined || $.trim(dataUrl).length == 0) return false;
 
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index 1a111b0a..612fc95e 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -52,12 +52,12 @@
                     </ul>
                 </li>
                 <li th:each="menu : ${menus}">
-                	<a href="#">
+                	<a th:class="${menu.target}" th:href="@{${menu.url == ''} ? |#| : ${menu.url}}">
                 		<i class="fa fa-bar-chart-o" th:class="${menu.icon}"></i>
                     	<span class="nav-label" th:text="${menu.menuName}">一级菜单</span> 
-                    	<span class="fa arrow"></span>
+                    	<span th:class="${menu.url == '' || menu.url == '#'} ? |fa arrow|"></span>
                 	</a>
-                   <ul class="nav nav-second-level collapse">
+                    <ul class="nav nav-second-level collapse">
 						<li th:each="cmenu : ${menu.children}">
 							<a th:if="${#lists.isEmpty(cmenu.children)}" th:class="${cmenu.target == ''} ? |menuItem| : ${cmenu.target}" th:utext="${cmenu.menuName}" th:href="@{${cmenu.url}}">二级菜单</a>
 							<a th:if="${not #lists.isEmpty(cmenu.children)}" href="#">[[${cmenu.menuName}]]<span class="fa arrow"></span></a>
diff --git a/ruoyi-admin/src/main/resources/templates/system/menu/add.html b/ruoyi-admin/src/main/resources/templates/system/menu/add.html
index 2fd6b972..3e402003 100644
--- a/ruoyi-admin/src/main/resources/templates/system/menu/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/menu/add.html
@@ -146,16 +146,19 @@
                     $("#perms").parents(".form-group").hide();
                     $("#icon").parents(".form-group").show();
                     $("#target").parents(".form-group").hide();
+                    $("input[name='visible']").parents(".form-group").show();
                 } else if (menuType == "C") {
                 	$("#url").parents(".form-group").show();
                     $("#perms").parents(".form-group").show();
-                    $("#icon").parents(".form-group").hide();
+                    $("#icon").parents(".form-group").show();
                     $("#target").parents(".form-group").show();
+                    $("input[name='visible']").parents(".form-group").show();
                 } else if (menuType == "F") {
                 	$("#url").parents(".form-group").hide();
                     $("#perms").parents(".form-group").show();
                     $("#icon").parents(".form-group").hide();
                     $("#target").parents(".form-group").hide();
+                    $("input[name='visible']").parents(".form-group").hide();
                 }
         	});  
         });
diff --git a/ruoyi-admin/src/main/resources/templates/system/menu/edit.html b/ruoyi-admin/src/main/resources/templates/system/menu/edit.html
index c7fc244b..9a31a5a4 100644
--- a/ruoyi-admin/src/main/resources/templates/system/menu/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/menu/edit.html
@@ -162,16 +162,19 @@
                 $("#perms").parents(".form-group").hide();
                 $("#icon").parents(".form-group").show();
                 $("#target").parents(".form-group").hide();
+                $("input[name='visible']").parents(".form-group").show();
             } else if (menuType == "C") {
                 $("#url").parents(".form-group").show();
                 $("#perms").parents(".form-group").show();
-                $("#icon").parents(".form-group").hide();
+                $("#icon").parents(".form-group").show();
                 $("#target").parents(".form-group").show();
+                $("input[name='visible']").parents(".form-group").show();
             } else if (menuType == "F") {
                 $("#url").parents(".form-group").hide();
                 $("#perms").parents(".form-group").show();
                 $("#icon").parents(".form-group").hide();
                 $("#target").parents(".form-group").hide();
+                $("input[name='visible']").parents(".form-group").hide();
             }
         }