Skip to content

Commit

Permalink
Merge pull request #112 from ConnorHowell/fix/export-custom-columns
Browse files Browse the repository at this point in the history
Fix for using ->fromTable() & ->withColumns()
  • Loading branch information
pxlrbt authored Sep 1, 2023
2 parents c67266f + e1556f0 commit 654bd28
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/Exports/Concerns/WithColumns.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 654bd28

Please sign in to comment.