空行提上功能

public/web/rpt_value_define.js

@@ -33,6 +33,7 @@ const JV = {
     NODE_FLOW_COLUMN : "流水式表_列",
     NODE_FLOW_CONTENT : "流水式表_数据",
     PROP_MULTI_COLUMN: "多列显示数量",
+    PROP_ERASE_BLANK_ROWS: '空行提上',
     PROP_FLOW_EX_DISPLAY_MODE: "流水拓展显示模式",
     DISPLAY_MODE_INDEPENDENT: "单独模式",
     DISPLAY_MODE_FOLLOW: "紧随模式",

web/maintain/report/html/rpt_tpl_dtl_info.html

@@ -29,14 +29,19 @@
             <div class="form-group" id="multiColCnt">
                 <label>显示调整</label>
                 <div class="row">
-                    <div class="input-group col-6">
+                    <div class="input-group col-3">
                         <div class="input-group-addon">分栏</div>
                         <select class="form-control input-sm" id="rptTplMultiCols"><option>1</option><option>2</option></select>
                     </div>
-                    <div class="input-group col-6" style="display: none">
+                    <div class="input-group input-group-sm col-3">
+                        <label class="form-check-label">空行提上
+                            <input id="rptTplEraseBlankRows" type="checkbox">
+                        </label>
+                    </div>
+                    <!-- <div class="input-group col-6" style="display: none">
                         <div class="input-group-addon">缩放</div>
                         <input class="form-control input-sm" type="number" value="1" step="0.25">
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="row" id="element_content_height_width">

web/maintain/report/js/rpt_tpl_helper.js

@@ -95,6 +95,7 @@ let tplHelper = {
                 $("#element_content_height").get(0).removeAttribute("disabled");
                 $("#element_content_width").get(0).disabled = "disabled" ;
                 $("#rptTplMultiCols")[0].value = rptTpl[JV.NODE_FLOW_INFO][JV.PROP_MULTI_COLUMN];
+                $("#rptTplEraseBlankRows").get(0).checked = !!(rptTpl[JV.NODE_FLOW_INFO][JV.PROP_ERASE_BLANK_ROWS]);
                 $("#element_cross_display_seq").get(0).disabled = "disabled" ;
             } else if (rptTpl[JV.NODE_CROSS_INFO]) {
                 $("#flow_content_height_div")[0].style.display = "none";

web/maintain/report/js/rpt_tpl_main.js

@@ -1041,6 +1041,7 @@ let zTreeOprObj = {
         }
         if (rptTpl[JV.NODE_FLOW_INFO]) {
             rptTpl[JV.NODE_FLOW_INFO][JV.PROP_MULTI_COLUMN] = parseInt($("#rptTplMultiCols")[0].value);
+            rptTpl[JV.NODE_FLOW_INFO][JV.PROP_ERASE_BLANK_ROWS] = $("#rptTplEraseBlankRows").get(0).checked || false;
         }
         rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_CROSS_DISPLAY_ORDER] = $("#element_cross_display_seq")[0].selectedIndex;
         //考虑到页边距必然跟用户设置走，所以这里没必要特意去设置了，全部下架