code sync

modules/reports/rpt_component/jpc_flow_tab.js

@@ -1124,25 +1124,17 @@ function combineAutoHeightCells(prepareObj, page, controls) {
                         if (mergeCell[JV.PROP_VALUE]) {
                             firstMergeCell[JV.PROP_VALUE] = firstMergeCell[JV.PROP_VALUE] + "|" + mergeCell[JV.PROP_VALUE];
                             validValueAmt++;
-                        } else {
-                            // firstMergeCell[JV.PROP_VALUE] = firstMergeCell[JV.PROP_VALUE] + "|" ;
                         }
                         rst.push(sameColCells[i].cellIdx); //记下Cell的位置，在函数外消除
                         //如果到了最后一条数据，得判断firstMergeCell是否满格（即数据是满的，有可能有些格数据也有折行但不是自动行高判断指标）
                         //不满格的cell的Vertical强制设置为 'center'
                         if (i === sameColCells.length - 1 && validValueAmt !== fullValidValueAmt) {
-                            // firstMergeCell[JV.PROP_CONTROL].Shrink = orgCtrl.Shrink;
-                            // firstMergeCell[JV.PROP_CONTROL].Wrap = "F";
-                            // firstMergeCell[JV.PROP_CONTROL].VerticalForExcel = null;
                             firstMergeCell[JV.PROP_CONTROL].VerticalForExcel = 'center';
                         }
                     } else {
                         //碰到新开始的自动行高行，判断原先的firstMergeCell是否满格（即数据是满的，有可能有些格数据也有折行但不是自动行高判断指标）
                         //不满格的cell的Vertical强制设置为 'center'
                         if (validValueAmt !== fullValidValueAmt) {
-                            // firstMergeCell[JV.PROP_CONTROL].Shrink = orgCtrl.Shrink;
-                            // firstMergeCell[JV.PROP_CONTROL].Wrap = "F";
-                            // firstMergeCell[JV.PROP_CONTROL].VerticalForExcel = null;
                             firstMergeCell[JV.PROP_CONTROL].VerticalForExcel = 'center';
                         }
                         firstMergeCell = sameColCells[i].cell;
@@ -1161,54 +1153,4 @@ function combineAutoHeightCells(prepareObj, page, controls) {
     return rst;
 }
 
-function combineAutoHeightCellsBk(prepareObj, page, controls) {
-    let rst = [];
-    if (prepareObj.cellsArr) {
-        //merge cells' value and area
-        //备注： 系统逻辑已经把Cell的顺序放好，无需再做排序。
-        for (let mergeKey in prepareObj.pageCellObj) {
-            let sameColCells = prepareObj.pageCellObj[mergeKey]; //左右位置相同的Cell先放在一起，统一处理
-            if (sameColCells.length > 1) {
-                let firstMergeCell = sameColCells[0].cell;
-                firstMergeCell[JV.PROP_STYLE] = firstMergeCell[JV.PROP_STYLE].slice(0, firstMergeCell[JV.PROP_STYLE].indexOf("_AutoHeightMerge"));
-                let orgCtrl = setupControl(firstMergeCell, controls);
-                let validValueAmt = 0;
-                for (let i = 1; i < sameColCells.length; i++) {
-                    let mergeCell = sameColCells[i].cell;
-                    if (mergeCell[JV.PROP_STYLE].indexOf("_AutoHeightMerge_Top") < 0) {
-                        //merge into the firstMergeCell!
-                        firstMergeCell[JV.PROP_AREA][JV.PROP_BOTTOM] = mergeCell[JV.PROP_AREA][JV.PROP_BOTTOM];
-                        firstMergeCell[JV.PROP_VALUE] = firstMergeCell[JV.PROP_VALUE] + "|" + mergeCell[JV.PROP_VALUE];
-                        if (mergeCell[JV.PROP_VALUE]) validValueAmt++;
-                        rst.push(sameColCells[i].cellIdx);
-                        if (i === sameColCells.length - 1 && validValueAmt === 0) {
-                            firstMergeCell[JV.PROP_CONTROL].Shrink = orgCtrl.Shrink;
-                            firstMergeCell[JV.PROP_CONTROL].Wrap = "F";
-                            firstMergeCell[JV.PROP_CONTROL].VerticalForExcel = null;
-                            // firstMergeCell[JV.PROP_CONTROL].VerticalForExcel = 'center';
-                        }
-                    } else {
-                        if (validValueAmt === 0) {
-                            firstMergeCell[JV.PROP_CONTROL].Shrink = orgCtrl.Shrink;
-                            firstMergeCell[JV.PROP_CONTROL].Wrap = "F";
-                            firstMergeCell[JV.PROP_CONTROL].VerticalForExcel = null;
-                            // firstMergeCell[JV.PROP_CONTROL].VerticalForExcel = 'center';
-                        }
-                        firstMergeCell = sameColCells[i].cell;
-                        firstMergeCell[JV.PROP_STYLE] = firstMergeCell[JV.PROP_STYLE].slice(0, firstMergeCell[JV.PROP_STYLE].indexOf("_AutoHeightMerge"));
-                        orgCtrl = setupControl(firstMergeCell, controls);
-                        validValueAmt = 0;
-                    }
-                }
-            }
-        }
-        rst.sort(function (i1, i2) {
-            return (i1 > i2)?1:-1;
-        });
-    }
-    // fsUtil.writeObjToFile(prepareObj, "D:/GitHome/ConstructionCost/tmp/afterMergeCellsPrepareObj_" + page + ".jsp");
-    // fsUtil.writeObjToFile(rst, "D:/GitHome/ConstructionCost/tmp/eliminateCells_" + page + ".jsp");
-    return rst;
-}
-
 module.exports = new JpcFlowTabSrv();