Merge pull request #15 from pxlrbt/fix/fix-tables

Fix export and queued exports for table package
pxlrbt · Jun 20, 2022 · 6192907 · 6192907
2 parents 972d24b + 7d66f8f
commit 6192907
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/src/Exports/Concerns/CanQueue.php b/src/Exports/Concerns/CanQueue.php
@@ -30,6 +30,8 @@ protected function prepareQueuedExport()
 
         $this->filename = $this->getFilename();
         $this->writerType = $this->getWriterType();
+        $this->columnFormats = $this->getColumnFormats();
+        $this->columnWidths = $this->getColumnWidths();
         $this->livewireClass = $this->getLivewireClass();
 
         // Reset

diff --git a/src/Exports/Concerns/WithColumnFormats.php b/src/Exports/Concerns/WithColumnFormats.php
@@ -7,9 +7,16 @@
 
 trait WithColumnFormats
 {
+    protected ?array $columnFormats = null;
+
     public function columnFormats(): array
     {
-        return $this->getMapping($this->getModelInstance())
+        return $this->getColumnFormats();
+    }
+
+    public function getColumnFormats(): array
+    {
+        return $this->columnFormat ??= $this->getMapping($this->getModelInstance())
             ->values()
             ->mapWithKeys(fn (Column $column, $key) => [
                 Coordinate::stringFromColumnIndex($key + 1) => $this->evaluate($column->getFormat()),

diff --git a/src/Exports/Concerns/WithColumns.php b/src/Exports/Concerns/WithColumns.php
@@ -65,7 +65,9 @@ public function fromForm(): static
     public function fromModel(): static
     {
         $this->generatedColumns = function () {
-            $mapping = $this->createFieldMappingFromForm();
+            $mapping = $this->getResourceClass() !== null
+                ? $this->createFieldMappingFromForm()
+                : collect();
 
             return collect($this->getModelClass()::first()->getAttributes())
                 ->map(

diff --git a/src/Exports/Concerns/WithWidths.php b/src/Exports/Concerns/WithWidths.php
@@ -7,7 +7,14 @@
 
 trait WithWidths
 {
+    protected ?array $columnWidths = null;
+
     public function columnWidths(): array
+    {
+        return $this->getColumnWidths();
+    }
+
+    public function getColumnWidths(): array
     {
         return $this->getMapping($this->getModelInstance())
             ->values()

diff --git a/src/Exports/ExcelExport.php b/src/Exports/ExcelExport.php
@@ -165,7 +165,7 @@ public function getModelClass(): ?string
     public function hydrate($livewire = null, $records = null, $formData = null): static
     {
         $this->livewire = $livewire;
-        $this->modelKeyName = $this->getModelInstance()->getQualifiedKeyName();
+        $this->modelKeyName = $this->getModelInstance()->getKeyName();
         $this->recordIds = $records?->pluck($this->modelKeyName)->toArray() ?? [];
 
         $this->formData = $formData;