check in for models alignment

modules/reports/rpt_component/helper/jpc_helper_common_output.js

@@ -44,7 +44,21 @@ function innerFormat(formatStr, rst) {
         if (!(isNaN(parseFloat(rst[JV.PROP_VALUE])))) {
             let dotIdx = formatStr.indexOf(".");
             if (dotIdx >= 0) {
-                rst[JV.PROP_VALUE] = parseFloat(rst[JV.PROP_VALUE]).toFixed(formatStr.length - dotIdx - 1);
+                let tmpStr = parseFloat(rst[JV.PROP_VALUE]).toFixed(formatStr.length - dotIdx - 1);
+                let digStr = formatStr.substr(dotIdx + 1, formatStr.length - dotIdx);
+                for (let sIdx = digStr.length - 1; sIdx >= 0; sIdx--) {
+                    if (digStr[sIdx] === '#') {
+                        if (tmpStr.length > 0 && tmpStr[tmpStr.length - 1] === '0') {
+                            tmpStr = tmpStr.substr(0, tmpStr.length - 1);
+                        } else {
+                            break;
+                        }
+                    } else {
+                        break;
+                    }
+                }
+                if (tmpStr[tmpStr.length - 1] === '.') tmpStr = tmpStr.substr(0, tmpStr.length - 1);
+                rst[JV.PROP_VALUE] = tmpStr;
             } else {
                 rst[JV.PROP_VALUE] = parseFloat(rst[JV.PROP_VALUE]).toFixed(0);
             }

modules/reports/rpt_component/jpc_flow_tab.js

@@ -484,7 +484,7 @@ JpcFlowTabSrv.prototype.createNew = function(){
                     if (currentRecAmt > 0) pageStatus[JV.STATUS_SEGMENT_START] = false;
                     if (pageIdx > 0) pageStatus[JV.STATUS_REPORT_START] = false;
                     //开始判断各种scenarios
-                    if (ttlSegRecAmtNormal < ttlSegRecAmt) {
+                    if ((ttlSegRecAmtNormal < ttlSegRecAmt) || (followTabEx != null)) {
                         //有流水拓展，并且是follow mode
                         if (currentRecAmt + maxRowRec > ttlSegRecAmtNormal) {
                             if (currentRecAmt >= ttlSegRecAmtNormal) {

test/unit/reports/test_tpl_09_1.js

@@ -44,7 +44,7 @@ let demoRptId = 226, pagesize = "A4";
 
 let userId_Leng = 1142; //小冷User Id
 // demoPrjId = 720; //QA: DW3
-demoPrjId = 1296; //QA:
+demoPrjId = 1626; //QA:
 //*/
 let userId_Dft = userId_Leng;
 /*/

web/building_saas/report/html/rpt_main.html

@@ -77,11 +77,11 @@
                         <div class="panel-body">
                             <div class="input-group input-group-sm" role="group">
                             <span class="input-group-btn">
-                              <button type="button" class="btn btn-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="上一页"><i class="fa fa-chevron-left" onclick="rptControlObj.prePage(this)"></i></button>
+                              <button type="button" class="btn btn-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="上一页" onclick="rptControlObj.prePage(this)"><i class="fa fa-chevron-left"></i></button>
                             </span>
                                 <input class="form-control" id="rpt_page_num" value="" style="width:60px"  data-toggle="tooltip" data-placement="bottom" title="输入页码按回车键，快速跳转">
                                 <span class="input-group-btn">
-                              <button type="button" class="btn btn-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="下一页"><i class="fa fa-chevron-right" onclick="rptControlObj.nextPage(this)"></i></button>
+                              <button type="button" class="btn btn-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="下一页" onclick="rptControlObj.nextPage(this)"><i class="fa fa-chevron-right"></i></button>
                             </span>
                             </div>
                         </div>

web/building_saas/report/js/rpt_main.js

@@ -119,15 +119,14 @@ let canvasOprObj = {
     canvasOnMouseMove: function (event) {
         if (zTreeOprObj.currentNode) {
             let x = event.offsetX - JpcCanvasOutput.offsetX, canvas = event.originalTarget;
+            if (!(canvas)) canvas = event.target; //chrome浏览器不认event.originalTarget,只认event.target或event.currentTarget
             if (x < FIRST_PAGE_OFFSET) {
                 canvas.style.cursor = "url(/web/building_saas/img/FirstPageSimple.cur), auto";
             } else if (x < PRE_PAGE_OFFSET) {
-                // canvas.style.cursor = "e-resize";
                 canvas.style.cursor = "url(/web/building_saas/img/PreviousPageSimple.cur), auto";
             } else if ((canvas.width - x) < LAST_PAGE_OFFSET) {
                 canvas.style.cursor = "url(/web/building_saas/img/LastPageSimple.cur), auto";
             } else if ((canvas.width - x) < NEXT_PAGE_OFFSET) {
-                // canvas.style.cursor = "w-resize";
                 canvas.style.cursor = "url(/web/building_saas/img/NextPageSimple.cur), auto";
             } else {
                 canvas.style.cursor = "";
@@ -136,9 +135,8 @@ let canvasOprObj = {
     },
     cavansOnClick: function(event){
         if (zTreeOprObj.currentNode) {
-            let x = event.offsetX - JpcCanvasOutput.offsetX,
-                //y = event.offsetY - JpcCanvasOutput.offsetY,
-                canvas = event.originalTarget;
+            let x = event.offsetX - JpcCanvasOutput.offsetX, canvas = event.originalTarget;
+            if (!(canvas)) canvas = event.target; //chrome浏览器不认event.originalTarget,只认event.target或event.currentTarget
             if (x < FIRST_PAGE_OFFSET) {
                 zTreeOprObj.showPage(1, canvas);
             } else if (x < PRE_PAGE_OFFSET) {