浏览代码

修复Model::setData不支持分页器bug

jqh 5 年之前
父节点
当前提交
ce341e0b38
共有 2 个文件被更改,包括 7 次插入2 次删除
  1. 1 1
      src/Grid/Concerns/Options.php
  2. 6 1
      src/Grid/Model.php

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

@@ -33,7 +33,7 @@ trait Options
 
         'export_limit'       => 50000,
         'dialog_form_area'   => ['700px', '670px'],
-        'table_header_style' => 'table-header-gray',
+        'table_header_style' => 'table-header-default',
 
     ];
 

+ 6 - 1
src/Grid/Model.php

@@ -346,11 +346,16 @@ class Model
             ($isA = is_array($data))
             || $data instanceof Collection
             || $data instanceof \Closure
-            || $data instanceof AbstractPaginator
+            || ($isP = $data instanceof AbstractPaginator)
         ) {
             if ($isA) {
                 $data = collect($data);
+            } elseif (! empty($isP)) {
+                $this->model = $data;
+                $this->data = $data->getCollection();
+                return;
             }
+
             $this->data = $data;
         }
     }