Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust for merge table cell.

Browse Source
This commit is contained in:
wangyidong
2019-09-09 10:31:16 +08:00
parent 4d0347207b
commit 3eaacbd6e8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/file/view/export2html.html.php
+6 -6
View File
@@ -45,16 +45,16 @@ foreach($rows as $row)
if(isset($endRowspan[$fieldName]) and $i < $endRowspan[$fieldName]) continue;
$fieldValue = isset($row->$fieldName) ? $row->$fieldName : '';
$rowspan = '';
if(isset($rowspans[$i]) and strpos($rowspans[$i]['rows'], $fieldName) !== false)
if(isset($rowspans[$i]) and isset($rowspans[$i]['rows'][$fieldName]))
{
$rowspan = "rowspan='{$rowspans[$i]['num']}'";
$endRowspan[$fieldName] = $i + $rowspans[$i]['num'];
$rowspan = "rowspan='{$rowspans[$i]['rows'][$fieldName]}'";
$endRowspan[$fieldName] = $i + $rowspans[$i]['rows'][$fieldName];
}
$colspan = '';
if(isset($colspans[$i]) and strpos($colspans[$i]['cols'], $fieldName) !== false)
if(isset($colspans[$i]) and isset($colspans[$i]['cols'][$fieldName]))
{
$colspan = "colspan='{$colspans[$i]['num']}'";
$endColspan = $col + $colspans[$i]['num'];
$colspan = "colspan='{$colspans[$i]['cols'][$fieldName]}'";
$endColspan = $col + $colspans[$i]['cols'][$fieldName];
}
echo "<td $rowspan $colspan><nobr>$fieldValue</nobr></td>\n";