customize config 小调整

modules/reports/controllers/rpt_controller.js

@@ -125,7 +125,6 @@ function setupCustomizeCfg(customizeCfg, rptTpl, defProperties) {
             } else {
                 tmpObj["Content_Narrow"].Name = "宋体";
             }
-            tmpObj["Content_Narrow"].Name = "Arial Narrow";
         }
     }
     defProperties.fonts = newFonts;
@@ -167,43 +166,45 @@ function setupCustomizeCfg(customizeCfg, rptTpl, defProperties) {
     }
     //4. 补0
     let private_Setup_Format = function(tabFields) {
-        for (let tabField of tabFields) {
-            if (tabField[JV.PROP_FORMAT]) {
-                tabField[JV.PROP_FORMAT] = tabField[JV.PROP_FORMAT].replace(new RegExp("#","gm"),"0");
+        if (tabFields) {
+            for (let tabField of tabFields) {
+                if (tabField[JV.PROP_FORMAT]) {
+                    tabField[JV.PROP_FORMAT] = tabField[JV.PROP_FORMAT].replace(new RegExp("#","gm"),"0");
+                }
             }
         }
     };
     if (customizeCfg.fillZero) {
-        if (rptTpl.flowTab) {
-            private_Setup_Format(rptTpl.flowTab[JV.NODE_FLOW_CONTENT][JV.PROP_FLOW_FIELDS]);
-            private_Setup_Format(rptTpl.flowTab[JV.NODE_FLOW_PAGE_SUM][JV.PROP_SUM_FIELDS]);
-            private_Setup_Format(rptTpl.flowTab[JV.NODE_FLOW_SEG_SUM][JV.PROP_SUM_FIELDS]);
-            private_Setup_Format(rptTpl.flowTab[JV.NODE_FLOW_GROUP][JV.PROP_SUM_FIELDS]);
-            for (let discrete of rptTpl.flowTab[JV.NODE_DISCRETE_INFO]) {
+        if (rptTpl[JV.NODE_FLOW_INFO]) {
+            private_Setup_Format(rptTpl[JV.NODE_FLOW_INFO][JV.NODE_FLOW_CONTENT][JV.PROP_FLOW_FIELDS]);
+            private_Setup_Format(rptTpl[JV.NODE_FLOW_INFO][JV.NODE_FLOW_PAGE_SUM][JV.PROP_SUM_FIELDS]);
+            private_Setup_Format(rptTpl[JV.NODE_FLOW_INFO][JV.NODE_FLOW_SEG_SUM][JV.PROP_SUM_FIELDS]);
+            private_Setup_Format(rptTpl[JV.NODE_FLOW_INFO][JV.NODE_FLOW_GROUP][JV.PROP_SUM_FIELDS]);
+            for (let discrete of rptTpl[JV.NODE_FLOW_INFO][JV.NODE_DISCRETE_INFO]) {
                 private_Setup_Format(discrete[JV.PROP_DISCRETE_FIELDS]);
             }
-            if (rptTpl.flowTabEx) {
-                private_Setup_Format(rptTpl.flowTabEx[JV.NODE_FLOW_CONTENT][JV.PROP_FLOW_FIELDS]);
-                private_Setup_Format(rptTpl.flowTabEx[JV.NODE_FLOW_PAGE_SUM][JV.PROP_SUM_FIELDS]);
-                private_Setup_Format(rptTpl.flowTabEx[JV.NODE_FLOW_SEG_SUM][JV.PROP_SUM_FIELDS]);
-                private_Setup_Format(rptTpl.flowTabEx[JV.NODE_FLOW_GROUP][JV.PROP_SUM_FIELDS]);
-                for (let discrete of rptTpl.flowTabEx[JV.NODE_DISCRETE_INFO]) {
+            if (rptTpl[JV.NODE_FLOW_INFO_EX]) {
+                private_Setup_Format(rptTpl[JV.NODE_FLOW_INFO_EX][JV.NODE_FLOW_CONTENT][JV.PROP_FLOW_FIELDS]);
+                private_Setup_Format(rptTpl[JV.NODE_FLOW_INFO_EX][JV.NODE_FLOW_PAGE_SUM][JV.PROP_SUM_FIELDS]);
+                private_Setup_Format(rptTpl[JV.NODE_FLOW_INFO_EX][JV.NODE_FLOW_SEG_SUM][JV.PROP_SUM_FIELDS]);
+                private_Setup_Format(rptTpl[JV.NODE_FLOW_INFO_EX][JV.NODE_FLOW_GROUP][JV.PROP_SUM_FIELDS]);
+                for (let discrete of rptTpl[JV.NODE_FLOW_INFO_EX][JV.NODE_DISCRETE_INFO]) {
                     private_Setup_Format(discrete[JV.PROP_DISCRETE_FIELDS]);
                 }
             }
-        } else if (rptTpl.billTab) {
-            private_Setup_Format(rptTpl.billTab[JV.NODE_BILL_CONTENT][JV.PROP_BILL_FIELDS]);
-            for (let discrete of rptTpl.billTab[JV.NODE_DISCRETE_INFO]) {
+        } else if (rptTpl[JV.NODE_BILL_INFO]) {
+            private_Setup_Format(rptTpl[JV.NODE_BILL_INFO][JV.NODE_BILL_CONTENT][JV.PROP_BILL_FIELDS]);
+            for (let discrete of rptTpl[JV.NODE_BILL_INFO][JV.NODE_DISCRETE_INFO]) {
                 private_Setup_Format(discrete[JV.PROP_DISCRETE_FIELDS]);
             }
-        } else if (rptTpl.crossTab) {
-            private_Setup_Format(rptTpl.crossTab[JV.NODE_CROSS_CONTENT][JV.TAB_CROSS_FIELDS]);
-            private_Setup_Format(rptTpl.crossTab[JV.NODE_CROSS_ROW][JV.TAB_CROSS_FIELDS]);
-            private_Setup_Format(rptTpl.crossTab[JV.NODE_CROSS_COL][JV.TAB_CROSS_FIELDS]);
-            private_Setup_Format(rptTpl.crossTab[JV.NODE_CROSS_COL_SUM][JV.TAB_CROSS_FIELDS]);
-            private_Setup_Format(rptTpl.crossTab[JV.NODE_CROSS_ROW_EXT][JV.TAB_CROSS_FIELDS]);
-            private_Setup_Format(rptTpl.crossTab[JV.NODE_CROSS_ROW_SUM_EXT][JV.TAB_CROSS_FIELDS]);
-            for (let discrete of rptTpl.crossTab[JV.NODE_DISCRETE_INFO]) {
+        } else if (rptTpl[JV.NODE_CROSS_INFO]) {
+            private_Setup_Format(rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_CONTENT][JV.TAB_CROSS_FIELDS]);
+            private_Setup_Format(rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_ROW][JV.TAB_CROSS_FIELDS]);
+            private_Setup_Format(rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_COL][JV.TAB_CROSS_FIELDS]);
+            private_Setup_Format(rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_COL_SUM][JV.TAB_CROSS_FIELDS]);
+            private_Setup_Format(rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_ROW_EXT][JV.TAB_CROSS_FIELDS]);
+            private_Setup_Format(rptTpl[JV.NODE_CROSS_INFO][JV.NODE_CROSS_ROW_SUM_EXT][JV.TAB_CROSS_FIELDS]);
+            for (let discrete of rptTpl[JV.NODE_CROSS_INFO][JV.NODE_DISCRETE_INFO]) {
                 private_Setup_Format(discrete[JV.PROP_DISCRETE_FIELDS]);
             }
         }

web/building_saas/report/html/rpt_content_format.html

@@ -93,23 +93,23 @@
                     <div class="col-4">
                         <div class="form-check">
                             <label class="form-check-label">
-                                <input id="rpt_vertical_line" type="checkbox" class="form-check-input">
-                                报表边框竖线
+                                <input id="rpt_vertical_line" type="checkbox" class="form-check-input" onchange="rptControlObj.changeCfgOption('showVerticalLine', this)">
+                                边框竖线
                             </label>
                         </div>
                     </div>
                     <div class="col-4">
                         <div class="form-check">
                             <label class="form-check-label">
-                                <input id="rpt_narrow" type="checkbox" class="form-check-input">
-                                金额窄体输出
+                                <input id="rpt_narrow" type="checkbox" class="form-check-input" onchange="rptControlObj.changeCfgOption('isNarrow', this)">
+                                窄体输出
                             </label>
                         </div>
                     </div>
                     <div class="col-4">
                         <div class="form-check">
                             <label class="form-check-label">
-                                <input id="rpt_fill_zero" type="checkbox" class="form-check-input">
+                                <input id="rpt_fill_zero" type="checkbox" class="form-check-input" onchange="rptControlObj.changeCfgOption('fillZero', this)">
                                 小数补0
                             </label>
                         </div>

web/building_saas/report/js/rpt_main.js

@@ -310,6 +310,9 @@ let rptControlObj = {
             }
         }
     },
+    changeCfgOption: function (optStr, dom) {
+        zTreeOprObj.reportPageCfg[optStr] = dom.checked;
+    },
     changeFontAdhoc: function(CfgDispName, fontProperty, fontDom) {
         for (let font of zTreeOprObj.reportPageCfg.fonts) {
             if (font["CfgDispName"] === CfgDispName) {