From c7a61be3899f3256d0164ca22ade24708a85277a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=A7=80=E6=89=8D?= <435952877@qq.com>
Date: Sat, 31 Oct 2020 16:56:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E7=BB=84=E8=8F=9C=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E5=92=8C=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E6=97=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 component/pear/modules/admin.js | 1 +
 component/pear/modules/menu.js  | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/component/pear/modules/admin.js b/component/pear/modules/admin.js
index 0b326dd..31869c8 100644
--- a/component/pear/modules/admin.js
+++ b/component/pear/modules/admin.js
@@ -40,6 +40,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
 					defaultMenu: 0,
 					accordion: param.menu.accordion,
 					url: param.menu.data,
+					data: param.menu.data,//async为false时，传入菜单数组
 					parseData: false,
 					change: function() {
 						compatible();
diff --git a/component/pear/modules/menu.js b/component/pear/modules/menu.js
index 0e61132..c8e6d9a 100644
--- a/component/pear/modules/menu.js
+++ b/component/pear/modules/menu.js
@@ -34,7 +34,10 @@ layui.define(['table', 'jquery', 'element'], function(exports) {
 				renderMenu(option);
 			});
 		} else {
-			renderMenu(option);
+			//renderMenu中需要调用done事件，done事件中需要menu对象，但是此时还未返回menu对象，做个延时提前返回对象
+			window.setTimeout(function() {
+				renderMenu(option);
+			}, 500);
 		}
 
 		return new pearMenu(opt);
-- 
Gitee