diff --git a/app/admin/view/default/index/index.html b/app/admin/view/default/index/index.html index c2f107996..720eb4f1f 100755 --- a/app/admin/view/default/index/index.html +++ b/app/admin/view/default/index/index.html @@ -9,7 +9,9 @@ {{include file="public/menu" /}} - +
+ +
diff --git a/app/admin/view/default/public/menu.html b/app/admin/view/default/public/menu.html index 36142431f..ad7f7f134 100755 --- a/app/admin/view/default/public/menu.html +++ b/app/admin/view/default/public/menu.html @@ -10,7 +10,7 @@ {{foreach $left_menu as $v}} {{if empty($v['items'])}}
  • - + {{if !empty($v['icon'])}}{{/if}}

    {{$v.name}}

     @@ -25,7 +25,7 @@ + - -
    diff --git a/app/admin/view/default/public/nav.html b/app/admin/view/default/public/nav.html index cf63bb023..786ee2452 100755 --- a/app/admin/view/default/public/nav.html +++ b/app/admin/view/default/public/nav.html @@ -1,13 +1,23 @@
    +

    {{$admin_theme_site_name}}后台管理系统
    + + +
    +
      +
      + + + +
      • diff --git a/config/trace.php b/config/trace.php index c360f6657..912c43b2f 100644 --- a/config/trace.php +++ b/config/trace.php @@ -14,7 +14,7 @@ // +---------------------------------------------------------------------- return [ // 内置Html和Console两种方式 支持扩展 - 'type' => 'Html', + 'type' => 'console', // 读取的日志通道名 'channel' => '', ]; diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index 525fb767c..b9895a804 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -35,346 +35,26 @@ i{ font-style: normal; } a:hover {outline:0;text-decoration:none;} a:active {outline:0;text-decoration:none;} a:focus {outline:0;text-decoration:none;} -.w100 {width:100%;} -.fw-100 {font-weight:100;} -.fw-700 {font-weight:700;} .am-popover { border-radius:2px !important; } .am-popover * {font-size: 12px;} .am-icon-trash-o:before {width:12px !important;} -.fr {float:right !important;} -.fl {float:left !important;} -.fs-12 {font-size:12px !important;} -.fs-13 {font-size:13px !important;} -.fs-14 {font-size:14px !important;} -.fs-15 {font-size:15px !important;} -.fs-16 {font-size:16px !important;} -.fs-17 {font-size:17px !important;} -.fs-18 {font-size:18px !important;} -.c-r {cursor:w-resize;} -.c-p {cursor:pointer;} -.c-m {cursor: move !important;} legend {margin-bottom: 1rem; } legend a.am-fr{margin-top: 10px;} .am-popup-bd {background:#fff;} -.cr-eee {color:#eee !important;} -.cr-ccc {color:#ccc !important;} -.cr-ddd {color:#ddd !important;} -.cr-999 {color:#999 !important;} -.cr-666 {color:#666 !important;} -.cr-red {color:#fd4747 !important;} -.cr-green { color: #4aaa4a !important; } -.cr-blue { color: #4abbf5 !important; } -.cr-yellow { color: #e4bfbc !important; } .am-form select,.am-form textarea,.am-form input[type="text"],.am-form input[type="password"],.am-form input[type="datetime"],.am-form input[type="datetime-local"],.am-form input[type="date"],.am-form input[type="month"],.am-form input[type="time"],.am-form input[type="week"],.am-form input[type="number"],.am-form input[type="email"],.am-form input[type="url"],.am-form input[type="search"],.am-form input[type="tel"],.am-form input[type="color"],.am-form-field {font-size:12px !important;} select {height:28px !important;} -.bk-cr-gray {background:#f3f3f3 !important;} -.bk-cr-ffd {background:#ffd !important;} -.bk-cr-white {background-color: #fff;} -.t-c {text-align:center;} -.t-l {text-align:left;} -.t-r {text-align:right;} -.o-h { overflow: hidden; } input:hover, select:hover, textarea:hover, .chosen-choices:hover, .chosen-single:hover,.am-tagsinput:hover, button.colorpicker-submit:hover { border-style:solid; border-width:1px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; border:1px solid #4FACF5 !important; -webkit-box-shadow: 0 0 5px #4FACF5 !important; box-shadow:0 0 5px #4FACF5 !important; } .am-input-group-sm > .am-input-group-btn > .am-btn, .am-input-group-sm > .am-form-field, .am-input-group-sm > .am-input-group-label, .am-input-group-sm > .am-input-group-btn > .am-btn { height: 31px; font-size: 12px !important; } -.left-menu-more-ico-rotate {-webkit-transform: rotate(-90deg);transform: rotate(-90deg);-webkit-transition: all 300ms;transition: all 300ms;} +.left-menu-more-icon-rotate {-webkit-transform: rotate(-90deg);transform: rotate(-90deg);-webkit-transition: all 300ms;transition: all 300ms;} .am-icon-angle-down {-webkit-transition: all 300ms;transition: all 300ms;} .am-alert-tips { background-color: #ffffe9; border-color: #faebd2; color: #888; } .am-alert-tips, .am-alert-tips * { font-size: 12px; } .am-btn-sm { font-size: 12px; } .am-input-group-sm > .am-input-group-label { line-height: 26px; } -.container {width:auto;} -.container-alt {margin-left:auto;margin-right:auto;padding-left:15px;padding-right:15px;} -/* Footer */ -.footer {border-top:1px solid rgba(152,166,173,0.2);bottom:0px;color:#98a6ad;text-align:left !important;padding:19px 30px 20px;position:absolute;right:0px;left:250px;} -#wrapper {height:100%;overflow:hidden;width:100%;} -.page {bottom:0;left:0;right:0;top:0;} -/* Page titles */ -.page-title {font-size:20px;font-weight:600;margin-bottom:0px;margin-top:0px;line-height:70px;} -.page-header {border-bottom:1px solid #DBDDDE;} -.header-title {font-size:16px;font-weight:600;line-height:16px;margin-bottom:8px;} -/* ============= Helper clasess============= */ -.m-0 { margin: 0px !important; } -.m-5 { margin: 5px !important; } -.m-10 { margin: 10px !important; } -.m-15 { margin: 15px !important; } -.m-20 { margin: 20px !important; } -.m-25 { margin: 25px !important; } -.m-30 { margin: 30px !important; } -.m-35 { margin: 35px !important; } -.m-40 { margin: 40px !important; } -.m-45 { margin: 45px !important; } -.m-50 { margin: 50px !important; } -.p-0 { padding: 0px !important; } -.p-10 { padding: 10px !important; } -.p-20 { padding: 20px !important; } -.p-30 { padding: 30px !important; } -.p-l-0 { padding-left: 0px !important; } -.p-l-5 { padding-left: 5px !important; } -.p-l-10 { padding-left: 10px !important; } -.p-l-15 { padding-left: 15px !important; } -.p-l-20 { padding-left: 20px !important; } -.p-l-25 { padding-left: 25px !important; } -.p-l-30 { padding-left: 30px !important; } -.p-r-0 { padding-right: 0px !important; } -.p-r-5 { padding-right: 5px !important; } -.p-r-10 { padding-right: 10px !important; } -.p-r-15 { padding-right: 15px !important; } -.p-r-20 { padding-right: 20px !important; } -.p-r-25 { padding-right: 25px !important; } -.p-r-30 { padding-right: 30px !important; } -.p-r-0 { padding-right: 0px !important; } -.p-t-0 { padding-top: 0px !important; } -.p-b-0 { padding-bottom: 0px !important; } -.p-t-10 { padding-top: 10px !important; } -.p-b-10 { padding-bottom: 10px !important; } -.p-l-r-10 { padding-left: 10px; padding-right: 10px; } -.m-0 { margin: 0px !important; } -.m-r-5 { margin-right: 5px !important; } -.m-r-10 { margin-right: 10px !important; } -.m-r-15 { margin-right: 15px !important; } -.m-r-20 { margin-right: 15px !important; } -.m-l-5 { margin-left: 5px !important; } -.m-l-10 { margin-left: 10px !important; } -.m-l-15 { margin-left: 15px !important; } -.m-l-20 { margin-left: 20px !important; } -.m-l-25 { margin-left: 25px !important; } -.m-l-30 { margin-left: 30px !important; } -.m-t-5 { margin-top: 5px !important; } -.m-t-0 { margin-top: 0px !important; } -.m-t-10 { margin-top: 10px !important; } -.m-t-15 { margin-top: 15px !important; } -.m-t-20 { margin-top: 20px !important; } -.m-t-30 { margin-top: 30px !important; } -.m-t-40 { margin-top: 40px !important; } -.m-b-0 { margin-bottom: 0px !important; } -.m-b-5 { margin-bottom: 5px !important; } -.m-b-10 { margin-bottom: 10px !important; } -.m-b-15 { margin-bottom: 15px !important; } -.m-b-20 { margin-bottom: 20px !important; } -.m-b-25 { margin-bottom: 25px !important; } -.m-b-30 { margin-bottom: 30px !important; } -.w-xs {min-width:80px;} -.w-sm {min-width:95px;} -.w-md {min-width:110px;} -.w-lg {min-width:140px;} -.m-h-40 {min-height:40px;} -.m-h-50 {min-height:50px;} -.l-h-34 {line-height:34px;} -.font-600 {font-weight:600;} -.font-bold {font-weight:700;} -.font-normal {font-weight:normal;} -.font-light {font-weight:300;} -.font-13 {font-size:13px !important;} -.wrapper-md {padding:20px;} -.pull-in {margin-left:-20px;margin-right:-20px;} -.b-0 {border:none !important;} -.vertical-middle {vertical-align:middle;} -.bx-shadow {-moz-box-shadow:0px 1px 2px 0px rgba(0,0,0,0.1);-webkit-box-shadow:0px 1px 2px 0px rgba(0,0,0,0.1);box-shadow:0px 1px 2px 0px rgba(0,0,0,0.1);} -.bx-shadow-none {box-shadow:none !important;} -.mx-box {max-height:380px;min-height:380px;} -.thumb-sm {height:32px;width:32px;} -.thumb-md {height:48px;width:48px;} -.thumb-lg {height:88px;width:88px;} -.thumb-xl {height:120px;width:120px;} -.add-new-plus {height:32px;text-align:center;width:32px;display:block;line-height:32px;color:#98a6ad;font-weight:700;background-color:#ebeff2;border-radius:50%;} -/* ============= Extras============= *//* Table type box */ -.table-box {display:table;height:100%;width:100%;} -.table-box .table-detail {display:table-cell;vertical-align:middle;} -/* Grid page */ -.grid-structure .grid-container {background-color:#f4f8fb;margin-bottom:10px;padding:10px 20px;} -/* Demo only */ -.icon-list-demo div {cursor:pointer;line-height:45px;white-space:nowrap;color:#75798B;} -.icon-list-demo div p {margin-bottom:0px;line-height:inherit;} -.icon-list-demo i {display:inline-block;font-size:18px;margin:0;vertical-align:middle;width:40px;} -.icon-list-demo .col-md-4 {-webkit-border-radius:3px;border-radius:3px;-moz-border-radius:3px;background-clip:padding-box;} -.icon-list-demo .col-md-4:hover {background-color:rgba(113,182,249,0.07);} -.button-list {margin-left:-8px;margin-bottom:-12px;} -.button-list .btn {margin-bottom:12px;margin-left:8px;} -.demo-dropdown {position:static;display:block;margin-bottom:5px;clear:left;} -#static-modal {position:relative;top:auto;right:auto;bottom:auto;left:auto;z-index:1;display:block;} -/* Switchery demo */ -.switchery-demo .switchery {margin-bottom:10px;} -/* ============= Bootstrap-custom============= */ -.row {margin-right:-10px;margin-left:-10px;} -.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9 {padding-left:10px;padding-right:10px;} -.breadcrumb {background-color:transparent;margin-bottom:15px;padding-top:10px;padding-left:0px;} -/* Image Thumbnail */ -.img-thumbnail {border:1px solid #EBEFF2;} -/* Dropdown */ -.dropdown-menu {padding:4px 0;transition:all 300ms ease;-moz-transition:all 300ms ease;-webkit-transition:all 300ms ease;-o-transition:all 300ms ease;-ms-transition:all 300ms ease;box-shadow:0 0px 8px 0 rgba(0,0,0,0.06),0 1px 0px 0 rgba(0,0,0,0.02);border:1px solid rgba(152,166,173,0.15);} -.dropdown-menu > li > a {padding:6px 20px;} -.dropdown-menu > li > a:focus,.dropdown-menu > li > a:hover {background-color:rgba(218,230,236,0.3) !important;} -.dropdown-menu > .active > a,.dropdown-menu > .active > a:hover,.dropdown-menu > .active > a:focus {background-color:rgba(152,166,173,0.1);color:#435966;} -/*Well */ -.well {background-color:rgba(152,166,173,0.15);border:rgba(152,166,173,0.5);-webkit-box-shadow:inset 0 1px 1px rgba(152,166,173,0.25);box-shadow:inset 0 1px 1px rgba(152,166,173,0.25);} -/* Background colors */ -.bg-custom {background-color:#71b6f9 !important;} -.bg-primary {background-color:#188ae2 !important;} -.bg-success {background-color:#10c469 !important;} -.bg-info {background-color:#35b8e0 !important;} -.bg-warning {background-color:#f9c851 !important;} -.bg-danger {background-color:#ff5b5b !important;} -.bg-muted {background-color:#f4f8fb !important;} -.bg-inverse {background-color:#3b3e47 !important;} -.bg-purple {background-color:#5b69bc !important;} -.bg-pink {background-color:#ff8acc !important;} -.bg-white {background-color:#ffffff !important;} -.bg-lightdark {background-color:#f4f8fb !important;} -/* Text colors */ -.text-custom {color:#71b6f9 !important;} -.text-white {color:#ffffff !important;} -.text-danger {color:#ff5b5b !important;} -.text-muted {color:#98a6ad !important;} -.text-primary {color:#188ae2 !important;} -.text-warning {color:#f9c851 !important;} -.text-success {color:#10c469 !important;} -.text-info {color:#35b8e0 !important;} -.text-inverse {color:#3b3e47 !important;} -.text-pink {color:#ff8acc !important;} -.text-purple {color:#5b69bc !important;} -.text-dark {color:#797979 !important;} -/* Form components */textarea.form-control {min-height:90px;} -.form-control {background-color:#FFFFFF;border:1px solid #E3E3E3;border-radius:4px;color:#565656;padding:7px 12px;height:38px;max-width:100%;-webkit-box-shadow:none;box-shadow:none;-webkit-transition:all 300ms linear;-moz-transition:all 300ms linear;-o-transition:all 300ms linear;-ms-transition:all 300ms linear;transition:all 300ms linear;} -.form-control:focus {background-color:#FFFFFF;border:1px solid #AAAAAA;-webkit-box-shadow:none;box-shadow:none;outline:0 !important;color:#333333;} -.input-lg {height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px;} -.input-sm {height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px;} -.form-horizontal .form-group {margin-left:-10px;margin-right:-10px;} -.form-control-feedback {line-height:38px !important;} -.input-group-btn .btn {padding:8px 12px;} -.input-group-btn .btn-sm {padding:5px 10px;} -.input-group-btn .btn-lg {padding:10px 17px;} -/* Labels */ -.label {font-weight:500;letter-spacing:0.05em;padding:.3em .6em .3em;color:#fff;border-radius:3px;} -.label-default {background-color:#71b6f9;} -.label-primary {background-color:#188ae2;} -.label-success {background-color:#10c469;} -.label-info {background-color:#35b8e0;} -.label-warning {background-color:#f9c851;} -.label-danger {background-color:#ff5b5b;} -.label-purple {background-color:#5b69bc;} -.label-pink {background-color:#ff8acc;} -.label-inverse {background-color:#3b3e47;} -/* Badge */ -.badge {text-transform:uppercase;font-weight:500;padding:3px 5px;font-size:12px;margin-top:1px;background-color:#71b6f9;} -.badge-xs {font-size:9px;} -.badge-xs,.badge-sm {-webkit-transform:translate(0,-2px);-ms-transform:translate(0,-2px);-o-transform:translate(0,-2px);transform:translate(0,-2px);} -.badge-primary {background-color:#188ae2;} -.badge-success {background-color:#10c469;} -.badge-info {background-color:#35b8e0;} -.badge-warning {background-color:#f9c851;} -.badge-danger {background-color:#ff5b5b;} -.badge-purple {background-color:#5b69bc;} -.badge-pink {background-color:#ff8acc;} -.badge-inverse {background-color:#3b3e47;} -/* Pagination/ Pager */ -.pagination > li:first-child > a,.pagination > li:first-child > span {border-bottom-left-radius:3px;border-top-left-radius:3px;} -.pagination > li:last-child > a,.pagination > li:last-child > span {border-bottom-right-radius:3px;border-top-right-radius:3px;} -.pagination > li > a,.pagination > li > span {color:#636e7b;} -.pagination > li > a:hover,.pagination > li > span:hover,.pagination > li > a:focus,.pagination > li > span:focus {background-color:#e4e7ea;} -.pagination-split li {margin-left:5px;display:inline-block;float:left;} -.pagination-split li:first-child {margin-left:0;} -.pagination-split li a {-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;} -.pagination > .active > a,.pagination > .active > span,.pagination > .active > a:hover,.pagination > .active > span:hover,.pagination > .active > a:focus,.pagination > .active > span:focus {background-color:#71b6f9;border-color:#71b6f9;} -.pager li > a,.pager li > span {-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;color:#636e7b;} -/* Tabs */ -.tab-content {padding:20px;border:2px solid #eeeeee;border-top:none;} -.nav-tabs > .active > a,.nav-tabs > .active > a:focus,.nav-tabs > .active > a:hover {border:2px solid #eeeeee !important;border-bottom-color:#ffffff !important;} -.nav-tabs {border-bottom:2px solid #eeeeee;} -.nav-tabs > li {margin-bottom:-2px;} -.nav-tabs a {color:#435966;font-size:15px;font-weight:600;font-family:'Karla',sans-serif;} -.nav > li > a:focus,.nav > li > a:hover {text-decoration:none;background-color:#f4f8fb;} -.nav .open > a,.nav .open > a:focus,.nav .open > a:hover {border-color:#eeeeee;} -/* List group */ -.list-group-item {border:1px solid #ebeff2;border-left:none;border-right:none;} -.list-group-item:hover {background-color:rgba(152,166,173,0.1);} -.list-group-item:first-child {border-top:none;} -.list-group-item:last-child {border-bottom:none;} -.list-no-border .list-group-item {border:none;} -/* Dropcap */ -.dropcap {font-size:3.1em;} -.dropcap,.dropcap-circle,.dropcap-square {display:block;float:left;font-weight:400;line-height:36px;margin-right:6px;text-shadow:none;} -/* Alert */ -.alert .btn {margin-top:10px;} -.alert-success {background-color:rgba(95,190,170,0.3);border-color:rgba(95,190,170,0.4);color:#5fbeaa;} -.alert-info {background-color:rgba(52,211,235,0.2);border-color:rgba(52,211,235,0.3);color:#35b8e0;} -.alert-warning {background-color:rgba(255,189,74,0.2);border-color:rgba(255,189,74,0.3);color:#f9c851;} -.alert-danger {background-color:rgba(240,80,80,0.2);border-color:rgba(240,80,80,0.3);color:#ff5b5b;} -/* Modals */ -.modal .modal-dialog .modal-content {-moz-box-shadow:none;-webkit-box-shadow:none;border-color:#DDDDDD;border-radius:2px;box-shadow:none;padding:25px;} -.modal .modal-dialog .modal-content .modal-header {border-bottom-width:2px;margin:0;padding:0;padding-bottom:15px;} -.modal .modal-dialog .modal-content .modal-body {padding:20px 0;} -.modal .modal-dialog .modal-content .modal-footer {padding:0;padding-top:15px;} -.modal-full {width:98%;} -.modal-content .nav.nav-tabs + .tab-content {margin-bottom:0px;} -.modal-content .panel-group {margin-bottom:0px;} -.modal-content .panel {border-top:none;} -/* Custom-modal */ -.modal-demo {background-color:#FFF;width:600px;-webkit-border-radius:4px;border-radius:4px;-moz-border-radius:4px;background-clip:padding-box;display:none;} -.modal-demo .close {position:absolute;top:15px;right:25px;color:#eeeeee;} -.custom-modal-title {padding:15px 25px 15px 25px;line-height:22px;font-size:18px;background-color:#36404a;color:#ffffff;text-align:left;margin:0px;} -.custom-modal-text {padding:20px;} -.custombox-modal-flash .close,.custombox-modal-rotatedown .close {top:20px;z-index:9999;} -/* Tabs-Accordions */ -.tabs-vertical-env .tab-content {margin-bottom:0px;} -.table > thead > tr > td.middle-align,.table > tbody > tr > td.middle-align,.table > .tfood > tr > td.middle-align,.table > thead > tr > th.middle-align,.table > tbody > tr > th.middle-align,.table > .tfood > tr > th.middle-align {vertical-align:middle;} -.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus {background-color:#71b6f9;border-color:#71b6f9;} -.nav-pills > .active > a > .badge {color:#71b6f9;} -.has-success .form-control {border-color:#10c469;box-shadow:none !important;} -.has-warning .form-control {border-color:#f9c851;box-shadow:none !important;} -.has-error .form-control {border-color:#ff5b5b;box-shadow:none !important;} -.input-group-addon {border-radius:2px;border:1px solid #eeeeee;} -/* Tooltips */ -.tooltip-inner {border-radius:1px;padding:6px 10px;} -.jqstooltip {-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;width:auto!important;height:auto!important;} -/* Popover */ -.popover {font-family:inherit;border:none;-webkit-border-radius:3px;border-radius:3px;-moz-border-radius:3px;background-clip:padding-box;} -.popover .popover-title {background-color:transparent;color:#71b6f9;font-weight:600;} -/* Code */code {color:#188ae2;background-color:#f4f8fb;border-radius:4px;} -/* Pre */pre {background-color:#f4f8fb;border:1px solid #d4d8da;} -/* Carousel */ -.carousel-control {width:10%;} -.carousel-control span {position:absolute;top:50%;/* pushes the icon in the middle of the height */ z-index:5;display:inline-block;font-size:30px;} -/* Owl */ -.slider-bg {background-size:cover !important;padding:5.5% 4.5%;} -/* Media */ -.media {margin-bottom:20px;} -.media .media-heading {font-weight:600;font-size:16px;} -.media:last-of-type {margin-bottom:0px;} -/* ============= Animation============= *//* Progressbar Animated */ -@-webkit-keyframes animationProgress {from {width:0;} -} -@keyframes animationProgress {from {width:0;} -} -/* Portlets loader */ -@-webkit-keyframes sk-rotateplane {0% {-webkit-transform:perspective(120px);} -50% {-webkit-transform:perspective(120px) rotateY(180deg);} -100% {-webkit-transform:perspective(120px) rotateY(180deg) rotateX(180deg);} -} -@keyframes sk-rotateplane {0% {transform:perspective(120px) rotateX(0deg) rotateY(0deg);-webkit-transform:perspective(120px) rotateX(0deg) rotateY(0deg);} -50% {transform:perspective(120px) rotateX(-180.1deg) rotateY(0deg);-webkit-transform:perspective(120px) rotateX(-180.1deg) rotateY(0deg);} -100% {transform:perspective(120px) rotateX(-180deg) rotateY(-179.9deg);-webkit-transform:perspective(120px) rotateX(-180deg) rotateY(-179.9deg);} -} -/*! * Waves v0.6.0 * http://fian.my.id/Waves * * Copyright 2014 Alfiana E. Sibuea and other contributors * Released under the MIT license * https://github.com/fians/Waves/blob/master/LICENSE */ -.waves-effect {position:relative;cursor:pointer;display:inline-block;overflow:hidden;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-tap-highlight-color:transparent;vertical-align:middle;z-index:1;will-change:opacity,transform;-webkit-transition:all 0.3s ease-out;-moz-transition:all 0.3s ease-out;-o-transition:all 0.3s ease-out;-ms-transition:all 0.3s ease-out;transition:all 0.3s ease-out;} -.waves-effect .waves-ripple {position:absolute;border-radius:50%;width:20px;height:20px;margin-top:-10px;margin-left:-10px;opacity:0;background:rgba(0,0,0,0.2);-webkit-transition:all 0.7s ease-out;-moz-transition:all 0.7s ease-out;-o-transition:all 0.7s ease-out;-ms-transition:all 0.7s ease-out;transition:all 0.7s ease-out;-webkit-transition-property:-webkit-transform,opacity;-moz-transition-property:-moz-transform,opacity;-o-transition-property:-o-transform,opacity;transition-property:transform,opacity;-webkit-transform:scale(0);-moz-transform:scale(0);-ms-transform:scale(0);-o-transform:scale(0);transform:scale(0);pointer-events:none;} -.waves-notransition {-webkit-transition:none !important;-moz-transition:none !important;-o-transition:none !important;-ms-transition:none !important;transition:none !important;} -.waves-circle {-webkit-transform:translateZ(0);-moz-transform:translateZ(0);-ms-transform:translateZ(0);-o-transform:translateZ(0);transform:translateZ(0);text-align:center;width:2.5em;height:2.5em;line-height:2.5em;border-radius:50%;-webkit-mask-image:none;} -.waves-input-wrapper {border-radius:0.2em;vertical-align:bottom;} -.waves-input-wrapper .waves-button-input {position:relative;top:0;left:0;z-index:1;} -.waves-block {display:block;} -.waves-effect.waves-light .waves-ripple {background-color:rgba(255,255,255,0.4);} -.waves-effect.waves-custom .waves-ripple {background-color:rgba(113,182,249,0.4);} -.waves-effect.waves-primary .waves-ripple {background-color:rgba(24,138,226,0.4);} -.waves-effect.waves-success .waves-ripple {background-color:rgba(16,196,105,0.4);} -.waves-effect.waves-info .waves-ripple {background-color:rgba(53,184,224,0.4);} -.waves-effect.waves-warning .waves-ripple {background-color:rgba(249,200,81,0.4);} -.waves-effect.waves-danger .waves-ripple {background-color:rgba(255,91,91,0.4);} -.waves-effect.waves-pink .waves-ripple {background-color:rgba(255,138,204,0.4);} -.waves-effect.purple .waves-ripple {background-color:rgba(91,105,188,0.2);} -.waves-effect.waves-inverse .waves-ripple {background-color:rgba(59,62,71,0.4);} + /* fixed-layout 固定头部和边栏布局*/ @media only screen and (max-width:641px) { header .am-dropdown-content {border:0px;} @@ -389,7 +69,7 @@ header .am-topbar-brand h2 { font-size: 18px; line-height: 32px; } header .admin-site-vice-name { font-size: 12px; color: #eaeaea; } ul {margin-top:0;} .admin-header {position:fixed;top:0;right:0;z-index:1000;margin-bottom:0;} -.admin-sidebar {width:260px;min-height:100%;float:left;border-right:1px solid #cecece;} +.admin-sidebar {width:260px;min-height:100%;float:left;} .admin-sidebar.am-active {z-index:1600;} .admin-sidebar-list {margin-bottom:0;} .admin-sidebar-list>li:first-child { border-top: 0 !important; } @@ -406,7 +86,7 @@ ul {margin-top:0;} header { left: 159px; } header .am-topbar-brand, .am-topbar-nav > li > a { line-height: 32px; } .admin-sidebar {display:block;width:160px;z-index:1; position: fixed; top: 0; left: 0;} - .admin-offcanvas-bar {position:static;width:auto;background:none;-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0);overflow-y:visible;min-height:100%;} + .admin-offcanvas-bar {position:static;width:auto;background:none;-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0);overflow-y:visible;min-height:100%;padding-bottom: 50px;} .admin-offcanvas-bar:after {content:none;} } @media only screen and (max-width:640px) { @@ -425,8 +105,6 @@ ul {margin-top:0;} .admin-sidebar-list li a {padding:0.65rem;} .common-left-menu a:hover { background:rgba(118, 119, 120, 0.45); } .common-left-menu-active {background:#1cc09f !important;color:#fff !important;} -#ifcontent {border:0px;} -.am-table > tbody > tr > td {vertical-align:top;} .admin-offcanvas-bar, .admin-offcanvas-bar .am-list > li { background: #36373c; } .admin-offcanvas-bar .am-list > li { border-style: solid; border-width: 1px 0; border-color: #2e2e31; } @@ -438,7 +116,6 @@ ul {margin-top:0;} /** * 导航 */ -.admin-site-vice-name { font-size: 12px; color: #eaeaea; } .table-nav { border-bottom: 1px solid #eee; } .table-nav li a { border-top-left-radius: 2px; border-top-right-radius: 2px; } @@ -456,37 +133,6 @@ ul {margin-top:0;} } -/** - * mini菜单 - */ -.menu-mini .nav-name,.menu-mini .am-icon-angle-down,.menu-mini .admin-sidebar-sub{display:none !important} -.menu-mini .admin-sidebar-list li {text-align: center;} - -/** - * mini开关 - */ -.menu-scaling-submit{position:fixed;left:164px;top:40px;opacity:.6;width:16px;height:25px;padding:2px;box-shadow:0 0 3px 1px #208fd5;font-size: 18px;} - -/** - * mini小icon - */ -.menu-mini-container-tips{position:absolute;left:63px;top:0;padding:0 10px;width:auto;height:35px;line-height:35px;text-align:center;color:#fff;background-color:#01bcd4;-webkit-box-shadow:0 0 5px rgba(0,0,0,.2);-moz-box-shadow:0 0 5px rgba(0,0,0,.2);box-shadow:0 0 5px rgba(0,0,0,.2);font-weight:700;display:none;z-index:1001;} -.menu-mini-container-tips span{font-size:12px} -.menu-mini-container-tips .mui-mbar-tab-tip,.menu-mini-container-popup .mui-mbar-tab-tip{position:absolute;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px;font-family:"\5b8b\4f53";top:10px;left:-10px;z-index:0;color:#01bcd4;} - -/** - * mini子菜单 - */ -.menu-mini-container-popup{background:#36373c;position:absolute;left:63px;top:0;min-width:120px;height:auto;display:none;z-index:1001;} -.menu-mini-container-popup ul{margin:0;padding:0} -.menu-mini-container-popup ul li{line-height:35px;list-style-type:none} -.menu-mini-container-popup ul li a{padding:0 10px;display:block;color:#fff} -.menu-mini-container-popup ul li a:hover{background:rgba(118,119,120,0.1)} -.menu-mini-container-popup ul li a span{font-size:12px} -.menu-mini-container-popup ul li:not(:last-child){border-bottom:1px solid #2e2e31} -.menu-mini-container-popup .mui-mbar-tab-tip{color:#36373c} -.menu-mini-container-popup ul li a.common-left-menu-active { background: #686868 !important; } - /** * 列表按钮美化 */ diff --git a/public/static/admin/default/css/index.index.css b/public/static/admin/default/css/index.index.css index 1351fee5a..4d99e916f 100644 --- a/public/static/admin/default/css/index.index.css +++ b/public/static/admin/default/css/index.index.css @@ -1,5 +1,108 @@ +/** + * 顶部导航 + */ +::-webkit-scrollbar { + display: none; +} + +#ifcontent { + height: 100%; + width: 100%; +} +#ifcontent iframe { + border: 0px; + vertical-align: top; +} @media only screen and (min-width: 641px) { #ifcontent { padding-left: 160px; } +} + +/** + * mini开关 + */ +.menu-scaling-submit { + position: fixed; + bottom: 15px; + color: #f5f6f9; + font-size: 18px; + line-height: 18px; + left: 123.5px; +} +.menu-scaling-submit:hover, .menu-scaling-submit:focus { + color: #fff; +} + + +/** + * mini菜单 + */ +.menu-mini .nav-name,.menu-mini .am-icon-angle-down,.menu-mini .admin-sidebar-sub{display:none !important} +.menu-mini .admin-sidebar-list li {text-align: center;} + + +/** + * mini小icon + */ +.menu-mini-container-tips{position:absolute;left:63px;top:0;padding:0 10px;width:auto;height:35px;line-height:35px;text-align:center;color:#fff;background-color:#01bcd4;-webkit-box-shadow:0 0 5px rgba(0,0,0,.2);-moz-box-shadow:0 0 5px rgba(0,0,0,.2);box-shadow:0 0 5px rgba(0,0,0,.2);font-weight:700;display:none;z-index:1001;} +.menu-mini-container-tips span{font-size:12px} +.menu-mini-container-tips .mui-mbar-tab-tip,.menu-mini-container-popup .mui-mbar-tab-tip{position:absolute;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px;font-family:"\5b8b\4f53";top:10px;left:-10px;z-index:0;color:#01bcd4;} + +/** + * mini子菜单 + */ +.menu-mini-container-popup{background:#36373c;position:absolute;left:63px;top:0;min-width:120px;height:auto;display:none;z-index:1001;} +.menu-mini-container-popup ul{margin:0;padding:0} +.menu-mini-container-popup ul li{line-height:35px;list-style-type:none} +.menu-mini-container-popup ul li a{padding:0 10px;display:block;color:#fff} +.menu-mini-container-popup ul li a:hover{background:rgba(118,119,120,0.1)} +.menu-mini-container-popup ul li a span{font-size:12px} +.menu-mini-container-popup ul li:not(:last-child){border-bottom:1px solid #2e2e31} +.menu-mini-container-popup .mui-mbar-tab-tip{color:#36373c} +.menu-mini-container-popup ul li a.common-left-menu-active { background: #686868 !important; } + +/** + * 导航打开页面列表 + */ +.header-menu-open-pages-list { + max-width: calc(100% - 650px); + margin-top: 4px; + margin-left: 20px; + height: 25px; +} +.header-menu-open-pages-list ul li { + display: inline-block; + border: 1px solid #5291ff; + border-radius: 2px; + padding: 2px 10px; + cursor: pointer; +} +.header-menu-open-pages-list ul li:not(:last-child) { + margin-right: 10px; +} +.header-menu-open-pages-list ul li span { + color: #c1d8ff; +} +.header-menu-open-pages-list ul li a { + margin-left: 3px; + color: #91b9ff; +} +.header-menu-open-pages-list ul li:hover { + border-color: #91b9ff; +} +.header-menu-open-pages-list ul li:hover span { + color: #d8e6ff; +} +.header-menu-open-pages-list ul li.am-active { + border-color: #bfd6ff; +} +.header-menu-open-pages-list ul li.am-active a, +.header-menu-open-pages-list ul li a:hover { + color: #ff9e80; +} +@media only screen and (max-width: 640px) { + .header-menu-open-pages-list { + display: none; + } } \ No newline at end of file diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js index aa62d8b46..6f7ca21b0 100755 --- a/public/static/admin/default/js/index.js +++ b/public/static/admin/default/js/index.js @@ -3,31 +3,48 @@ $(function() // 左侧菜单箭头方向回调处理 $('#admin-offcanvas li.admin-parent').on('open.collapse.amui', function() { - $(this).find('a i').toggleClass('left-menu-more-ico-rotate'); + $(this).find('a i').toggleClass('left-menu-more-icon-rotate'); }).on('close.collapse.amui', function() { - $(this).find('a i').toggleClass('left-menu-more-ico-rotate'); + $(this).find('a i').toggleClass('left-menu-more-icon-rotate'); }); // url加载 $(document).on('click', '.common-left-menu li a, .common-nav-top li a, .menu-mini-container-popup ul li a', function() { - var link = $(this).data('url') || null; + var url = $(this).data('url') || null; var type = $(this).data('type'); - if(link != null) + var key = $(this).data('key'); + if(url != null) { - // 打开url地址 - $('#ifcontent').attr('src', link); + // 先隐藏所有的iframe + // 页面未打开则添加iframe并打开 + if($('#ifcontent iframe.iframe-item-key-'+key).length == 0) + { + $('#ifcontent').append(''); + } + + // 添加快捷导航 + if($('.header-menu-open-pages-list ul li.nav-item-key-'+key).length == 0) + { + var html = '
      • '; + html += ''+$(this).find('.nav-name').text()+''; + html += ''; + html += '
        • '; + $('.header-menu-open-pages-list ul').append(html); + } + // 模拟点击当前元素 + $('.header-menu-open-pages-list ul li.nav-item-key-'+key).trigger('click'); // 顶部菜单事件，关闭弹层 if(type == 'nav') { - if($(document).width() < 641) - { - $('.header-nav-submit').trigger('click'); - } else { - $(this).parents('.common-nav-top').trigger('click'); - } + if($(document).width() < 641) + { + $('.header-nav-submit').trigger('click'); + } else { + $(this).parents('.common-nav-top').trigger('click'); + } } // 关闭左侧弹层 @@ -54,15 +71,15 @@ $(function() $('.menu-mini-container-tips').hide(); if(status == 0) { - $(this).animate({left: '59px'}, 300); - $(this).removeClass('am-icon-angle-double-left').addClass('am-icon-angle-double-right'); + $(this).animate({left: '18.5px'}, 300); + $(this).removeClass('am-icon-dedent').addClass('am-icon-indent'); $('#admin-offcanvas').addClass('menu-mini').addClass('menu-mini-event'); $('#admin-offcanvas').animate({width: '55px'}, 300); $('#ifcontent').animate({paddingLeft: '55px'}, 300); - $('header.admin-header').animate({left: '54px'}, 300); + $('header.admin-header').animate({left: '55px'}, 300); } else { - $(this).animate({left: '164px'}, 300); - $(this).removeClass('am-icon-angle-double-right').addClass('am-icon-angle-double-left'); + $(this).animate({left: '123.5px'}, 300); + $(this).removeClass('am-icon-indent').addClass('am-icon-dedent'); $('#admin-offcanvas').animate({width: '160px'}, 300); $('#ifcontent').animate({paddingLeft: '160px'}, 300); $('header.admin-header').animate({left: '159px'}, 300); @@ -154,7 +171,7 @@ $(function() { $('.menu-scaling-submit').attr('data-status', 0); $('.menu-scaling-submit').css({'left': '164px'}); - $('.menu-scaling-submit').removeClass('am-icon-angle-double-right').addClass('am-icon-angle-double-left'); + $('.menu-scaling-submit').removeClass('am-icon-indent').addClass('am-icon-dedent'); $('#admin-offcanvas').css({'width': 'inherit'}); $('#admin-offcanvas').removeClass('menu-mini').removeClass('menu-mini-event'); $('#ifcontent').css({'padding-left':0}); @@ -168,4 +185,36 @@ $(function() } } }); + + // 页面切换 + $(document).on('click', '.header-menu-open-pages-list ul li', function() + { + // 选中当前页面 + $('.header-menu-open-pages-list ul li').removeClass('am-active'); + $(this).addClass('am-active'); + var key = $(this).data('key'); + // 显示当前页面 + $('#ifcontent iframe').hide(); + $('#ifcontent iframe.iframe-item-key-'+key).show(); + }); + // 页面移除 + $(document).on('click', '.header-menu-open-pages-list ul li a', function() + { + // 移除当前页面 + var $parent = $(this).parent(); + var key = $parent.data('key'); + $parent.remove(); + $('#ifcontent iframe.iframe-item-key-'+key).remove(); + // 当前没有选中的导航则模拟点击最后一个选中 + if($('.header-menu-open-pages-list ul li.am-active').length == 0) + { + $('.header-menu-open-pages-list ul li:last').trigger('click'); + } + // 无页面则添加默认初始化页面 + if($('.header-menu-open-pages-list ul li').length == 0) + { + $('#ifcontent iframe').show(); + } + return false; + }); }); \ No newline at end of file diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index aa8a3657c..45e2cccc1 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -1189,7 +1189,7 @@ form .am-tab-panel .am-form-group:last-child { } /** - * 表单内部操作导航 + * 表单内部顶部操作导航 */ .form-legend-fixed { position: sticky; @@ -1204,6 +1204,27 @@ form .am-tab-panel .am-form-group:last-child { margin-left: 10px; } +/** + * 表单内部底部操作导航 + */ +.form-bottom-nav-fixed { + position: fixed; + left: 0; + bottom: 0; + width: 100%; + background: #fff; + z-index: 10; + border-top: 1px solid #e5e5e5; + padding: 10px; + text-align: right; +} +.form-bottom-nav-fixed button { + border: 0px; +} +.form-bottom-nav-fixed .am-badge:not(:first-child) { + margin-left: 10px; +} + /** * 滚动条样式 diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js index 4be0b8163..1acdb36d5 100755 --- a/public/static/common/js/common.js +++ b/public/static/common/js/common.js @@ -2564,6 +2564,82 @@ function PopoverContentHandle(content) return content.replace(new RegExp("\n", 'g'), '
        ').replace(new RegExp("\r", 'g'), '').replace(new RegExp("'", 'g'), '').replace(new RegExp('"', 'g'), ''); } +/** + * 数据打印处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2022-10-09 + * @desc description + * @param {int} is_pdf [是否导出PDF（0否、1是）] + */ +function DataPrintHandle(is_pdf = 0) +{ + // 打印和模板数据 + var print_data = window['print_data'] || null; + var print_template = window['print_template'] || null; + if(print_data == null || print_template == null) + { + Prompt(window['lang_operate_params_error'] || '操作参数有误'); + return false; + } + + // 需要打印的数据 + var result = []; + + // 是否列表选择多选 + var print_is_list_choice = parseInt(window['print_is_list_choice'] || 0); + if(print_is_list_choice == 1) + { + // 获取数据id + var values = FromTableCheckedValues('form_checkbox_value', '.am-table-scrollable-horizontal'); + if(values.length <= 0) + { + Prompt(window['lang_before_choice_data_tips'] || '请先选择数据'); + return false; + } + + // 获取需要打印的数据 + var field = window['print_data_list_key'] || 'id'; + print_data = JsonStringToJsonObject(print_data); + for(var i in print_data) + { + if((print_data[i][field] || null) != null && values.indexOf(print_data[i][field]) != -1) + { + result.push(print_data[i]); + } + } + if(result.length == 0) + { + Prompt(window['lang_not_operate_error'] || '没有相关数据'); + return false; + } + } else { + result = print_data; + } + + // 是否已引入hiprint库 + if((window['hiprint'] || null) == null) + { + Prompt(window['lang_not_load_lib_hiprint_error'] || '请先引入hiprint组件库'); + return false; + } + + // 初始化模板 + var ht = new hiprint.PrintTemplate({template: JsonStringToJsonObject(print_template)}); + + // 是否导出pdf + if(is_pdf == 1) + { + // 导出pdf + var filename = $(this).data('file-name') || 'file-'+(new Date().getTime()); + ht.toPdf(result, filename); + } else { + // 调用打印组件 + ht.print(result, {}); + } +} + // 公共数据操作 $(function() @@ -2798,69 +2874,7 @@ $(function() // 表格公共excel导出操作 $(document).on('click', '.form-table-operate-top-data-print-submit,.common-print-submit', function() { - // 打印和模板数据 - var print_data = window['print_data'] || null; - var print_template = window['print_template'] || null; - if(print_data == null || print_template == null) - { - Prompt(window['lang_operate_params_error'] || '操作参数有误'); - return false; - } - - // 需要打印的数据 - var result = []; - - // 是否列表选择多选 - var print_is_list_choice = parseInt(window['print_is_list_choice'] || 0); - if(print_is_list_choice == 1) - { - // 获取数据id - var values = FromTableCheckedValues('form_checkbox_value', '.am-table-scrollable-horizontal'); - if(values.length <= 0) - { - Prompt(window['lang_before_choice_data_tips'] || '请先选择数据'); - return false; - } - - // 获取需要打印的数据 - var field = window['print_data_list_key'] || 'id'; - print_data = JsonStringToJsonObject(print_data); - for(var i in print_data) - { - if((print_data[i][field] || null) != null && values.indexOf(print_data[i][field]) != -1) - { - result.push(print_data[i]); - } - } - if(result.length == 0) - { - Prompt(window['lang_not_operate_error'] || '没有相关数据'); - return false; - } - } else { - result = print_data; - } - - // 是否已引入hiprint库 - if((window['hiprint'] || null) == null) - { - Prompt(window['lang_not_load_lib_hiprint_error'] || '请先引入hiprint组件库'); - return false; - } - - // 初始化模板 - var ht = new hiprint.PrintTemplate({template: JsonStringToJsonObject(print_template)}); - - // 是否导出pdf - if($(this).data('is-pdf') == 1) - { - // 导出pdf - var filename = $(this).data('file-name') || 'file-'+(new Date().getTime()); - ht.toPdf(result, filename); - } else { - // 调用打印组件 - ht.print(result, {}); - } + DataPrintHandle($(this).data('is-pdf')); }); // 页面加载loading diff --git a/public/static/common/lib/ueditor/ueditor.all.js b/public/static/common/lib/ueditor/ueditor.all.js index b3c1b58e8..a35d4f786 100755 --- a/public/static/common/lib/ueditor/ueditor.all.js +++ b/public/static/common/lib/ueditor/ueditor.all.js @@ -6918,6 +6918,8 @@ var fillCharReg = new RegExp(domUtils.fillChar, 'g'); '