From 7463a692a0397df4e38f877abb353fdc7545ee22 Mon Sep 17 00:00:00 2001
From: jqh <841324345@qq.com>
Date: Sun, 23 May 2021 10:41:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E6=B8=B2=E6=9F=93=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/filter/container.blade.php           |  2 +-
 .../views/filter/right-side-container.blade.php      |  2 +-
 resources/views/filter/simple-container.blade.php    |  2 +-
 resources/views/grid/quick-search.blade.php          |  2 +-
 src/Grid/Concerns/HasFilter.php                      |  5 +++++
 src/Grid/Concerns/HasQuickSearch.php                 | 12 ++++++++++++
 6 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/resources/views/filter/container.blade.php b/resources/views/filter/container.blade.php
index cb83d74bd..1a35083aa 100755
--- a/resources/views/filter/container.blade.php
+++ b/resources/views/filter/container.blade.php
@@ -9,7 +9,7 @@
 
 <div class="filter-box shadow-0 card mb-0 {{ $expand ? '' : 'd-none' }} {{$containerClass}}">
     <div class="card-body" style="{!! $style !!}"  id="{{ $filterID }}">
-        <form action="{!! $action !!}" class="form-horizontal" pjax-container method="get">
+        <form action="{!! $action !!}" class="form-horizontal grid-filter-form" pjax-container method="get">
             <div class="row mb-0">
                 @foreach($layout->columns() as $column)
                     @foreach($column->filters() as $filter)
diff --git a/resources/views/filter/right-side-container.blade.php b/resources/views/filter/right-side-container.blade.php
index 2063c3d97..04152ab3b 100644
--- a/resources/views/filter/right-side-container.blade.php
+++ b/resources/views/filter/right-side-container.blade.php
@@ -1,6 +1,6 @@
 <div class="hidden">
     <div class="filter-box right-side-filter-container" style="{!! $style !!}"  id="{{ $filterID }}">
-        <form action="{!! $action !!}" class="form-horizontal" pjax-container method="get">
+        <form action="{!! $action !!}" class="form-horizontal grid-filter-form" pjax-container method="get">
             <div class="mb-1" style="height: 55px">
                 <div class="p-1 position-fixed d-flex justify-content-between header">
                     <div>
diff --git a/resources/views/filter/simple-container.blade.php b/resources/views/filter/simple-container.blade.php
index a2d23e4f3..b78be92d5 100644
--- a/resources/views/filter/simple-container.blade.php
+++ b/resources/views/filter/simple-container.blade.php
@@ -1,6 +1,6 @@
 <div class="filter-box card p-2 {{ $expand ? '' : 'd-none' }} {{$containerClass}}" style="padding-bottom: .5rem!important;margin-top: 10px;margin-bottom: 8px;box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.04);">
     <div class="card-body" style="{!! $style !!}"  id="{{ $filterID }}">
-        <form action="{!! $action !!}" class="form-horizontal" pjax-container method="get">
+        <form action="{!! $action !!}" class="form-horizontal grid-filter-form" pjax-container method="get">
             <div class="row mt-1 mb-0">
                 @foreach($layout->columns() as $column)
                     @foreach($column->filters() as $filter)
diff --git a/resources/views/grid/quick-search.blade.php b/resources/views/grid/quick-search.blade.php
index 8eafd2330..a6e1e2d41 100755
--- a/resources/views/grid/quick-search.blade.php
+++ b/resources/views/grid/quick-search.blade.php
@@ -1,6 +1,6 @@
 <style>::-ms-clear,::-ms-reveal{display: none;}</style>
 
-<form action="{!! $action !!}" class="input-no-border d-md-inline-block" pjax-container style="display:none;margin-right: 16px">
+<form action="{!! $action !!}" class="input-no-border quick-search-form d-md-inline-block" style="display:none;margin-right: 16px">
     <div class="table-filter">
         <label style="width: {{ $width }}rem">
             <input
diff --git a/src/Grid/Concerns/HasFilter.php b/src/Grid/Concerns/HasFilter.php
index e692d8281..94ccc0fec 100644
--- a/src/Grid/Concerns/HasFilter.php
+++ b/src/Grid/Concerns/HasFilter.php
@@ -5,6 +5,7 @@
 use Closure;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Grid;
+use Dcat\Admin\Support\Helper;
 use Illuminate\Support\Collection;
 
 trait HasFilter
@@ -154,5 +155,9 @@ protected function addFilterScript()
 }
 JS
         );
+
+        $url = Helper::fullUrlWithoutQuery(['_pjax']);
+
+        Admin::script("$('.grid-filter-form').attr('action', '{$url}');", true);
     }
 }
diff --git a/src/Grid/Concerns/HasQuickSearch.php b/src/Grid/Concerns/HasQuickSearch.php
index 8373b99ff..36adc3233 100644
--- a/src/Grid/Concerns/HasQuickSearch.php
+++ b/src/Grid/Concerns/HasQuickSearch.php
@@ -2,6 +2,7 @@
 
 namespace Dcat\Admin\Grid\Concerns;
 
+use Dcat\Admin\Admin;
 use Dcat\Admin\Grid\Column;
 use Dcat\Admin\Grid\Events\ApplyQuickSearch;
 use Dcat\Admin\Grid\Model;
@@ -49,6 +50,8 @@ public function quickSearch($search = null)
             $this->quickSearch = $search;
 
             $search->setGrid($this);
+
+            $this->addQuickSearchScript();
         });
     }
 
@@ -324,4 +327,13 @@ protected function addWhereBasicBinding($query, ?string $column, ?bool $or, ?str
 
         Helper::withQueryCondition($query, $column, $method, [$operator, $value]);
     }
+
+    protected function addQuickSearchScript()
+    {
+        if ($this->isAsyncRequest()) {
+            $url = Helper::fullUrlWithoutQuery(['_pjax']);
+
+            Admin::script("$('.quick-search-form').attr('action', '{$url}');", true);
+        }
+    }
 }