修改页面预览生成逻辑

modules/reports/controllers/rpt_controller.js

@@ -108,36 +108,7 @@ function getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, option, cb) {
     })
 }
 
-function getPreViewPage(rpt_id, pageSize, cb) {
-    let rptTpl = null;
-    rptTplFacade.getRptTemplate(rpt_id).then(function(rst) {
-        rptTpl = rst;
-        if (rptTpl) {
-            let printCom = JpcEx.createNew();
-            let defProperties = rptUtil.getReportDefaultCache();
-            rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE] = pageSize;
-            printCom.initialize(rptTpl);
-            let pageRst = printCom.outputAsPreviewPage(rptTpl, defProperties);
-            if (pageRst) {
-                //fsUtil.writeObjToFile(pageRst, "D:/GitHome/ConstructionCost/tmp/previewPageResult.jsp");
-                cb(null, pageRst);
-            } else {
-                cb('Have errors while on going...', null);
-            }
-        } else {
-            cb('No report template was found!', null);
-        }
-    });
-}
-
 module.exports = {
-    getPreviewPage: function(req, res) {
-        let rpt_id = params.rpt_tpl_id,
-            pageSize = params.pageSize;
-        getPreViewPage(rpt_id, pageSize, function (err, pageRst) {
-            callback(req, res, err, pageRst);
-        });
-    },
     getReportAllPages: function (req, res) {
         let params = JSON.parse(req.body.params),
             rpt_id = params.rpt_tpl_id,

modules/reports/rpt_component/jpc_bill_tab.js

@@ -51,19 +51,19 @@ JpcBillTabSrv.prototype.createNew = function(){
         if (band) {
             if (pageStatus[band[JV.BAND_PROP_DISPLAY_TYPE]]) {
                 if (tab[JV.PROP_TEXT]) {
-                    rst.push(JpcTextHelper.outputText(tab[JV.PROP_TEXT], band, unitFactor, 1, 0, 1, 0, 1, 0));
+                    rst = rst.concat(JpcTextHelper.outputText(tab[JV.PROP_TEXT], band, unitFactor, 1, 0, 1, 0, 1, 0));
                 }
                 if (tab[JV.PROP_TEXTS]) {
                     for (let j = 0; j < tab[JV.PROP_TEXTS].length; j++) {
-                        rst.push(JpcTextHelper.outputText(tab[JV.PROP_TEXTS][j], band, unitFactor, 1, 0, 1, 0, 1, 0));
+                        rst = rst.concat(JpcTextHelper.outputText(tab[JV.PROP_TEXTS][j], band, unitFactor, 1, 0, 1, 0, 1, 0));
                     }
                 }
                 if (tab[JV.NODE_DISCRETE_INFO]) {
-                    rst.push(JpcDiscreteHelper.outputPreviewDiscreteInfo(tab[JV.NODE_DISCRETE_INFO], bands, unitFactor, pageStatus, page - 1, 1, 0));
+                    rst = rst.concat(JpcDiscreteHelper.outputPreviewDiscreteInfo(tab[JV.NODE_DISCRETE_INFO], bands, unitFactor, pageStatus, page - 1, 1, 0));
                 }
             }
         }
-        rst.push(JpcDiscreteHelper.outputPreviewDiscreteInfo(rptTpl[JV.NODE_BILL_INFO][JV.NODE_DISCRETE_INFO], bands, unitFactor, pageStatus));
+        rst = rst.concat(JpcDiscreteHelper.outputPreviewDiscreteInfo(rptTpl[JV.NODE_BILL_INFO][JV.NODE_DISCRETE_INFO], bands, unitFactor, pageStatus));
         return rst;
     };
     JpcBillTabResult.outputAsSimpleJSONPage = function (rptTpl, dataObj, page, bands, controls, $CURRENT_RPT) {

modules/reports/rpt_component/jpc_flow_tab.js

@@ -610,16 +610,16 @@ JpcFlowTabSrv.prototype.createNew = function(){
         me.dispValueIdxLst.push(vIdx);
         let unitFactor = JpcCommonHelper.getUnitFactor(rptTpl);
         // 2.2 Column tab
-        rst.push(me.outputColumn(rptTpl, null, 1, 0, bands, unitFactor, controls, 0));
+        rst = rst.concat(me.outputColumn(rptTpl, null, 1, 0, bands, unitFactor, controls, 0));
         // 2.1 Content-Tab
-        // rst.push(me.outputContent(rptTpl, null, 1, bands, unitFactor, controls, 0, $CURRENT_RPT));
+        // rst = rst.concat(me.outputContent(rptTpl, null, 1, bands, unitFactor, controls, 0, $CURRENT_RPT));
         // 2.3 Sum Seg
-        // rst.push(me.outputSegSum(rptTpl, dataObj, 1, 0, bands, unitFactor, controls));
+        // rst = rst.concat(me.outputSegSum(rptTpl, dataObj, 1, 0, bands, unitFactor, controls));
         // 2.4 Sum Page
-        // rst.push(me.outputPageSum(rptTpl, dataObj, 1, 0, bands, unitFactor, controls));
+        // rst = rst.concat(me.outputPageSum(rptTpl, dataObj, 1, 0, bands, unitFactor, controls));
         // 2.5 Group
         // 2.6 Discrete
-        rst.push(JpcDiscreteHelper.outputPreviewDiscreteInfo(rptTpl[JV.NODE_FLOW_INFO][JV.NODE_DISCRETE_INFO], bands, unitFactor, pageStatus));
+        rst = rst.concat(JpcDiscreteHelper.outputPreviewDiscreteInfo(rptTpl[JV.NODE_FLOW_INFO][JV.NODE_DISCRETE_INFO], bands, unitFactor, pageStatus));
         me.dispValueIdxLst = bkdispValueIdxLst;
         return rst;
     };