去掉列表输出tojson方法

加入json中文不转换中间件修改菜单关闭按钮样式
2021-03-09 06:28:33 +08:00
parent 89bab045dd
commit b3ee45674f
62 changed files with 107 additions and 151 deletions
@@ -105,13 +105,14 @@ class Grid
            $rows[] = static::dataFilter($item, $header, $callback);
        }

-        $rows = collect($rows);
+        $ret = [];
        if ($items instanceof AbstractPaginator) {
-            $items->setCollection($rows);
+            $ret = $items->setCollection(collect($rows))->toArray();
        } else {
-            $items = $rows;
+            $ret = collect(['data' => $rows]);
        }
-        return $items;
+        $ret['header'] = $header;
+        return $ret;
    }

    public static function dataFilter($item, $header, $callback = null)