diff --git a/admin/css/pearAdmin.css b/admin/css/pearAdmin.css index 882b7c8..742d83f 100644 --- a/admin/css/pearAdmin.css +++ b/admin/css/pearAdmin.css @@ -1,242 +1,248 @@ +/** +~ Copyright [就眠仪式] [Pear Admin Layui of copyright owner] +~ +~ Licensed under the Apache License, Version 2.0 (the "License"); +~ you may not use this file except in compliance with the License. +~ You may obtain a copy of the License at +~ +~ http://www.apache.org/licenses/LICENSE-2.0 +~ +~ Unless required by applicable law or agreed to in writing, software +~ distributed under the License is distributed on an "AS IS" BASIS, +~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +~ See the License for the specific language governing permissions and +~ limitations under the License. +~ + */ +.pear-admin .layui-header, +.pear-admin .layui-body, +.pear-admin .layui-logo, +.pear-admin .layui-side { + transition: all .3s; +} +.pear-admin .layui-logo .title { + font-size: 20px; +} +.layui-header .layui-nav-more { + display: none !important; +} +.pe-collaspe { + position: absolute; + width: 50px; + height: 50px; + line-height: 50px; + background-color: #5FB878; + z-index: 9999; + right: 40px; + bottom: 25px; + border-radius: 50px; + text-align: center; + color: white; + box-shadow: 2px 0 6px rgba(0, 21, 41, .35); +} - .pear-admin .layui-header, - .pear-admin .layui-body, - .pear-admin .layui-logo, - .pear-admin .layui-side{ - transition: all .3s; - } - .pear-admin .layui-logo .title{ - font-size: 20px; - } - .layui-header .layui-nav-more{ - display: none!important; - } - - .pe-collaspe{ - position: absolute; - width: 50px; - height: 50px; - line-height: 50px; - background-color: #5FB878; - z-index: 9999; - right: 40px; - bottom: 25px; - border-radius: 50px; - text-align: center; - color: white; - box-shadow: 2px 0 6px rgba(0, 21, 41, .35); - } - - /** - * 风格 - * */ - .light-theme .layui-logo{ - background-color: white!important; - color: black!important; - } - - .light-theme .layui-side-scroll{ - background-color: white!important; - color: black!important; - } - - .light-theme .bottom-nav { - background-color: white!important; - box-shadow: none; - border-top: whitesmoke 1px solid; - } - - .light-theme .bottom-nav *{ - color: dimgray; - } - - /** 通 用 框 架 布 局 */ - .pear-admin .layui-header { - left: 220px; - width: calc(100% - 220px); - background-color: white; - border-bottom: 1px solid whitesmoke; - } - .pear-admin .layui-header .layui-nav-img{ - width: 30px; - height: 30px; - } - .pear-admin .layui-layout-control{ - left: 120px; - position: absolute; - } - .pear-admin .layui-logo{ - width: 220px; - height: 60px; - position: relative; - background-color: #28333E; - - } - .pear-admin .layui-logo img{ - width: 36px; - height: 36px; - } - .pear-admin .layui-logo .title{ - font-size: 21px; - font-weight: 550; - color: #5FB878; - position: relative; - top: 5px; - margin-left: 5px; - } - .pear-admin .layui-logo .logo{ - display: none; - } - .pear-mini .layui-logo .title{ - display: none; - } - .pear-mini .layui-logo .logo{ - display: inline-block; - } - .pear-admin .layui-side { - top: 0px; - width: 220px; - box-shadow: 2px 0 6px rgba(0, 21, 41, .35); - z-index: 9999; - } - .pear-admin .layui-side-scroll::-webkit-scrollbar{ - width:0px; - height:0px; - } - .pear-admin .layui-side-scroll{ - height: calc(100% - 60px); - background-color: #28333E; - - } - .pear-admin .layui-header .layui-nav .layui-nav-item>a { - color: black; - font-size: 15px; - } - .pear-admin .layui-body { - left: 220px; - bottom: 0px; - } - .pear-admin .layui-layout-left { - left: 0px; - - } - - /** 隐 藏 布 局 样 式 */ - .pear-mini .layui-side{ - width: 60px; - } - .pear-mini .layui-header{ - left: 60px; - width: calc(100% - 60px); - } - .pear-mini .layui-body{ - left: 60px; - } - .pear-mini .layui-logo{ - width: 60px; - } - .pear-mini .layui-nav-tree .layui-nav-item span{ - display: none; - } - .pear-mini .bottom-nav li{ - width: 100%!important; - } - .pear-mini .layui-side-scroll{ - height: calc(100% - 60px); - } - - - - /** 顶 部 菜 单 样 式 */ - .pear-admin .layui-header .layui-nav .layui-nav-bar { - top: 0px !important; - height: 2px !important; - background-color: #5FB878; - } - .pear-admin .layui-header .layui-nav .layui-this:after { - display: none; - } - - /** 新增兼容 */ - @media screen and (max-width:768px) { - - - .pear-mini .bottom-nav{ - display: none; - } - .pear-mini .layui-side-scroll{ - height: calc(100% - 62px); - } - - /** 隐 藏 布 局 样 式 */ - .pear-mini .layui-side{ - width: 0px; - } - .pear-mini .layui-header{ - left: 0px; - width: 100%; - } - .pear-mini .layui-body{ - left: 0px; - } - .pear-mini .layui-logo{ - width: 0px; - } - .pear-admin .layui-body{ - left: 0px; - } - .pear-admin .layui-header{ - left: 0px; - width: 100%; - } - .pear-admin .pear-cover{ - width: 100%; - height: 100%; - background-color: #1E1E1E; - display: block; - position: absolute; - z-index: 1000; - opacity: 0; - margin-top: -60px; - } - .pear-mini .pear-cover{ - display: none; - } - } - - - @-webkit-keyframes am-horizontal-roll_show { - 0% { - opacity: 1; - -webkit-transform: translateX(2000px); - transform: translateX(2000px) - } - - 100% { - opacity: 1; - -webkit-transform: translateX(0); - transform: translateX(0) - } - } - @keyframes am-horizontal-roll_show { - 0% { - opacity: 1; - -webkit-transform: translateX(800px); - -ms-transform: translateX(800px); - transform: translateX(800px) - } - - 100% { - opacity: 1; - -webkit-transform: translateX(0); - -ms-transform: translateX(0); - transform: translateX(0) - } - } - .layer-anim-right { - -webkit-animation: am-horizontal-roll_show .6s ease-out; - animation: am-horizontal-roll_show .6s ease-out; - - } - - \ No newline at end of file +/** 亮色侧边风格 */ +.light-theme .layui-logo { + background-color: white !important; + color: black !important; +} +.light-theme .layui-side-scroll { + background-color: white !important; + color: black !important; +} +.light-theme .bottom-nav { + background-color: white !important; + box-shadow: none; + border-top: whitesmoke 1px solid; +} +.light-theme .bottom-nav * { + color: dimgray; +} + +/** 通 用 框 架 布 局 */ +.pear-admin .layui-header { + left: 220px; + width: calc(100% - 220px); + background-color: white; + border-bottom: 1px solid whitesmoke; +} +.pear-admin .layui-header .layui-nav-img { + width: 30px; + height: 30px; +} +.pear-admin .layui-layout-control { + left: 120px; + position: absolute; +} +.pear-admin .layui-logo { + width: 220px; + height: 60px; + position: relative; + background-color: #28333E; + +} +.pear-admin .layui-logo img { + width: 36px; + height: 36px; +} +.pear-admin .layui-logo .title { + font-size: 21px; + font-weight: 550; + color: #5FB878; + position: relative; + top: 5px; + margin-left: 5px; +} +.pear-admin .layui-logo .logo { + display: none; +} +.pear-mini .layui-logo .title { + display: none; +} +.pear-mini .layui-logo .logo { + display: inline-block; +} +.pear-admin .layui-side { + top: 0px; + width: 220px; + box-shadow: 2px 0 6px rgba(0, 21, 41, .35); + z-index: 9999; +} +.pear-admin .layui-side-scroll::-webkit-scrollbar { + width: 0px; + height: 0px; +} +.pear-admin .layui-side-scroll { + height: calc(100% - 60px); + background-color: #28333E; + +} +.pear-admin .layui-header .layui-nav .layui-nav-item>a { + color: black; + font-size: 15px; +} +.pear-admin .layui-body { + left: 220px; + bottom: 0px; +} +.pear-admin .layui-layout-left { + left: 0px; + +} + +/** 隐 藏 布 局 样 式 */ +.pear-mini .layui-side { + width: 60px; +} +.pear-mini .layui-header { + left: 60px; + width: calc(100% - 60px); +} +.pear-mini .layui-body { + left: 60px; +} +.pear-mini .layui-logo { + width: 60px; +} +.pear-mini .layui-nav-tree .layui-nav-item span { + display: none; +} +.pear-mini .bottom-nav li { + width: 100% !important; +} +.pear-mini .layui-side-scroll { + height: calc(100% - 60px); +} + + + +/** 顶 部 菜 单 样 式 */ +.pear-admin .layui-header .layui-nav .layui-nav-bar { + top: 0px !important; + height: 2px !important; + background-color: #5FB878; +} +.pear-admin .layui-header .layui-nav .layui-this:after { + display: none; +} + +/** 新增兼容 */ +@media screen and (max-width:768px) { + .pear-mini .bottom-nav { + display: none; + } + .pear-mini .layui-side-scroll { + height: calc(100% - 62px); + } + /** 隐 藏 布 局 样 式 */ + .pear-mini .layui-side { + width: 0px; + } + .pear-mini .layui-header { + left: 0px; + width: 100%; + } + .pear-mini .layui-body { + left: 0px; + } + .pear-mini .layui-logo { + width: 0px; + } + .pear-admin .layui-body { + left: 0px; + } + .pear-admin .layui-header { + left: 0px; + width: 100%; + } + .pear-admin .pear-cover { + width: 100%; + height: 100%; + background-color: #1E1E1E; + display: block; + position: absolute; + z-index: 1000; + opacity: 0; + margin-top: -60px; + } + .pear-mini .pear-cover { + display: none; + } +} + + +@-webkit-keyframes am-horizontal-roll_show { + 0% { + opacity: 1; + -webkit-transform: translateX(2000px); + transform: translateX(2000px) + } + + 100% { + opacity: 1; + -webkit-transform: translateX(0); + transform: translateX(0) + } +} + +@keyframes am-horizontal-roll_show { + 0% { + opacity: 1; + -webkit-transform: translateX(800px); + -ms-transform: translateX(800px); + transform: translateX(800px) + } + + 100% { + opacity: 1; + -webkit-transform: translateX(0); + -ms-transform: translateX(0); + transform: translateX(0) + } +} + +.layer-anim-right { + -webkit-animation: am-horizontal-roll_show .6s ease-out; + animation: am-horizontal-roll_show .6s ease-out; + +} diff --git a/admin/css/pearCommon.css b/admin/css/pearCommon.css index 9733c21..9277598 100644 --- a/admin/css/pearCommon.css +++ b/admin/css/pearCommon.css @@ -2,52 +2,42 @@ margin: 10px; background-color: whitesmoke; } - .layui-form-item { margin-bottom: 0px !important; margin-top: 5px !important; } - .layui-input { height: 34px !important; line-height: 34px !important; border-radius: 3px !important; } - .layui-form-label { width: 60px !important; padding-left: 0px !important; } - .layui-table-tool-panel { margin-top: 10px !important; } - .layui-table-tool { background-color: white !important; border-bottom: none !important; padding-bottom: 10px !important; } - .layui-table-header, .layui-table-header th { background-color: white !important; } - .layui-table-view { border: none !important; } - .layui-table-cell { height: 34px !important; line-height: 34px !important; } - .layui-laypage .layui-laypage-curr .layui-laypage-em { border-radius: 50px !important; background-color: #5FB878 !important; } - .layui-table tr { height: 34px !important; line-height: 34px !important; diff --git a/admin/css/pearMenu.css b/admin/css/pearMenu.css index a3b5287..4058f7a 100644 --- a/admin/css/pearMenu.css +++ b/admin/css/pearMenu.css @@ -15,12 +15,10 @@ padding-top: 5px; padding-bottom: 5px; } - .layui-nav-tree .layui-nav-child dd.layui-this, .layui-nav-tree .layui-nav-child dd.layui-this a, .layui-nav-tree .layui-this, .layui-nav-tree .layui-this>a, .layui-nav-tree .layui-this>a:hover{ background-color: #5FB878; } - .pear-nav-tree .toast{ font-size: 14px; margin: 5px; @@ -171,8 +169,6 @@ border-bottom-color: dimgray!important; } - - .light-theme .pear-nav-tree .layui-nav-child{ padding-top: 0px; padding-bottom: 0px; @@ -195,9 +191,7 @@ } - /** 下 拉 图 标 */ - .pear-nav-tree.arrow .layui-nav-more { font-family: layui-icon !important; font-size: 12px; @@ -217,11 +211,9 @@ transition: all .2s; -webkit-transition: all .2s; } - .pear-nav-tree.arrow .layui-nav-child .layui-nav-more { top: 17px; } - .pear-nav-tree.arrow .layui-nav-more:before { content: "\e61a"; } @@ -234,7 +226,6 @@ width: 12px; text-align: center; } - .pear-nav-tree.arrow .layui-nav-itemed > a > .layui-nav-more:before { content: '\e61a'; background-color: transparent; diff --git a/admin/css/pearTab.css b/admin/css/pearTab.css index 0992de5..6b83199 100644 --- a/admin/css/pearTab.css +++ b/admin/css/pearTab.css @@ -1,15 +1,11 @@ - .pear-tab { margin: 0px; overflow: hidden; height: 100% !important; } - .pear-tab .layui-tab-content{ height: calc(100% - 42px) !important; } - - .pear-tab .layui-tab-content .layui-tab-item{ height: 100%; } @@ -17,26 +13,21 @@ .pear-tab .layui-tab-content { padding: 0px; } - .pear-tab .layui-tab-title { border: none; border: 1px solid whitesmoke; background-color: white; } - .pear-tab .layui-tab-title li { border-right: 1px solid whitesmoke; color: dimgray; } - .pear-tab .layui-tab-title .layui-tab-bar { display: none; } - .pear-tab .layui-tab-title .layui-this:after { display: none; } - .pear-tab .layui-tab-title .pear-tab-active { display: inline-block; background-color: lightgray; @@ -45,26 +36,21 @@ border-radius: 30px; margin-right: 12px; } - .pear-tab .layui-tab-title .layui-this .pear-tab-active { background-color: #5FB878; } - .pear-tab .layui-tab-title .layui-tab-close:hover { border-radius: 50px; background-color: lightgray; line-height: 19px; } - .pear-tab .layui-tab-title .disable-close+.layui-tab-close { display: none; } - .pear-tab .layui-tab-title .able-close+.layui-tab-close { display: inline-block; } - .pear-tab .layui-tab-control>li { position: absolute; top: 0px; @@ -76,67 +62,52 @@ border-top: whitesmoke 1px solid; border-bottom: whitesmoke 1px solid; } - .pear-tab .layui-tab-prev { left: 0px; border-right: whitesmoke 1px solid; border-left: whitesmoke 1px solid; } - .pear-tab .layui-tab-next { right: 40px; border-left: 1px solid whitesmoke; } - .pear-tab .layui-tab-tool { right: 0px; border-left: 1px solid whitesmoke; } - .pear-tab .layui-tab-control .layui-tab-tool, .pear-tab .layui-tab-control .layui-tab-prev, .pear-tab .layui-tab-control .layui-tab-next { display: none; } - - .pear-tab.layui-tab-roll .layui-tab-control .layui-tab-prev, .pear-tab.layui-tab-roll .layui-tab-control .layui-tab-next { display: block; } - .pear-tab.layui-tab-roll .layui-tab-control .layui-tab-next { right: 0px; border-right: 1px solid whitesmoke; } - .pear-tab.layui-tab-roll .layui-tab-title { padding-left: 40px; padding-right: 40px; } - - .pear-tab.layui-tab-tool .layui-tab-control .layui-tab-tool { display: block; } - .pear-tab.layui-tab-tool .layui-tab-title { padding-left: 0px; padding-right: 40px; } - - .pear-tab.layui-tab-rollTool .layui-tab-title { padding-left: 40px; padding-right: 80px; } - .pear-tab.layui-tab-rollTool .layui-tab-control .layui-tab-prev, .pear-tab.layui-tab-rollTool .layui-tab-control .layui-tab-next, .pear-tab.layui-tab-rollTool .layui-tab-control .layui-tab-tool { display: block; } - .pear-tab .layui-tab-tool .layui-nav { position: absolute; height: 43px !important; @@ -146,15 +117,12 @@ padding: 0; background: 0 0; } - .pear-tab .layui-tab-tool .layui-nav-item { height: 40px; } - .pear-tab .layui-tab-tool .layui-nav-bar { display: none; } - .pear-tab .layui-tab-tool .layui-nav-child { left: auto; top: 45px; @@ -162,11 +130,9 @@ width: 120px; border: 1px solid whitesmoke; } - .pear-tab .layui-tab-tool .layui-this a { background-color: #009688; } - .pear-tab-loading { position: absolute; display: none; @@ -176,13 +142,11 @@ z-index: 19; background-color: #fff } - .pear-tab-loading.close { animation: close 1s; -webkit-animation: close 1s; animation-fill-mode: forwards; } - .ball-loader { position: absolute; left: 50%; @@ -191,13 +155,11 @@ -ms-transform: translate(-50%, -50%); -webkit-transform: translate(-50%, -50%) } - .ball-loader>span, .signal-loader>span { background-color: #4aca85!important; display: inline-block } - .ball-loader>span:nth-child(1), .ball-loader.sm>span:nth-child(1), .signal-loader>span:nth-child(1), @@ -205,7 +167,6 @@ -webkit-animation-delay: 0s; animation-delay: 0s } - .ball-loader>span:nth-child(2), .ball-loader.sm>span:nth-child(2), .signal-loader>span:nth-child(2), @@ -213,7 +174,6 @@ -webkit-animation-delay: .1s; animation-delay: .1s } - .ball-loader>span:nth-child(3), .ball-loader.sm>span:nth-child(3), .signal-loader>span:nth-child(3), @@ -221,7 +181,6 @@ -webkit-animation-delay: .15s; animation-delay: .15s } - .ball-loader>span:nth-child(4), .ball-loader.sm>span:nth-child(4), .signal-loader>span:nth-child(4), @@ -229,7 +188,6 @@ -webkit-animation-delay: .2s; animation-delay: .2s } - .ball-loader>span { width: 20px; height: 20px; @@ -241,7 +199,6 @@ animation: ball-load 1s ease-in-out infinite; -webkit-animation: 1s ball-load ease-in-out infinite } - @-webkit-keyframes ball-load { 0% { transform: scale(0); diff --git a/admin/css/pearTable.css b/admin/css/pearTable.css index 07361c7..e0bb3d1 100644 --- a/admin/css/pearTable.css +++ b/admin/css/pearTable.css @@ -1,59 +1,60 @@ -.layui-table-view{ - border-radius: 5px; - } - - .layui-table th{ - background-color: whitesmoke; - } - - .layui-table-tool{ - background-color: whitesmoke; - } - - .layui-table-tool .layui-inline[lay-event] { - width: 32px!important; - height: 32px!important; - line-height: 20px!important; - border-radius: 2px; - } - - .layui-inline i{ - font-size: 18px; - } - - .layui-table-tool-panel{ - margin-top: 8px; - border-radius: 4px!important; - } - - .layui-table-page .layui-laypage .layui-laypage-curr .layui-laypage-em{ - border-radius: 50px; - background-color: #5FB878; - } - .layui-table-cell{ - height: 34px; - line-height: 34px; - } - - .layui-table-page{ - height: 45px; - font-size: 18px; - padding-top: 9px; - } - - .layui-laypage-skip input{ - - height: 26px!important; - line-height: 26px!important; - } +.layui-table-view { + border-radius: 5px; +} - .layui-laypage-limits{ - position: absolute!important; - right: 10px!important; - } - - .layui-laypage-limits select{ - height: 20px!important; - border-radius: 2px; - color: dimgray; - } \ No newline at end of file +.layui-table th { + background-color: whitesmoke; +} + +.layui-table-tool { + background-color: whitesmoke; +} + +.layui-table-tool .layui-inline[lay-event] { + width: 32px !important; + height: 32px !important; + line-height: 20px !important; + border-radius: 2px; +} + +.layui-inline i { + font-size: 18px; +} + +.layui-table-tool-panel { + margin-top: 8px; + border-radius: 4px !important; +} + +.layui-table-page .layui-laypage .layui-laypage-curr .layui-laypage-em { + border-radius: 50px; + background-color: #5FB878; +} + +.layui-table-cell { + height: 34px; + line-height: 34px; +} + +.layui-table-page { + height: 45px; + font-size: 18px; + padding-top: 9px; +} + +.layui-laypage-skip input { + + height: 26px !important; + line-height: 26px !important; +} + +.layui-laypage-limits { + position: absolute !important; + right: 10px !important; +} + +.layui-laypage-limits select { + height: 20px !important; + border-radius: 2px; + color: dimgray; +} diff --git a/component/layui/lay/extends/pearAdmin.js b/component/layui/lay/extends/pearAdmin.js index 2f2e39e..49c48e7 100644 --- a/component/layui/lay/extends/pearAdmin.js +++ b/component/layui/lay/extends/pearAdmin.js @@ -1,3 +1,19 @@ +/** +~ Copyright [就眠仪式] [Pear Admin Layui of copyright owner] +~ +~ Licensed under the Apache License, Version 2.0 (the "License"); +~ you may not use this file except in compliance with the License. +~ You may obtain a copy of the License at +~ +~ http://www.apache.org/licenses/LICENSE-2.0 +~ +~ Unless required by applicable law or agreed to in writing, software +~ distributed under the License is distributed on an "AS IS" BASIS, +~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +~ See the License for the specific language governing permissions and +~ limitations under the License. +~ + */ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pearMenu', 'pearNotice', 'pearFrame'], function(exports) { "use strict"; @@ -18,18 +34,12 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear var pearAdmin = new function() { this.render = function(option) { - - this.menuRender(option); - - this.bodyRender(option); - - this.keepLoad(option); - - this.themeRender(option); - - this.noticeRender(option); - - this.permissionRender(option); + this.menuRender(option); + this.bodyRender(option); + this.keepLoad(option); + this.themeRender(option); + this.noticeRender(option); + this.permissionRender(option); } this.permissionRender = function(option) { @@ -39,8 +49,6 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear } this.menuRender = function(option) { - - /** 侧 边 菜 单 组 件 初 始 化 */ sideMenu = pearMenu.render({ elem: 'sideMenu', //依赖容器 async: true, //数据形式 @@ -58,7 +66,6 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear } this.noticeRender = function(option) { - var option = { elem: 'headerNotice', url: option.notice, @@ -86,10 +93,8 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear this.bodyRender = function(option) { - - if (option.muiltTab) { - - bodyTab = pearTab.render({ + if (option.muiltTab) { + bodyTab = pearTab.render({ elem: 'content', roll: true, tool: true, @@ -105,18 +110,13 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear }] //初始化数据 }); - // 选 项 卡 切 换 API 文 档 bodyTab.click(function(id) { - // 选 项 卡 定 位 bodyTab.positionTab(); - sideMenu.selectItem(id); }) - $("body").on("click", ".refresh", function() { - $(".refresh a").removeClass("layui-icon-refresh-1"); $(".refresh a").addClass("layui-anim"); $(".refresh a").addClass("layui-anim-rotate"); @@ -141,12 +141,10 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear icon: data.menuIcon, close: true }, 300); - compatible(); }) } else { - // 选 项 卡 初 始 API 文 档 bodyFrame = pearFrame.render({ elem: 'content', title: '工作空间 / 首页', @@ -172,24 +170,17 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear }) sideMenu.click(function(dom, data) { - compatible(); bodyFrame.changePage(data.menuUrl, data.menuPath, true); - }) } - } - + this.keepLoad = function(option) { - // 关 闭 加 载 层 + compatible(); - setTimeout(function() { - - $(".loader-main").fadeOut(option.done); - - // 设 置 关 闭 时 间 + $(".loader-main").fadeOut(option.done); }, option.keepLoad) } @@ -253,26 +244,20 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear } - - var theme = "'; - - + var theme = "'; + $("iframe").contents().find("head").append(theme); - - $("#pearone-bg-color").html(style); + $("#pearone-bg-color").html(style); } this.themeRender = function(option) { var color = localStorage.getItem("theme-color"); - var menu = localStorage.getItem("theme-menu"); this.colorSet(color); - this.menuSkin(menu); } @@ -306,28 +291,19 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear } }) - - /** - * 全屏/退出全屏 - */ $("body").on("click", ".fullScreen", function() { if ($(this).hasClass("layui-icon-screen-restore")) { - screenFun(2).then(function() { $(".fullScreen").eq(0).removeClass("layui-icon-screen-restore"); }); - } else { - screenFun(1).then(function() { $(".fullScreen").eq(0).addClass("layui-icon-screen-restore"); }); - } }); - function compatible() { if ($(window).width() <= 768) { sideMenu.collaspe(); @@ -343,11 +319,6 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear } } - /** - * 全屏和退出全屏的方法 - * @param num 1代表全屏 2代表退出全屏 - * @returns {Promise} - */ function screenFun(num) { num = num || 1; num = num * 1; @@ -384,7 +355,6 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear } - //监听背景色选择 $('body').on('click', '[data-select-bgcolor]', function() { var theme = $(this).attr('data-select-bgcolor'); @@ -531,6 +501,5 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pear }); } - exports('pearAdmin', pearAdmin); }) diff --git a/login.html b/login.html index bdededd..170f1ea 100644 --- a/login.html +++ b/login.html @@ -40,7 +40,6 @@ var $ = layui.jquery; $("body").on("click",".login",function(){ - location.href="index.html" }) }) diff --git a/view/common/other/icon.html b/view/common/other/icon.html index 842645d..ede4898 100644 --- a/view/common/other/icon.html +++ b/view/common/other/icon.html @@ -74,9 +74,7 @@ console.log(d); } }); - - -// ********************** 示例2 - 默认值 ***************************************** + iconPicker.render({ // 选择器，推荐使用input elem: '#iconPicker2', @@ -97,11 +95,7 @@ console.log(d); } }); - -// ********************** 示例2 END ***************************************** - - -// ********************* 示例3 - 弹窗中打开 ********************************** + iconPicker.render({ elem: '#iconPicker3', type: 'fontClass', @@ -144,12 +138,7 @@ $('#btnSubmit3-2').click(function(){ alert($('#iconPicker3-2').val()); }); - - - -// ********************* 示例3 END ********************************** - -// ********************* 示例4 - 异步设置值 ********************************** + iconPicker.render({ elem: '#iconPicker4', type: 'fontClass' @@ -162,11 +151,6 @@ iconPicker.checkIcon('iconPicker4', icon); }); -// ********************* 示例4 END ********************************** - - - - });