|
|
@@ -207,6 +207,7 @@ JpcCrossTabSrv.prototype.createNew = function() {
|
|
|
me.dispSerialIdxLst_Row = [];
|
|
|
me.col_sum_fields_idx = [];
|
|
|
me.col_sum_fields_value_total = [];
|
|
|
+ me.row_sum_fields_idx = []; // 补充的交叉行合计的指标数据
|
|
|
me.row_sum_fields_value_total = [];
|
|
|
me.dispSumValueLst_Col = []; // 这个是横向合计(一列列累加)
|
|
|
me.dispSumValueLst_Row = []; // 这个是纵向合计(一行行累加)
|
|
|
@@ -242,6 +243,8 @@ JpcCrossTabSrv.prototype.createNew = function() {
|
|
|
// $FS_UTIL.writeObjToFile(me.sortedContentSequence, 'D:/GitHome/temp/JL_cross_sortedContentSequence' + (new Date()).getTime() + '.js');
|
|
|
|
|
|
JpcFieldHelper.findAndPutDataFieldIdx(rptTpl, rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_COL_SUM][JV.PROP_CROSS_FIELDS], null, me.col_sum_fields_idx);
|
|
|
+ JpcFieldHelper.findAndPutDataFieldIdx(rptTpl, rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_ROW_SUM][JV.PROP_CROSS_FIELDS], null, me.row_sum_fields_idx);
|
|
|
+
|
|
|
// pre-sum the data(for col sum display)
|
|
|
const data_details = dataObj[JV.DATA_DETAIL_DATA];
|
|
|
const data_fields = [];
|
|
|
@@ -280,15 +283,15 @@ JpcCrossTabSrv.prototype.createNew = function() {
|
|
|
|
|
|
}
|
|
|
const row_data_fields = [];
|
|
|
- for (let i = 0; i < me.col_sum_fields_idx.length; i++) {
|
|
|
+ for (let i = 0; i < me.row_sum_fields_idx.length; i++) {
|
|
|
let data_field = null;
|
|
|
- if (typeof me.col_sum_fields_idx[i] === 'object') {
|
|
|
- const exField = JE.F(me.col_sum_fields_idx[i][JV.PROP_ID], $CURRENT_RPT);
|
|
|
+ if (typeof me.row_sum_fields_idx[i] === 'object') {
|
|
|
+ const exField = JE.F(me.row_sum_fields_idx[i][JV.PROP_ID], $CURRENT_RPT);
|
|
|
if (exField) {
|
|
|
data_field = exField[JV.PROP_AD_HOC_DATA];
|
|
|
}
|
|
|
} else {
|
|
|
- data_field = data_details[me.col_sum_fields_idx[i]];
|
|
|
+ data_field = data_details[me.row_sum_fields_idx[i]];
|
|
|
}
|
|
|
row_data_fields.push(data_field);
|
|
|
}
|
