From e1556f02f41f519d4736feb2128b2d465f13cef0 Mon Sep 17 00:00:00 2001 From: Connor Howell Date: Fri, 1 Sep 2023 09:50:53 +0100 Subject: [PATCH] Fix for using ->fromTable() & ->withColumns() --- src/Exports/Concerns/WithColumns.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Exports/Concerns/WithColumns.php b/src/Exports/Concerns/WithColumns.php index ccab81d..e6383ad 100644 --- a/src/Exports/Concerns/WithColumns.php +++ b/src/Exports/Concerns/WithColumns.php @@ -45,6 +45,10 @@ public function getColumns(): array $columns = $this->evaluate($this->generatedColumns); foreach ($this->evaluate($this->columns) as $column) { + if($this->columnsSource === 'table') { + $column->tableColumn = $columns[$column->getName()]->tableColumn; + } + $columns[$column->getName()] = $column; }