修复快捷搜索查询问题，将快捷搜索分组

Author: SmallRuralDog

public/app.js

@@ -1607,6 +1607,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -28365,7 +28373,7 @@ var render = function() {
                 _vm._v(" "),
                 _c(
                   "div",
-                  { staticClass: "search-view" },
+                  { staticClass: "search-view mr-10" },
                   [
                     _vm.attrs.quickSearch
                       ? _c(
@@ -28417,6 +28425,18 @@ var render = function() {
                       : _vm._e()
                   ],
                   1
+                ),
+                _vm._v(" "),
+                _c(
+                  "div",
+                  _vm._l(_vm.attrs.toolbars.left, function(component, index) {
+                    return _c(component.componentName, {
+                      key: component.componentName + index,
+                      tag: "component",
+                      attrs: { attrs: component }
+                    })
+                  }),
+                  1
                 )
               ],
               1

public/mix-manifest.json

@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=7bccd6d48bd0882ab721",
+    "/app.js": "/app.js?id=dec16533ce6d68ab6193",
     "/manifest.js": "/manifest.js?id=d9708e48a6c10ccee4bb",
     "/vendor.js": "/vendor.js?id=f4679ac178c0e413cb28"
 }

resources/js/components/grid/Table.vue

@@ -9,7 +9,7 @@
             :rows="selectionRows"
             v-if="attrs.selection"
           />
-          <div class="search-view">
+          <div class="search-view mr-10">
             <el-input
               v-model="quickSearch"
               :placeholder="attrs.quickSearch.placeholder"
@@ -23,6 +23,14 @@
               >
             </el-input>
           </div>
+          <div>
+            <component
+              v-for="(component, index) in attrs.toolbars.left"
+              :key="component.componentName + index"
+              :is="component.componentName"
+              :attrs="component"
+            />
+          </div>
         </div>
         <div class="grid-top-container-right">
           <component

src/Grid.php

@@ -215,7 +215,7 @@ public function hideActions()
     public function data()
     {
 
-        $collection = $this->applyQuery();
+        $this->applyQuery();
 
         $data = $this->model->buildData();
         return [

src/Grid/Concerns/HasQuickSearch.php

@@ -4,7 +4,6 @@
 namespace SmallRuralDog\Admin\Grid\Concerns;
 
 
-use Illuminate\Support\Collection;
 use SmallRuralDog\Admin\Grid\Column;
 use SmallRuralDog\Admin\Grid\Model;
 use SmallRuralDog\Admin\Grid\Tools\QuickSearch;
@@ -58,6 +57,7 @@ public function quickSearchPlaceholder($placeholder)
      */
     protected function applyQuickSearch()
     {
+
         if (!$this->quickSearch) {
             return;
         }
@@ -75,9 +75,12 @@ protected function applyQuickSearch()
         }
 
         if (is_array($this->quickSearch->search)) {
-            foreach ($this->quickSearch->search as $column) {
-                $this->addWhereLikeBinding($column, true, '%' . $query . '%');
-            }
+            $this->model()->where(function ($queryW) use ($query) {
+                foreach ($this->quickSearch->search as $key => $column) {
+                    $this->addWhereLikeBinding($queryW, $column, false, '%' . $query . '%');
+                }
+            });
+
         } elseif (is_null($this->quickSearch->search)) {
             $this->addWhereBindings($query);
         }
@@ -165,18 +168,19 @@ protected function parseQueryBindings(array $queries)
     /**
      * Add where like binding to model query.
      *
+     * @param  $query
      * @param string $column
      * @param bool $or
      * @param string $pattern
      */
-    protected function addWhereLikeBinding(string $column, bool $or, string $pattern)
+    protected function addWhereLikeBinding($query, string $column, bool $or, string $pattern)
     {
         $connectionType = $this->model()->eloquent()->getConnection()->getDriverName();
         $likeOperator = $connectionType == 'pgsql' ? 'ilike' : 'like';
 
         $method = $or ? 'orWhere' : 'where';
 
-        $this->model()->{$method}($column, $likeOperator, $pattern);
+        $query->{$method}($column, $likeOperator, $pattern);
     }
 
     /**

src/Grid/Model.php

@@ -277,11 +277,11 @@ protected function displayData($data)
 
     public function __call($method, $arguments)
     {
+
         $this->queries->push([
             'method' => $method,
             'arguments' => $arguments,
         ]);
-
         return $this;
     }
 
@@ -310,6 +310,8 @@ public function get()
         $this->setSort();
         $this->setPaginate();
 
+        //dd($this->queries);
+
         $this->queries->unique()->each(function ($query) {
             $this->model = call_user_func_array([$this->model, $query['method']], $query['arguments']);
         });