From fd0a0e12862634eef8242cc59b597413fae1fea3 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, 3 Aug 2020 02:21:38 +0800 Subject: [PATCH] =?UTF-8?q?FireFox=20IE=20=E8=8F=9C=E5=8D=95=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=9D=A1=20=E4=B8=8E=20Safair=20KeepState=20=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E7=A9=BA=E7=99=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/css/admin.all.css | 1 - admin/css/admin.css | 2 +- admin/css/load.all.css | 1 - component/pear/module/admin.js | 7 +------ component/pear/module/tab.js | 12 ++++++------ index.html | 11 ++++++++--- pear.config.json | 2 +- 7 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 admin/css/admin.all.css delete mode 100644 admin/css/load.all.css diff --git a/admin/css/admin.all.css b/admin/css/admin.all.css deleted file mode 100644 index 6e403a0..0000000 --- a/admin/css/admin.all.css +++ /dev/null @@ -1 +0,0 @@ -.pear-admin .layui-header,.pear-admin .layui-body,.pear-admin .layui-logo,.pear-admin .layui-side,.pear-admin .layui-header .layui-layout-left{transition:all .3s}.pear-admin .layui-logo .title{font-size:20px}.pear-admin .layui-header{left:230px;width:calc(100% - 230px);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:230px;height:60px;line-height:60px;position:relative;background-color:#28333e}.pear-admin .layui-logo img{width:34px;height:34px}.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-admin .layui-side{top:0;width:230px;box-shadow:2px 0 6px rgba(0,21,41,.35);z-index:9999}.pear-admin .layui-side-scroll::-webkit-scrollbar{width:0;height:0}.pear-admin .layui-side-scroll{height:calc(100% - 60px)!important;background-color:#28333e;width:230px}.pear-admin .layui-header .layui-nav .layui-nav-item>a{color:black;font-size:15px}.pear-admin .layui-body{left:230px;bottom:0}.pear-admin .layui-layout-left{left:0}.pear-mini .layui-logo .title{display:none}.pear-mini .layui-logo .logo{display:inline-block}.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:0!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:0}.pear-mini .layui-header{left:0;width:100%}.pear-mini .layui-body{left:0}.pear-mini .layui-logo{width:0}.pear-admin .layui-body{left:0}.pear-admin .layui-header{left:0;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}.light-theme .layui-logo{background-color:white!important;color:black!important}.light-theme .layui-side-scroll{background-color:white!important;color:black!important}.pearone-color .color-title{padding:15px 0 0 20px;margin-bottom:4px}.pearone-color .color-content{padding:15px 10px 0 20px}.pearone-color .color-content ul{list-style:none;padding:0}.pearone-color .color-content ul li{position:relative;display:inline-block;vertical-align:top;width:70px;height:50px;margin:0 20px 20px 0;padding:2px 2px 2px 2px;background-color:#f2f2f2;cursor:pointer;font-size:12px;color:#666}.pearone-color .color-content li.layui-this:after,.pearone-color .color-content li:hover:after{width:100%;height:100%;padding:4px;top:-5px;left:-5px;border:#5fb878 2px solid;opacity:1;border-radius:4px}.pearone-color .color-content li:after{content:'';position:absolute;z-index:20;top:50%;left:50%;width:1px;height:0;border:1px solid #f2f2f2;transition:all .3s;-webkit-transition:all .3s;opacity:0}.select-color{margin-bottom:30px}.select-color .select-color-title{padding:15px 0 0 20px;margin-bottom:4px}.select-color .select-color-content{padding:20px 0 0 0;margin-bottom:4px}.select-color .select-color-content .select-color-item{background-color:gray;width:30px;height:30px;border-radius:3px;float:left;margin-left:20px;color:white;font-size:18px;text-align:center;box-shadow:0 1px 2px 0 rgba(0,0,0,.15);line-height:30px}.more-setting{margin-top:45px}.more-setting form{margin-top:30px}.more-setting-title{padding:15px 0 0 20px;margin-bottom:4px}.more-setting .layui-form-label{width:60px}.more-menu-list{width:100%;margin-top:80px}.more-menu-item:first-child{border-top:1px solid #e8e8e8}.more-menu-item .layui-icon{font-size:18px;padding-right:10px}.more-menu-item{color:#595959;height:50px;line-height:50px;font-size:16px;padding:0 25px;border-bottom:1px solid #e8e8e8;font-style:normal;display:block}.more-menu-item:hover{background-color:whitesmoke}.more-menu-item:after{color:#8c8c8c;right:16px;content:"\e602";position:absolute;font-family:layui-icon!important} \ No newline at end of file diff --git a/admin/css/admin.css b/admin/css/admin.css index 710a1e1..a560271 100644 --- a/admin/css/admin.css +++ b/admin/css/admin.css @@ -69,7 +69,7 @@ .pear-admin .layui-side-scroll { height: calc(100% - 60px)!important; background-color: #28333E; - width: 230px; + width: 247px; } diff --git a/admin/css/load.all.css b/admin/css/load.all.css deleted file mode 100644 index 98c88eb..0000000 --- a/admin/css/load.all.css +++ /dev/null @@ -1 +0,0 @@ -.loader-main{position:fixed;width:100%;height:100%;background-color:whitesmoke;z-index:9999999;margin-top:-61px}.loader{width:50px;height:50px;margin:30px auto 40px;margin-top:20%;position:relative;z-index:999999;background-color:whitesmoke}.loader:before{content:"";width:50px;height:7px;border-radius:50%;background:#000;opacity:.1;position:absolute;top:59px;left:0;animation:shadow .5s linear infinite}.loader:after{content:"";width:50px;height:50px;border-radius:3px;background-color:#5fb878;position:absolute;top:0;left:0;animation:loading .5s linear infinite}@-webkit-keyframes loading{17%{border-bottom-right-radius:3px}25%{transform:translateY(9px) rotate(22.5deg)}50%{transform:translateY(18px) scale(1,0.9) rotate(45deg);border-bottom-right-radius:40px}75%{transform:translateY(9px) rotate(67.5deg)}100%{transform:translateY(0) rotate(90deg)}}@keyframes loading{17%{border-bottom-right-radius:3px}25%{transform:translateY(9px) rotate(22.5deg)}50%{transform:translateY(18px) scale(1,0.9) rotate(45deg);border-bottom-right-radius:40px}75%{transform:translateY(9px) rotate(67.5deg)}100%{transform:translateY(0) rotate(90deg)}}@-webkit-keyframes shadow{0%,100%{transform:scale(1,1)}50%{transform:scale(1.2,1)}}@keyframes shadow{0%,100%{transform:scale(1,1)}50%{transform:scale(1.2,1)}} \ No newline at end of file diff --git a/component/pear/module/admin.js b/component/pear/module/admin.js index c384d0f..0ddab4b 100644 --- a/component/pear/module/admin.js +++ b/component/pear/module/admin.js @@ -68,7 +68,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'], bodyTab.click(function(id) { // 选 项 卡 切 换 刷 新 if(!option.tab.keepState){ - bodyTab.refresh(200); + bodyTab.refresh(false); } bodyTab.positionTab(); sideMenu.selectItem(id); @@ -90,8 +90,6 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'], }) sideMenu.click(function(dom, data) { - console.log(data.menuUrl); - bodyTab.addTabOnly({ id: data.menuId, title: data.menuTitle, @@ -244,7 +242,6 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'], $(".fullScreen").eq(0).addClass("layui-icon-screen-restore"); }); } - }); $("body").on("click",'[user-menu-id]',function(){ @@ -256,7 +253,6 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'], icon: "", close: true }, 300); - }else{ bodyFrame.changePage($(this).attr("user-menu-url"), "", true); } @@ -310,7 +306,6 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'], }); } - $("body").on("click", ".setting", function() { var bgColorHtml = '
  • ' + diff --git a/component/pear/module/tab.js b/component/pear/module/tab.js index 897ebc1..a398fef 100644 --- a/component/pear/module/tab.js +++ b/component/pear/module/tab.js @@ -340,18 +340,18 @@ layui.define(['jquery', 'element'], function(exports) { pearLoad.css({ display: "block" }); + + index++; setTimeout(function() { - - pearLoad.fadeOut(500); - + pearLoad.fadeOut(500,function(){ + pearLoad.remove(); + }); }, time); $(".layui-tab[lay-filter='" + elem + "'] .layui-tab-content .layui-show").find("iframe")[0].contentWindow .location.reload(true); - - index++; - + } else { $(".layui-tab[lay-filter='" + this.option.elem + "'] .layui-tab-content .layui-show").find("iframe")[0].contentWindow diff --git a/index.html b/index.html index 3248676..70f4bc9 100644 --- a/index.html +++ b/index.html @@ -5,9 +5,14 @@ Pear Admin Layui - - - + + + + diff --git a/pear.config.json b/pear.config.json index 5b88b33..f802cc6 100644 --- a/pear.config.json +++ b/pear.config.json @@ -11,7 +11,7 @@ }, "tab": { "muiltTab": true, - "keepState": false, + "keepState": true, "tabMax": 30, "index": { "id": "0",