Creative-Solutions-Office
/
Excel2Html
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

support null columns parameter

This commit is contained in:
Buddhism8003 2024-10-18 15:46:12 +02:00
parent 1be11f6567
commit 777ed5c746
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/HtmlConverter.php
View File

@ -38,6 +38,9 @@ class HtmlConverter {
} }
$this->columns = $tmpColumns; $this->columns = $tmpColumns;
} }
else{
$this->columns = ConverterHelpers::RangeToColumnArray('A-'.$worksheet->getHighestDataColumn());
}
$this->scale = $scale; $this->scale = $scale;
$this->worksheet = $worksheet; $this->worksheet = $worksheet;
$this->html = ''; $this->html = '';

13
tests/HtmlConverterTest.php
View File

@ -1,5 +1,4 @@
<?php <?php
use CSO\Excel2Html\ConverterHelpers;
use CSO\Excel2Html\Exceptions\SheetNotFoudException; use CSO\Excel2Html\Exceptions\SheetNotFoudException;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use CSO\Excel2Html\HtmlConverter; use CSO\Excel2Html\HtmlConverter;
@ -67,7 +66,17 @@ final class HtmlConverterTest extends TestCase{
'tests/assets/test.xlsx', 'tests/assets/test.xlsx',
styleOption: StyleOptions::WITH_COLUMN_WIDTH | StyleOptions::COLUMN_WIDTH_PROPORTIONAL, styleOption: StyleOptions::WITH_COLUMN_WIDTH | StyleOptions::COLUMN_WIDTH_PROPORTIONAL,
worksheetName:'TestTable', worksheetName:'TestTable',
columns:['A', 'B-F'], columns:['A', 'B-E', 'F'],
scale: 1.1);
$res = $conv->getHtml();
$expected = file_get_contents('tests/assets/results/testProp.html');
$this->assertSame($expected, $res);
}
public function testHtmlPropIsSameWithoutColumns(): void{
$conv = HtmlConverter::fromFilepath(
'tests/assets/test.xlsx',
styleOption: StyleOptions::WITH_COLUMN_WIDTH | StyleOptions::COLUMN_WIDTH_PROPORTIONAL,
worksheetName:'TestTable',
scale: 1.1); scale: 1.1);
$res = $conv->getHtml(); $res = $conv->getHtml();
$expected = file_get_contents('tests/assets/results/testProp.html'); $expected = file_get_contents('tests/assets/results/testProp.html');