Merge pull request kartik-v#309 from onmotion/fixBatchSize

fix the loss of the first page if batchSize
japel · Oct 8, 2019 · 7dc1cf1 · 7dc1cf1
2 parents fb3e25f + 4637261
commit 7dc1cf1
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/ExportMenu.php b/src/ExportMenu.php
@@ -941,6 +941,11 @@ public function initExport()
             /** @noinspection PhpUndefinedFieldInspection */
             $this->_provider->pagination = clone($this->dataProvider->pagination);
             $this->_provider->pagination->pageSize = $this->batchSize;
+            $this->_provider->refresh();
+            if (\Yii::$app->request->getBodyParam('exportFull_export')) {
+                $this->_provider->pagination->page = null;
+                \Yii::$app->request->setQueryParams([$this->_provider->pagination->pageParam => 1]);
+            } 
         } else {
             $this->_provider->pagination = false;
         }
@@ -1302,6 +1307,9 @@ public function generateBody()
         $this->findGroupedColumn();
         while (count($models) > 0) {
             $keys = $this->_provider->getKeys();
+            if ($this->_provider instanceof ArrayDataProvider) {
+                $models = array_values($models);                
+            }                                                   
             foreach ($models as $index => $model) {
                 $key = $keys[$index];
                 $this->generateRow($model, $key, $this->_endRow);