update exporter

src/Grid/Exporters/AbstractExporter.php

@@ -85,12 +85,16 @@ abstract class AbstractExporter implements ExporterInterface
      */
     public function buildData(?int $page = null, ?int $perPage = null)
     {
+        if (! is_null($this->data)) {
+            return $this->data;
+        }
+
         $model = $this->grid->model();
 
         // current page
         if ($this->scope === Grid\Exporter::SCOPE_CURRENT_PAGE) {
             $page    = $model->getCurrentPage();
-            $perPage = $model->getPageName();
+            $perPage = $model->getPerPage();
         }
 
         $model->reset();
@@ -102,7 +106,7 @@ abstract class AbstractExporter implements ExporterInterface
             $model->forPage($page, $perPage);
         }
 
-        return $this->data ?? $this->grid->getFilter()->execute(true);
+        return $this->grid->getFilter()->execute(true);
     }
 
     /**

src/Grid/Model.php

@@ -453,7 +453,7 @@ class Model
             return null;
         }
 
-        return $this->currentPage ?: ($this->currentPage = \request($this->pageName, 1));
+        return $this->currentPage ?: ($this->currentPage = (request($this->pageName) ?: 1));
     }
 
     /**
@@ -476,7 +476,8 @@ class Model
         if (!$this->usePaginate) {
             return null;
         }
-        return \request($this->perPageName, $this->perPage);
+
+        return request($this->perPageName) ?: $this->perPage;
     }
 
     /**