ソースを参照

修复快捷搜索带翻页参数bug

jqh 6 年 前
コミット
bc611856b1
1 ファイル変更8 行追加3 行削除
  1. 8 3
      src/Grid/Tools/QuickSearch.php

+ 8 - 3
src/Grid/Tools/QuickSearch.php

@@ -37,12 +37,17 @@ class QuickSearch extends AbstractTool
      */
     public function render()
     {
-        $query = request()->query();
+        $request = request();
+        $query = $request->query();
 
-        Arr::forget($query, QuickSearchConcerns::$searchKey);
+        Arr::forget($query, [
+            QuickSearchConcerns::$searchKey,
+            $this->grid->model()->getPageName(),
+            '_pjax',
+        ]);
 
         $vars = [
-            'action' => request()->url() . '?' . http_build_query($query),
+            'action' => $request->url() . '?' . http_build_query($query),
             'key' => QuickSearchConcerns::$searchKey,
             'value' => request(QuickSearchConcerns::$searchKey),
             'placeholder' => $this->placeholder ?: trans('admin.search'),