vscode代码美化

app/controller/report_controller.js

@@ -195,7 +195,7 @@ module.exports = app => {
                     customSelects.stageFlow.forEach(x => {
                         if (!x) return;
                         x.visible = (!ctx.session.sessionUser.is_admin && ctx.session.sessionProject.page_show.individualSign === 1)
-                            ? x.aid === ctx.session.sessionUser.accountId : true
+                            ? x.aid === ctx.session.sessionUser.accountId : true;
                     });
                 } else {
                     customSelects.audit_select = [];
@@ -396,7 +396,7 @@ module.exports = app => {
             if (!params.stage_select && copyCustomSelect) delete copyCustomSelect.stage_select;
             if (!params.material_sum_select && copyCustomSelect) delete copyCustomSelect.material_sum_select;
             if (params.change_select) {
-                copyCustomSelect = { tid: params.tender_id, rid: params.rpt_tpl_id, sid: -1, change_select: params.change_select};
+                copyCustomSelect = { tid: params.tender_id, rid: params.rpt_tpl_id, sid: -1, change_select: params.change_select };
             }
 
             const pageRst = await getAllPagesCommon(ctx, rptTpl, params, JV.PAGING_OPTION_NORMAL, JV.OUTPUT_TYPE_NORMAL, this.app.baseDir, copyCustomSelect);
@@ -427,7 +427,7 @@ module.exports = app => {
             stageFlow.forEach(x => {
                 if (!x) return;
                 x.visible = (!ctx.session.sessionUser.is_admin && ctx.session.sessionProject.page_show.individualSign === 1)
-                    ? x.aid === ctx.session.sessionUser.accountId : true
+                    ? x.aid === ctx.session.sessionUser.accountId : true;
             });
 
             // console.log('encodeSignatureDataUri!');
@@ -1510,7 +1510,7 @@ function mergeTextSignature(isTxtSignature, status, pageData, singleRoleRel, rpt
             pageData.forEach((dtlPage, index) => {
                 let dftRolRel = [];
                 const rpt_id = rpt_ids[index];
-                for (let roleRel of singleRoleRel) {
+                for (const roleRel of singleRoleRel) {
                     if (roleRel.rpt_id === rpt_id) {
                         dftRolRel = roleRel;
                     }
@@ -1706,4 +1706,4 @@ function _resetPageDataByBreaks(pageDataArr, breakAmt, rpt_names, newRptNames) {
         }
     }
     return rst;
-};
+}

app/reports/rpt_component/helper/jpc_helper_common_output.js

@@ -10,7 +10,7 @@ const REG5 = new RegExp('\t', 'g');
 const OFFSET_FLOAT = 0.0000000001;
 
 const JpcCommonOutputHelper = {
-    createCommonOutputWithoutDecorate: function(node, value, forceCombine) {
+    createCommonOutputWithoutDecorate(node, value, forceCombine) {
         const me = this;
         const rst = {};
         // 1. font/style/control
@@ -36,7 +36,7 @@ const JpcCommonOutputHelper = {
         }
         return rst;
     },
-    createCommonOutput: function(node, value, controls) {
+    createCommonOutput(node, value, controls) {
         const me = this;
         const rst = {};
         // 1. font/style/control
@@ -56,7 +56,7 @@ const JpcCommonOutputHelper = {
         }
         return rst;
     },
-    formatCell: function(formatStr, rstCell) {
+    formatCell(formatStr, rstCell) {
         if (formatStr) {
             const rstCellFloatVal = parseFloat(rstCell[JV.PROP_VALUE]);
             if (!(isNaN(rstCellFloatVal))) {

app/reports/rpt_component/jpc_rte.js

@@ -7,7 +7,7 @@ const strUtil = require('../public/stringUtil');
 const JV = require('./jpc_value_define');
 const JE = {
     $STR_UTIL: strUtil,
-    F: function(fID, $CURRENT_RPT) {
+    F(fID, $CURRENT_RPT) {
         let rst = null;
         if ($CURRENT_RPT) {
             if ($CURRENT_RPT.fields[JV.NODE_DETAIL_FIELDS][JV.PROP_ID + '_' + fID]) {
@@ -30,7 +30,7 @@ const JE = {
         }
         return rst;
     },
-    P: function(pID, $CURRENT_RPT) {
+    P(pID, $CURRENT_RPT) {
         let rst = null;
         if ($CURRENT_RPT && ($CURRENT_RPT.params[JV.PROP_ID + '_' + pID])) {
             rst = $CURRENT_RPT.params[JV.PROP_ID + '_' + pID];
@@ -43,21 +43,21 @@ const JE = {
         }
         return rst;
     },
-    getCurrentPage: function($CURRENT_RPT) {
+    getCurrentPage($CURRENT_RPT) {
         let rst = 0;
         if ($CURRENT_RPT) {
             rst = $CURRENT_RPT.runTimePageData.currentPage;
         }
         return rst;
     },
-    getTotalPage: function($CURRENT_RPT) {
+    getTotalPage($CURRENT_RPT) {
         let rst = 0;
         if ($CURRENT_RPT) {
             rst = $CURRENT_RPT.totalPages;
         }
         return rst;
     },
-    getFieldDataLen: function(field, dataObj) {
+    getFieldDataLen(field, dataObj) {
         let rst = 0;
         if (field.DataNodeName === 'NA') {
             if (!field[JV.PROP_AD_HOC_DATA]) {
@@ -75,14 +75,14 @@ const JE = {
         }
         return rst;
     },
-    setFieldValue: function(field, dataObj, valIdx, newValue) {
+    setFieldValue(field, dataObj, valIdx, newValue) {
         if (field.DataNodeName === 'NA') {
             if (!field[JV.PROP_AD_HOC_DATA]) {
                 field[JV.PROP_AD_HOC_DATA] = [];
             }
             field[JV.PROP_AD_HOC_DATA][valIdx] = newValue;
         } else if (!field.DataNodeName) {
-            //that means this is a self-defined discrete field!
+            // that means this is a self-defined discrete field!
             field.DataNodeName = JV.DATA_DISCRETE_DATA;
             field.DataSeq = dataObj[JV.DATA_DISCRETE_DATA].length;
             dataObj[JV.DATA_DISCRETE_DATA].push([]);
@@ -91,7 +91,7 @@ const JE = {
             dataObj[field.DataNodeName][field.DataSeq][valIdx] = newValue;
         }
     },
-    getFieldValueArray: function(field, dataObj) {
+    getFieldValueArray(field, dataObj) {
         let rst = null;
         if (field.DataNodeName === 'NA') {
             if (!field[JV.PROP_AD_HOC_DATA]) {
@@ -110,7 +110,7 @@ const JE = {
         if (rst === null || rst === undefined) rst = [];
         return rst;
     },
-    setFieldValueArray: function(field, dataObj, newArr) {
+    setFieldValueArray(field, dataObj, newArr) {
         if (newArr instanceof Array) {
             if (field.DataNodeName === 'NA') {
                 field[JV.PROP_AD_HOC_DATA] = newArr;
@@ -125,7 +125,7 @@ const JE = {
             }
         }
     },
-    getFieldValue: function(field, dataObj, valIdx, newVal) {
+    getFieldValue(field, dataObj, valIdx, newVal) {
         let rst = null;
         if (field.DataNodeName === 'NA') {
             if (!field[JV.PROP_AD_HOC_DATA]) {
@@ -140,7 +140,7 @@ const JE = {
             }
         } else {
             if (!field.DataNodeName) {
-                //that means this is a self-defined discrete field!
+                // that means this is a self-defined discrete field!
                 field.DataNodeName = JV.DATA_DISCRETE_DATA;
                 field.DataSeq = dataObj[JV.DATA_DISCRETE_DATA];
                 dataObj[JV.DATA_DISCRETE_DATA].push([]);
@@ -156,7 +156,7 @@ const JE = {
         if (rst === null || rst === undefined) rst = newVal;
         return rst;
     },
-    removeFieldValue: function(field, dataObj, valIdx) {
+    removeFieldValue(field, dataObj, valIdx) {
         if (field.DataNodeName === 'NA') {
             if (field[JV.PROP_AD_HOC_DATA].length > valIdx && valIdx >= 0) {
                 field[JV.PROP_AD_HOC_DATA].splice(valIdx, 1);
@@ -167,7 +167,7 @@ const JE = {
             }
         }
     },
-    insertFieldValue: function(field, dataObj, valIdx, newValue) {
+    insertFieldValue(field, dataObj, valIdx, newValue) {
         if (field.DataNodeName === 'NA') {
             if (field[JV.PROP_AD_HOC_DATA].length > valIdx && valIdx >= 0) {
                 field[JV.PROP_AD_HOC_DATA].splice(valIdx, 0, newValue);
@@ -182,21 +182,21 @@ const JE = {
             }
         }
     },
-    isSignature: function(fID, $CURRENT_RPT) {
+    isSignature(fID, $CURRENT_RPT) {
         let rst = false;
         if ($CURRENT_RPT.fields[JV.NODE_SIGNATURE_FIELDS]) {
             rst = $CURRENT_RPT.fields[JV.NODE_SIGNATURE_FIELDS][JV.PROP_ID + '_' + fID] !== undefined;
         }
         return rst;
     },
-    isDynamicParam: function(pID, $CURRENT_RPT) {
+    isDynamicParam(pID, $CURRENT_RPT) {
         let rst = false;
         if ($CURRENT_RPT.params[JV.NODE_DYNAMIC_DATE_PARAMS]) {
             rst = $CURRENT_RPT.params[JV.NODE_DYNAMIC_DATE_PARAMS][JV.PROP_ID + '_' + pID] !== undefined;
         }
         return rst;
     },
-    isSignatureAudit: function(pID, $CURRENT_RPT) {
+    isSignatureAudit(pID, $CURRENT_RPT) {
         let rst = false;
         if ($CURRENT_RPT.params[JV.NODE_SIGNATURE_AUDIT_PARAMS]) {
             rst = $CURRENT_RPT.params[JV.NODE_SIGNATURE_AUDIT_PARAMS][JV.PROP_ID + '_' + pID] !== undefined;