diff --git a/component/pear/module/admin.js b/component/pear/module/admin.js index 72e5fea..3da8e8e 100644 --- a/component/pear/module/admin.js +++ b/component/pear/module/admin.js @@ -45,8 +45,8 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'], sideMenu.selectItem(param.menu.select); } - this.bodyRender = function(option) { - if (option.tab.muiltTab) { + this.bodyRender = function(param) { + if (param.tab.muiltTab) { bodyTab = pearTab.render({ elem: 'content', roll: true, @@ -54,20 +54,20 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'], width: '100%', height: '100%', index: 0, - tabMax: option.tab.tabMax, + tabMax: param.tab.tabMax, closeEvent: function(id) { sideMenu.selectItem(id); }, data: [{ - id: option.tab.index.id, - url: option.tab.index.href, - title: option.tab.index.title, + id: param.tab.index.id, + url: param.tab.index.href, + title: param.tab.index.title, close: false }] }); bodyTab.click(function(id) { // 选 项 卡 切 换 刷 新 - if(!option.tab.keepState){ + if(!param.tab.keepState){ bodyTab.refresh(false); } bodyTab.positionTab(); @@ -89,7 +89,6 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'], }, 600) }) sideMenu.click(function(dom, data) { - bodyTab.addTabOnly({ id: data.menuId, title: data.menuTitle, diff --git a/component/pear/module/menu.js b/component/pear/module/menu.js index 8c9f40f..1909cce 100644 --- a/component/pear/module/menu.js +++ b/component/pear/module/menu.js @@ -47,8 +47,6 @@ layui.define(['table', 'jquery', 'element'], function(exports) { } } - - // 渲 染 菜 单 结 束 并 完 成 element.init(); downShow(option); @@ -57,8 +55,6 @@ layui.define(['table', 'jquery', 'element'], function(exports) { return new pearMenu(option); } - - /** 监听事件赋值 */ pearMenu.prototype.click = function(clickEvent) { var _this = this; @@ -76,36 +72,26 @@ layui.define(['table', 'jquery', 'element'], function(exports) { if (doms.text() != '') { data['menuPath'] = doms.find("span").text() + " / " + data['menuPath']; - } var domss = hash(doms); - if (domss.text() != '') { data['menuPath'] = domss.find("span").text() + " / " + data['menuPath']; } - var domsss = hash(domss); - if (domsss.text() != '') { - data['menuPath'] = domsss.find("span").text() + " / " + data['menuPath']; - } clickEvent(dom, data); }); - } function hash(dom) { - return dom.parent().parent().prev(); } pearMenu.prototype.skin = function(skin) { - var menu = $(".pear-nav-tree[lay-filter='" + this.option.elem + "']").parent(); - menu.removeClass("dark-theme"); menu.removeClass("light-theme"); menu.addClass(skin); @@ -115,28 +101,20 @@ layui.define(['table', 'jquery', 'element'], function(exports) { pearMenu.prototype.selectItem = function(pearId) { if (this.option.control != false) { - $("#" + this.option.elem + " a[menu-id='" + pearId + "']").parents(".layui-side-scroll ").find("ul").css({ display: "none" }); - $("#" + this.option.elem + " a[menu-id='" + pearId + "']").parents(".layui-side-scroll ").find(".layui-this").removeClass( "layui-this"); - $("#" + this.option.elem + " a[menu-id='" + pearId + "']").parents("ul").css({ display: "block" }); - var controlId = $("#" + this.option.elem + " a[menu-id='" + pearId + "']").parents("ul").attr("pear-id"); $("#" + this.option.control).find(".layui-this").removeClass("layui-this"); - $("#" + this.option.control).find("[pear-id='" + controlId + "']").addClass("layui-this"); } - - // 根 据 菜 单 Id 选 中 菜 单 项 目 - if (this.option.accordion == true) { $("#" + this.option.elem + " a[menu-id='" + pearId + "']").parents(".pear-nav-tree").find(".layui-nav-itemed").removeClass( "layui-nav-itemed"); @@ -145,14 +123,9 @@ layui.define(['table', 'jquery', 'element'], function(exports) { $("#" + this.option.elem + " a[menu-id='" + pearId + "']").parents(".pear-nav-tree").find(".layui-this").removeClass( "layui-this"); - // 通 过 动 画 打 开 当 前 菜 单 项 layui-nav-child - if (!$("#" + this.option.elem).is(".pear-nav-mini")) { - $("#" + this.option.elem + " a[menu-id='" + pearId + "']").parents(".layui-nav-item").addClass("layui-nav-itemed"); - $("#" + this.option.elem + " a[menu-id='" + pearId + "']").parents("dd").addClass("layui-nav-itemed"); - } $("#" + this.option.elem + " a[menu-id='" + pearId + "']").parent().addClass("layui-this"); @@ -164,30 +137,21 @@ layui.define(['table', 'jquery', 'element'], function(exports) { pearMenu.prototype.collaspe = function(time) { var elem = this.option.elem; - var config = this.option; if ($("#" + this.option.elem).is(".pear-nav-mini")) { - $.each(activeMenus, function(i, item) { $("#" + elem + " a[menu-id='" + $(this).attr("menu-id") + "']").parent().addClass("layui-nav-itemed"); }) - $("#" + this.option.elem).removeClass("pear-nav-mini"); - $("#" + this.option.elem).animate({ width: "220px" }, 150); - isHoverMenu(false, config); - } else { - activeMenus = $("#" + this.option.elem).find(".layui-nav-itemed>a"); $("#" + this.option.elem).find(".layui-nav-itemed").removeClass("layui-nav-itemed"); - $("#" + this.option.elem).addClass("pear-nav-mini"); - $("#" + this.option.elem).animate({ width: "60px" }, 400); @@ -198,52 +162,38 @@ layui.define(['table', 'jquery', 'element'], function(exports) { /** 同 步 请 求 获 取 数 据 */ function getData(url) { - $.ajaxSettings.async = false; var data = null; - $.get(url+"?fresh=" + Math.random(), function(result) { data = result; }); - $.ajaxSettings.async = true; return data; } function createMenu(option) { - // 声 明 头 部 var menuHtml = '