jqh 4 年之前
父节点
当前提交
9348c04a32
共有 2 个文件被更改,包括 2 次插入3 次删除
  1. 0 1
      src/Grid/Displayers/AbstractDisplayer.php
  2. 2 2
      src/Grid/Filter.php

+ 0 - 1
src/Grid/Displayers/AbstractDisplayer.php

@@ -5,7 +5,6 @@ namespace Dcat\Admin\Grid\Displayers;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid\Column;
 use Dcat\Admin\Grid\Column;
-use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Fluent;
 use Illuminate\Support\Fluent;
 
 
 abstract class AbstractDisplayer
 abstract class AbstractDisplayer

+ 2 - 2
src/Grid/Filter.php

@@ -634,11 +634,11 @@ class Filter implements Renderable
 
 
         $this->grid()->fireOnce(new Fetching());
         $this->grid()->fireOnce(new Fetching());
 
 
-        $data = $this->model->buildData($toArray);
+        $data = $this->model->buildData();
 
 
         $this->grid()->fireOnce(new Fetched([&$data]));
         $this->grid()->fireOnce(new Fetched([&$data]));
 
 
-        return $data;
+        return $toArray ? $data->toArray() : $data;
     }
     }
 
 
     /**
     /**