Clientbase
/
PhpSpreadsheet
mirror of https://github.com/basemaster/PhpSpreadsheet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweaks to HTML generation, accessing cells directly from the collection

This commit is contained in:
MarkBaker 2022-05-06 12:08:26 +02:00
parent 0dc1e9b07a
commit f9d941a3af
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/PhpSpreadsheet/Writer/Html.php
View File

@ -477,12 +477,8 @@ class Html extends BaseWriter
$column = $minCol; $column = $minCol;
while ($column <= $maxCol) { while ($column <= $maxCol) {
// Cell exists? // Cell exists?
if ($sheet->cellExistsByColumnAndRow($column, $row)) { $cellAddress = Coordinate::stringFromColumnIndex($column) . $row;
$rowData[$column] = Coordinate::stringFromColumnIndex($column) . $row; $rowData[$column++] = ($sheet->getCellCollection()->has($cellAddress)) ? $cellAddress : '';
} else {
$rowData[$column] = '';
}
++$column;
} }
$html .= $this->generateRow($sheet, $rowData, $row - 1, $cellType); $html .= $this->generateRow($sheet, $rowData, $row - 1, $cellType);
} }
@ -1232,7 +1228,7 @@ class Html extends BaseWriter
private function generateRowCellCss(Worksheet $worksheet, $cellAddress, $row, $columnNumber) private function generateRowCellCss(Worksheet $worksheet, $cellAddress, $row, $columnNumber)
{ {
$cell = ($cellAddress > '') ? $worksheet->getCell($cellAddress) : ''; $cell = ($cellAddress > '') ? $worksheet->getCellCollection()->get($cellAddress) : '';
$coordinate = Coordinate::stringFromColumnIndex($columnNumber + 1) . ($row + 1); $coordinate = Coordinate::stringFromColumnIndex($columnNumber + 1) . ($row + 1);
if (!$this->useInlineCss) { if (!$this->useInlineCss) {
$cssClass = 'column' . $columnNumber; $cssClass = 'column' . $columnNumber;