three-trees-ui 1.0.46 → 1.0.47

package/lib/three-trees-ui.common.js

@@ -2395,7 +2395,7 @@ const Formulas = {
     }
     args.forEach(item => {
       item = Formulas.parseNumber(item);
-      num += item;
+      num = Formulas.floatAdd(num, item);
     });
     return num;
   },
@@ -2775,6 +2775,132 @@ const Formulas = {
     }
     return new Date(Date.parse(str.replace(/-/g, '/')));
   },
+  //格式化
+  toNonExponential(num) {
+    if (num == null) {
+      return num;
+    }
+    if (typeof num == 'number') {
+      var m = num.toExponential().match(/\d(?:\.(\d*))?e([+-]\d+)/);
+      return num.toFixed(Math.max(0, (m[1] || '').length - m[2]));
+    } else {
+      return num;
+    }
+  },
+  // 加
+  floatAdd(arg1, arg2) {
+    arg1 = Number(arg1) || 0;
+    arg2 = Number(arg2) || 0;
+    arg1 = Formulas.toNonExponential(arg1);
+    arg2 = Formulas.toNonExponential(arg2);
+    var r1, r2, m;
+    try {
+      r1 = arg1.toString().split('.')[1].length;
+    } catch (e) {
+      r1 = 0;
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length;
+    } catch (e) {
+      r2 = 0;
+    }
+    m = Math.pow(10, Math.max(r1, r2));
+    return (Formulas.floatMultiply(arg1, m) + Formulas.floatMultiply(arg2, m)) / m;
+  },
+  // 减
+  floatSub(arg1, arg2) {
+    arg1 = Number(arg1) || 0;
+    arg2 = Number(arg2) || 0;
+    arg1 = Formulas.toNonExponential(arg1);
+    arg2 = Formulas.toNonExponential(arg2);
+    var r1, r2, m, n;
+    try {
+      r1 = arg1.toString().split('.')[1].length;
+    } catch (e) {
+      r1 = 0;
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length;
+    } catch (e) {
+      r2 = 0;
+    }
+    m = Math.pow(10, Math.max(r1, r2));
+    // 动态控制精度长度
+    n = r1 >= r2 ? r1 : r2;
+    return ((Formulas.floatMultiply(arg1, m) - Formulas.floatMultiply(arg2, m)) / m).toFixed(n);
+  },
+  //乘
+  floatMultiply(arg1, arg2) {
+    arg1 = Number(arg1);
+    arg2 = Number(arg2);
+    if (!arg1 && arg1 !== 0 || !arg2 && arg2 !== 0) {
+      return null;
+    }
+    arg1 = Formulas.toNonExponential(arg1);
+    arg2 = Formulas.toNonExponential(arg2);
+    var n1, n2;
+    var r1, r2; // 小数位数
+    try {
+      r1 = arg1.toString().split('.')[1].length;
+    } catch (e) {
+      r1 = 0;
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length;
+    } catch (e) {
+      r2 = 0;
+    }
+    n1 = Number(arg1.toString().replace('.', ''));
+    n2 = Number(arg2.toString().replace('.', ''));
+    return n1 * n2 / Math.pow(10, r1 + r2);
+  },
+  //除
+  floatDivide(arg1, arg2) {
+    arg1 = Number(arg1);
+    arg2 = Number(arg2);
+    if (!arg2) {
+      return null;
+    }
+    if (!arg1 && arg1 !== 0) {
+      return null;
+    } else if (arg1 === 0) {
+      return 0;
+    }
+    arg1 = Formulas.toNonExponential(arg1);
+    arg2 = Formulas.toNonExponential(arg2);
+    var n1, n2;
+    var r1, r2; // 小数位数
+    try {
+      r1 = arg1.toString().split('.')[1].length;
+    } catch (e) {
+      r1 = 0;
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length;
+    } catch (e) {
+      r2 = 0;
+    }
+    n1 = Number(arg1.toString().replace('.', ''));
+    n2 = Number(arg2.toString().replace('.', ''));
+    return Formulas.floatMultiply(n1 / n2, Math.pow(10, r2 - r1));
+  },
+  //余
+  floatMod(arg1, arg2) {
+    arg1 = Number(arg1);
+    arg2 = Number(arg2);
+    if (!arg2) {
+      return null;
+    }
+    if (!arg1 && arg1 !== 0) {
+      return null;
+    } else if (arg1 === 0) {
+      return 0;
+    }
+    let intNum = arg1 / arg2;
+    intNum = intNum < 0 ? Math.ceil(arg1 / arg2) : Math.floor(arg1 / arg2); // -1.02 取整为 -1; 1.02取整为1
+    let intVal = Formulas.floatMultiply(intNum, arg2);
+    return Formulas.floatSub(arg1, intVal);
+  },
   getArrayByPath(obj) {
     let array = [];
     if (!obj.data) return array;
@@ -4666,7 +4792,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"1.0.46\"}");
+module.exports = JSON.parse("{\"a\":\"1.0.47\"}");
 
 /***/ }),
 

