From 4005cdf480aeb87a207ed2a31563a9ab663e1352 Mon Sep 17 00:00:00 2001 From: iamsongpeng Date: Wed, 4 Mar 2020 14:45:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=A1=86=E6=9E=B6=E7=BC=A9?= =?UTF-8?q?=E6=94=BEbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 + .../src/main/resources/static/css/splayui.css | 38 ++++++++++--------- .../static/js/layuimodule/splayui/splayui.js | 12 +++--- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 9905805..3a67cc0 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,8 @@ * Javascript 工具库：static/lib/lodash.min.js * Layui 树形表格插件 * https://gitee.com/whvse/treetable-lay + * 图标库使用 + * http://www.fontawesome.com.cn/faicons/ * 后端 * Hutool 是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。 diff --git a/sparchetype/src/main/resources/static/css/splayui.css b/sparchetype/src/main/resources/static/css/splayui.css index 6c8cc4f..566df9a 100644 --- a/sparchetype/src/main/resources/static/css/splayui.css +++ b/sparchetype/src/main/resources/static/css/splayui.css @@ -59,7 +59,7 @@ } /**头部样式（缩放） */ -.splayui .layui-layout-left.layui-header-menu.layui-hide-xs { +.splayui-admin .layui-layout-left.layui-header-menu.layui-hide-xs { left: 155px !important; } @@ -89,10 +89,10 @@ } /**logo演示（缩放） */ -.splayui .layui-layout-admin .layui-logo { +.splayui-admin .layui-layout-admin .layui-logo { width: 60px !important; } -.splayui .layui-layout-admin .layui-logo h1 { +.splayui-admin .layui-layout-admin .layui-logo h1 { display: none; } @@ -108,10 +108,12 @@ color: #ffffff !important; transition: all 0.2s; } + /**缩放工具（缩放） */ -.splayui .splayui-tool { +.splayui-admin .splayui-tool { left: 95px !important; } + .splayui-tool i { display: block; color: #fff; @@ -276,20 +278,20 @@ padding: 5px 0; } /**左侧菜单栏（缩放） */ -.splayui .layui-side.layui-bg-black, -.splayui .layui-left-menu, -.splayui .layui-left-menu > ul, -.splayui .layui-left-menu > ul li i { +.splayui-admin .layui-side.layui-bg-black, +.splayui-admin .layui-left-menu, +.splayui-admin .layui-left-menu > ul, +.splayui-admin .layui-left-menu > ul li i { width: 60px !important; } -.splayui .layui-left-menu > ul li span:first-child { +.splayui-admin .layui-left-menu > ul li span:first-child { display: none; } -.splayui .layui-left-menu > ul li span:last-child { +.splayui-admin .layui-left-menu > ul li span:last-child { float: right; right: 7px; } -.splayui .layui-left-menu .layui-nav .layui-nav-item a { +.splayui-admin .layui-left-menu .layui-nav .layui-nav-item a { height: 40px; line-height: 40px; padding-right: 0px !important; @@ -303,7 +305,7 @@ transition: all 0.2s; } /**内容主体（缩放） */ -.splayui .layui-layout-admin .layui-body { +.splayui-admin .layui-layout-admin .layui-body { left: 60px !important; } @@ -415,7 +417,7 @@ .layui-layout-admin .layui-body .layui-tab-item.layui-show { border-top: 1px solid #e2e2e2; } - .splayui .splayui-tool { + .splayui-admin .splayui-tool { left: 15px !important; } .splayui-tool i:hover { @@ -430,7 +432,7 @@ float: right; right: 0px; } - .splayui .layui-layout-left.layui-header-menu { + .splayui-admin .layui-layout-left.layui-header-menu { left: 50px !important; transition: all 0.2s; } @@ -448,7 +450,7 @@ a { padding: 0 15px; } - .splayui .layui-layout-admin .layui-body { + .splayui-admin .layui-layout-admin .layui-body { left: 0px !important; } .layui-layout-admin .layui-body .clildFrame.layui-tab-content { @@ -462,9 +464,9 @@ -webkit-overflow-scrolling: touch !important; } .splayui-all .layui-nav.layui-layout-right, - .splayui .layui-layout-admin .layui-logo, - .splayui .layui-side.layui-bg-black, - .splayui .layui-left-menu, + .splayui-admin .layui-layout-admin .layui-logo, + .splayui-admin .layui-side.layui-bg-black, + .splayui-admin .layui-left-menu, .layui-layout-admin .layui-body #top_tabs, .layui-layout-admin .layui-body .layui-nav.closeBox { transition: all 0.2s; diff --git a/sparchetype/src/main/resources/static/js/layuimodule/splayui/splayui.js b/sparchetype/src/main/resources/static/js/layuimodule/splayui/splayui.js index eced32f..808b74f 100644 --- a/sparchetype/src/main/resources/static/js/layuimodule/splayui/splayui.js +++ b/sparchetype/src/main/resources/static/js/layuimodule/splayui/splayui.js @@ -67,7 +67,7 @@ layui.define(["element", "jquery"], function (exports) { if (splayui.checkMobile()) { $('.splayui-tool i').attr('data-side-fold', 0); $('.splayui-tool i').attr('class', 'fa fa-indent'); - $('.layui-layout-body').attr('class', 'layui-layout-body splayui-mini'); + $('.layui-layout-body').attr('class', 'layui-layout-body splayui-admin'); } }; @@ -141,16 +141,16 @@ layui.define(["element", "jquery"], function (exports) { $.each(menuList, function (index, menu) { leftMenuHtml += '
  • \n'; if (menu.children && menu.children.length > 0) { - leftMenuHtml += ' ' + menu.name + ' '; + leftMenuHtml += ' ' + menu.name + ' '; var buildChildHtml = function (html, children, menuParameId) { html += '
    \n'; $.each(children, function (childIndex, childMenu) { html += '
    \n'; if (childMenu.children && childMenu.children.length > 0) { - html += ' ' + childMenu.name + ''; + html += ' ' + childMenu.name + ''; html = buildChildHtml(html, childMenu.children, menuParameId); } else { - html += ' ' + childMenu.name + '\n'; + html += ' ' + childMenu.name + '\n'; menuParameId++; window.menuParameId = menuParameId; } @@ -161,7 +161,7 @@ layui.define(["element", "jquery"], function (exports) { }; leftMenuHtml = buildChildHtml(leftMenuHtml, menu.children, menuParameId); } else { - leftMenuHtml += ' ' + menu.name + '\n'; + leftMenuHtml += ' ' + menu.name + '\n'; menuParameId++; } leftMenuHtml += '
    • \n'; @@ -840,7 +840,7 @@ layui.define(["element", "jquery"], function (exports) { if (isShow == 1) { // 缩放 $(this).attr('data-side-fold', 0); $('.splayui-tool i').attr('class', 'fa fa-indent'); - $('.layui-layout-body').attr('class', 'layui-layout-body splayui-mini'); + $('.layui-layout-body').attr('class', 'layui-layout-body splayui-admin'); } else { // 正常 $(this).attr('data-side-fold', 1); $('.splayui-tool i').attr('class', 'fa fa-outdent');