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

* [bug#50569,done,0.5h] fix columnTotal.

Browse Source
This commit is contained in:
qixinzhi
2024-06-11 08:18:40 +00:00
parent d2da3278c8
commit 877e764694
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/pivot/zen.php
+6 -2
View File
@@ -259,7 +259,9 @@ class pivotZen extends pivot
$index++;
}
$lastRow = count($data->array) - 1;
$lastRow = count($data->array) - 1;
$hasGroup = $data->groups;
$hasColumnTotal = !empty($data->columnTotal) && $data->columnTotal != 'noShow';
foreach($data->array as $rowKey => $rowData)
{
$index = 0;
@@ -292,7 +294,9 @@ class pivotZen extends pivot
$cellSpan[$field]['rowspan'] = $field . '_rowspan';
}
if($i == 0 && !empty($data->groups) && !empty($data->columnTotal) && $rowKey == $lastRow)
$isFirstColumnAndLastRow = $i === 0 && $rowKey === $lastRow;
if($isFirstColumnAndLastRow && $hasGroup && $hasColumnTotal)
{
$rows[$rowKey][$field . '_colspan'] = count($data->groups);
$cellSpan[$field]['colspan'] = $field . '_colspan';