ulthon/ulthon_admin
1
0
Fork 0
mirror of https://gitee.com/ulthon/ulthon_admin.git synced 2026-07-01 15:32:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化特效皮肤兼容性；升级layuidao 2.8.1;

Browse Source
This commit is contained in:
augushong
2023-04-27 20:38:40 +08:00
parent c0cc38af69
commit 78135f1fe1
14 changed files with 136 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/view/layout/default.html
View File

@@ -27,7 +27,7 @@
};
</script>
<script src="__STATIC__/common/js/app.js"></script>
<script src="__STATIC__/plugs/layui-v2.8.0/layui.js?v={$version}" charset="utf-8"></script>
<script src="__STATIC__/plugs/layui-v2.8.1/layui.js?v={$version}" charset="utf-8"></script>
<script src="__STATIC__/plugs/require-2.3.6/require.js?v={$version}" charset="utf-8"></script>
<script src="__STATIC__/config-admin.js?v={$version}" charset="utf-8"></script>
</head>

11
app/common/command/admin/Version.php
View File

@@ -14,13 +14,14 @@ use think\facade\App;
class Version extends Command
{
public const VERSION = 'v2.0.26';
const VERSION = 'v2.0.26';
public const LAYUI_VERSION = '2.8.1';
const LAYUI_VERSION = '2.8.0';
const COMMENT = [
'引入并兼容layui2.8.0',
public const COMMENT = [
'升级layui2.8.1',
'新增tableSelect组件支持where条件',
'优化特效皮肤的兼容性',
];
protected function configure()

6
public/static/admin/css/public.css
View File

@@ -1,4 +1,4 @@
@import url("../../plugs/layui-v2.8.0/css/layui.css");
@import url("../../plugs/layui-v2.8.1/css/layui.css");
@import url("../../plugs/font-awesome-4.7.0/css/font-awesome.min.css");
@import url("../css/iconfont.css");
@import url('../../plugs/jq-module/city-picker/css/city-picker.css');
@@ -642,8 +642,4 @@ table样式
[data-toggle="copy-text"].copy-rendered {
cursor: pointer;
}
#layuimini-bg-color {
background-color: #fff;
}

246
public/static/common/css/theme/_sicfi.scss
View File

@@ -1,25 +1,25 @@
// 通常用于背景色
$black-color :rgb(2, 17, 20);
$black-color :rgb(2, 17, 20);
// 通常用于字体颜色
$main-color :rgb(126, 252, 246);
$main-color :rgb(126, 252, 246);
// 通常用于边框
$less-main-color:rgb(6, 216, 215);
$plus-main-color:rgb(0, 125, 124);
// 通常用于激活状态,通常跟背景色搭配
$cover-color :rgba(62, 251, 251, 0.05);
$cover-color :rgba(62, 251, 251, 0.05);
// 更强的激活状态,适合做选项操作时使用
$active-color :rgba(62, 251, 251, 0.5);
$red-color :rgb(255, 0, 0);
$red-color :rgb(255, 0, 0);
$yellow-color:rgb(255, 255, 153);
$green-color :rgb(0, 255, 0);
& {
background-color: $black-color;
color : $main-color;
color: $main-color;
}
.layuimini-main {
@@ -43,39 +43,39 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
padding-right: 25px;
}
clip-path : $box-shape;
padding-right : 10px;
position : relative;
clip-path : $box-shape;
padding-right : 10px;
position : relative;
background-color: transparent;
border : 1px solid;
color : rgb(126, 252, 246);
text-shadow : rgb(126, 252, 246) 0px 0px 1px;
border : 1px solid;
color : rgb(126, 252, 246);
text-shadow : rgb(126, 252, 246) 0px 0px 1px;
background-color: rgb(126, 252, 246);
&::before {
content : '';
display : block;
position : absolute;
z-index : -1;
clip-path : $box-shape;
width : 100%;
height : 100%;
left : -0.5px;
top : -0.5px;
content: '';
display: block;
position: absolute;
z-index: -1;
clip-path: $box-shape;
width: 100%;
height: 100%;
left: -0.5px;
top: -0.5px;
background-color: $black-color;
}
&:hover::after {
content : '';
display : block;
position : absolute;
z-index : -1;
clip-path : $box-shape;
width : 100%;
height : 100%;
left : -0.5px;
top : -0.5px;
content: '';
display: block;
position: absolute;
z-index: -1;
clip-path: $box-shape;
width: 100%;
height: 100%;
left: -0.5px;
top: -0.5px;
background-color: rgba(126, 252, 246, 0.2);
}
@@ -86,10 +86,10 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
}
&.layui-btn-success {
text-shadow : rgb(0, 255, 0) 0px 0px 1px;
color : rgb(0, 255, 0);
text-shadow: rgb(0, 255, 0) 0px 0px 1px;
color: rgb(0, 255, 0);
background-color: rgba(0, 255, 0);
border : unset;
border: unset;
&:hover::after {
background-color: rgba(0, 255, 0, 0.2);
@@ -97,10 +97,10 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
}
&.layui-btn-danger {
text-shadow : rgb(255, 0, 0) 0px 0px 1px;
color : rgb(255, 0, 0);
text-shadow: rgb(255, 0, 0) 0px 0px 1px;
color: rgb(255, 0, 0);
background-color: rgb(255, 0, 0);
border : unset;
border: unset;
&:hover::after {
background-color: rgba(255, 0, 0, 0.2);
@@ -108,10 +108,10 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
}
&.layuimini-btn-primary {
text-shadow : rgb(255, 255, 153) 0px 0px 1px;
color : rgb(255, 255, 153);
text-shadow: rgb(255, 255, 153) 0px 0px 1px;
color: rgb(255, 255, 153);
background-color: rgb(255, 255, 153);
border : unset;
border: unset;
&:hover::after {
background-color: rgba(255, 255, 153, 0.2);
@@ -124,9 +124,9 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
}
&.layui-btn-normal {
color : $black-color;
color: $black-color;
background-color: $main-color;
border : unset;
border: unset;
&::before {
background-color: $main-color;
@@ -140,7 +140,7 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layui-table {
background: $black-color;
color : $main-color;
color: $main-color;
tr {
@@ -166,22 +166,22 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
}
.layui-table-tool .layui-inline[lay-event] {
color : $main-color;
border : none;
color: $main-color;
border: none;
position: relative;
&::after {
border-color: $main-color;
border-width: 1px;
border-style: solid;
clip-path : $box-shape;
position : absolute;
left : 0;
top : 0;
width : calc(100% - 1px);
height : calc(100% - 1px);
content : '';
display : block;
clip-path: $box-shape;
position: absolute;
left: 0;
top: 0;
width: calc(100% - 1px);
height: calc(100% - 1px);
content: '';
display: block;
}
}
@@ -209,8 +209,8 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layuimini-color .elem-content li.layui-this {
background-color: $main-color;
color : $black-color !important;
border-color : $less-main-color;
color: $black-color !important;
border-color: $less-main-color;
}
.layuimini-color .more-menu-item {
@@ -227,7 +227,7 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layuimini-tab .layui-tab-title {
background-color: $cover-color !important;
border-color : $less-main-color;
border-color: $less-main-color;
}
@@ -257,7 +257,7 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layuimini-tab .layui-tab-control>li {
background-color: $black-color;
border-color : $less-main-color;
border-color: $less-main-color;
}
.layuimini-tab .layui-tab-title li {
@@ -267,16 +267,16 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layui-flow-more a *,
.layui-laypage input,
.layui-table-view select[lay-ignore] {
border-color : $less-main-color;
border-color: $less-main-color;
background-color: $black-color;
color : $main-color;
color: $main-color;
}
.layui-laypage button,
.layui-laypage input {
border-color : $less-main-color;
border-color: $less-main-color;
background-color: $black-color;
color : $main-color;
color: $main-color;
}
@@ -301,9 +301,9 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
}
.layui-table-view .layui-form-checkbox.layui-form-checked[lay-skin="primary"] i {
border-color : $main-color;
border-color: $main-color;
background-color: $main-color;
color : $black-color;
color: $black-color;
}
.layui-table-view .layui-form-checkbox[lay-skin="primary"] i {
@@ -315,36 +315,36 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
}
.box-border-line {
position : relative;
border : 1px solid $less-main-color;
border-width : 1px;
position: relative;
border: 1px solid $less-main-color;
border-width: 1px;
$border-offset: 3px;
&::before {
content : '';
position : absolute;
width : 50px;
height : 20px;
transition : all 0.2s;
border : 1px solid $less-main-color;
top : -$border-offset;
left : -$border-offset;
border-right : none;
border-bottom : none;
content: '';
position: absolute;
width: 50px;
height: 20px;
transition: all 0.2s;
border: 1px solid $less-main-color;
top: -$border-offset;
left: -$border-offset;
border-right: none;
border-bottom: none;
pointer-events: none;
}
&::after {
content : "";
position : absolute;
width : 50px;
height : 20px;
transition : all 0.2s;
border : 1px solid $less-main-color;
bottom : -$border-offset;
right : -$border-offset;
border-left : none;
border-top : none;
content: "";
position: absolute;
width: 50px;
height: 20px;
transition: all 0.2s;
border: 1px solid $less-main-color;
bottom: -$border-offset;
right: -$border-offset;
border-left: none;
border-top: none;
pointer-events: none;
}
@@ -352,7 +352,7 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
&::after,
&::before {
width : calc(100% + $border-offset);
width: calc(100% + $border-offset);
height: calc(100% + $border-offset);
}
}
@@ -377,11 +377,11 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layui-form-pane .layui-form-label {
background-color: $cover-color;
color : $main-color;
color: $main-color;
}
.layuimini-container .table-search-fieldset {
color : $main-color;
color: $main-color;
border-color: $less-main-color;
}
@@ -390,19 +390,19 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layui-form-autocomplete {
dl {
color : $main-color;
color: $main-color;
background-color: $black-color;
border-color : $less-main-color;
border-color: $less-main-color;
dd {
&.layui-this {
background-color: $main-color !important;
color : $black-color;
color: $black-color;
}
&:hover {
background-color: $less-main-color !important;
color : $black-color;
color: $black-color;
}
}
}
@@ -411,7 +411,7 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layui-iconpicker-item,
.layui-iconpicker-item:hover {
border-color: $less-main-color !important;
color : $black-color;
color: $black-color;
.layui-iconpicker-icon:hover {
border-color: $less-main-color !important;
@@ -421,7 +421,7 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layui-nav-child {
background-color: $black-color;
color : $main-color;
color: $main-color;
}
.layui-layout-admin .layui-header .layui-nav .layui-nav-item .layui-nav-child a {
@@ -467,12 +467,12 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layui-bg-orange {
background-color: $yellow-color !important;
color : $black-color !important;
color: $black-color !important;
}
.layui-bg-green {
background-color: $green-color !important;
color : $black-color !important;
color: $black-color !important;
}
.layui-table-hover {
@@ -481,13 +481,13 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layui-table-grid-down {
background-color: $black-color;
color : $main-color;
border-color : unset;
color: $main-color;
border-color: unset;
}
.layui-table-tips-main {
background-color: $main-color;
color : $black-color;
color: $black-color;
}
.layui-layout-admin .layui-header .layuimini-tool i {
@@ -505,7 +505,7 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layui-card {
background-color: $cover-color;
border-radius : 0;
border-radius: 0;
@extend .box-border-line;
@@ -524,7 +524,7 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
a i {
background-color: $cover-color;
color : $active-color;
color: $active-color;
}
a cite {
@@ -535,7 +535,7 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
&:hover {
a i {
background-color: $active-color;
color : $main-color;
color: $main-color;
}
a cite {
@@ -555,7 +555,7 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.city-picker-span,
.main-input {
background-color: $cover-color;
color : $main-color;
color: $main-color;
}
.city-picker-span>.title>span {
@@ -563,7 +563,7 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
&:hover {
background-color: $main-color;
color : $black-color;
color: $black-color;
}
}
@@ -574,9 +574,9 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
}
.layui-form-checked[lay-skin="primary"] i {
border-color : $main-color !important;
border-color: $main-color !important;
background-color: $main-color;
color : $black-color;
color: $black-color;
}
.layui-input:focus,
@@ -634,18 +634,18 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
}
.layui-layer {
border : 1px solid $main-color;
border: 1px solid $main-color;
background-color: $black-color;
}
.layui-layer-easy .layui-layer-title {
background-color: $plus-main-color !important;
color : $main-color !important;
color: $main-color !important;
}
.tableSelect {
background-color: $black-color !important;
border-color : $less-main-color !important;
border-color: $less-main-color !important;
}
.layui-table td,
@@ -678,21 +678,21 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
}
.hr-line {
color : $main-color;
border-color : $less-main-color;
color: $main-color;
border-color: $less-main-color;
background-color: $main-color;
}
.layui-layer-easy .layui-layer-btn {
background-color: $black-color;
border-top : 1px solid $less-main-color;
border-top: 1px solid $less-main-color;
}
.layui-layer-easy .layui-layer-btn .layui-layer-btn0 {
background-color: $main-color;
border-color : $less-main-color;
color : $main-color !important;
clip-path : $box-shape;
border-color: $less-main-color;
color: $main-color !important;
clip-path: $box-shape;
}
.layui-layer-easy .layui-layer-btn a {
@@ -707,26 +707,26 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layui-nav-tree .layui-nav-item {
margin: 5px;
width : calc(100% - 10px);
width: calc(100% - 10px);
}
.layui-nav .layui-nav-item {
clip-path : $box-shape;
color : $main-color;
clip-path: $box-shape;
color: $main-color;
background-color: $active-color;
&.layui-this a {
background-color: $main-color !important;
color : $black-color !important;
color: $black-color !important;
}
&.layui-this {
background-color: $main-color !important;
color : $black-color !important;
color: $black-color !important;
span {
background-color: $main-color !important;
color : $black-color !important;
color: $black-color !important;
}
}
@@ -771,7 +771,7 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layuimini-menu-left-zoom.layui-nav-tree .layui-nav-child dd.layui-this,
.layuimini-menu-left-zoom.layui-nav-tree .layui-nav-child dd.layui-this a {
background-color: $main-color !important;
color : $black-color !important;
color: $black-color !important;
.layui-left-nav {
color: $black-color !important;
@@ -780,7 +780,7 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layui-iconpicker-icon {
border-color : $less-main-color !important;
border-color: $less-main-color !important;
background-color: $less-main-color !important;
}
@@ -796,4 +796,4 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%,
.layui-header .layui-nav-child dd.layui-this,
.layui-layout-admin .layui-header .layui-nav .layui-nav-item .layui-nav-child .layui-this a {
background-color: $active-color !important;
}
}

2
public/static/config-admin.js
View File

@@ -9,7 +9,7 @@ require.config({
"echarts": ["plugs/echarts/echarts.min"],
"echarts-theme": ["plugs/echarts/echarts-theme"],
"easy-admin": ["plugs/easy-admin/easy-admin"],
"layui": ["plugs/layui-v2.8.0/layui"],
"layui": ["plugs/layui-v2.8.1/layui"],
"miniAdmin": ["plugs/lay-module/layuimini/miniAdmin"],
"miniMenu": ["plugs/lay-module/layuimini/miniMenu"],
"miniTab": ["plugs/lay-module/layuimini/miniTab"],

1
public/static/plugs/layui-v2.8.0/css/layui.css
View File

File diff suppressed because one or more lines are too long

1
public/static/plugs/layui-v2.8.1/css/layui.css Normal file
View File

File diff suppressed because one or more lines are too long

0
public/static/plugs/layui-v2.8.0/font/iconfont.eot → public/static/plugs/layui-v2.8.1/font/iconfont.eot
View File

0
public/static/plugs/layui-v2.8.0/font/iconfont.svg → public/static/plugs/layui-v2.8.1/font/iconfont.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 321 KiB

After

Width:  |  Height:  |  Size: 321 KiB

0
public/static/plugs/layui-v2.8.0/font/iconfont.ttf → public/static/plugs/layui-v2.8.1/font/iconfont.ttf
View File

0
public/static/plugs/layui-v2.8.0/font/iconfont.woff → public/static/plugs/layui-v2.8.1/font/iconfont.woff
View File

0
public/static/plugs/layui-v2.8.0/font/iconfont.woff2 → public/static/plugs/layui-v2.8.1/font/iconfont.woff2
View File

2
public/static/plugs/layui-v2.8.0/layui.js → public/static/plugs/layui-v2.8.1/layui.js
View File

File diff suppressed because one or more lines are too long

4
view/index/welcome.html
View File

@@ -10,8 +10,8 @@
<title>ulthon_admin | 一款基于ThinkPHP6.0和Layui的快速开发的后台管理框架系统</title>
<link rel="stylesheet" href="//layui.ulthon.com/cdn/layui-ul.css">
<link rel="stylesheet" href="__STATIC__/common/css/welcome.css?v={$version}">
<link rel="stylesheet" href="/static/plugs/layui-v2.8.0/css/layui.css">
<script src="/static/plugs/layui-v2.8.0/layui.js"></script>
<link rel="stylesheet" href="/static/plugs/layui-v2.8.1/css/layui.css">
<script src="/static/plugs/layui-v2.8.1/layui.js"></script>
</head>