修复 当Grid无数据时使用了hidePage()页面报错 #53

Author: yidalh

src/Grid/Model.php

@@ -177,7 +177,7 @@ protected function setPaginate()
             return $query['method'] == 'paginate';
         });
 
-        if (!$this->usePaginate) {
+        if ($this->grid->isHidePage()) {
             $query = [
                 'method' => 'get',
                 'arguments' => [],
@@ -400,10 +400,8 @@ public function displayData($data)
         $columns = $this->grid->getColumns();
         $items = collect();
 
-
         foreach ($data as $key => $row) {
             $item = [];
-
             foreach ($this->grid->getAppendFields() as $field) {
                 data_set($item, $field, data_get($row, $field));
             }
@@ -476,19 +474,25 @@ public function get()
             $this->model = $this->relation->getQuery();
         }
 
+
         $this->setSort();
+
+
         $this->setPaginate();
 
 
         $this->queries->unique()->each(function ($query) {
             $this->model = call_user_func_array([$this->model, $query['method']], $query['arguments']);
         });
 
-
         $data = $this->model;
 
         if ($this->model instanceof Collection) {
-            return $this->displayData($data);
+            if ($data->count() > 0) {
+                return $this->displayData($data);
+            } else {
+                return $data;
+            }
         }
 
         if ($this->model instanceof LengthAwarePaginator) {