diff --git a/component/pear/css/module/menu.css b/component/pear/css/module/menu.css index 06ad2f3..38e9ea3 100644 --- a/component/pear/css/module/menu.css +++ b/component/pear/css/module/menu.css @@ -14,6 +14,14 @@ line-height: 48px; } +.pear-side-scroll::-webkit-scrollbar { + width: 0px; + height: 0px; +} +.pear-side-scroll{ + width: 230px; +} + .pear-nav-tree .layui-nav-child { padding-top: 5px; padding-bottom: 5px; diff --git a/component/pear/module/admin.js b/component/pear/module/admin.js index fa82897..f24d938 100644 --- a/component/pear/module/admin.js +++ b/component/pear/module/admin.js @@ -206,7 +206,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm localStorage.setItem("theme-color-context", currentColor.color); pearTheme.changeTheme(window, option.other.autoHead); var menu = localStorage.getItem("theme-menu"); - if (menu === "null") { + if (menu == null) { menu = option.theme.defaultMenu; } else { if (option.theme.allowCustom === false) { @@ -239,13 +239,12 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm this.jump = function(id, title, url) { if (config.tab.muiltTab) { bodyTab.addTabOnly({ - id: id, - title: title, - url: url, - icon: null, - close: true - }, - 300); + id: id, + title: title, + url: url, + icon: null, + close: true + }, 300); } else { sideMenu.selectItem(id); bodyFrame.changePage(url, title, true); @@ -366,7 +365,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm move: false, content: html + buildColorHtml() + buildLinkHtml() + bottomTool(), success: function(layero, index) { - + var color = localStorage.getItem("theme-color"); var menu = localStorage.getItem("theme-menu"); diff --git a/component/pear/module/menu.js b/component/pear/module/menu.js index d652179..2b8ac30 100644 --- a/component/pear/module/menu.js +++ b/component/pear/module/menu.js @@ -42,10 +42,11 @@ layui.define(['table', 'jquery', 'element'], function(exports) { } } else { //renderMenu中需要调用done事件,done事件中需要menu对象,但是此时还未返回menu对象,做个延时提前返回对象 - window.setTimeout(function() { - renderMenu(option); - }, 500); + window.setTimeout(function() { renderMenu(option);}, 500); } + + // 处理高度 + $("#"+opt.elem).height(option.height) return new pearMenu(opt); } @@ -194,7 +195,7 @@ layui.define(['table', 'jquery', 'element'], function(exports) { } function createMenu(option) { - var menuHtml = '