master
cody 5 days ago
parent 34c2b33306
commit b6fe64e629

@ -396,10 +396,19 @@ class CommonExport implements FromCollection, WithStyles, WithColumnWidths, With
$header = array_values($this->fields);
$moreFileds = [];
if (empty($clear)) {
if (isset($this->data[0]['data']) && is_array($this->data[0]['data'])) {
$moreHeader = array_column($this->data[0]['data'], 'name');
// 容错,取前三个数据
$otherData = ($this->data[0]['data'] ?? null);
if (empty($otherData)) {
$otherData = ($this->data[1]['data'] ?? null);
if (empty($otherData)) {
$otherData = ($this->data[2]['data'] ?? null);
}
}
if (isset($otherData) && is_array($otherData)) {
$moreHeader = array_column($otherData, 'name');
$header = array_merge($header, $moreHeader);
$moreFileds = array_column($this->data[0]['data'], 'field');
$moreFileds = array_column($otherData, 'field');
}
}
$newList[] = $header;

Loading…
Cancel
Save