1. adding 30 default filter

2. adding full collection export excel

resources/views/bootstrap/main.blade.php

@@ -10,6 +10,8 @@
                         10
                     @elseif($perPage == '20')
                         20
+                    @elseif($perPage == '30')
+                        30
                     @elseif($perPage == '100')
                         100
                     @endif

src/Classes/ExportExcelClass.php

@@ -10,52 +10,66 @@
 
 class ExportExcelClass implements FromCollection, WithHeadings
 {
+    private $type;
     private $collection;
     private $headings;
 
-    public function __construct($collection_to_export, $collection_headings) {
+    public function __construct($type, $collection_to_export, $collection_headings = null) {
+
+        $this->type = $type;
         $this->collection = $collection_to_export;
         $this->headings = $collection_headings;
     }
 
     public function collection()
     {
-        $subCollection = $this->collection->map(function ($user) {
-            $result = [];
+        if($this->type == 'full_collection') {
+            return $this->collection;
 
-            foreach ($this->headings as $itemKey => $itemValue)
-            {
-                $collection = Str::of($itemKey)->explode('.');
-                $val = $user;
+        }elseif($this->type == 'merged_collection')
+        {
+            $subCollection = $this->collection->map(function ($user) {
+                $result = [];
+
+                foreach ($this->headings as $itemKey => $itemValue) {
+                    $collection = Str::of($itemKey)->explode('.');
+                    $val = $user;
 
-                foreach ($collection as $rel) {
-                    if ($val === null) {
-                        break;
+                    foreach ($collection as $rel) {
+                        if ($val === null) {
+                            break;
+                        }
+                        $val = optional($val)->$rel;
+                        $result[$itemKey] = $val;
                     }
-                    $val = optional($val)->$rel;
-                    $result[$itemKey] = $val;
-                }
 
-            }
-            return collect($result)
-                ->all();
-        });
+                }
+                return collect($result)
+                    ->all();
+            });
 
-        return $subCollection;
+            return $subCollection;
+        }
 
     }
 
     public function headings(): array
     {
-        $headingsResult = [];
-        foreach ($this->headings as $items)
+        if($this->type == 'full_collection')
         {
-            if($items['columnName'] !== null)
-            {
-                $headingsResult[] = $items['columnName'];
+            return array_keys($this->collection->first()->toArray());
+
+        }elseif ($this->type == 'merged_collection') {
+
+
+            $headingsResult = [];
+            foreach ($this->headings as $items) {
+                if ($items['columnName'] !== null) {
+                    $headingsResult[] = $items['columnName'];
+                }
             }
-        }
 
-        return $headingsResult;
+            return $headingsResult;
+        }
     }
 }

src/Http/Livewire/Main.php

@@ -39,7 +39,7 @@ class Main extends Component
 
     public function mount($tableArr = null, $query = null)
     {
-        $this->perPage = 10;
+        $this->perPage = 30;
         $this->tableStruct();
         $this->getFilterFromSession();
     }
@@ -243,7 +243,9 @@ public function downloadExcel()
     {
         $query = $this->queryStruct();
 
-        return Excel::download(new ExportExcelClass($query, $this->Data),now()->toDateString() . ' excel.xlsx');
+        //Full Collection
+
+        return Excel::download(new ExportExcelClass('full_collection', $query),now()->toDateString() . ' excel.xlsx');
     }
 
     public function saveFilterToSession()