layui升级并兼容2.8.0

app/admin/view/layout/default.html

@@ -27,7 +27,7 @@
         };
     </script>
     <script src="__STATIC__/common/js/app.js"></script>
-    <script src="__STATIC__/plugs/layui-v2.7.6/layui.js?v={$version}" charset="utf-8"></script>
+    <script src="__STATIC__/plugs/layui-v2.8.0/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>

app/common/command/admin/Version.php

@@ -15,17 +15,12 @@ use think\facade\App;
 class Version extends Command
 {
 
-    const VERSION = 'v2.0.25';
+    const VERSION = 'v2.0.26';
 
-    const LAYUI_VERSION = '2.7.6';
+    const LAYUI_VERSION = '2.8.0';
 
     const COMMENT = [
-        '修复部分css没有正确使用缓存参数',
+        '引入并兼容layui2.8.0',
-        '修复table的field属性的边界情况处理',
-        '新增table的重载方法',
-        '优化table的tabbar设置关闭的情况',
-        '修复菜单管理修改排序的错误效果',
-        '新增curd生成的模型支持注解部分',
     ];
 
     protected function configure()

public/static/admin/css/public.css

@@ -1,4 +1,4 @@
-@import url("../../plugs/layui-v2.7.6/css/layui.css");
+@import url("../../plugs/layui-v2.8.0/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');
@@ -364,6 +364,7 @@ table样式
  */
 .layuimini-container .layui-form-select dl dd.layui-this {
     background-color: #1e9fff !important;
+    color: #fff;
 }
 
 /**
@@ -375,11 +376,6 @@ table样式
     border-bottom: none;
 }
 
-.layui-layer-easy .layui-layer-title~.layui-layer-setwin {
-    top   : 0px;
-    height: 42px;
-}
-
 .layui-layer-easy .layui-layer-title~.layui-layer-setwin>a {
     height: 42px;
     line-height: 42px;
@@ -429,6 +425,10 @@ table样式
     text-align: inherit !important;
 }
 
+.layui-layer-easy .layui-layer-setwin>span {
+    color: #fff;
+}
+
 .layui-layer-easy .layui-layer-setwin>a {
     background: none !important;
 }
@@ -459,44 +459,13 @@ table样式
     text-decoration: none !important;
 }
 
-.layui-layer-easy .layui-layer-setwin .layui-layer-min {
+.layui-layer-easy .layui-layer-setwin .layui-layer-max::after,
-    display: none;
+.layui-layer-easy .layui-layer-setwin .layui-layer-max::before {
+    border-color: #fff;
 }
 
-.layui-layer-easy .layui-layer-setwin .layui-layer-min:after {
+.layui-layer-easy .layui-layer-setwin .layui-layer-min::before {
-    content: "\e625";
+    background-color: #fff;
-}
-
-.layui-layer-easy .layui-layer-setwin .layui-layer-max {
-    display: none;
-}
-
-.layui-layer-easy .layui-layer-setwin .layui-layer-max:after {
-    content: "\e623";
-}
-
-.layui-layer-easy .layui-layer-setwin .layui-layer-maxmin {
-    display: none;
-}
-
-.layui-layer-easy .layui-layer-setwin .layui-layer-maxmin:after {
-    content: "\e624";
-}
-
-.layui-layer-easy .layui-layer-setwin .layui-layer-close1:after {
-    content: "\e626";
-}
-
-.layui-layer-easy .layui-layer-setwin .layui-layer-close2,
-.layui-layer-easy .layui-layer-setwin .layui-layer-close2:hover {
-    background: url('../libs/layer/dist/theme/default/icon.png') no-repeat -149px -31px !important;
-    top       : -30px;
-    right     : -30px;
-}
-
-.layui-layer-easy .layui-layer-setwin .layui-layer-close2:after,
-.layui-layer-easy .layui-layer-setwin .layui-layer-close2:hover:after {
-    display: none;
 }
 
 .layui-layer-content {

public/static/common/css/theme/_win7.scss

@@ -227,11 +227,9 @@
 
 .layui-form-checked[lay-skin="primary"] i {
     color: #16638f;
-
+    border-color: #888;
     display: block;
     font-weight: 700;
-
-
     position: absolute;
 
     &::before {

public/static/common/css/theme/index.css

@@ -727,7 +727,6 @@
   padding: 4px 9px;
   -webkit-user-select: none;
      -moz-user-select: none;
-      -ms-user-select: none;
           user-select: none;
   color: #2e3436;
   outline-color: rgba(53, 132, 228, 0.5);
@@ -852,7 +851,6 @@
   transition: all 0.15s cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -webkit-user-select: none;
      -moz-user-select: none;
-      -ms-user-select: none;
           user-select: none;
   outline-color: rgba(53, 132, 228, 0.5);
   border: 1px solid #cdc7c2;
@@ -933,7 +931,6 @@
   font-weight: normal;
   -webkit-user-select: none;
      -moz-user-select: none;
-      -ms-user-select: none;
           user-select: none;
   border: 0;
   border-top-style: none;
@@ -993,7 +990,6 @@
   padding: 4px 9px;
   -webkit-user-select: none;
      -moz-user-select: none;
-      -ms-user-select: none;
           user-select: none;
   color: #2e3436 !important;
   outline-color: rgba(53, 132, 228, 0.5);
@@ -1249,7 +1245,6 @@
   cursor: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAzElEQVRYR+2X0Q6AIAhF5f8/2jYXZkwEjNSVvVUjDpcrGgT7FUkI2D9xRfQETwNIiWO85wfINfQUEyxBG2ArsLwC0jioGt5zFcwF4OYDPi/mBYKm4t0U8ATgRm3ThFoAqkhNgWkA0jJLvaOVSs7j3qMnSgXWBMiWPXe94QqMBMBc1VZIvaTu5u5pQewq0EqNZvIEMCmxAawK0DNkay9QmfFNAJUXfgGgUkLaE7j/h8fnASkxHTz0DGIBMCnBeeM7AArpUd3mz2x3C7wADglA8BcWMZhZAAAAAElFTkSuQmCC) 14 0, pointer;
   -webkit-user-select: none;
   -moz-user-select: none;
-  -ms-user-select: none;
   user-select: none;
   color: #212529;
   background-color: #fff;
@@ -1324,8 +1319,6 @@
   line-height: 24px;
 }
 .elem-style-nes .layui-table img {
-  -ms-interpolation-mode: nearest-neighbor;
-      image-rendering: -moz-crisp-edges;
   image-rendering: pixelated;
 }
 .elem-style-nes .layui-form-checkbox[lay-skin=primary] i {
@@ -1470,7 +1463,7 @@
   background: linear-gradient(180deg, #eee 45%, #ddd 0, #bbb);
   border: 1.5px solid #888;
   border-radius: 3px;
-  box-shadow: inset 0 -1px 1px hsla(0deg, 0%, 100%, 0.8), inset 0 1px 1px #fff;
+  box-shadow: inset 0 -1px 1px hsla(0, 0%, 100%, 0.8), inset 0 1px 1px #fff;
   box-sizing: border-box;
   color: #222;
 }
@@ -1485,7 +1478,7 @@
   font-size: 12px;
 }
 .elem-style-win7 .layui-layer-title {
-  background: linear-gradient(90deg, hsla(0deg, 0%, 100%, 0.4), rgba(0, 0, 0, 0.1), hsla(0deg, 0%, 100%, 0.2)), linear-gradient(55deg, transparent, rgba(0, 0, 0, 0.1) 20%, rgba(0, 0, 0, 0.1) 50%, transparent 53%), #4580c4 !important;
+  background: linear-gradient(90deg, hsla(0, 0%, 100%, 0.4), rgba(0, 0, 0, 0.1), hsla(0, 0%, 100%, 0.2)), linear-gradient(55deg, transparent, rgba(0, 0, 0, 0.1) 20%, rgba(0, 0, 0, 0.1) 50%, transparent 53%), #4580c4 !important;
   border: 1px solid rgba(0, 0, 0, 0.6);
   border-radius: 6px 6px 0 0;
   height: 27px;
@@ -1505,7 +1498,7 @@
 .elem-style-win7 .layui-layer-easy .layui-layer-title ~ .layui-layer-setwin > a {
   height: 20px !important;
   line-height: 20px !important;
-  background: linear-gradient(hsla(0deg, 0%, 100%, 0.3), hsla(0deg, 0%, 100%, 0.3) 45%, rgba(0, 0, 0, 0.1) 50%, rgba(0, 0, 0, 0.1) 75%, hsla(0deg, 0%, 100%, 0.5)) !important;
+  background: linear-gradient(hsla(0, 0%, 100%, 0.3), hsla(0, 0%, 100%, 0.3) 45%, rgba(0, 0, 0, 0.1) 50%, rgba(0, 0, 0, 0.1) 75%, hsla(0, 0%, 100%, 0.5)) !important;
   border: 0;
   border-radius: 0;
   border-bottom-right-radius: 0px;
@@ -1537,7 +1530,7 @@
 }
 .elem-style-win7 .layui-layer-easy .layui-layer-title ~ .layui-layer-setwin > a.layui-layer-close1:hover {
   filter: contrast(1.3);
-  background-image: linear-gradient(hsla(0deg, 0%, 100%, 0.3), hsla(0deg, 0%, 100%, 0.3) 45%, rgba(0, 0, 0, 0.1) 50%, rgba(0, 0, 0, 0.1) 75%, hsla(0deg, 0%, 100%, 0.5)) !important;
+  background-image: linear-gradient(hsla(0, 0%, 100%, 0.3), hsla(0, 0%, 100%, 0.3) 45%, rgba(0, 0, 0, 0.1) 50%, rgba(0, 0, 0, 0.1) 75%, hsla(0, 0%, 100%, 0.5)) !important;
 }
 .elem-style-win7 .layui-layer-dialog {
   border-radius: 20px;
@@ -1554,7 +1547,7 @@
   border-bottom-width: 0;
 }
 .elem-style-win7 .layui-layer:not(.layui-layer-loading)::before {
-  background: linear-gradient(transparent 20%, hsla(0deg, 0%, 100%, 0.7) 40%, transparent 41%), linear-gradient(90deg, hsla(0deg, 0%, 100%, 0.4), rgba(0, 0, 0, 0.1), hsla(0deg, 0%, 100%, 0.2)), linear-gradient(55deg, transparent, rgba(0, 0, 0, 0.1) 20%, rgba(0, 0, 0, 0.1) 50%, transparent 53%), #4580c4;
+  background: linear-gradient(transparent 20%, hsla(0, 0%, 100%, 0.7) 40%, transparent 41%), linear-gradient(90deg, hsla(0, 0%, 100%, 0.4), rgba(0, 0, 0, 0.1), hsla(0, 0%, 100%, 0.2)), linear-gradient(55deg, transparent, rgba(0, 0, 0, 0.1) 20%, rgba(0, 0, 0, 0.1) 50%, transparent 53%), #4580c4;
   border-radius: 6px;
   content: "";
   height: 100%;
@@ -1583,7 +1576,7 @@
   z-index: 0;
 }
 .elem-style-win7 .layui-card::before {
-  background: linear-gradient(transparent 20%, hsla(0deg, 0%, 100%, 0.7) 40%, transparent 41%), linear-gradient(90deg, hsla(0deg, 0%, 100%, 0.4), rgba(0, 0, 0, 0.1), hsla(0deg, 0%, 100%, 0.2)), linear-gradient(55deg, transparent, rgba(0, 0, 0, 0.1) 20%, rgba(0, 0, 0, 0.1) 50%, transparent 53%), #4580c4;
+  background: linear-gradient(transparent 20%, hsla(0, 0%, 100%, 0.7) 40%, transparent 41%), linear-gradient(90deg, hsla(0, 0%, 100%, 0.4), rgba(0, 0, 0, 0.1), hsla(0, 0%, 100%, 0.2)), linear-gradient(55deg, transparent, rgba(0, 0, 0, 0.1) 20%, rgba(0, 0, 0, 0.1) 50%, transparent 53%), #4580c4;
   border-radius: 6px;
   content: "";
   height: 100%;
@@ -1593,7 +1586,7 @@
 }
 .elem-style-win7 .layui-card .layui-card-header {
   align-items: center;
-  background: linear-gradient(90deg, hsla(0deg, 0%, 100%, 0.4), rgba(0, 0, 0, 0.1), hsla(0deg, 0%, 100%, 0.2)), linear-gradient(55deg, transparent, rgba(0, 0, 0, 0.1) 20%, rgba(0, 0, 0, 0.1) 50%, transparent 53%), #4580c4;
+  background: linear-gradient(90deg, hsla(0, 0%, 100%, 0.4), rgba(0, 0, 0, 0.1), hsla(0, 0%, 100%, 0.2)), linear-gradient(55deg, transparent, rgba(0, 0, 0, 0.1) 20%, rgba(0, 0, 0, 0.1) 50%, transparent 53%), #4580c4;
   border-radius: 6px 6px 0 0;
   font: 9pt Segoe UI, sans-serif;
   justify-content: space-between;
@@ -1634,6 +1627,7 @@
 }
 .elem-style-win7 .layui-form-checked[lay-skin=primary] i {
   color: #16638f;
+  border-color: #888;
   display: block;
   font-weight: 700;
   position: absolute;

public/static/config-admin.js

@@ -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.7.6/layui"],
+        "layui": ["plugs/layui-v2.8.0/layui"],
         "miniAdmin": ["plugs/lay-module/layuimini/miniAdmin"],
         "miniMenu": ["plugs/lay-module/layuimini/miniMenu"],
         "miniTab": ["plugs/lay-module/layuimini/miniTab"],

public/static/plugs/layui-v2.7.6/css/modules/code.css

@@ -1 +0,0 @@
-html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-view{display:block;position:relative;margin:10px 0;padding:0;border:1px solid #eee;border-left-width:6px;background-color:#fafafa;color:#333;font-family:Courier New;font-size:13px}.layui-code-title{position:relative;padding:0 10px;height:40px;line-height:40px;border-bottom:1px solid #eee;font-size:12px}.layui-code-title>.layui-code-about{position:absolute;right:10px;top:0;color:#b7b7b7}.layui-code-about>a{padding-left:10px}.layui-code-view>.layui-code-ol,.layui-code-view>.layui-code-ul{position:relative;overflow:auto}.layui-code-view>.layui-code-ol>li{position:relative;margin-left:45px;line-height:20px;padding:0 10px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view>.layui-code-ol>li:first-child,.layui-code-view>.layui-code-ul>li:first-child{padding-top:10px}.layui-code-view>.layui-code-ol>li:last-child,.layui-code-view>.layui-code-ul>li:last-child{padding-bottom:10px}.layui-code-view>.layui-code-ul>li{position:relative;line-height:20px;padding:0 10px;list-style-type:none;*list-style-type:none;background-color:#fff}.layui-code-view pre{margin:0}.layui-code-dark{border:1px solid #0c0c0c;border-left-color:#3f3f3f;background-color:#0c0c0c;color:#c2be9e}.layui-code-dark>.layui-code-title{border-bottom:none}.layui-code-dark>.layui-code-ol>li,.layui-code-dark>.layui-code-ul>li{background-color:#3f3f3f;border-left:none}.layui-code-dark>.layui-code-ul>li{margin-left:6px}.layui-code-demo .layui-code{visibility:visible!important;margin:-15px;border-top:none;border-right:none;border-bottom:none}.layui-code-demo .layui-tab-content{padding:15px;border-top:none}

view/index/welcome.html

@@ -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.7.6/css/layui.css">
+    <link rel="stylesheet" href="/static/plugs/layui-v2.8.0/css/layui.css">
-    <script src="/static/plugs/layui-v2.7.6/layui.js"></script>
+    <script src="/static/plugs/layui-v2.8.0/layui.js"></script>
 
 
 </head>