diff --git a/src/Excel/PhpOffice.php b/src/Excel/PhpOffice.php index 951e353..c371a49 100644 --- a/src/Excel/PhpOffice.php +++ b/src/Excel/PhpOffice.php @@ -117,7 +117,7 @@ public function export(string $filename, array|\Closure $closure, ?\Closure $cal $column = 0; $items = $generate->current(); if ($callbackData instanceof \Closure) { - $items = $callbackData($items); + $items = $callbackData($items, $row - 2); } foreach ($items as $name => $value) { $columnRow = $this->getColumnIndex($column) . $row; diff --git a/src/Excel/XlsWriter.php b/src/Excel/XlsWriter.php index 0e43734..3609254 100644 --- a/src/Excel/XlsWriter.php +++ b/src/Excel/XlsWriter.php @@ -132,10 +132,10 @@ public function export(string $filename, array|\Closure $closure, ?\Closure $cal ->toResource() ); $exportData = []; - foreach ($data as $item) { + foreach ($data as $idx => $item) { $yield = []; if ($callbackData) { - $item = $callbackData($item); + $item = $callbackData($item, $idx); } foreach ($this->property as $property) { foreach ($item as $name => $value) {