From 1fbb6f9e5ae3324607be4a3e025ca5586b898e2d Mon Sep 17 00:00:00 2001
From: sassassin <530521314@qq.com>
Date: Tue, 30 Jun 2020 08:08:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8F=9C=E5=8D=95=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=A4=96=E9=83=A8=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E9=85=8D=E7=BD=AE=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 component/layui/lay/extends/pearAdmin.js |  2 +-
 component/layui/lay/extends/pearMenu.js  | 28 +++++++++++++-----------
 index.html                               |  1 +
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/component/layui/lay/extends/pearAdmin.js b/component/layui/lay/extends/pearAdmin.js
index b39b04b..675946a 100644
--- a/component/layui/lay/extends/pearAdmin.js
+++ b/component/layui/lay/extends/pearAdmin.js
@@ -51,7 +51,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear
 			this.menuRender = function(option) {
 				sideMenu = pearMenu.render({
 					elem: 'sideMenu', //依赖容器
-					async: true, //数据形式
+					async: option.async, //数据形式
 					theme: option.theme,
 					height: '100%',
 					control: option.control ? 'control' : false, // control 
diff --git a/component/layui/lay/extends/pearMenu.js b/component/layui/lay/extends/pearMenu.js
index 8d98d22..812c651 100644
--- a/component/layui/lay/extends/pearMenu.js
+++ b/component/layui/lay/extends/pearMenu.js
@@ -41,12 +41,14 @@ layui.define(['table', 'jquery', 'element'], function(exports) {
 			}
 		}
 
-		if (option.control != false) {
+		if(option.data.length > 0){
+			if (option.control != false) {
 
-			createMenuAndControl(option);
+				createMenuAndControl(option);
 
-		} else {
-			createMenu(option);
+			} else {
+				createMenu(option);
+			}
 		}
 
 
@@ -234,12 +236,12 @@ layui.define(['table', 'jquery', 'element'], function(exports) {
 
 			var href = "javascript:;";
 			var target = "";
-			var calss = "site-demo-active"
+			var className = "site-demo-active"
 
 			if (item.openType == "_blank" && item.type == 1) {
 				href = item.href;
 				target = "target='_blank'";
-				calss = "";
+				className = "";
 			}
 
 			// 判 断 菜 单 类 型 0 是 不可跳转的目录 1 是 可 点 击 跳 转 的 菜 单
@@ -251,7 +253,7 @@ layui.define(['table', 'jquery', 'element'], function(exports) {
 			} else if (item.type == 1) {
 				
 				// 创 建 菜 单 结 构
-				content += '<a class="' + calss + '" menu-type="' + item.type + '" menu-url="' + item.href + '" menu-id="' +
+				content += '<a class="' + className + '" menu-type="' + item.type + '" menu-url="' + item.href + '" menu-id="' +
 					item.id +
 					'" menu-title="' + item.title + '"  href="' + href + '"  ' + target + '><i class="' + item.icon +
 					'"></i><span>' + item.title + '</span></a>';
@@ -318,13 +320,13 @@ layui.define(['table', 'jquery', 'element'], function(exports) {
 
 				var target = "";
 
-				var calss = "site-demo-active";
+				var className = "site-demo-active";
 
 				if (note.openType == "_blank" && note.type == 1) {
 
 					href = note.href;
 					target = "target='_blank'";
-					calss = "";
+					className = "";
 				}
 
 
@@ -336,7 +338,7 @@ layui.define(['table', 'jquery', 'element'], function(exports) {
 						'</span></a>';
 				} else if (note.type == 1) {
 					// 创 建 菜 单 结 构
-					content += '<a ' + target + ' class="' + calss + '" menu-type="' + note.type + '" menu-url="' + note.href +
+					content += '<a ' + target + ' class="' + className + '" menu-type="' + note.type + '" menu-url="' + note.href +
 						'" menu-id="' + note.id +
 						'" menu-title="' + note.title + '" href="' + href + '"><i class="' + note.icon +
 						'"></i><span>' + note.title + '</span></a>';
@@ -399,12 +401,12 @@ layui.define(['table', 'jquery', 'element'], function(exports) {
 
 				var target = "";
 
-				var calss = "site-demo-active";
+				var className = "site-demo-active";
 
 				if (note.openType == "_blank" && note.type == 1) {
 					href = note.href;
 					target = "target='_blank'";
-					calss = "";
+					className = "";
 				}
 
 				// 判 断 子 项 类 型
@@ -414,7 +416,7 @@ layui.define(['table', 'jquery', 'element'], function(exports) {
 						'"><i class="' + note.icon + '"></i><span>' + note.title + '</span></a>';
 				} else if (note.type == 1) {
 					// 创 建 菜 单 结 构
-					content += '<a ' + target + ' class="' + calss + '" menu-type="' + note.type + '" menu-url="' + note.href +
+					content += '<a ' + target + ' class="' + className + '" menu-type="' + note.type + '" menu-url="' + note.href +
 						'" menu-id="' + note.id + '" menu-title="' + note.title + '" menu-icon="' + note.icon + '" href="' + href +
 						'" ><i class="' + note.icon + '"></i><span>' + note.title + '</span></a>';
 				}
diff --git a/index.html b/index.html
index 7c247d4..83682ea 100644
--- a/index.html
+++ b/index.html
@@ -81,6 +81,7 @@
 					theme: "dark-theme", // 默 认 主 题 样 式 dark-theme 默认主题 light-theme 亮主题
 					index: 'view/console/console1.html', // 默 认 加 载 主 页
 					data: 'admin/data/menu.json', // 菜 单 数 据 加 载 地 址
+					async: true,//加 载 菜 单 数 据
 					select: '0', // 默 认 选 中 菜 单 项
 					notice: 'admin/data/notice.json', // 消 息 列 表 数 据
 					auth: 'admin/data/permission.json' // 前端权限限制，false 关闭该功能
-- 
Gitee