From bac423523d7b72860d251f96799d6854840d2cf9 Mon Sep 17 00:00:00 2001
From: xiaoqingping <xiaoqingping@foxmail.com>
Date: Thu, 27 Feb 2025 17:10:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel=E7=9A=84callbackData?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Excel/PhpOffice.php | 2 +-
 src/Excel/XlsWriter.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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) {