From 604c556cca4cb091be790b7ed902897113e29378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E4=BB=AA=E5=BC=8F?= <854085467@qq.com> Date: Mon, 30 Nov 2020 23:12:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/css/admin.css | 1 - admin/css/load.css | 7 - component/pear/css/pear-module/button.css | 27 +- component/pear/css/pear-module/cropper.css | 404 ++++++++++---------- component/pear/css/pear-module/dropdown.css | 169 +++++++- component/pear/css/pear-module/menu.css | 1 - component/pear/css/pear-module/tab.css | 5 +- component/pear/modules/admin.js | 1 + component/pear/modules/menu.js | 94 +++-- component/pear/modules/tab.js | 17 +- index.html | 6 +- login.html | 1 + view/system/logging.html | 2 +- 13 files changed, 422 insertions(+), 313 deletions(-) diff --git a/admin/css/admin.css b/admin/css/admin.css index 0a48751..e883c50 100644 --- a/admin/css/admin.css +++ b/admin/css/admin.css @@ -117,7 +117,6 @@ .pear-mini .layui-side-scroll { height: calc(100% - 60px); } - .pear-admin .layui-header .layui-nav .layui-nav-bar { top: 0px !important; height: 2px !important; diff --git a/admin/css/load.css b/admin/css/load.css index 3c4409a..995b19c 100644 --- a/admin/css/load.css +++ b/admin/css/load.css @@ -6,7 +6,6 @@ z-index: 9999999; margin-top: -61px; } - .loader { width: 50px; height: 50px; @@ -16,7 +15,6 @@ z-index: 999999; background-color: whitesmoke; } - .loader:before { content: ""; width: 50px; @@ -29,7 +27,6 @@ left: 0; animation: shadow .5s linear infinite; } - .loader:after { content: ""; width: 50px; @@ -41,7 +38,6 @@ left: 0; animation: loading .5s linear infinite; } - @-webkit-keyframes loading { 17% { border-bottom-right-radius: 3px; @@ -64,7 +60,6 @@ transform: translateY(0) rotate(90deg); } } - @keyframes loading { 17% { border-bottom-right-radius: 3px; @@ -87,7 +82,6 @@ transform: translateY(0) rotate(90deg); } } - @-webkit-keyframes shadow { 0%, @@ -99,7 +93,6 @@ transform: scale(1.2, 1); } } - @keyframes shadow { 0%, diff --git a/component/pear/css/pear-module/button.css b/component/pear/css/pear-module/button.css index 8b907b6..7c2ccfc 100644 --- a/component/pear/css/pear-module/button.css +++ b/component/pear/css/pear-module/button.css @@ -17,11 +17,9 @@ font-size: 14px; border-radius: 4px; } - .pear-btn i { font-size: 13px; } - .pear-btn:hover { opacity: .8; filter: alpha(opacity=80); @@ -29,78 +27,63 @@ border-color: #c6e2ff; background-color: #ECF5FF; } - .pear-btn-danger, .pear-btn-warming, .pear-btn-success, .pear-btn-primary { color: #fff !important } - .pear-btn[dashed] { border-style: dashed !important; } - /** Button 主题 */ .pear-btn-primary { background-color: #2D8CF0 !important; } - .pear-btn-danger { background-color: #f56c6c !important } - .pear-btn-warming { background-color: #e6a23c !important } - .pear-btn-success { background-color: #67c23a !important } - .pear-btn[round] { border-radius: 50px; } - .pear-btn-primary[plain] { color: #409eff !important; background: #ecf5ff !important; border-color: #b3d8ff !important; } - .pear-btn-primary[plain]:hover { color: #fff !important; background-color: #2d8cf0 !important } - .pear-btn-success[plain] { color: #67c23a !important; background: #f0f9eb !important; border-color: #c2e7b0 !important; } - .pear-btn-success[plain]:hover { color: white !important; background-color: #67c23a !important } - .pear-btn-warming[plain] { color: #e6a23c !important; background: #fdf6ec !important; border-color: #f5dab1 !important; } - .pear-btn-warming[plain]:hover { color: white !important; background-color: #e6a23c !important } - .pear-btn-danger[plain] { color: #f56c6c !important; background: #fef0f0 !important; border-color: #fbc4c4 !important; } - .pear-btn-danger[plain]:hover { color: white !important; background-color: #f56c6c !important @@ -111,36 +94,30 @@ display: inline-block; vertical-align: middle; } - .pear-btn-group .pear-btn { float: left; position: relative; border-radius: 0px; } - .pear-btn-md { height: 34px; line-height: 34px; padding: 0 10px; font-size: 12.5px; } - .pear-btn-group .pear-btn:first-child { border-top-left-radius: 4px !important; border-bottom-left-radius: 4px !important; } - .pear-btn-group .pear-btn:last-child { border-top-right-radius: 4px !important; border-bottom-right-radius: 4px !important; } - .pear-btn-group .pear-btn[round]:first-child { border-top-left-radius: 50px !important; border-bottom-left-radius: 50px !important; } - .pear-btn-group .pear-btn[round]:last-child { border-top-right-radius: 50px !important; border-bottom-right-radius: 50px !important; @@ -153,17 +130,15 @@ padding: 0 10px; font-size: 12px; } - .pear-btn-xs { height: 22px; line-height: 22px; padding: 0 5px; font-size: 12px; } - .pear-btn-lg { height: 44px; line-height: 44px; padding: 0 25px; font-size: 16px; -} +} \ No newline at end of file diff --git a/component/pear/css/pear-module/cropper.css b/component/pear/css/pear-module/cropper.css index 2ebd829..2c64042 100644 --- a/component/pear/css/pear-module/cropper.css +++ b/component/pear/css/pear-module/cropper.css @@ -1,274 +1,272 @@ -/*! - * Cropper v0.9.1 - * https://github.com/fengyuanchen/cropper - * - * Copyright (c) 2014-2015 Fengyuan Chen and contributors - * Released under the MIT license - * - * Date: 2015-03-21T04:58:27.265Z - */ - - .cropper-container { - position: relative; - overflow: hidden; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - -webkit-tap-highlight-color: transparent; - -webkit-touch-callout: none +.cropper-container { + position: relative; + overflow: hidden; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + -webkit-tap-highlight-color: transparent; + -webkit-touch-callout: none } - .cropper-container img { - display: block; - width: 100%; - min-width: 0 !important; - max-width: none !important; - height: 100%; - min-height: 0 !important; - max-height: none !important; - image-orientation: 0deg !important - } +.cropper-container img { + display: block; + width: 100%; + min-width: 0 !important; + max-width: none !important; + height: 100%; + min-height: 0 !important; + max-height: none !important; + image-orientation: 0deg !important +} -.cropper-canvas, .cropper-crop-box, .cropper-drag-box, .cropper-modal { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0 +.cropper-canvas, +.cropper-crop-box, +.cropper-drag-box, +.cropper-modal { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0 } .cropper-drag-box { - background-color: #fff; - filter: alpha(opacity=0); - opacity: 0 + background-color: #fff; + filter: alpha(opacity=0); + opacity: 0 } .cropper-modal { - background-color: #000; - filter: alpha(opacity=50); - opacity: .5 + background-color: #000; + filter: alpha(opacity=50); + opacity: .5 } .cropper-view-box { - display: block; - width: 100%; - height: 100%; - overflow: hidden; - outline: #69f solid 1px; - outline-color: rgba(102,153,255,.75) + display: block; + width: 100%; + height: 100%; + overflow: hidden; + outline: #69f solid 1px; + outline-color: rgba(102, 153, 255, .75) } .cropper-dashed { - position: absolute; - display: block; - filter: alpha(opacity=50); - border: 0 dashed #fff; - opacity: .5 + position: absolute; + display: block; + filter: alpha(opacity=50); + border: 0 dashed #fff; + opacity: .5 } - .cropper-dashed.dashed-h { - top: 33.33333333%; - left: 0; - width: 100%; - height: 33.33333333%; - border-top-width: 1px; - border-bottom-width: 1px - } +.cropper-dashed.dashed-h { + top: 33.33333333%; + left: 0; + width: 100%; + height: 33.33333333%; + border-top-width: 1px; + border-bottom-width: 1px +} - .cropper-dashed.dashed-v { - top: 0; - left: 33.33333333%; - width: 33.33333333%; - height: 100%; - border-right-width: 1px; - border-left-width: 1px - } +.cropper-dashed.dashed-v { + top: 0; + left: 33.33333333%; + width: 33.33333333%; + height: 100%; + border-right-width: 1px; + border-left-width: 1px +} -.cropper-face, .cropper-line, .cropper-point { - position: absolute; - display: block; - width: 100%; - height: 100%; - filter: alpha(opacity=10); - opacity: .1 +.cropper-face, +.cropper-line, +.cropper-point { + position: absolute; + display: block; + width: 100%; + height: 100%; + filter: alpha(opacity=10); + opacity: .1 } .cropper-face { - top: 0; - left: 0; - cursor: move; - background-color: #fff + top: 0; + left: 0; + cursor: move; + background-color: #fff } .cropper-line { - background-color: #69f + background-color: #69f } - .cropper-line.line-e { - top: 0; - right: -3px; - width: 5px; - cursor: e-resize - } +.cropper-line.line-e { + top: 0; + right: -3px; + width: 5px; + cursor: e-resize +} - .cropper-line.line-n { - top: -3px; - left: 0; - height: 5px; - cursor: n-resize - } +.cropper-line.line-n { + top: -3px; + left: 0; + height: 5px; + cursor: n-resize +} - .cropper-line.line-w { - top: 0; - left: -3px; - width: 5px; - cursor: w-resize - } +.cropper-line.line-w { + top: 0; + left: -3px; + width: 5px; + cursor: w-resize +} - .cropper-line.line-s { - bottom: -3px; - left: 0; - height: 5px; - cursor: s-resize - } +.cropper-line.line-s { + bottom: -3px; + left: 0; + height: 5px; + cursor: s-resize +} .cropper-point { - width: 5px; - height: 5px; - background-color: #69f; - filter: alpha(opacity=75); - opacity: .75 + width: 5px; + height: 5px; + background-color: #69f; + filter: alpha(opacity=75); + opacity: .75 } - .cropper-point.point-e { - top: 50%; - right: -3px; - margin-top: -3px; - cursor: e-resize - } +.cropper-point.point-e { + top: 50%; + right: -3px; + margin-top: -3px; + cursor: e-resize +} - .cropper-point.point-n { - top: -3px; - left: 50%; - margin-left: -3px; - cursor: n-resize - } +.cropper-point.point-n { + top: -3px; + left: 50%; + margin-left: -3px; + cursor: n-resize +} - .cropper-point.point-w { - top: 50%; - left: -3px; - margin-top: -3px; - cursor: w-resize - } +.cropper-point.point-w { + top: 50%; + left: -3px; + margin-top: -3px; + cursor: w-resize +} - .cropper-point.point-s { - bottom: -3px; - left: 50%; - margin-left: -3px; - cursor: s-resize - } +.cropper-point.point-s { + bottom: -3px; + left: 50%; + margin-left: -3px; + cursor: s-resize +} - .cropper-point.point-ne { - top: -3px; - right: -3px; - cursor: ne-resize - } +.cropper-point.point-ne { + top: -3px; + right: -3px; + cursor: ne-resize +} - .cropper-point.point-nw { - top: -3px; - left: -3px; - cursor: nw-resize - } +.cropper-point.point-nw { + top: -3px; + left: -3px; + cursor: nw-resize +} - .cropper-point.point-sw { - bottom: -3px; - left: -3px; - cursor: sw-resize - } +.cropper-point.point-sw { + bottom: -3px; + left: -3px; + cursor: sw-resize +} - .cropper-point.point-se { - right: -3px; - bottom: -3px; - width: 20px; - height: 20px; - cursor: se-resize; - filter: alpha(opacity=100); - opacity: 1 - } +.cropper-point.point-se { + right: -3px; + bottom: -3px; + width: 20px; + height: 20px; + cursor: se-resize; + filter: alpha(opacity=100); + opacity: 1 +} - .cropper-point.point-se:before { - position: absolute; - right: -50%; - bottom: -50%; - display: block; - width: 200%; - height: 200%; - content: " "; - background-color: #69f; - filter: alpha(opacity=0); - opacity: 0 - } +.cropper-point.point-se:before { + position: absolute; + right: -50%; + bottom: -50%; + display: block; + width: 200%; + height: 200%; + content: " "; + background-color: #69f; + filter: alpha(opacity=0); + opacity: 0 +} @media (min-width:768px) { - .cropper-point.point-se { - width: 15px; - height: 15px - } + .cropper-point.point-se { + width: 15px; + height: 15px + } } @media (min-width:992px) { - .cropper-point.point-se { - width: 10px; - height: 10px - } + .cropper-point.point-se { + width: 10px; + height: 10px + } } @media (min-width:1200px) { - .cropper-point.point-se { - width: 5px; - height: 5px; - filter: alpha(opacity=75); - opacity: .75 - } + .cropper-point.point-se { + width: 5px; + height: 5px; + filter: alpha(opacity=75); + opacity: .75 + } } .cropper-bg { - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC) + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC) } .cropper-invisible { - filter: alpha(opacity=0); - opacity: 0 + filter: alpha(opacity=0); + opacity: 0 } .cropper-hide { - position: fixed; - top: 0; - left: 0; - z-index: -1; - width: auto !important; - min-width: 0 !important; - max-width: none !important; - height: auto !important; - min-height: 0 !important; - max-height: none !important; - filter: alpha(opacity=0); - opacity: 0 + position: fixed; + top: 0; + left: 0; + z-index: -1; + width: auto !important; + min-width: 0 !important; + max-width: none !important; + height: auto !important; + min-height: 0 !important; + max-height: none !important; + filter: alpha(opacity=0); + opacity: 0 } .cropper-hidden { - display: none !important + display: none !important } .cropper-move { - cursor: move + cursor: move } .cropper-crop { - cursor: crosshair + cursor: crosshair } -.cropper-disabled .cropper-canvas, .cropper-disabled .cropper-face, .cropper-disabled .cropper-line, .cropper-disabled .cropper-point { - cursor: not-allowed +.cropper-disabled .cropper-canvas, +.cropper-disabled .cropper-face, +.cropper-disabled .cropper-line, +.cropper-disabled .cropper-point { + cursor: not-allowed } diff --git a/component/pear/css/pear-module/dropdown.css b/component/pear/css/pear-module/dropdown.css index f5a4385..0bb4b8a 100644 --- a/component/pear/css/pear-module/dropdown.css +++ b/component/pear/css/pear-module/dropdown.css @@ -1,7 +1,162 @@ -/** - * layui_dropdown - * v2.3.2 - * by Microanswer - * http://layuidropdown.microanswer.cn/ - **/ -html #layuicss-dropdown_css{display:none;position:absolute;width:1989px}.dropdown-root{position:fixed;outline:0;overflow:hidden}.dropdown-pointer{width:0;height:0;position:absolute;display:block;overflow:hidden;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgBAMAAABQs2O3AAAAAXNSR0IB2cksfwAAAAlwSFlzAAAOxAAADsQBlSsOGwAAABVQTFRFAAAAgICAgICAgICAhISE8PDw////jUnEegAAAAd0Uk5TAB/2/////74r3wgAAACOSURBVHicfcztDYAgDEVR2MCwgXEDwwbGDYwbyP4jyJfYlvbdvzc5zrH8ti8OFeKxou+384JEiPeDiAykhIgMpASICiCiAoDogE10wCQGYBEDMAgC6AQBVIIBGsEAhRDATAhgIiZAEhMgCAXghAIwQgUooQKEMICfMIBBmMBHmEAnANAIADQCAYVwCCjEC5fhzAE36RUGAAAAAElFTkSuQmCC) bottom center no-repeat;background-size:100% 50%;-webkit-transform-origin:center center;-moz-transform-origin:center center;-ms-transform-origin:center center;-o-transform-origin:center center;transform-origin:center center}.dropdown-pointer.bottom{-webkit-transform:rotate(-180deg);-moz-transform:rotate(-180deg);-ms-transform:rotate(-180deg);-o-transform:rotate(-180deg);transform:rotate(-180deg)}.dropdown-root .dropdown-content{background-color:#fff;border-radius:3px;box-shadow:1px 1px 5px #979797;overflow-x:auto;overflow-y:hidden}.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-thead{display:table-header-group}.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-tbody{display:table-row-group}.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-tr{display:table-row}.dropdown-root .dropdown-content .dropdown-content-table,.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-td,.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-th{display:table-cell;border:unset;text-align:unset;font-weight:400;min-height:unset;font-size:12px;line-height:12px;padding-top:0;padding-bottom:0}.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-th{font-weight:700}.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-tr,.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-tr:hover{background-color:unset}.dropdown-root .dropdown-content .dropdown-menu-wrap{border-right:1px solid transparent;overflow-y:auto;overflow-x:hidden}.dropdown-root .dropdown-content .dropdown-menu-fixed-head{border-right:1px solid transparent;overflow:hidden}.dropdown-root .dropdown-content .dropdown-menu-fixed-head .menu-fixed-head{margin:6px 14px 2px;color:#a8a8a8;font-size:12px}.dropdown-root .dropdown-content .dropdown-menu-fixed-head.menu-splitor,.dropdown-root .dropdown-content .dropdown-menu-wrap.menu-splitor{border-right:1px solid #D9D9D9}.dropdown-root .dropdown-content .dropdown-menu-wrap.overflowauto{overflow-y:auto;overflow-x:hidden}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu{padding:0;margin:0}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap{list-style:none;outline:0}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap:first-child{margin-top:10px}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap.nomargin{margin-top:0!important}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap:last-child{margin-bottom:10px}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-header{margin-top:6px}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-header.withLine{margin-left:0;margin-bottom:0;margin-right:0}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-header,.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-header legend{font-size:12px!important;line-height:15px!important;padding:0 14px!important;color:#a8a8a8}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-item{line-height:36px}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-item a{display:block;color:#333;padding:0 20px;min-width:40px;text-indent:0;font-size:14px;white-space:nowrap}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-item a:hover{background-color:#D9D9D9} \ No newline at end of file +html #layuicss-dropdown_css { + display: none; + position: absolute; + width: 1989px +} + +.dropdown-root { + position: fixed; + outline: 0; + overflow: hidden +} + +.dropdown-pointer { + width: 0; + height: 0; + position: absolute; + display: block; + overflow: hidden; + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgBAMAAABQs2O3AAAAAXNSR0IB2cksfwAAAAlwSFlzAAAOxAAADsQBlSsOGwAAABVQTFRFAAAAgICAgICAgICAhISE8PDw////jUnEegAAAAd0Uk5TAB/2/////74r3wgAAACOSURBVHicfcztDYAgDEVR2MCwgXEDwwbGDYwbyP4jyJfYlvbdvzc5zrH8ti8OFeKxou+384JEiPeDiAykhIgMpASICiCiAoDogE10wCQGYBEDMAgC6AQBVIIBGsEAhRDATAhgIiZAEhMgCAXghAIwQgUooQKEMICfMIBBmMBHmEAnANAIADQCAYVwCCjEC5fhzAE36RUGAAAAAElFTkSuQmCC) bottom center no-repeat; + background-size: 100% 50%; + -webkit-transform-origin: center center; + -moz-transform-origin: center center; + -ms-transform-origin: center center; + -o-transform-origin: center center; + transform-origin: center center +} + +.dropdown-pointer.bottom { + -webkit-transform: rotate(-180deg); + -moz-transform: rotate(-180deg); + -ms-transform: rotate(-180deg); + -o-transform: rotate(-180deg); + transform: rotate(-180deg) +} + +.dropdown-root .dropdown-content { + background-color: #fff; + border-radius: 3px; + box-shadow: 1px 1px 5px #979797; + overflow-x: auto; + overflow-y: hidden +} + +.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-thead { + display: table-header-group +} + +.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-tbody { + display: table-row-group +} + +.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-tr { + display: table-row +} + +.dropdown-root .dropdown-content .dropdown-content-table, +.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-td, +.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-th { + display: table-cell; + border: unset; + text-align: unset; + font-weight: 400; + min-height: unset; + font-size: 12px; + line-height: 12px; + padding-top: 0; + padding-bottom: 0 +} + +.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-th { + font-weight: 700 +} + +.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-tr, +.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-tr:hover { + background-color: unset +} + +.dropdown-root .dropdown-content .dropdown-menu-wrap { + border-right: 1px solid transparent; + overflow-y: auto; + overflow-x: hidden +} + +.dropdown-root .dropdown-content .dropdown-menu-fixed-head { + border-right: 1px solid transparent; + overflow: hidden +} + +.dropdown-root .dropdown-content .dropdown-menu-fixed-head .menu-fixed-head { + margin: 6px 14px 2px; + color: #a8a8a8; + font-size: 12px +} + +.dropdown-root .dropdown-content .dropdown-menu-fixed-head.menu-splitor, +.dropdown-root .dropdown-content .dropdown-menu-wrap.menu-splitor { + border-right: 1px solid #D9D9D9 +} + +.dropdown-root .dropdown-content .dropdown-menu-wrap.overflowauto { + overflow-y: auto; + overflow-x: hidden +} + +.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu { + padding: 0; + margin: 0 +} + +.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap { + list-style: none; + outline: 0 +} + +.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap:first-child { + margin-top: 10px +} + +.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap.nomargin { + margin-top: 0 !important +} + +.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap:last-child { + margin-bottom: 10px +} + +.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-header { + margin-top: 6px +} + +.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-header.withLine { + margin-left: 0; + margin-bottom: 0; + margin-right: 0 +} + +.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-header, +.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-header legend { + font-size: 12px !important; + line-height: 15px !important; + padding: 0 14px !important; + color: #a8a8a8 +} + +.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-item { + line-height: 36px +} + +.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-item a { + display: block; + color: #333; + padding: 0 20px; + min-width: 40px; + text-indent: 0; + font-size: 14px; + white-space: nowrap +} + +.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-item a:hover { + background-color: #D9D9D9 +} diff --git a/component/pear/css/pear-module/menu.css b/component/pear/css/pear-module/menu.css index d3da04e..60e929b 100644 --- a/component/pear/css/pear-module/menu.css +++ b/component/pear/css/pear-module/menu.css @@ -24,7 +24,6 @@ .layui-nav-tree .layui-this, .layui-nav-tree .layui-this>a, .layui-nav-tree .layui-this>a:hover { - background-color: #5FB878; } diff --git a/component/pear/css/pear-module/tab.css b/component/pear/css/pear-module/tab.css index 3f30bbf..1c88604 100644 --- a/component/pear/css/pear-module/tab.css +++ b/component/pear/css/pear-module/tab.css @@ -40,8 +40,8 @@ .pear-tab .layui-tab-title .pear-tab-active { display: inline-block; background-color: lightgray; - width: 9px; - height: 9px; + width: 8px; + height: 8px; border-radius: 30px; margin-right: 12px; } @@ -182,6 +182,7 @@ animation-fill-mode: forwards; } + .ball-loader { position: absolute; left: 50%; diff --git a/component/pear/modules/admin.js b/component/pear/modules/admin.js index 69440af..58cdd70 100644 --- a/component/pear/modules/admin.js +++ b/component/pear/modules/admin.js @@ -163,6 +163,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'], } localStorage.setItem("theme-color", color.id); localStorage.setItem("theme-menu", menu); + localStorage.setItem("theme-color-context",color.color); this.colorSet(color.color); this.menuSkin(menu); } diff --git a/component/pear/modules/menu.js b/component/pear/modules/menu.js index c8e6d9a..e622b4c 100644 --- a/component/pear/modules/menu.js +++ b/component/pear/modules/menu.js @@ -27,9 +27,8 @@ layui.define(['table', 'jquery', 'element'], function(exports) { change: opt.change ? opt.change : function() {}, done: opt.done ? opt.done : function() {} } - if (option.async) { - getData(option.url).then(function(data){ + getData(option.url).then(function(data) { option.data = data; renderMenu(option); }); @@ -39,34 +38,33 @@ layui.define(['table', 'jquery', 'element'], function(exports) { renderMenu(option); }, 500); } - return new pearMenu(opt); } pearMenu.prototype.click = function(clickEvent) { var _this = this; - $("body").on("click","#" + _this.option.elem + " .site-demo-active",function(){ - var dom = $(this); - var data = { - menuId: dom.attr("menu-id"), - menuTitle: dom.attr("menu-title"), - menuPath: dom.attr("menu-title"), - menuIcon: dom.attr("menu-icon"), - menuUrl: dom.attr("menu-url") - }; - var doms = hash(dom); - 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); + $("body").on("click", "#" + _this.option.elem + " .site-demo-active", function() { + var dom = $(this); + var data = { + menuId: dom.attr("menu-id"), + menuTitle: dom.attr("menu-title"), + menuPath: dom.attr("menu-title"), + menuIcon: dom.attr("menu-icon"), + menuUrl: dom.attr("menu-url") + }; + var doms = hash(dom); + 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); }) } @@ -132,16 +130,16 @@ layui.define(['table', 'jquery', 'element'], function(exports) { isHoverMenu(true, config); } } - - function getData(url){ - var defer = $.Deferred(); - $.get(url+"?fresh=" + Math.random(), function(result) { - defer.resolve(result) + + function getData(url) { + var defer = $.Deferred(); + $.get(url + "?fresh=" + Math.random(), function(result) { + defer.resolve(result) }); - return defer.promise(); + return defer.promise(); } - - function renderMenu(option){ + + function renderMenu(option) { if (option.parseData != false) { option.parseData(option.data); } @@ -212,17 +210,19 @@ layui.define(['table', 'jquery', 'element'], function(exports) { '" class="layui-this layui-nav-item">' + item.title + ''; menuItem = '" controlPe += controlItemPe; @@ -327,7 +326,7 @@ layui.define(['table', 'jquery', 'element'], function(exports) { var superEle = $(this).parent(); var ele = $(this).next('.layui-nav-child'); var heights = ele.children("dd").length * 48; - + if ($(this).parent().is(".layui-nav-itemed")) { if (option.accordion) { $(this).parent().parent().find(".layui-nav-itemed").removeClass("layui-nav-itemed"); @@ -361,26 +360,21 @@ layui.define(['table', 'jquery', 'element'], function(exports) { if (b) { $("#" + option.elem + ".pear-nav-mini .layui-nav-item,#" + option.elem + ".pear-nav-mini dd").hover(function() { $(this).children(".layui-nav-child").addClass("layui-nav-hover"); - var top = $(this).offset().top + 5; var y = window.document.body.clientHeight; - var height = $(window).height(); - var topLength = $(this).offset().top; - var thisHeight = $(this).children(".layui-nav-child").height(); - - if((thisHeight+topLength)>height){ - topLength = height-thisHeight-10; + if ((thisHeight + topLength) > height) { + topLength = height - thisHeight - 10; } if (!$(this).is(".layui-nav-item")) { - var left = $(this).offset().left + $(this).width()+2; + var left = $(this).offset().left + $(this).width() + 3; $(this).children(".layui-nav-child").offset({ left: left }); } else { - var left = $(this).offset().left + 62; + var left = $(this).offset().left + 63; $(this).children(".layui-nav-child").offset({ left: left }); diff --git a/component/pear/modules/tab.js b/component/pear/modules/tab.js index 071ed62..ecac6ba 100644 --- a/component/pear/modules/tab.js +++ b/component/pear/modules/tab.js @@ -312,13 +312,10 @@ layui.define(['jquery', 'element'], function(exports) { function tabDelete(elem, id, callback) { //根据 elem id 来删除指定的 layui title li - var tabTitle = $(".layui-tab[lay-filter='" + elem + "']").find(".layui-tab-title"); // 删除指定 id 的 title - var removeTab = tabTitle.find("li[lay-id='" + id + "']"); - var nextNode = removeTab.next("li"); if(!removeTab.hasClass("layui-this")){ @@ -334,37 +331,29 @@ layui.define(['jquery', 'element'], function(exports) { if (nextNode.length) { nextNode.addClass("layui-this"); - currId = nextNode.attr("lay-id"); - $("#" + elem + " [id='" + currId + "']").parent().addClass("layui-show"); } else { var prevNode = removeTab.prev("li"); - prevNode.addClass("layui-this"); - currId = prevNode.attr("lay-id"); - $("#" + elem + " [id='" + currId + "']").parent().addClass("layui-show"); } - callback(currId); - removeTab.remove(); - // 删除 content var tabContent = $(".layui-tab[lay-filter='" + elem + "']").find("iframe[id='" + id + "']").parent(); - tabContent.remove(); - } function createTab(option) { var type = ""; + + var types = option.type+" "; if (option.roll == true) { @@ -379,7 +368,7 @@ layui.define(['jquery', 'element'], function(exports) { type = "layui-tab-rollTool"; } - var tab = '
'; + var tab = '
'; var title = '
@@ -48,7 +49,9 @@
@@ -58,6 +61,7 @@
+
diff --git a/login.html b/login.html index 88e0b48..6353cd0 100644 --- a/login.html +++ b/login.html @@ -3,6 +3,7 @@ Login Page + diff --git a/view/system/logging.html b/view/system/logging.html index 29d3964..d4fde96 100644 --- a/view/system/logging.html +++ b/view/system/logging.html @@ -2,7 +2,7 @@ - Title + 行为日志