Skip to content

导出excel的callbackData支持传入序号 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xiaoqingping wants to merge 1 commit into from
Closed

导出excel的callbackData支持传入序号 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Excel/PhpOffice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/Excel/XlsWriter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down