package/lib/three-trees-ui.umd.js

@@ -2404,7 +2404,7 @@ const Formulas = {
     }
     args.forEach(item => {
       item = Formulas.parseNumber(item);
-      num += item;
+      num = Formulas.floatAdd(num, item);
     });
     return num;
   },
@@ -2784,6 +2784,132 @@ const Formulas = {
     }
     return new Date(Date.parse(str.replace(/-/g, '/')));
   },
+  //格式化
+  toNonExponential(num) {
+    if (num == null) {
+      return num;
+    }
+    if (typeof num == 'number') {
+      var m = num.toExponential().match(/\d(?:\.(\d*))?e([+-]\d+)/);
+      return num.toFixed(Math.max(0, (m[1] || '').length - m[2]));
+    } else {
+      return num;
+    }
+  },
+  // 加
+  floatAdd(arg1, arg2) {
+    arg1 = Number(arg1) || 0;
+    arg2 = Number(arg2) || 0;
+    arg1 = Formulas.toNonExponential(arg1);
+    arg2 = Formulas.toNonExponential(arg2);
+    var r1, r2, m;
+    try {
+      r1 = arg1.toString().split('.')[1].length;
+    } catch (e) {
+      r1 = 0;
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length;
+    } catch (e) {
+      r2 = 0;
+    }
+    m = Math.pow(10, Math.max(r1, r2));
+    return (Formulas.floatMultiply(arg1, m) + Formulas.floatMultiply(arg2, m)) / m;
+  },
+  // 减
+  floatSub(arg1, arg2) {
+    arg1 = Number(arg1) || 0;
+    arg2 = Number(arg2) || 0;
+    arg1 = Formulas.toNonExponential(arg1);
+    arg2 = Formulas.toNonExponential(arg2);
+    var r1, r2, m, n;
+    try {
+      r1 = arg1.toString().split('.')[1].length;
+    } catch (e) {
+      r1 = 0;
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length;
+    } catch (e) {
+      r2 = 0;
+    }
+    m = Math.pow(10, Math.max(r1, r2));
+    // 动态控制精度长度
+    n = r1 >= r2 ? r1 : r2;
+    return ((Formulas.floatMultiply(arg1, m) - Formulas.floatMultiply(arg2, m)) / m).toFixed(n);
+  },
+  //乘
+  floatMultiply(arg1, arg2) {
+    arg1 = Number(arg1);
+    arg2 = Number(arg2);
+    if (!arg1 && arg1 !== 0 || !arg2 && arg2 !== 0) {
+      return null;
+    }
+    arg1 = Formulas.toNonExponential(arg1);
+    arg2 = Formulas.toNonExponential(arg2);
+    var n1, n2;
+    var r1, r2; // 小数位数
+    try {
+      r1 = arg1.toString().split('.')[1].length;
+    } catch (e) {
+      r1 = 0;
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length;
+    } catch (e) {
+      r2 = 0;
+    }
+    n1 = Number(arg1.toString().replace('.', ''));
+    n2 = Number(arg2.toString().replace('.', ''));
+    return n1 * n2 / Math.pow(10, r1 + r2);
+  },
+  //除
+  floatDivide(arg1, arg2) {
+    arg1 = Number(arg1);
+    arg2 = Number(arg2);
+    if (!arg2) {
+      return null;
+    }
+    if (!arg1 && arg1 !== 0) {
+      return null;
+    } else if (arg1 === 0) {
+      return 0;
+    }
+    arg1 = Formulas.toNonExponential(arg1);
+    arg2 = Formulas.toNonExponential(arg2);
+    var n1, n2;
+    var r1, r2; // 小数位数
+    try {
+      r1 = arg1.toString().split('.')[1].length;
+    } catch (e) {
+      r1 = 0;
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length;
+    } catch (e) {
+      r2 = 0;
+    }
+    n1 = Number(arg1.toString().replace('.', ''));
+    n2 = Number(arg2.toString().replace('.', ''));
+    return Formulas.floatMultiply(n1 / n2, Math.pow(10, r2 - r1));
+  },
+  //余
+  floatMod(arg1, arg2) {
+    arg1 = Number(arg1);
+    arg2 = Number(arg2);
+    if (!arg2) {
+      return null;
+    }
+    if (!arg1 && arg1 !== 0) {
+      return null;
+    } else if (arg1 === 0) {
+      return 0;
+    }
+    let intNum = arg1 / arg2;
+    intNum = intNum < 0 ? Math.ceil(arg1 / arg2) : Math.floor(arg1 / arg2); // -1.02 取整为 -1; 1.02取整为1
+    let intVal = Formulas.floatMultiply(intNum, arg2);
+    return Formulas.floatSub(arg1, intVal);
+  },
   getArrayByPath(obj) {
     let array = [];
     if (!obj.data) return array;
@@ -4675,7 +4801,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"1.0.46\"}");
+module.exports = JSON.parse("{\"a\":\"1.0.47\"}");
 
 /***/ }),