From b22e23bcc5d297228c81115b7fb02c43fc453e06 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sun, 22 Dec 2019 11:24:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B0=8F=E5=B1=8F=E5=B9=95=E7=9A=84?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/sys/officeIndex.html        |  2 +-
 .../views/modules/sys/user/empUserIndex.html  |  2 +-
 .../modules/sys/sysIndex/leftMenu.html        | 42 +++++++++++++++----
 .../default/modules/sys/sysIndex/topMenu.html |  7 ++++
 4 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/modules/core/src/main/resources/views/modules/sys/officeIndex.html b/modules/core/src/main/resources/views/modules/sys/officeIndex.html
index d15fd9ed..87ae8704 100644
--- a/modules/core/src/main/resources/views/modules/sys/officeIndex.html
+++ b/modules/core/src/main/resources/views/modules/sys/officeIndex.html
@@ -26,7 +26,7 @@
 <script>
 // 初始化布局
 $('body').layout({
-	west__initClosed: false, // 是否默认关闭
+	west__initClosed: $(window).width() <= 767, // 是否默认关闭
 	west__size: 180
 });
 // 主页框架
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html
index ade6d79e..504ea390 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html
@@ -29,7 +29,7 @@
 <script>
 // 初始化布局
 $('body').layout({
-	west__initClosed: false, // 是否默认关闭
+	west__initClosed: $(window).width() <= 767, // 是否默认关闭
 	west__size: 200
 });
 // 主页框架
diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/leftMenu.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/leftMenu.html
index 04d58f4b..63c3e37b 100644
--- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/leftMenu.html
+++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/leftMenu.html
@@ -4,14 +4,42 @@
 			<img data-href="${ctx}/sys/user/info" data-title="${text('个人中心')}" class="img-circle pointer"
 				src="${@user.getAvatarUrl().replaceFirst('/ctxPath', ctxPath)}">
 			<script>
-				$('.user-panel .img-circle').click(function(){
-					if (!$('.main-header').is(':hidden')){
-						$('.main-header').slideUp(300);
-						$('[data-toggle="push-menu"]').click();
-					}else{
-						$('.main-header').slideDown(300);
+				$(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>
 		</div>
 		<div class="pull-left info">
diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html
index f5e3d27d..d1f089c4 100644
--- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html
+++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenu.html
@@ -60,10 +60,17 @@
 					if(js.trim($("#leftMenu-" + code).text()) == ''){
 						$('.main-sidebar').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').show();
 						$('.content-wrapper').css('margin-left', '');
+						if (window.initMenu && $(window).width() <= 767 && !$('body').hasClass('sidebar-open')){
+							$('[data-toggle="push-menu"]').click();
+						}
 					}
+					window.initMenu = true;
 					setTimeout(function(){
 						$(window).resize();
 					},200);