From e5755e2936b9044ae86eaf91b473137ea638db3b Mon Sep 17 00:00:00 2001
From: sassassin <530521314@qq.com>
Date: Mon, 12 Oct 2020 08:04:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=8F=9C=E5=8D=95=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=90=8C=E6=AD=A5=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=97=B6=E4=BB=8D=E7=84=B6=E5=8F=AF=E4=BB=A5=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 component/pear/module/admin.js |  8 ++++----
 component/pear/module/menu.js  | 36 ++++++++++++++++++++--------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/component/pear/module/admin.js b/component/pear/module/admin.js
index e2cded3..f44d66c 100644
--- a/component/pear/module/admin.js
+++ b/component/pear/module/admin.js
@@ -43,10 +43,10 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
 					parseData: false,
 					change:function(){
 						compatible();
-					},done(){
-						sideMenu.selectItem(param.menu.select);
-					}
-				})
+					},
+					done:function(){}
+				});
+				sideMenu.selectItem(param.menu.select);
 			}
 			
 			this.bodyRender = function(param) {
diff --git a/component/pear/module/menu.js b/component/pear/module/menu.js
index f97f49f..0942471 100644
--- a/component/pear/module/menu.js
+++ b/component/pear/module/menu.js
@@ -24,29 +24,19 @@ layui.define(['table', 'jquery', 'element'], function(exports) {
 			height: opt.height,
 			theme: opt.theme,
 			data: opt.data ? opt.data : [],
-			change: opt.change ? opt.change : function() {
-			},
+			change: opt.change ? opt.change : function() {},
 			done: opt.done ? opt.done : function() {}
 		}
 
 		if (option.async) {
 			getData(option.url).then(function(data){
 				option.data = data;
-				if (option.parseData != false) {
-					option.parseData(option.data);
-				}
-				if (option.data.length > 0) {
-					if (option.control != false) {
-						createMenuAndControl(option);
-					} else {
-						createMenu(option);
-					}
-				}
-				element.init();
-				downShow(option);
-				option.done();
+				renderMenu(option);
 			});
+		} else {
+			renderMenu(option);
 		}
+
 		return new pearMenu(opt);
 	}
 
@@ -150,6 +140,22 @@ layui.define(['table', 'jquery', 'element'], function(exports) {
 	    return defer.promise();
 	}
 	
+	function renderMenu(option){
+		if (option.parseData != false) {
+			option.parseData(option.data);
+		}
+		if (option.data.length > 0) {
+			if (option.control != false) {
+				createMenuAndControl(option);
+			} else {
+				createMenu(option);
+			}
+		}
+		element.init();
+		downShow(option);
+		option.done();
+	}
+
 	function createMenu(option) {
 		var menuHtml = '<ul lay-filter="' + option.elem +
 			'" class="layui-nav arrow   pear-menu layui-nav-tree pear-nav-tree">'