优化Layer弹窗

优化表格Loading
优化个人日志搜索
优化附件列表

application/admin/controller/general/Profile.php

@@ -16,6 +16,8 @@ use think\Validate;
 class Profile extends Backend
 {
 
+    protected $searchFields = 'id,title';
+
     /**
      * 查看
      */

bower.json

@@ -28,7 +28,7 @@
     "fastadmin-dragsort": "~1.0.0",
     "fastadmin-addtabs": "~1.0.5",
     "fastadmin-selectpage": "~1.0.6",
-    "fastadmin-layer": "~3.1.2",
+    "fastadmin-layer": "~3.5.1",
     "bootstrap-slider": "*"
   }
 }

public/assets/css/backend.css

@@ -755,6 +755,9 @@ form.form-horizontal .control-label {
 .dropdown-menu.text-left li {
   text-align: left !important;
 }
+.bootstrap-table .fixed-table-loading {
+  padding: 10px 0;
+}
 .bootstrap-table .fixed-table-toolbar .dropdown-menu {
   overflow: auto;
 }
@@ -875,14 +878,16 @@ table.table-nowrap thead > tr > th {
   background: #2c3e50 !important;
   color: #fff !important;
   border-bottom: none;
+  height: 45px;
+  line-height: 45px;
 }
 .layui-layer-fast .layui-layer-title ~ .layui-layer-setwin {
   top: 0px;
-  height: 42px;
+  height: 45px;
 }
 .layui-layer-fast .layui-layer-title ~ .layui-layer-setwin > a {
-  height: 42px;
+  height: 45px;
-  line-height: 42px;
+  line-height: 45px;
   display: inline-block;
 }
 .layui-layer-fast.layui-layer-border {
@@ -921,6 +926,18 @@ table.table-nowrap thead > tr > th {
   height: auto;
   text-align: inherit !important;
 }
+.layui-layer-fast .layui-layer-confirm {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  left: 0;
+  bottom: 0;
+  border: none;
+  background: transparent;
+}
+.layui-layer-fast .layui-layer-tab .layui-layer-title span.layui-this {
+  height: 46px;
+}
 .layui-layer-fast .layui-layer-setwin > a {
   background: none !important;
 }

public/assets/js/backend/auth/rule.js

@@ -39,7 +39,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
                         },
                         {
                             field: 'id',
-                            title: '<a href="javascript:;" class="btn btn-success btn-xs btn-toggle"><i class="fa fa-chevron-up"></i></a>',
+                            title: '<a href="javascript:;" class="btn btn-success btn-xs btn-toggle" style="border-top:none;"><i class="fa fa-chevron-up"></i></a>',
                             operate: false,
                             formatter: Controller.api.formatter.subnode
                         },

public/assets/js/backend/general/attachment.js

@@ -41,7 +41,7 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin
                         {field: 'imageheight', title: __('Imageheight'), sortable: true},
                         {field: 'imagetype', title: __('Imagetype'), sortable: true, formatter: Table.api.formatter.search, operate: 'like'},
                         {field: 'storage', title: __('Storage'), formatter: Table.api.formatter.search, operate: 'like'},
-                        {field: 'mimetype', title: __('Mimetype'), formatter: Table.api.formatter.search},
+                        {field: 'mimetype', title: __('Mimetype'), formatter: Controller.api.formatter.mimetype},
                         {
                             field: 'createtime',
                             title: __('Createtime'),
@@ -142,7 +142,8 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin
                             field: 'mimetype', title: __('Mimetype'), sortable: true, operate: 'LIKE %...%',
                             process: function (value, arg) {
                                 return value.replace(/\*/g, '%');
-                            }
+                            },
+                            formatter: Controller.api.formatter.mimetype
                         },
                         {field: 'createtime', title: __('Createtime'), formatter: Table.api.formatter.datetime, datetimeFormat: 'YYYY-MM-DD', operate: 'RANGE', addclass: 'datetimerange', sortable: true},
                         {
@@ -187,17 +188,22 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin
             },
             formatter: {
                 thumb: function (value, row, index) {
+                    var html = '';
                     if (row.mimetype.indexOf("image") > -1) {
-                        return '<a href="' + row.fullurl + '" target="_blank"><img src="' + row.fullurl + row.thumb_style + '" alt="" style="max-height:60px;max-width:120px"></a>';
+                        html = '<a href="' + row.fullurl + '" target="_blank"><img src="' + row.fullurl + row.thumb_style + '" alt="" style="max-height:60px;max-width:120px"></a>';
                     } else {
-                        return '<a href="' + row.fullurl + '" target="_blank"><img src="' + Fast.api.fixurl("ajax/icon") + "?suffix=" + row.imagetype + '" alt="" style="max-height:90px;max-width:120px"></a>';
+                        html = '<a href="' + row.fullurl + '" target="_blank"><img src="' + Fast.api.fixurl("ajax/icon") + "?suffix=" + row.imagetype + '" alt="" style="max-height:90px;max-width:120px"></a>';
                     }
+                    return '<div style="width:120px;margin:0 auto;text-align:center;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;">' + html + '</div>';
                 },
                 url: function (value, row, index) {
                     return '<a href="' + row.fullurl + '" target="_blank" class="label bg-green">' + row.url + '</a>';
                 },
                 filename: function (value, row, index) {
-                    return '<div style="width:180px;margin:0 auto;text-align:center;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;">' + Table.api.formatter.search.call(this, value, row, index) + '</div>';
+                    return '<div style="width:150px;margin:0 auto;text-align:center;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;">' + Table.api.formatter.search.call(this, value, row, index) + '</div>';
+                },
+                mimetype: function (value, row, index) {
+                    return '<div style="width:80px;margin:0 auto;text-align:center;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;">' + Table.api.formatter.search.call(this, value, row, index) + '</div>';
                 },
             }
         }

