Update

resources/assets/dcat-admin/main.css

@@ -823,7 +823,7 @@ input.label {
     height:53px;
 }
 .table > thead > tr > th {
-    color: #555;
+    color: var(--80);
 }
 .table-header-default.table>thead>tr>th,.table-header-gray.table>thead>tr>th {
     border-bottom: 1px solid #e3e7eb;
@@ -866,7 +866,7 @@ input.label {
     vertical-align: bottom !important;
     /*color:var(--90-half);*/
     /*font-weight:bold;*/
-    color:#555;
+    color:var(--80);
 }
 
 td {

resources/views/grid/quick-search.blade.php

@@ -1,4 +1,4 @@
-<form action="{!! $action !!}" pjax-container style="display: inline-block;">
+<form action="{!! $action !!}" pjax-container style="display: inline-block;margin-right:5px;">
     <div class="input-group input-group-sm quick-search" style="display: inline-block;">
         <input type="text" placeholder="{{ $placeholder }}" name="{{ $key }}" class="form-control " style="width:200px;" value="{{ $value }}">
 

resources/views/widgets/navbar.blade.php

@@ -11,8 +11,9 @@
         </div>
 
         <div class="navbar-collapse collapse" id="{{$id}}">
+            @if($items['left'])
             <ul class="nav navbar-nav">
-                @foreach($items as $k => $item)
+                @foreach($items['left'] as $k => $item)
                     @if($k === '__dropdown__')
                         <li class="dropdown">
                             {!! $item !!}
@@ -22,6 +23,21 @@
                     @endif
                 @endforeach
             </ul>
+            @endif
+
+            @if($items['right'])
+                <ul class="nav navbar-nav navbar-right">
+                    @foreach($items['right'] as $k => $item)
+                        @if($k === '__dropdown__')
+                            <li class="dropdown">
+                                {!! $item !!}
+                            </li>
+                        @else
+                            {!! $item !!}
+                        @endif
+                    @endforeach
+                </ul>
+            @endif
         </div>
     </div>
 </nav>

src/Grid.php

@@ -1164,7 +1164,7 @@ HTML;
         $view = view($this->view, $this->variables());
 
         if (!$wrapper = $this->wrapper) {
-            return "<div class='box'>{$view->render()}</div>";
+            return "<div class='box box-default'>{$view->render()}</div>";
         }
 
         return $wrapper($view);

src/Widgets/Navbar.php

@@ -3,6 +3,7 @@
 namespace Dcat\Admin\Widgets;
 
 use Dcat\Admin\Admin;
+use Dcat\Admin\Support\Helper;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Str;
 
@@ -24,7 +25,10 @@ class Navbar extends Widget
     /**
      * @var array
      */
-    protected $items = [];
+    protected $items = [
+        'right' => [],
+        'left' => [],
+    ];
 
     protected $active;
 
@@ -59,17 +63,27 @@ class Navbar extends Widget
         return $this->style('margin:'.$value);
     }
 
-    public function add($items)
+    public function add($items, bool $right = false)
     {
-        if ($items instanceof Arrayable) {
-            $items = $items->toArray();
+        if ($right) {
+            $this->items['right'] = array_merge($this->items['right'], Helper::array($items));
+        } else {
+            $this->items['left'] = array_merge($this->items['left'], Helper::array($items));
         }
 
-        $this->items = (array)$items;
-
         return $this;
     }
 
+    public function left($items)
+    {
+        return $this->add($items, false);
+    }
+
+    public function right($items)
+    {
+        return $this->add($items, true);
+    }
+
     public function checked($key)
     {
         $this->active = $key;
@@ -94,7 +108,8 @@ class Navbar extends Widget
     public function dropdown(
         ?string $text,
         array $options,
-        \Closure $closure = null
+        \Closure $closure = null,
+        bool $right = false
     )
     {
         $dropdown = Dropdown::make($options)
@@ -106,31 +121,20 @@ class Navbar extends Widget
             $closure($dropdown);
         }
 
-        $this->items[self::DROPDOWN_FLAG_KEY] = $dropdown;
+        $key = $right ? 'right' : 'left';
+
+        $this->items[$key][self::DROPDOWN_FLAG_KEY] = $dropdown;
 
         return $this;
     }
 
     public function variables()
     {
-        foreach ($this->items as $k => &$item) {
-            if ($k === self::DROPDOWN_FLAG_KEY) {
-                continue;
-            }
-
-            if ($builder = $this->builder) {
-                $item = $builder($item, $k);
-            }
-
-            if (strpos($item, '</li>')) {
-                continue;
-            }
-
-            $active = $this->active === $k ? 'active' : '';
-
-            $item = strpos($item, '</a>') ? $item : "<a href='javascript:void(0)'>$item</a>";
-
-            $item = "<li class='nav-li $active'>$item</li>";
+        foreach ($this->items['left'] as $k => &$item) {
+            $item = $this->formatItem($k, $item);
+        }
+        foreach ($this->items['right'] as $k => &$item) {
+            $item = $this->formatItem($k, $item);
         }
 
         if ($this->click) {
@@ -153,5 +157,26 @@ JS
         ];
     }
 
+    protected function formatItem($k, $item)
+    {
+        if ($k === self::DROPDOWN_FLAG_KEY) {
+            return $item;
+        }
+
+        if ($builder = $this->builder) {
+            $item = $builder($item, $k);
+        }
+
+        if (strpos($item, '</li>')) {
+            return $item;
+        }
+
+        $active = $this->active === $k ? 'active' : '';
+
+        $item = strpos($item, '</a>') ? $item : "<a href='javascript:void(0)'>$item</a>";
+
+        return "<li class='nav-li $active'>$item</li>";
+    }
+
 }