*[task#128593,2h,done].

This commit is contained in:
songchenxuan
2024-09-19 14:53:11 +08:00
committed by 周鑫
parent 77326f3fca
commit cd2b4a1153
5 changed files with 24 additions and 2 deletions
+6
View File
@@ -419,9 +419,15 @@ $lang->pivot->stepDesign->columnsTip = 'Add 1 column to the pivot table and set
$lang->pivot->stepDesign->columnTotal = 'Show column totals';
$lang->pivot->stepDesign->columnCalc = 'Summary calculation';
$lang->pivot->stepDesign->columnPosition = 'Summary position';
$lang->pivot->stepDesign->columnTotalTip = 'Add a row to display the summary data for each column.';
$lang->pivot->stepDesign->total = 'Total';
$lang->pivot->stepDesign->columnPositionList = array();
$lang->pivot->stepDesign->columnPositionList['bottom'] = 'Display on table bottom';
$lang->pivot->stepDesign->columnPositionList['row'] = 'Display on row group';
$lang->pivot->stepDesign->columnPositionList['all'] = 'Display on row group and table bottom';
$lang->pivot->stepDesign->columnTotalList = array();
$lang->pivot->stepDesign->columnTotalList['noShow'] = 'No Show';
$lang->pivot->stepDesign->columnTotalList['sum'] = 'Sum';
+5
View File
@@ -422,6 +422,11 @@ $lang->pivot->stepDesign->columnCalc = 'Summary calculation';
$lang->pivot->stepDesign->columnTotalTip = 'Add a row to display the summary data for each column.';
$lang->pivot->stepDesign->total = 'Total';
$lang->pivot->stepDesign->columnPositionList = array();
$lang->pivot->stepDesign->columnPositionList['bottom'] = 'Display on table bottom';
$lang->pivot->stepDesign->columnPositionList['row'] = 'Display on row group';
$lang->pivot->stepDesign->columnPositionList['all'] = 'Display on row group and table bottom';
$lang->pivot->stepDesign->columnTotalList = array();
$lang->pivot->stepDesign->columnTotalList['noShow'] = 'No Show';
$lang->pivot->stepDesign->columnTotalList['sum'] = 'Sum';
+5
View File
@@ -422,6 +422,11 @@ $lang->pivot->stepDesign->columnCalc = 'Summary calculation';
$lang->pivot->stepDesign->columnTotalTip = 'Add a row to display the summary data for each column.';
$lang->pivot->stepDesign->total = 'Total';
$lang->pivot->stepDesign->columnPositionList = array();
$lang->pivot->stepDesign->columnPositionList['bottom'] = 'Display on table bottom';
$lang->pivot->stepDesign->columnPositionList['row'] = 'Display on row group';
$lang->pivot->stepDesign->columnPositionList['all'] = 'Display on row group and table bottom';
$lang->pivot->stepDesign->columnTotalList = array();
$lang->pivot->stepDesign->columnTotalList['noShow'] = 'No Show';
$lang->pivot->stepDesign->columnTotalList['sum'] = 'Sum';
+7 -1
View File
@@ -418,10 +418,16 @@ $lang->pivot->stepDesign->groupsTip = '通过选择分组字段,对SQL查询
$lang->pivot->stepDesign->columnsTip = '在透视表中添加1列并对其进行设置。';
$lang->pivot->stepDesign->columnTotal = '显示列的汇总';
$lang->pivot->stepDesign->columnCalc = '汇总计算方式';
$lang->pivot->stepDesign->columnCalc = '汇总的计算方式';
$lang->pivot->stepDesign->columnPosition = '汇总的展示位置';
$lang->pivot->stepDesign->columnTotalTip = '增加一行显示每一列的汇总数据。';
$lang->pivot->stepDesign->total = '总计';
$lang->pivot->stepDesign->columnPositionList = array();
$lang->pivot->stepDesign->columnPositionList['bottom'] = '仅在整张表下方展示';
$lang->pivot->stepDesign->columnPositionList['row'] = '仅在每层行分组下方展示';
$lang->pivot->stepDesign->columnPositionList['all'] = '在整张表与每层行分组下方均展示';
$lang->pivot->stepDesign->columnTotalList = array();
$lang->pivot->stepDesign->columnTotalList['noShow'] = '不显示';
$lang->pivot->stepDesign->columnTotalList['sum'] = '求和';
+1 -1
View File
@@ -1500,7 +1500,7 @@ class pivotModel extends model
$records = $this->mapRecordValueWithFieldOptions($records, $fields, $sql, $driver);
$showColTotal = zget($settings, 'columnTotal', 'noShow');
$showColTotal = zget($settings, 'columnTotal', 'noShow');
$mergeRecords = array();
$drillRecords = array();