@@ -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',
];
@@ -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;