@bchr/bchr-front-lib 0.3.108 → 0.3.112

package/lib/base/AppFormulaFunctions.js

@@ -47,12 +47,18 @@ window.AppFormulaFunctions = {
   },
   // YH use 生活补贴标准级别
   lifeBTLevel: function lifeBTLevel(post_wa_rank_pk, work_place_pk) {
-    if (!post_wa_rank_pk || !work_place_pk || post_wa_rank_pk == "0") {
+    if (!post_wa_rank_pk || !work_place_pk) {
+      console.log("lifeBTLevel param post_wa_rank_pk: " + post_wa_rank_pk + ",work_place_pk" + work_place_pk);
       return null;
     }
 
     post_wa_rank_pk = post_wa_rank_pk + "";
-    work_place_pk = work_place_pk + ""; // M8 和T6以上级别
+    work_place_pk = work_place_pk + "";
+
+    if (post_wa_rank_pk == "0" || post_wa_rank_pk == "0") {
+      return null;
+    } // M8 和T6以上级别
+
 
     var postWaRankOfDeptLevelAndUp = ["601801", "601802", "601803", "601804", "601805", "601806", "601807", "601808", "601817", "601818", "601819", "601820", "601821", "601822"];
 
@@ -93,6 +99,7 @@ window.AppFormulaFunctions = {
   // YH use 房补级别
   houseBTLevel: function houseBTLevel(post_wa_rank_pk, work_place_pk, person_class_pk) {
     if (!post_wa_rank_pk || !work_place_pk || !person_class_pk) {
+      console.log("houseBTLevel param post_wa_rank_pk: " + post_wa_rank_pk + ",work_place_pk" + work_place_pk + ", person_class_pk=" + person_class_pk);
       return null;
     }
 
@@ -102,7 +109,7 @@ window.AppFormulaFunctions = {
 
     if (post_wa_rank_pk == "0" || post_wa_rank_pk == "0") {
       return null;
-    } //100006、100011、101003、101006、103006、103011
+    } //100006、100011、101003、101006、103006、103011 总共六类人员类别有房补
 
 
     var houseBTPersonClassPKs = ["100006", "100011", "101003", "101006", "103006", "103011"];
@@ -181,6 +188,7 @@ window.AppFormulaFunctions = {
   // YH use 意外险级别
   accidentInsLevel: function accidentInsLevel(execute_wa_grade_pk) {
     if (!execute_wa_grade_pk) {
+      console.log("accidentInsLevel param execute_wa_grade_pk: " + execute_wa_grade_pk);
       return null;
     }
 

package/lib/base/layout/ui_tpl/form/FormForModify.js

@@ -767,7 +767,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
               } else {
                 var formItemValueList = formItemValue.split("#");
 
-                if (!formItemValueList || formItemValueList.length != 3) {
+                if (!formItemValueList || formItemValueList.length < 3) {
                   console.log("formula error, detail info: formItemCode=" + formItemValue + ", formItemValue=" + formItemValue);
                   return "continue";
                 }
@@ -788,11 +788,11 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
                   }
                 }
 
-                formulaFunctionValue = eval(realFormulaValue.replace("@", ","));
+                formulaFunctionValue = eval(realFormulaValue.replaceAll("@", ","));
               }
 
               if (!formulaFunctionValue) {
-                console.log("formula function return null, detail info: formItemCode=" + formItemValue + ", formItemValue=" + formItemValue);
+                console.log("formula function return null, detail info: formItemValue=" + formItemValue);
                 return "continue";
               }
 
@@ -1244,7 +1244,7 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
           if (typeof formItemValue === 'number') {
             value = formItemValue && formItemValue > 0 ? formItemValue : null;
           } else {
-            value = Number(formItemValue);
+            formItemValue = Number(formItemValue);
             value = formItemValue && formItemValue > 0 ? formItemValue : null;
           }
 

package/lib/services/HttpService.js

@@ -364,10 +364,7 @@ var HttpService = /*#__PURE__*/function () {
       var containsHTML = /<(br|basefont|hr|input|source|frame|param|area|meta|!--|col|link|option|base|img|wbr|!DOCTYPE).*?>|<(a|abbr|acronym|address|applet|article|aside|audio|b|bdi|bdo|big|blockquote|body|button|canvas|caption|center|cite|code|colgroup|command|datalist|dd|del|details|dfn|dialog|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frameset|head|header|hgroup|h1|h2|h3|h4|h5|h6|html|i|iframe|ins|kbd|keygen|label|legend|li|map|mark|menu|meter|nav|noframes|noscript|object|ol|optgroup|output|p|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|small|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|track|tt|u|ul|var|video).*?<\/\2>/i.test(str);
 
       if (containsHTML) {
-        new Promise(function (resolve, reject) {
-          reject("不安全的输入,请检查!");
-        });
-        return;
+        throw new Error("不安全的输入,请检查!");
       }
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bchr/bchr-front-lib",
-  "version": "0.3.108",
+  "version": "0.3.112",
   "description": "bchr front lib",
   "main": "lib/index.js",
   "scripts": {

package/src/base/AppFormulaFunctions.js

@@ -48,13 +48,19 @@ window.AppFormulaFunctions = {
 
     // YH use 生活补贴标准级别
     lifeBTLevel : function (post_wa_rank_pk, work_place_pk) {
-        if (!post_wa_rank_pk || !work_place_pk || post_wa_rank_pk == "0") {
-            return null
+        if (!post_wa_rank_pk || !work_place_pk) {
+            console.log("lifeBTLevel param post_wa_rank_pk: " + post_wa_rank_pk + ",work_place_pk" + work_place_pk);
+            return null;
         }
 
         post_wa_rank_pk = post_wa_rank_pk + "";
         work_place_pk   = work_place_pk + "";
 
+        if (post_wa_rank_pk == "0" || post_wa_rank_pk == "0")
+        {
+            return null;
+        }
+
         // M8 和T6以上级别
         let postWaRankOfDeptLevelAndUp = [
             "601801", "601802", "601803", "601804", "601805", "601806", "601807", "601808",
@@ -93,6 +99,7 @@ window.AppFormulaFunctions = {
     // YH use 房补级别
     houseBTLevel : function (post_wa_rank_pk, work_place_pk, person_class_pk) {
         if (!post_wa_rank_pk || !work_place_pk || !person_class_pk) {
+            console.log("houseBTLevel param post_wa_rank_pk: " + post_wa_rank_pk + ",work_place_pk" + work_place_pk + ", person_class_pk=" + person_class_pk);
             return null
         }
 
@@ -105,7 +112,7 @@ window.AppFormulaFunctions = {
             return null;
         }
 
-        //100006、100011、101003、101006、103006、103011
+        //100006、100011、101003、101006、103006、103011 总共六类人员类别有房补
         let houseBTPersonClassPKs = ["100006", "100011", "101003", "101006", "103006", "103011"];
         if (houseBTPersonClassPKs.findIndex(item => item == person_class_pk) === -1) {
             return null;
@@ -179,13 +186,14 @@ window.AppFormulaFunctions = {
     // YH use 意外险级别
     accidentInsLevel : function (execute_wa_grade_pk) {
         if (!execute_wa_grade_pk) {
+            console.log("accidentInsLevel param execute_wa_grade_pk: " + execute_wa_grade_pk)
             return null;
         }
 
         execute_wa_grade_pk = execute_wa_grade_pk + "";
 
         if (execute_wa_grade_pk == "0") {
-            return null
+            return null;
         }
 
         // M1

package/src/base/layout/ui_tpl/form/FormForModify.js

@@ -1113,7 +1113,7 @@ class FormForModify extends React.Component{
                             formulaFunctionValue = eval(formItemValue.replace('#value#', `value`).replace("@", ","));
                         } else {
                             let formItemValueList = formItemValue.split("#");
-                            if (!formItemValueList || formItemValueList.length != 3) {
+                            if (!formItemValueList || formItemValueList.length < 3) {
                                 console.log("formula error, detail info: formItemCode=" + formItemValue + ", formItemValue=" + formItemValue);
                                 continue;
                             }
@@ -1130,13 +1130,14 @@ class FormForModify extends React.Component{
                                         realFormulaValue = realFormulaValue + formItemParamOrExp;
                                     }
                                 }
+
                             }
 
-                            formulaFunctionValue = eval(realFormulaValue.replace("@", ","));
+                            formulaFunctionValue = eval(realFormulaValue.replaceAll("@", ","));
                         }
 
                         if (!formulaFunctionValue) {
-                            console.log("formula function return null, detail info: formItemCode=" + formItemValue + ", formItemValue=" + formItemValue);
+                            console.log("formula function return null, detail info: formItemValue=" + formItemValue);
                             continue;
                         }
 
@@ -1220,7 +1221,7 @@ class FormForModify extends React.Component{
                 if (typeof formItemValue === 'number') {
                     value = formItemValue && formItemValue > 0 ? formItemValue : null;
                 } else {
-                    value = Number(formItemValue);
+                    formItemValue = Number(formItemValue);
                     value = formItemValue && formItemValue > 0 ? formItemValue : null;
                 }
                 break;

package/src/services/HttpService.js

@@ -341,11 +341,7 @@ class HttpService {
 
         let containsHTML = /<(br|basefont|hr|input|source|frame|param|area|meta|!--|col|link|option|base|img|wbr|!DOCTYPE).*?>|<(a|abbr|acronym|address|applet|article|aside|audio|b|bdi|bdo|big|blockquote|body|button|canvas|caption|center|cite|code|colgroup|command|datalist|dd|del|details|dfn|dialog|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frameset|head|header|hgroup|h1|h2|h3|h4|h5|h6|html|i|iframe|ins|kbd|keygen|label|legend|li|map|mark|menu|meter|nav|noframes|noscript|object|ol|optgroup|output|p|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|small|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|track|tt|u|ul|var|video).*?<\/\2>/i.test(str);
         if (containsHTML) {
-            new Promise((resolve, reject) => {
-                reject("不安全的输入,请检查!");
-            });
-
-            return;
+            throw new Error("不安全的输入,请检查!");
         }
     }