Sfoglia il codice sorgente

交叉表尾页处理补漏

TonyKang 3 anni fa
parent
commit
9cfe9bb296
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      app/reports/rpt_component/jpc_cross_tab.js

+ 2 - 2
app/reports/rpt_component/jpc_cross_tab.js

@@ -389,7 +389,7 @@ JpcCrossTabSrv.prototype.createNew = function() {
                         for (let colIdx = 0; colIdx < colSplitCnt; colIdx++) {
                             pageStatus[JV.STATUS_CROSS_COL_END] = (colIdx === (colSplitCnt - 1));
                             let needOneMoreRptEnd = false;
-                            if (pageStatus[JV.STATUS_CROSS_ROW_END] && pageStatus[JV.STATUS_CROSS_COL_END]) {
+                            if ((segIdx === segCnt - 1) && pageStatus[JV.STATUS_CROSS_ROW_END] && pageStatus[JV.STATUS_CROSS_COL_END]) {
                                 pageStatus[JV.STATUS_REPORT_END] = true;
                                 private_resetBandArea();
                                 let hasAdHocColEnd = !JpcCrossTabHelper.chkTabEnd(JV.NODE_CROSS_COL_SUM, rptTpl, bands, me.sortedColSequence, segIdx, (colSplitCnt - 1) * orgMaxColRec, maxColRec);
@@ -442,7 +442,7 @@ JpcCrossTabSrv.prototype.createNew = function() {
                         for (let rowIdx = 0; rowIdx < rowSplitCnt; rowIdx++) {
                             pageStatus[JV.STATUS_CROSS_ROW_END] = (rowIdx === (rowSplitCnt - 1));
                             let needOneMoreRptEnd = false;
-                            if (pageStatus[JV.STATUS_CROSS_ROW_END] && pageStatus[JV.STATUS_CROSS_COL_END]) {
+                            if ((segIdx === segCnt - 1) && pageStatus[JV.STATUS_CROSS_ROW_END] && pageStatus[JV.STATUS_CROSS_COL_END]) {
                                 pageStatus[JV.STATUS_REPORT_END] = true;
                                 private_resetBandArea();
                                 let hasAdHocColEnd = !JpcCrossTabHelper.chkTabEnd(JV.NODE_CROSS_COL_SUM, rptTpl, bands, me.sortedColSequence, segIdx, (colSplitCnt - 1) * orgMaxColRec, maxColRec);