public/assets/js/backend/general/profile.js

@@ -26,8 +26,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'upload'], function (
                     [
                         {field: 'id', title: 'ID'},
                         {field: 'title', title: __('Title')},
-                        {field: 'url', title: __('Url'), align: 'left', formatter: Table.api.formatter.url},
+                        {field: 'url', title: __('Url'), formatter: Table.api.formatter.url},
-                        {field: 'ip', title: __('ip'), formatter:Table.api.formatter.search},
+                        {field: 'ip', title: __('IP')},
                         {field: 'createtime', title: __('Createtime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
                     ]
                 ],

public/assets/less/backend.less

@@ -933,6 +933,10 @@ form.form-horizontal .control-label {
     }
 }
 
+.bootstrap-table .fixed-table-loading {
+    padding: 10px 0;
+}
+
 .bootstrap-table .fixed-table-toolbar .dropdown-menu {
     overflow: auto;
 }
@@ -1067,14 +1071,16 @@ table.table-nowrap {
         background: #2c3e50 !important;
         color: #fff !important;
         border-bottom: none;
+        height: 45px;
+        line-height: 45px;
         //只有当包含layui-layer-title标题时才显示按钮
         ~ .layui-layer-setwin {
             top: 0px;
-            height: 42px;
+            height: 45px;
 
             > a {
-                height: 42px;
+                height: 45px;
-                line-height: 42px;
+                line-height: 45px;
                 display: inline-block;
             }
         }
@@ -1124,6 +1130,20 @@ table.table-nowrap {
         text-align: inherit !important;
     }
 
+    .layui-layer-confirm {
+        position: absolute;
+        width: 1px;
+        height: 1px;
+        left: 0;
+        bottom: 0;
+        border: none;
+        background: transparent;
+    }
+
+    .layui-layer-tab .layui-layer-title span.layui-this {
+        height:46px;
+    }
+
     .layui-layer-setwin {
         > a {
             background: none !important;