From fcb2ef903e7058951540522f4c6c252b3e2c02f9 Mon Sep 17 00:00:00 2001 From: qixinzhi Date: Wed, 16 Oct 2024 06:47:24 +0000 Subject: [PATCH] [bug] fix group total. --- module/bi/model.php | 16 +++++++++------- module/pivot/model.php | 43 ++++++++++++++++++++++++++++++------------ 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/module/bi/model.php b/module/bi/model.php index aecd1f366d..7fefb45fd9 100644 --- a/module/bi/model.php +++ b/module/bi/model.php @@ -1981,9 +1981,8 @@ class biModel extends model $index++; } - $lastRow = count($data->array) - 1; - $hasGroup = isset($data->groups); - $showLastRow = isset($data->showLastRow) ? $data->showLastRow : false; + $lastRow = count($data->array) - 1; + $hasGroup = isset($data->groups); $drills = !empty($data->drills) ? array_values($data->drills) : array(); foreach($data->array as $rowKey => $rowData) @@ -1994,6 +1993,11 @@ class biModel extends model $drillConditions = array(); $isDrill = array(); + $totalLang = $this->lang->pivot->total; + $totalColspan = 0; + + foreach($rowData as $value) if($value == $totalLang) $totalColspan++; + for($i = 0; $i < count($rowData); $i++) { $field = 'field' . $index; @@ -2026,11 +2030,9 @@ class biModel extends model $cellSpan[$field]['rowspan'] = $field . '_rowspan'; } - $isFirstColumnAndLastRow = $i === 0 && $rowKey === $lastRow; - - if($isFirstColumnAndLastRow && $hasGroup && $showLastRow) + if($value == $totalLang) { - $rows[$rowKey][$field . '_colspan'] = count($data->groups); + $rows[$rowKey][$field . '_colspan'] = $totalColspan; $cellSpan[$field]['colspan'] = $field . '_colspan'; } diff --git a/module/pivot/model.php b/module/pivot/model.php index 02fa499f7d..24a9e487fe 100644 --- a/module/pivot/model.php +++ b/module/pivot/model.php @@ -1014,9 +1014,9 @@ class pivotModel extends model * * @param array $data * @access public - * @return array + * @return array|string */ - public function getGroupTreeWithKey(array $data): array + public function getGroupTreeWithKey(array $data): array|string { $first = reset($data); if(!isset($first['groups'])) return $first['groupKey']; @@ -1089,7 +1089,9 @@ class pivotModel extends model } else { - if(is_numeric($colValue['value'])) $summary[$colKey]['value'] += $colValue['value']; + $isGroup = zget($colValue, 'isGroup', 1); + if($isGroup) $summary[$colKey]['value'] = $colValue['value']; + else $summary[$colKey]['value'] += $colValue['value']; } } } @@ -1214,7 +1216,7 @@ class pivotModel extends model $records = array(); foreach($crystalData as $value) { - $groupRecords = $this->flattenCrystalData($value['rows']); + $groupRecords = $this->flattenCrystalData($value['rows'], $withGroupSummary); if($withGroupSummary && isset($value['summary'])) $groupRecords[] = $this->flattenRow($value['summary']); $records = array_merge($records, $groupRecords); } @@ -1236,6 +1238,21 @@ class pivotModel extends model $lastGroupValue = array(); foreach($groups as $group) $lastGroupValue[$group] = ''; + /* 定义内部函数：获取当前行数据的分组值。*/ + /* Define internal function: get current row data's group value. */ + $getGroupValue = function($record, $key, $index) use ($groups) + { + $value = array($record[$key]['value']); + $index -= 1; + while($index >= 0) + { + $value[] = $record[$groups[$index]]['value']; + $index -= 1; + } + + return $value; + }; + $groupsRowSpan = array(); foreach($records as $index => $record) { @@ -1252,10 +1269,12 @@ class pivotModel extends model } $records[$index] = $record; - foreach($groups as $group) + foreach($groups as $groupIndex => $group) { - $groupValue = $record[$group]['value']; - if($groupValue != '$total$' && $groupValue == $lastGroupValue[$group]) + $groupValue = $getGroupValue($record, $group, $groupIndex); + $groupValueStr = implode('_', $groupValue); + + if($groupValue[0] != '$total$' && $groupValueStr == $lastGroupValue[$group]) { $groupRowSpan = array_pop($groupsRowSpan[$group]); $groupRowSpan['index'][] = $index; @@ -1266,7 +1285,7 @@ class pivotModel extends model { $groupsRowSpan[$group][] = array('index' => array($index), 'rowSpan' => $rowSpan); } - $lastGroupValue[$group] = $groupValue; + $lastGroupValue[$group] = $groupValueStr; } } @@ -1463,7 +1482,7 @@ class pivotModel extends model $field = zget($setting, 'field', ''); $showOrigin = zget($setting, 'showOrigin', 0); - if($showOrigin) return array('value' => array_column($records, $field)); + if($showOrigin) return array('value' => array_column($records, $field), 'isGroup' => false); $stat = zget($setting, 'stat', 'count'); $slice = zget($setting, 'slice', 'noSlice'); @@ -1477,7 +1496,7 @@ class pivotModel extends model $value = $this->columnStatistics($records, $stat, $field); if($showMode == 'default') return array('value' => $value); - return array('value' => $value, 'percentage' => array($value, 1, $showMode, $monopolize, $columnKey)); + return array('value' => $value, 'percentage' => array($value, 1, $showMode, $monopolize, $columnKey), 'isGroup' => false); } /* 处理切片列的情况。 */ @@ -1492,7 +1511,7 @@ class pivotModel extends model $value = $this->columnStatistics($sliceRecords, $stat, $field); - $sliceCell = array('value' => $value, 'drillFields' => array($slice => $sliceRecord->{$slice . '_origin'})); + $sliceCell = array('value' => $value, 'drillFields' => array($slice => $sliceRecord->{$slice . '_origin'}), 'isGroup' => false); if($showMode != 'default') $sliceCell['percentage'] = array($value, 1, $showMode, $monopolize, $columnKey); $cell[$sliceKey] = $sliceCell; @@ -1501,7 +1520,7 @@ class pivotModel extends model if($showTotal != 'noShow') { $value = array_sum(array_column($cell, 'value')); - $totalCell = array('value' => $value); + $totalCell = array('value' => $value, 'isGroup' => false); if($showMode != 'default') $totalCell['percentage'] = array($value, 1, $showMode, $monopolize, "rowTotal_{$columnKey}"); $cell['total'] = $totalCell; }