From 630af59c3b28e02f3987d819e79bf27532d955ca Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 17 May 2022 12:02:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B6=E9=83=A8=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E8=87=AA=E5=8A=A8=E6=8A=98=E5=8F=A0=E5=88=B0=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/include/sysIndex/leftMenu.html      | 43 +---------
 .../views/include/sysIndex/topMenu.html       | 85 +++----------------
 2 files changed, 17 insertions(+), 111 deletions(-)

diff --git a/modules/core/src/main/resources/views/include/sysIndex/leftMenu.html b/modules/core/src/main/resources/views/include/sysIndex/leftMenu.html
index 63c3e37b..226cc7e9 100644
--- a/modules/core/src/main/resources/views/include/sysIndex/leftMenu.html
+++ b/modules/core/src/main/resources/views/include/sysIndex/leftMenu.html
@@ -3,44 +3,7 @@
 		<div class="pull-left image">
 			<img data-href="${ctx}/sys/user/info" data-title="${text('个人中心')}" class="img-circle pointer"
 				src="${@user.getAvatarUrl().replaceFirst('/ctxPath', ctxPath)}">
-			<script>
-				$(function(){
-					if ($(window).width() <= 767){
-						$('body').append('<div class="btn btn-default full-screen-menu"><i class="fa fa-bars"></i></div>');
-					}
-					$('.full-screen-menu,.user-panel .img-circle').click(function(){
-						if (!$('.main-header').is(':hidden')){
-							$('.main-header').slideUp(100, function(){
-								if (($(window).width() > 767 && !$('body').hasClass('sidebar-collapse'))
-										|| $('body').hasClass('sidebar-open')){
-									$('[data-toggle="push-menu"]').click();
-								}
-							});
-						}else{
-							$('.main-header').slideDown(100, function(){
-								setTimeout(function(){
-									if (${@Global.getConfig('sys.index.sidebarStyle', '1') != '2'}){
-										$('[data-toggle="push-menu"]').click();
-									}
-								},100);
-							});
-						}
-						setTimeout(function(){
-							$('#tabpanel').tabPanel('resize');
-						},500);
-					});
-					$('#leftMenu').on('click', '.addTabPage', function (e) {
-						if ($(window).width() <= 767 && $('body').hasClass('sidebar-open')){
-							var href = $(this).data('href');
-				        	if (href != '' && href != 'blank'){
-				        		if ($(window).width() <= 767){
-					        		$('.full-screen-menu').click();
-				        		}
-							}
-						}
-					});
-				})
-			</script>
+			<script src="${ctxStatic}/modules/sys/leftMenu.js"></script>
 		</div>
 		<div class="pull-left info">
 			<p>${user.userName}</p>
@@ -69,8 +32,8 @@
 		<% if(@Global.getConfig('sys.index.menuStyle', '1') == '1'){ %>
 		<ul class="sidebar-menu">
 			<% 
-				var p = {parentCode: '0'};
-				menu.tree(p); print(p.html);
+			var p = {parentCode: '0'};
+			menu.tree(p); print(p.html);
 			%>
 		</ul>
 		<% } %>
diff --git a/modules/core/src/main/resources/views/include/sysIndex/topMenu.html b/modules/core/src/main/resources/views/include/sysIndex/topMenu.html
index ce7a7d31..d946b86c 100644
--- a/modules/core/src/main/resources/views/include/sysIndex/topMenu.html
+++ b/modules/core/src/main/resources/views/include/sysIndex/topMenu.html
@@ -21,78 +21,21 @@
 		</ul>
 	</div>
 	<% if(@Global.getConfig('sys.index.menuStyle', '1') == '2'){ %>
-	<div class="navbar-custom-menu pull-left">
-		<ul class="nav navbar-nav" id="topMenu">
-		<%
-			var p = {parentCode: '0', children: false};
-			menu.tree(p); print(p.html);
-		%>
+	<div class="navbar-custom-menu pull-left" id="topMenu">
+		<ul class="nav navbar-nav">
+			<li class="treeview dropdown" id="topMenuMore" style="position:relative;">
+				<a href="javascript:" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">
+					<i class="fa fa-fw icon-options"></i></span>
+				</a>
+				<ul class="treeview-menu dropdown-menu" style="left:0;">
+					<%
+					var p = {parentCode: '0', children: false};
+					menu.tree(p); print(p.html);
+					%>
+				</ul>
+			</li>
 		</ul>
-		<script>
-			$(function(){
-				$('#topMenu').on('click', '.addTabPage', function (e) {
-					$('#topMenu li').removeClass('active');
-					$(this).closest('li').addClass('active');
-					var code = $(this).data("code");
-					js.cookie('currentMenuCode', code); // 保存当前菜单ID
-					if ($("#leftMenu-" + code).length > 0){
-						$("#leftMenu > ul").hide();
-						$("#leftMenu-" + code).show();
-						refreshSidebar(code);
-					}else{
-						js.ajaxSubmit('${ctx}/index/menuTree?parentCode=' + code
-									+ '&t=' + new Date().getTime(), function(data){
-							if (data && data.indexOf('"result":"login"') == -1){
-								$("#leftMenu > ul").hide();
-								$("#leftMenu").append(data);
-								// 如果是初次加载，则选中上次打开的菜单
-								if($('.sidebar-menu').length == 1){
-									$(window).trigger("hashchange");
-								}
-								refreshSidebar(code);
-							}else{
-								location = '${ctx}/login';
-							}
-						}, 'html');
-					}
-				});
-				var refreshSidebar = function(code){
-					if(js.trim($("#leftMenu-" + code).text()) == ''){
-						$('.main-sidebar,.logo small,.tabpanel_tab_content').hide();
-						$('.content-wrapper').css("cssText","margin-left:0!important;");
-						if (window.initMenu && $(window).width() <= 767 && $('body').hasClass('sidebar-open')){
-							$('[data-toggle="push-menu"]').click();
-						}
-					}else{
-						$('.main-sidebar,.logo small,.tabpanel_tab_content').show();
-						$('.content-wrapper').css('margin-left', '');
-						if (window.initMenu && $(window).width() <= 767 && !$('body').hasClass('sidebar-open')){
-							$('[data-toggle="push-menu"]').click();
-						}
-						var li = $("#leftMenu-" + code + " > li");
-						if (!li.hasClass('menu-open')){
-							li = li.eq(0).find('> a');
-							if (li.data('href') == 'blank'){
-								li.click();
-							}
-						}
-					}
-					$('#leftMenu').triggerHandler('initd');
-					window.initMenu = true;
-					$(window).resize();
-				}
-				// 激活存储的顶部当前菜单项
-				var currentMenuCode = js.cookie('currentMenuCode'), currentMenu;
-				if (currentMenuCode && currentMenuCode != ''){
-					currentMenu = $("#topMenu .addTabPage[data-code="+currentMenuCode+"]");
-				}
-				if (currentMenu && currentMenu.length > 0 && window.location.hash != ''){
-					currentMenu.click();
-				}else{
-					$("#topMenu .addTabPage:first").click(); 
-				}
-			});
-		</script>
+		<script src="${ctxStatic}/modules/sys/topMenu.js"></script>
 	</div>
 	<% } %>
 </nav>
\ No newline at end of file