Merge pull request #122 from yajra/better-export

[4.x] Improve support for custom laravel-excel export class using collection.

Author: yajra

src/Exports/DataTablesCollectionExport

@@ -0,0 +1,47 @@
+<?php
+
+namespace Yajra\DataTables\Exports;
+
+use Illuminate\Support\Collection;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+
+abstract class DataTablesCollectionExport implements  FromCollection, WithHeadings
+{
+    use Exportable;
+
+    /**
+     * @var Collection
+     */
+    protected $collection;
+
+    /**
+     * @param Collection $collection
+     */
+    public function __construct(Collection $collection)
+    {
+        $this->collection = $collection;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function collection()
+    {
+        return $this->collection;
+    }
+
+    /**
+     * @return array
+     */
+    public function headings(): array
+    {
+        $first = $this->collection->first();
+        if ($first) {
+            return array_keys($first);
+        }
+
+        return [];
+    }
+}

src/Services/DataTable.php

@@ -405,9 +405,17 @@ public function excel()
      */
     protected function buildExcelFile()
     {
-        $dataForExport = collect($this->getDataForExport());
+        if ($this->exportClass != DataTablesExportHandler::class) {
+            $collection = collect($this->getAjaxResponseData());
+        } else {
+            $collection = collect($this->getDataForExport());
+        }
+
+        if (method_exists($collection, 'lazy')) {
+            $collection->lazy();
+        }
 
-        return new $this->exportClass($dataForExport);
+        return new $this->exportClass($collection);
     }
 
     /**

src/Services/DataTablesExportHandler.php

@@ -2,48 +2,8 @@
 
 namespace Yajra\DataTables\Services;
 
-use Illuminate\Support\Collection;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromCollection;
-use Maatwebsite\Excel\Concerns\WithHeadings;
+use Yajra\DataTables\Exports\DataTablesCollectionExport;
 
-class DataTablesExportHandler implements FromCollection, WithHeadings
+class DataTablesExportHandler extends DataTablesCollectionExport
 {
-    use Exportable;
-
-    /**
-     * @var Collection
-     */
-    protected $collection;
-
-    /**
-     * DataTablesExportHandler constructor.
-     *
-     * @param Collection $collection
-     */
-    public function __construct(Collection $collection)
-    {
-        $this->collection = $collection;
-    }
-
-    /**
-     * @return Collection
-     */
-    public function collection()
-    {
-        return $this->collection;
-    }
-
-    /**
-     * @return array
-     */
-    public function headings(): array
-    {
-        $first = $this->collection->first();
-        if ($first) {
-            return array_keys($first);
-        }
-
-        return [];
-    }
 }