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 = '