From 19e49b7525557c9a1554605d1ab949d7c13b9f5b Mon Sep 17 00:00:00 2001
From: Sight <1453017105@qq.com>
Date: Wed, 25 May 2022 23:35:46 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8F=9C=E5=8D=95=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=B7=B3=E8=BD=AC=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 component/pear/module/admin.js | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/component/pear/module/admin.js b/component/pear/module/admin.js
index 48d6e89..b11e8ba 100644
--- a/component/pear/module/admin.js
+++ b/component/pear/module/admin.js
@@ -515,7 +515,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm
 			var createList = function (data) {
 				var _listHtml = '';
 				$.each(data, function (index, item) {
-					_listHtml += '<li smenu-id=' + item.info.id + ' smenu-icon=' + item.info.icon + ' smenu-url=' + item.info.href + ' smenu-title=' + item.info.title + '>';
+					_listHtml += '<li smenu-id=' + item.info.id + ' smenu-icon=' + item.info.icon + ' smenu-url=' + item.info.href + ' smenu-title=' + item.info.title + ' smenu-type=' + item.info.type + '>';
 					_listHtml += '  <span><i style="margin-right:10px" class=" ' + item.info.icon + '"></i>' + item.path + '</span>';
 					_listHtml += '  <i class="layui-icon layui-icon-right"></i>';
 					_listHtml += '</li>'
@@ -585,13 +585,17 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm
 						var menuUrl = $(this).attr("smenu-url");
 						var menuIcon = $(this).attr("smenu-icon");
 						var menuTitle = $(this).attr("smenu-title");
+						var menuType = $(this).attr("smenu-type");
+						var openableWindow = menuType === "1" || menuType === 1;
 						
 						if(sideMenu.isCollapse){
 							collapse();
 						}
-						
-						pearAdmin.jump(menuId,menuTitle,menuUrl)
-						
+						if (openableWindow) {
+							pearAdmin.jump(menuId, menuTitle, menuUrl)
+						} else {
+							sideMenu.selectItem(menuId);
+						}
 						compatible();
 						layer.close(layeridx);
 					})
@@ -604,15 +608,24 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm
 					})
 
 					// 监听键盘事件 
-					// Enter:13 Spacebar:32 UpArrow:38 DownArrow:40
+					// Enter:13 Spacebar:32 UpArrow:38 DownArrow:40 Esc:27
 					$(document).off("keydown").keydown(function (e) {
 						if (e.keyCode === 13 || e.keyCode === 32) {
 							e.preventDefault();
 							var menuId = $(".menu-search-list li.this").attr("smenu-id");
+							var menuUrl = $(".menu-search-list li.this").attr("smenu-url");
+							var menuTitle = $(".menu-search-list li.this").attr("smenu-title");
+							var menuType = $(".menu-search-list li.this").attr("smenu-type");
+							var openableWindow = menuType === "1" || menuType === 1;
 							if (sideMenu.isCollapse) {
 								collapse();
 							}
-							sideMenu.selectItem(menuId);
+							if (openableWindow) {
+								pearAdmin.jump(menuId, menuTitle, menuUrl)
+							} else {
+								sideMenu.selectItem(menuId);
+							}
+							compatible();
 							layer.close(layeridx);
 						}else if(e.keyCode === 38){
 							e.preventDefault();
@@ -632,6 +645,9 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm
 							}else{
 								$list.children().first().addClass("this");
 							}
+						}else if(e.keyCode === 27){
+							e.preventDefault();
+							layer.close(layeridx);
 						}
 					})
 				}
-- 
Gitee