Browse Source

修复启用数据表格异步渲染功能后减少筛选条件无效问题

jqh 4 years ago
parent
commit
f3458b25fb
2 changed files with 7 additions and 2 deletions
  1. 1 1
      src/Grid/Concerns/HasFilter.php
  2. 6 1
      src/Grid/Concerns/HasQuickSearch.php

+ 1 - 1
src/Grid/Concerns/HasFilter.php

@@ -156,7 +156,7 @@ if (count > 0) {
 JS
         );
 
-        $url = Helper::fullUrlWithoutQuery(['_pjax']);
+        $url = Helper::urlWithoutQuery($this->filter()->urlWithoutFilters(), ['_pjax', static::ASYNC_NAME]);
 
         Admin::script("$('.grid-filter-form').attr('action', '{$url}');", true);
     }

+ 6 - 1
src/Grid/Concerns/HasQuickSearch.php

@@ -331,7 +331,12 @@ trait HasQuickSearch
     protected function addQuickSearchScript()
     {
         if ($this->isAsyncRequest()) {
-            $url = Helper::fullUrlWithoutQuery(['_pjax']);
+            $url = Helper::fullUrlWithoutQuery([
+                '_pjax',
+                $this->quickSearch->getQueryName(),
+                static::ASYNC_NAME,
+                $this->model()->getPageName(),
+            ]);
 
             Admin::script("$('.quick-search-form').attr('action', '{$url}');", true);
         }