code sync

modules/reports/rpt_component/helper/jpc_helper_field.js

@@ -70,7 +70,19 @@ let JpcFieldHelper = {
                 }
                 if (!isFounded) {
                     if (rstFields) rstFields.push(tab_fields[i]);
-                    if (rstFieldsIdx) rstFieldsIdx.push(JV.BLANK_FIELD_INDEX);
+                    if (rstFieldsIdx) {
+                        if (rptTpl[JV.NODE_NO_MAPPING_FIELDS] && rptTpl[JV.NODE_NO_MAPPING_FIELDS].length > 0) {
+                            for (let discretField of rptTpl[JV.NODE_NO_MAPPING_FIELDS]) {
+                                if (discretField[JV.PROP_ID] === tab_fields[i]["FieldID"]) {
+                                    rstFieldsIdx.push(discretField);
+                                    isFounded = true;
+                                    break;
+                                }
+                            }
+                        } else {
+                            rstFieldsIdx.push(JV.BLANK_FIELD_INDEX);
+                        }
+                    }
                 }
             }
         }

modules/reports/rpt_component/jpc_ex.js

@@ -173,16 +173,16 @@ JpcExSrv.prototype.createNew = function(){
         //pre-condition: the data should be sorted in SQL/NoSQL level!
         //let dt1 = new Date();
         if (me.flowTab) {
-            me.flowTab.sorting(rptTpl, dataObj, dataHelper.dataSeq.slice(0));
+            me.flowTab.sorting(rptTpl, dataObj, dataHelper.dataSeq.slice(0), me);
             if (me.flowTabEx) {
                 me.flowTabEx.sorting(rptTpl, dataObj, dataHelper.exDataSeq.slice(0));
             }
         }
         if (me.billTab) {
-            me.billTab.sorting(rptTpl, dataObj, dataHelper.dataSeq.slice(0));
+            me.billTab.sorting(rptTpl, dataObj, dataHelper.dataSeq.slice(0), me);
         }
         if (me.crossTab) {
-            me.crossTab.sorting(rptTpl, dataObj, dataHelper.dataSeq.slice(0));
+            me.crossTab.sorting(rptTpl, dataObj, dataHelper.dataSeq.slice(0), me);
         }
         //let dt2 = new Date();
         //alert(dt2 - dt1);

modules/reports/rpt_component/jpc_rte.js

@@ -63,8 +63,8 @@ let JE = {
             dataObj[field.DataNodeName][field.DataSeq][valIdx] = newValue;
         }
     },
-    getFieldValue: function (field, dataObj, valIdx, dftVal) {
-        let rst = dftVal;
+    getFieldValue: function (field, dataObj, valIdx, newVal) {
+        let rst = newVal;
         if (field.DataNodeName === "NA") {
             if (!field[JV.PROP_AD_HOC_DATA]) {
                 field[JV.PROP_AD_HOC_DATA] = [];
@@ -72,7 +72,7 @@ let JE = {
             if (field[JV.PROP_AD_HOC_DATA].length > valIdx) {
                 rst = field[JV.PROP_AD_HOC_DATA][valIdx];
             } else {
-                if (dftVal === null && field[JV.PROP_AD_HOC_DATA].length > 0) {
+                if (newVal === null && field[JV.PROP_AD_HOC_DATA].length > 0) {
                     rst = field[JV.PROP_AD_HOC_DATA][field[JV.PROP_AD_HOC_DATA].length - 1];
                 }
             }
@@ -86,7 +86,7 @@ let JE = {
             if (dataObj[field.DataNodeName][field.DataSeq].length > valIdx) {
                 rst = dataObj[field.DataNodeName][field.DataSeq][valIdx];
             } else {
-                if (dftVal === null && dataObj[field.DataNodeName][field.DataSeq].length > 0) {
+                if (newVal === null && dataObj[field.DataNodeName][field.DataSeq].length > 0) {
                     rst = dataObj[field.DataNodeName][field.DataSeq][dataObj[field.DataNodeName][field.DataSeq].length - 1];
                 }
             }

package.json

@@ -15,7 +15,7 @@
     "express-partials": "^0.3.0",
     "express-session": "^1.15.1",
     "glob": "~4.0.5",
-    "lodash": "^3.10.1",
+    "lodash": "^4.17.10",
     "moment": "^2.18.1",
     "mongoose": "~4.13.12",
     "request": "^2.79.0",

test/demo/stringTest.js

@@ -19,15 +19,22 @@ let strUtil = require('../../public/stringUtil');
 //     t.end();
 // })
 
-test('string test1', function(t){
-    let str = "abc|def";
-    // let str1 = str.replace('|', '\n');
-    // let str1 = strUtil.replaceAll(str, "|", "\n\r");
-    // let str1 = strUtil.replaceAll(str, "\|", "+");
-    let str1 = str.split('|').join('\n\r');
-    console.log(str1);
-    //t.equal(str1, "@('1.1') + @('1.2') + @('1.3') + @('1.4')");
-    // t.equal(str1, "at('1.1') + at('1.2') + at('1.3') + at('1.4')");
+// test('string test1', function(t){
+//     let str = "abc|def";
+//     // let str1 = str.replace('|', '\n');
+//     // let str1 = strUtil.replaceAll(str, "|", "\n\r");
+//     // let str1 = strUtil.replaceAll(str, "\|", "+");
+//     let str1 = str.split('|').join('\n\r');
+//     console.log(str1);
+//     //t.equal(str1, "@('1.1') + @('1.2') + @('1.3') + @('1.4')");
+//     // t.equal(str1, "at('1.1') + at('1.2') + at('1.3') + at('1.4')");
+//     t.end();
+// })
+
+test('string encodeURI', function(t){
+    let str = "a\tdef";
+    console.log(str);
+    console.log(str.replace('\t', ' '));
     t.end();
 })