|
@@ -690,9 +690,9 @@ JpcFlowTabSrv.prototype.createNew = function(){
|
|
|
// 2.2 Column tab
|
|
|
tabRstLst.push(me.outputColumn(rptTpl, dataObj, page, segIdx, bands, unitFactor, 0));
|
|
|
// 2.3 Sum Seg
|
|
|
- tabRstLst.push(me.outputSegSum(rptTpl, dataObj, page, segIdx, bands, unitFactor, controls));
|
|
|
+ tabRstLst.push(me.outputSegSum(rptTpl, dataObj, page, segIdx, bands, unitFactor, controls, $CURRENT_RPT));
|
|
|
// 2.4 Sum Page
|
|
|
- tabRstLst.push(me.outputPageSum(rptTpl, dataObj, page, segIdx, bands, unitFactor, controls));
|
|
|
+ tabRstLst.push(me.outputPageSum(rptTpl, dataObj, page, segIdx, bands, unitFactor, controls, $CURRENT_RPT));
|
|
|
// 2.5 Group
|
|
|
// 2.6 Discrete
|
|
|
tabRstLst.push(JpcDiscreteHelper.outputDiscreteInfo(rptTpl[FLOW_NODE_STR][JV.NODE_DISCRETE_INFO], bands, dataObj, unitFactor, me.pageStatusLst[page - 1], segIdx, 1, 0, $CURRENT_RPT, customizeCfg));
|
|
@@ -941,12 +941,22 @@ JpcFlowTabSrv.prototype.createNew = function(){
|
|
|
let me = this, rst = [];
|
|
|
let FLOW_NODE_STR = me.isEx?JV.NODE_FLOW_INFO_EX:JV.NODE_FLOW_INFO;
|
|
|
let tab = rptTpl[FLOW_NODE_STR][JV.NODE_FLOW_SEG_SUM];
|
|
|
+ let refTab = rptTpl[FLOW_NODE_STR][JV.NODE_FLOW_CONTENT];
|
|
|
+ let refTabEx = (rptTpl[JV.NODE_FLOW_INFO_EX])?rptTpl[JV.NODE_FLOW_INFO_EX][JV.NODE_FLOW_CONTENT]:null;
|
|
|
let band = bands[tab[JV.PROP_BAND_NAME]];
|
|
|
if (band) {
|
|
|
let pageStatus = me.pageStatusLst[page - 1];
|
|
|
if (pageStatus[band[JV.BAND_PROP_DISPLAY_TYPE]]) {
|
|
|
+ let ref_tab_fields = refTab[JV.PROP_FLOW_FIELDS];
|
|
|
+ let ref_tab_fields_ex = refTabEx?refTabEx[JV.PROP_FLOW_FIELDS]:null;
|
|
|
let tab_fields = me.seg_sum_tab_fields;
|
|
|
for (let i = 0; i < tab_fields.length; i++) {
|
|
|
+ if (!JpcFieldHelper.resetSumFormat(ref_tab_fields, tab_fields[i])) {
|
|
|
+ if (!JpcFieldHelper.resetSumFormat(ref_tab_fields_ex, tab_fields[i])) {
|
|
|
+ let map_data_field = JE.F(tab_fields[i][JV.PROP_FIELD_ID], $CURRENT_RPT);
|
|
|
+ tab_fields[i][JV.PROP_FORMAT] = map_data_field[JV.PROP_FORMAT];
|
|
|
+ }
|
|
|
+ }
|
|
|
let sumVal = 0;
|
|
|
if (me.segSumValLst[segIdx] && me.segSumValLst[segIdx].length > i) {
|
|
|
sumVal = me.segSumValLst[segIdx][i];
|
|
@@ -961,16 +971,26 @@ JpcFlowTabSrv.prototype.createNew = function(){
|
|
|
}
|
|
|
return rst;
|
|
|
};
|
|
|
- JpcFlowTabResult.outputPageSum = function (rptTpl, dataObj, page, segIdx, bands, unitFactor, controls) {
|
|
|
+ JpcFlowTabResult.outputPageSum = function (rptTpl, dataObj, page, segIdx, bands, unitFactor, controls, $CURRENT_RPT) {
|
|
|
let me = this, rst = [];
|
|
|
let FLOW_NODE_STR = me.isEx?JV.NODE_FLOW_INFO_EX:JV.NODE_FLOW_INFO;
|
|
|
let tab = rptTpl[FLOW_NODE_STR][JV.NODE_FLOW_PAGE_SUM];
|
|
|
+ let refTab = rptTpl[FLOW_NODE_STR][JV.NODE_FLOW_CONTENT];
|
|
|
+ let refTabEx = (rptTpl[JV.NODE_FLOW_INFO_EX])?rptTpl[JV.NODE_FLOW_INFO_EX][JV.NODE_FLOW_CONTENT]:null;
|
|
|
let band = bands[tab[JV.PROP_BAND_NAME]];
|
|
|
if (band) {
|
|
|
let pageStatus = me.pageStatusLst[page - 1];
|
|
|
if (pageStatus[band[JV.BAND_PROP_DISPLAY_TYPE]]) {
|
|
|
+ let ref_tab_fields = refTab[JV.PROP_FLOW_FIELDS];
|
|
|
+ let ref_tab_fields_ex = refTabEx?refTabEx[JV.PROP_FLOW_FIELDS]:null;
|
|
|
let tab_fields = me.page_sum_tab_fields;
|
|
|
for (let i = 0; i < tab_fields.length; i++) {
|
|
|
+ if (!JpcFieldHelper.resetSumFormat(ref_tab_fields, tab_fields[i])) {
|
|
|
+ if (!JpcFieldHelper.resetSumFormat(ref_tab_fields_ex, tab_fields[i])) {
|
|
|
+ let map_data_field = JE.F(tab_fields[i][JV.PROP_FIELD_ID], $CURRENT_RPT);
|
|
|
+ tab_fields[i][JV.PROP_FORMAT] = map_data_field[JV.PROP_FORMAT];
|
|
|
+ }
|
|
|
+ }
|
|
|
let cellItem = JpcCommonOutputHelper.createCommonOutput(tab_fields[i], me.pageSumValLst[page - 1][i], controls);
|
|
|
cellItem[JV.PROP_AREA] = JpcAreaHelper.outputArea(tab_fields[i][JV.PROP_AREA], band, unitFactor, 1, 0, 1, 0, me.multiCols, 0, true, false);
|
|
|
rst.push(cellItem);
|