@bchr/bchr-front-lib 0.3.135 → 0.3.138

package/lib/base/AppFormulaFunctions.js

@@ -68,24 +68,37 @@ window.AppFormulaFunctions = {
 
     return null;
   },
-  calcOtherWaByBaseWa: function calcOtherWaByBaseWa(baseWa, percent, calcType) {
+
+  /**
+   * 根据基本工资计算其他工资项
+   * @param baseWa     级别薪资
+   * @param percent    百分比
+   * @param digitsNum  保留小数点后几位 (默认0)
+   * @param calcType   计算方式（默认向上取整）
+   * @returns {null|number}
+   */
+  calcOtherWaByBaseWa: function calcOtherWaByBaseWa(baseWa, percent, digitsNum, calcType) {
     if (!baseWa || !percent) {
       console.log("calcOtherWaByBaseWa param baseWa: " + baseWa + ",percent" + percent);
       return null;
     }
 
-    var wa = Math.floor(parseFloat(baseWa * 100 * percent));
+    if (!digitsNum) {
+      digitsNum = 0;
+    }
+
+    var wa = parseFloat(baseWa * Math.pow(10, digitsNum) * percent);
 
     if (!calcType) {
       calcType = 3;
     }
 
     if (calcType == 1) {
-      return Math.ceil(wa) / 100; //向上取整
+      return Math.round(wa) / Math.pow(10, digitsNum); //四舍五入
     } else if (calcType == 2) {
-      return Math.floor(wa) / 100; //向下取整
+      return Math.floor(wa) / Math.pow(10, digitsNum); //向下取整
     } else {
-      return Math.round(wa) / 100; //四舍五入
+      return Math.ceil(wa) / Math.pow(10, digitsNum); //向上取整
     }
   },
   //生活补贴标准级别

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

@@ -1238,6 +1238,10 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
       if (callback && typeof callback === "function") {
         callback(value, label, extra, ref);
       }
+
+      if (value) {
+        this.formItemOnChangeForFormula(config, value);
+      }
     }
   }, {
     key: "showModal",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bchr/bchr-front-lib",
-  "version": "0.3.135",
+  "version": "0.3.138",
   "description": "bchr front lib",
   "main": "lib/index.js",
   "scripts": {
@@ -49,3 +49,4 @@
     "react-loadable": "^5.5.0"
   }
 }
+

package/src/base/AppFormulaFunctions.js

@@ -73,24 +73,36 @@ window.AppFormulaFunctions = {
         return null;
     },
 
-    calcOtherWaByBaseWa(baseWa, percent, calcType) {
+    /**
+     * 根据基本工资计算其他工资项
+     * @param baseWa     级别薪资
+     * @param percent    百分比
+     * @param digitsNum  保留小数点后几位 (默认0)
+     * @param calcType   计算方式（默认向上取整）
+     * @returns {null|number}
+     */
+    calcOtherWaByBaseWa(baseWa, percent, digitsNum, calcType) {
         if (!baseWa || !percent) {
             console.log("calcOtherWaByBaseWa param baseWa: " + baseWa + ",percent" + percent);
             return null;
         }
 
-        let wa = Math.floor(parseFloat(baseWa * 100 * percent));
+        if (!digitsNum) {
+            digitsNum = 0;
+        }
+
+        let wa = parseFloat(baseWa * Math.pow(10, digitsNum) * percent);
 
         if (!calcType) {
             calcType = 3;
         }
 
         if (calcType == 1) {
-            return Math.ceil(wa)/100;     //向上取整
+            return  Math.round(wa)/Math.pow(10, digitsNum);    //四舍五入
         } else if (calcType == 2) {
-            return Math.floor(wa)/100;    //向下取整
+            return Math.floor(wa)/Math.pow(10, digitsNum);     //向下取整
         } else {
-            return Math.round(wa)/100;    //四舍五入
+            return Math.ceil(wa)/Math.pow(10, digitsNum);      //向上取整
         }
     },
 

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

@@ -1058,6 +1058,10 @@ class FormForModify extends React.Component{
         if (callback && typeof callback === "function") {
             callback(value, label, extra, ref);
         }
+
+        if (value) {
+            this.formItemOnChangeForFormula(config, value)
+        }
     }
 
     showModal(config) {