application/common/controller/Backend.php

@@ -561,7 +561,7 @@ class Backend extends Controller
                 $primaryvalue = array_unique(is_array($primaryvalue) ? $primaryvalue : explode(',', $primaryvalue));
                 //修复自定义data-primary-key为字符串内容时，给排序字段添加上引号
                 $primaryvalue = array_map(function ($value) {
-                    return \think\Db::quote($value);
+                    return '\'' . $value . '\'';
                 }, $primaryvalue);
 
                 $primaryvalue = implode(',', $primaryvalue);

public/assets/css/backend.css

@@ -1347,26 +1347,26 @@ table.table-nowrap thead > tr > th {
   .fixed-table-toolbar .toolbar .btn {
     min-height: 33px;
   }
-  .fixed-table-toolbar .toolbar > a.btn-refresh,
-  .fixed-table-toolbar .toolbar > a.btn-del,
-  .fixed-table-toolbar .toolbar > a.btn-add,
-  .fixed-table-toolbar .toolbar > a.btn-edit,
-  .fixed-table-toolbar .toolbar > a.btn-import,
+  .fixed-table-toolbar .toolbar a.btn-refresh,
+  .fixed-table-toolbar .toolbar a.btn-del,
+  .fixed-table-toolbar .toolbar a.btn-add,
+  .fixed-table-toolbar .toolbar a.btn-edit,
+  .fixed-table-toolbar .toolbar a.btn-import,
   .fixed-table-toolbar .toolbar a.btn-more,
-  .fixed-table-toolbar .toolbar > a.btn-recyclebin,
-  .fixed-table-toolbar .toolbar > .btn-mini-xs,
-  .fixed-table-toolbar .toolbar > .btn-multi:not([data-action=destroy]) {
+  .fixed-table-toolbar .toolbar a.btn-recyclebin,
+  .fixed-table-toolbar .toolbar .btn-mini-xs,
+  .fixed-table-toolbar .toolbar .btn-multi {
     font-size: 0;
   }
-  .fixed-table-toolbar .toolbar > a.btn-refresh > .fa,
-  .fixed-table-toolbar .toolbar > a.btn-del > .fa,
-  .fixed-table-toolbar .toolbar > a.btn-add > .fa,
-  .fixed-table-toolbar .toolbar > a.btn-edit > .fa,
-  .fixed-table-toolbar .toolbar > a.btn-import > .fa,
-  .fixed-table-toolbar .toolbar a.btn-more > .fa,
-  .fixed-table-toolbar .toolbar > a.btn-recyclebin > .fa,
-  .fixed-table-toolbar .toolbar > .btn-mini-xs > .fa,
-  .fixed-table-toolbar .toolbar > .btn-multi:not([data-action=destroy]) > .fa {
+  .fixed-table-toolbar .toolbar a.btn-refresh .fa,
+  .fixed-table-toolbar .toolbar a.btn-del .fa,
+  .fixed-table-toolbar .toolbar a.btn-add .fa,
+  .fixed-table-toolbar .toolbar a.btn-edit .fa,
+  .fixed-table-toolbar .toolbar a.btn-import .fa,
+  .fixed-table-toolbar .toolbar a.btn-more .fa,
+  .fixed-table-toolbar .toolbar a.btn-recyclebin .fa,
+  .fixed-table-toolbar .toolbar .btn-mini-xs .fa,
+  .fixed-table-toolbar .toolbar .btn-multi .fa {
     font-size: initial;
   }
   .fixed-table-toolbar .search {
@@ -1644,7 +1644,9 @@ table.table-nowrap thead > tr > th {
 }
 .btn-commonsearch.searching,
 .btn-commonsearch.searching:focus {
-  color: #4e73df;
+  background: #444c69;
+  color: #fff;
+  border-color: #444c69;
 }
 .btn-commonsearch.searching:hover,
 .btn-commonsearch.searching:active,
@@ -1653,16 +1655,6 @@ table.table-nowrap thead > tr > th {
   color: #fff;
   outline: none;
 }
-.btn-commonsearch.searching:after {
-  content: " ";
-  position: absolute;
-  right: 4px;
-  bottom: 8px;
-  background: #4e73df;
-  border-radius: 50%;
-  height: 4px;
-  width: 4px;
-}
 .btn-switcher {
   margin-top: 5px;
   display: inline-block;

public/assets/less/backend.less

@@ -844,31 +844,31 @@ form.form-horizontal .control-label {
 
     [data-vertical="true"] {
 
-        .jstree-leaf:not(:first-child) {
-            float: left;
-            background: none;
-            margin-left: 0;
-            min-width: 80px;
-            clear: none;
-        }
+            .jstree-leaf:not(:first-child) {
+                float: left;
+                background: none;
+                margin-left: 0;
+                min-width: 80px;
+                clear: none;
+            }
 
-        .jstree-leaf {
-            float: left;
-            background: none;
-            margin-left: 0;
-            padding-left: 24px;
-            min-width: 80px;
-            clear: none;
-            color: #999;
-        }
+            .jstree-leaf {
+                float: left;
+                background: none;
+                margin-left: 0;
+                padding-left: 24px;
+                min-width: 80px;
+                clear: none;
+                color: #999;
+            }
 
-        .jstree-leaf > .jstree-icon, .jstree-leaf .jstree-themeicon {
-            display: none;
-        }
+            .jstree-leaf > .jstree-icon, .jstree-leaf .jstree-themeicon {
+                display: none;
+            }
 
-        .jstree-last {
+            .jstree-last {
 
-        }
+            }
 
     }
 
@@ -1359,14 +1359,13 @@ table.table-nowrap {
                 min-height: @input-min-height;
             }
 
-            > a.btn-refresh, > a.btn-del, > a.btn-add, > a.btn-edit, > a.btn-import, a.btn-more, > a.btn-recyclebin, > .btn-mini-xs, > .btn-multi:not([data-action=destroy]) {
+            a.btn-refresh, a.btn-del, a.btn-add, a.btn-edit, a.btn-import, a.btn-more, a.btn-recyclebin, .btn-mini-xs, .btn-multi {
                 font-size: 0;
 
-                > .fa {
+                .fa {
                     font-size: initial;
                 }
             }
-
         }
 
         .search {
@@ -1702,10 +1701,9 @@ table.table-nowrap {
 
     &.searching {
         &, &:focus {
-            //background: @component-active-bg;
-            //color: @component-active-color;
-            //border-color: @component-active-bg;
-            color: #4e73df;
+            background: @component-active-bg;
+            color: @component-active-color;
+            border-color: @component-active-bg;
         }
 
         &:hover, &:active, &:active:hover {
@@ -1713,17 +1711,6 @@ table.table-nowrap {
             color: @component-active-color;
             outline: none;
         }
-
-        &:after {
-            content: " ";
-            position: absolute;
-            right: 4px;
-            bottom: 8px;
-            background: #4e73df;
-            border-radius: 50%;
-            height: 4px;
-            width: 4px;
-        }
     }
 }