bug fix

web/maintain/report/html/rpt_tpl_dtl_info.html

@@ -38,11 +38,11 @@
             <div class="row" id="element_content_height_width">
                 <div class="form-group col-md-6">
                     <label>显示行 - 高度</label>
-                    <input class="form-control input-sm" id="element_content_height" type="number" value="0.6" step="0.1" min="0" max="50" onchange="" disabled>
+                    <input class="form-control input-sm" id="element_content_height" type="number" value="0.6" step="0.1" min="0" max="50" onchange="zTreeOprObj.changeProperty(`流水式表_信息.流水式表_数据.CommonHeight`, this)" disabled>
                 </div>
                 <div class="form-group col-md-6">
                     <label>显示列 - 宽度</label>
-                    <input class="form-control input-sm" id="element_content_width" type="number" value="4.0" step="0.1" min="0" max="50" onchange="" disabled>
+                    <input class="form-control input-sm" id="element_content_width" type="number" value="4.0" step="0.1" min="0" max="50" onchange="zTreeOprObj.changeProperty(`流水式表_信息.流水式表_数据.CommonWidth`, this)" disabled>
                 </div>
             </div>
         </div>

web/maintain/report/js/rpt_tpl_band.js

@@ -279,6 +279,35 @@ let bandTreeOprObj = {
             }
         }
     },
+    changeBandHeight: function (bandName, newHeight) {
+        let me = this;
+        let private_setup_band_height = function (bNode) {
+            let rst = false;
+            if (bNode[JV.PROP_NAME] === bandName) {
+                bNode[JV.BAND_PROP_HEIGHT] = newHeight;
+                rst = true;
+            }
+            if (bNode[JV.BAND_PROP_SUB_BANDS] && bNode[JV.BAND_PROP_SUB_BANDS].length > 0) {
+                for (let sbNode of bNode[JV.BAND_PROP_SUB_BANDS]) {
+                    if (private_setup_band_height(sbNode)) {
+                        rst = true;
+                        break;
+                    }
+                }
+            }
+            return rst;
+        };
+        if (me.currentNode && me.currentNode[JV.PROP_NAME] === bandName) {
+            me.currentNode[JV.BAND_PROP_HEIGHT] = newHeight;
+        } else {
+            let nodes = me.treeObj.getNodes();
+            for (let node of nodes) {
+                if (private_setup_band_height(node)) {
+                    break;
+                }
+            }
+        }
+    },
     bandShowFrequencyChange: function (dom) {
         let me = this;
         if (me.currentNode) {

web/maintain/report/js/rpt_tpl_field_location.js

@@ -41,6 +41,7 @@ let fieldLocationOprObj = {
             let sheet = me.columnWorkBook.getActiveSheet();
             sheet.suspendPaint();
             sheet.clearSelection();
+            sheet.setRowCount(0);
             let spans =sheet.getSpans();
             for(let i = 0; i < spans.length; i++)
             {

web/maintain/report/js/rpt_tpl_main.js

@@ -829,6 +829,17 @@ let zTreeOprObj = {
         }
         return rst;
     },
+    changeProperty: function (propStr, dom) {
+        let me = zTreeOprObj;
+        if (me.currentNode && me.currentNode.rptTpl) {
+            let props = propStr.split('.');
+            let lastProp = me.currentNode.rptTpl;
+            for (let idx = 1; idx < props.length; idx++) {
+                lastProp = lastProp[props[idx - 1]];
+            }
+            lastProp[props[props.length - 1]] = dom.value;
+        }
+    },
     extractMainInfo: function (rptTpl) {
         //模板信息
         rptTpl[JV.NODE_MAIN_INFO][JV.NODE_MAIN_INFO_RPT_NAME] = $("#rptTplName")[0].value;

web/maintain/report/js/rpt_tpl_vis_jumbo.js

@@ -843,6 +843,7 @@ let visualJumbo = {
         let pageSummaryNodes = [[], []];
         if (pageTotalBand) {
             handledBands.push(pageTotalBand[JV.PROP_NAME]);
+            me.private_setup_bandHeight(pageTotalBand[JV.PROP_NAME], pageTotalBand, sheet);
             me.private_build_txt_fld_nodes(pageTotalBand, sheet, rptTpl, pageSummaryNodes);
         }
 
@@ -850,6 +851,7 @@ let visualJumbo = {
         let segSummaryNodes = [[], []];
         if (segTotalBand) {
             handledBands.push(segTotalBand[JV.PROP_NAME]);
+            me.private_setup_bandHeight(segTotalBand[JV.PROP_NAME], segTotalBand, sheet);
             me.private_build_txt_fld_nodes(segTotalBand, sheet, rptTpl, segSummaryNodes);
         }
         //3. 其他就归类到离散去了
@@ -860,6 +862,7 @@ let visualJumbo = {
                     let sArr = {Name: "子项", BandName: sBandMap[JV.PROP_BAND_NAME], items: [[],[]], isParent: true};
                     let sBand = visualCommonOprObj.getBandEx(sBandMap[JV.PROP_BAND_NAME], rptTpl);
                     if (sBand) {
+                        me.private_setup_bandHeight(sBand[JV.PROP_NAME], sBand, sheet);
                         me.private_build_txt_fld_nodes(sBand, sheet, rptTpl, sArr.items);
                     }
                     if (sArr.items[0].length > 0 || sArr.items[1].length > 0) {
@@ -1049,6 +1052,7 @@ let visualJumbo = {
                 let sArr = {Name: "子项", BandName: sBandMap[JV.PROP_BAND_NAME], items: [[],[]], isParent: true};
                 let sBand = visualCommonOprObj.getBandEx(sBandMap[JV.PROP_BAND_NAME], rptTpl);
                 if (sBand) {
+                    me.private_setup_bandHeight(sBand[JV.PROP_NAME], sBand, sheet);
                     me.private_build_txt_fld_nodes(sBand, sheet, rptTpl, sArr.items);
                 }
                 if (sArr.items[0].length > 0 || sArr.items[1].length > 0) {
@@ -1112,6 +1116,7 @@ let visualJumbo = {
             for (let iRow = 0; iRow < sheet.getRowCount(); iRow++) {
                 if (sheet.getCell(iRow, 0).backColor() === bandColor) {
                     rptTpl[JV.NODE_FLOW_INFO][JV.NODE_FLOW_CONTENT][JV.PROP_CMN_HEIGHT] = (sheet.getRowHeight(iRow) / unitFactor).toFixed(2);
+                    $(`#element_content_height`)[0].value = (sheet.getRowHeight(iRow) / unitFactor).toFixed(2);
                 }
             }
         }
@@ -1135,7 +1140,9 @@ let visualJumbo = {
                 for (let idx = firstRowIdx; idx <= lastRowIdx; idx++) {
                     bH += sheet.getRowHeight(idx);
                 }
-                band[JV.BAND_PROP_HEIGHT] = (bH / unitFactor).toFixed(2);
+                let bandH = (bH / unitFactor).toFixed(2);
+                band[JV.BAND_PROP_HEIGHT] = bandH;
+                bandTreeOprObj.changeBandHeight(bandName, bandH);
             }
         }
     },