Merge branch '2.0' into gitee2

resources/assets/adminlte/scss/_sidebar-mini.scss

@@ -64,9 +64,9 @@
       display: inline-block;
     }
 
-    .nav .menu-open .nav-treeview {
-      display: block!important;
-    }
+    //.nav .menu-open .nav-treeview {
+    //  display: block!important;
+    //}
 
     .nav-sidebar > .nav-item > .nav-link i {
       font-size: 1.2rem;
@@ -78,9 +78,9 @@
       padding: 10px 21px !important;
     }
 
-    .nav .menu-open .nav-treeview {
-      display: none!important;
-    }
+    //.nav .menu-open .nav-treeview {
+    //  display: none!important;
+    //}
   }
 
   // 导航栏

resources/assets/dcat/js/bootstrappers/Menu.js

@@ -29,6 +29,15 @@ export default class Menu {
 
             $(this).addClass('active')
         });
+
+        // 启用sidebar_collapsed模式后点击菜单自动缩进
+        $('.sidebar-collapse .main-sidebar .nav-item .nav-link[href]').on('click', function () {
+            var href = $(this).attr('href');
+
+            if (href !== '#' && href !== 'javascript:void(0)') {
+                $('.sidebar-collapse .main-sidebar').removeClass('sidebar-focused');
+            }
+        });
     }
 
     initHorizontal() {

resources/assets/dcat/sass/components/_menu.scss

@@ -57,7 +57,7 @@
 }
 
 body.sidebar-collapse {
-  .main-sidebar:not(:hover) {
+  .main-sidebar:not(:hover,.sidebar-focused) {
     .navbar-header {
       //width: 80px;
       padding: 0.35rem 15px;

resources/views/grid/dropdown-actions.blade.php

@@ -1,3 +1,4 @@
+@if (!empty($default) || !empty($custom))
 <div class="grid-dropdown-actions dropdown">
     <a href="#" style="padding:0 10px;" data-toggle="dropdown">
         <i class="feather icon-more-vertical"></i>
@@ -19,4 +20,5 @@
             @endforeach
         @endif
     </ul>
-</div>
+</div>
+@endif

src/Exception/Handler.php

@@ -4,6 +4,7 @@ namespace Dcat\Admin\Exception;
 
 use Dcat\Admin\Contracts\ExceptionHandler;
 use Dcat\Admin\Support\Helper;
+use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Support\MessageBag;
 use Illuminate\Support\ViewErrorBag;
 
@@ -18,6 +19,10 @@ class Handler implements ExceptionHandler
      */
     public function handle(\Throwable $e)
     {
+        if ($e instanceof HttpResponseException) {
+            throw $e;
+        }
+
         $this->report($e);
 
         return $this->render($e);

src/Grid/Tools/BatchActions.php

@@ -47,7 +47,7 @@ class BatchActions extends AbstractTool
      */
     protected function appendDefaultAction()
     {
-        $this->add($this->makeBatchDelete());
+        $this->add($this->makeBatchDelete(), '_delete_');
     }
 
     protected function makeBatchDelete()
@@ -87,14 +87,19 @@ class BatchActions extends AbstractTool
      * Add a batch action.
      *
      * @param BatchAction $action
+     * @param ?string $key
      *
      * @return $this
      */
-    public function add(BatchAction $action)
+    public function add(BatchAction $action, ?string $key = null)
     {
         $action->selectorPrefix = '.grid-batch-action-'.$this->actions->count();
 
-        $this->actions->push($action);
+        if ($key) {
+            $this->actions->push($action);
+        } else {
+            $this->actions->put($key, $action);
+        }
 
         return $this;
     }
@@ -129,7 +134,7 @@ class BatchActions extends AbstractTool
     public function render()
     {
         if (! $this->enableDelete) {
-            $this->actions->shift();
+            $this->actions->forget('_delete_');
         }
 
         if ($this->actions->isEmpty()) {