Merge 51434243ac903deff521cc621f354e6d52bbcb4e into 9533accd73edc020072bc7a4f0c0ddb28a5b701f
This commit is contained in:
commit
90ef11ac38
@ -58,4 +58,4 @@ after_script:
|
||||
if [[ "$WITH_COVERAGE" == "true" ]]; then
|
||||
wget https://scrutinizer-ci.com/ocular.phar
|
||||
php ocular.phar code-coverage:upload --format=php-clover build/logs/coverage.clover
|
||||
fi
|
||||
fi
|
||||
|
@ -27,6 +27,9 @@ class Sheet
|
||||
/** @var SheetManager Sheet manager */
|
||||
private $sheetManager;
|
||||
|
||||
/** @var merge cell */
|
||||
private $mergeRanges;
|
||||
|
||||
/**
|
||||
* @param int $sheetIndex Index of the sheet, based on order in the workbook (zero-based)
|
||||
* @param string $associatedWorkbookId ID of the sheet's associated workbook
|
||||
@ -108,4 +111,21 @@ class Sheet
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return merge
|
||||
*/
|
||||
public function getMergeRanges()
|
||||
{
|
||||
return $this->mergeRanges;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $mergeRanges
|
||||
* @return mixed
|
||||
*/
|
||||
public function setMergeRanges($mergeRanges)
|
||||
{
|
||||
return $this->mergeRanges = $mergeRanges;
|
||||
}
|
||||
}
|
||||
|
@ -294,6 +294,17 @@ EOD;
|
||||
}
|
||||
|
||||
\fwrite($worksheetFilePointer, '</sheetData>');
|
||||
// do something to merging cells
|
||||
$mergeRanges = $worksheet->getExternalSheet()->getMergeRanges();
|
||||
if (!empty($mergeRanges)) {
|
||||
$startLine = '<mergeCells count="1">';
|
||||
$rangeLine = '';
|
||||
foreach ($mergeRanges as $key => $range) {
|
||||
$rangeLine .= '<mergeCell ref="' . $range . '"/>';
|
||||
}
|
||||
$endLine = '</mergeCells>';
|
||||
\fwrite($worksheetFilePointer, $startLine . $rangeLine . $endLine);
|
||||
}
|
||||
\fwrite($worksheetFilePointer, '</worksheet>');
|
||||
\fclose($worksheetFilePointer);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user