@leankylin-sheet/formula-parser 4.0.44 → 4.0.46

package/dist/evaluate-by-operator/operator/math.d.ts

@@ -0,0 +1 @@
+export function multiplyNumber(num1?: number, num2?: number): number;

package/dist/index.esm.js

@@ -1,6 +1,7 @@
 import Emitter from 'tiny-emitter';
 import * as formulajs from '@formulajs/formulajs';
 import { utils } from '@formulajs/formulajs';
+import { Decimal } from 'decimal.js';
 
 function _callSuper(t, o, e) {
   return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
@@ -350,13 +351,7 @@ function func$4(symbol) {
     if (symbolParts.length === 1) {
       if (formulajs[symbolParts[0]]) {
         foundFormula = true;
-        if (symbolParts[0] === "SUMPRODUCT") {
-          var _params2;
-          params = (_params2 = params) === null || _params2 === void 0 ? void 0 : _params2.map(function (item) {
-            var _item$flat;
-            return (item === null || item === void 0 ? void 0 : item.flat) ? (_item$flat = item.flat()) === null || _item$flat === void 0 ? void 0 : _item$flat.map(toNumberNotNaN) : toNumberNotNaN(item);
-          });
-        }
+        params = tsParams(symbolParts[0], params);
         result = formulajs[symbolParts[0]].apply(formulajs, _toConsumableArray(params));
       }
     } else {
@@ -384,6 +379,26 @@ function func$4(symbol) {
 }
 func$4.isFactory = true;
 func$4.SYMBOL = SYMBOL$4;
+function tsParams(fnName, params) {
+  if (fnName === "SUMPRODUCT") {
+    var _params2;
+    params = (_params2 = params) === null || _params2 === void 0 ? void 0 : _params2.map(function (item) {
+      var _item$flat;
+      return (item === null || item === void 0 ? void 0 : item.flat) ? (_item$flat = item.flat()) === null || _item$flat === void 0 ? void 0 : _item$flat.map(toNumberNotNaN) : toNumberNotNaN(item);
+    });
+  } else if (fnName === "SUMIF") {
+    var _params3;
+    params = (_params3 = params) === null || _params3 === void 0 ? void 0 : _params3.map(function (item, index) {
+      if (index === 2 && Array.isArray(item)) {
+        return item === null || item === void 0 ? void 0 : item.map(function (cell) {
+          return [null, undefined, ""].includes(cell === null || cell === void 0 ? void 0 : cell[0]) ? [0] : cell;
+        });
+      }
+      return item;
+    });
+  }
+  return params;
+}
 
 var SYMBOL$5 = '>';
 function func$5(exp1, exp2) {
@@ -472,6 +487,19 @@ function func$9(first) {
 }
 func$9.SYMBOL = SYMBOL$9;
 
+/**
+ * 解决js处理精度问题
+ * 0.3 * 0.1 = 0.03
+ * @param num1
+ * @param num2
+ * @returns
+ */
+var multiplyNumber = function multiplyNumber() {
+  var num1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  var num2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  return new Decimal(num1).mul(num2).toNumber();
+};
+
 var SYMBOL$a = "*";
 
 // export default function func(first, ...rest) {
@@ -496,7 +524,7 @@ function func$a(first) {
         return Array.isArray(rItem) ? rItem[index] : toNumber(rItem);
       });
       var v = _list.reduce(function (acc, value) {
-        return acc * toNumber(value);
+        return multiplyNumber(acc, toNumber(value));
       }, toNumber(item));
       if (isNaN(v)) {
         throw Error(ERROR_VALUE);
@@ -506,7 +534,7 @@ function func$a(first) {
     return dd;
   }
   var result = rest.reduce(function (acc, value) {
-    return acc * toNumber(value);
+    return multiplyNumber(acc, toNumber(value));
   }, toNumber(first));
   if (isNaN(result)) {
     throw Error(ERROR_VALUE);

package/dist/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var Emitter = require('tiny-emitter');
 var formulajs = require('@formulajs/formulajs');
+var decimal_js = require('decimal.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -378,13 +379,7 @@ function func$4(symbol) {
     if (symbolParts.length === 1) {
       if (formulajs__namespace[symbolParts[0]]) {
         foundFormula = true;
-        if (symbolParts[0] === "SUMPRODUCT") {
-          var _params2;
-          params = (_params2 = params) === null || _params2 === void 0 ? void 0 : _params2.map(function (item) {
-            var _item$flat;
-            return (item === null || item === void 0 ? void 0 : item.flat) ? (_item$flat = item.flat()) === null || _item$flat === void 0 ? void 0 : _item$flat.map(toNumberNotNaN) : toNumberNotNaN(item);
-          });
-        }
+        params = tsParams(symbolParts[0], params);
         result = formulajs__namespace[symbolParts[0]].apply(formulajs__namespace, _toConsumableArray(params));
       }
     } else {
@@ -412,6 +407,26 @@ function func$4(symbol) {
 }
 func$4.isFactory = true;
 func$4.SYMBOL = SYMBOL$4;
+function tsParams(fnName, params) {
+  if (fnName === "SUMPRODUCT") {
+    var _params2;
+    params = (_params2 = params) === null || _params2 === void 0 ? void 0 : _params2.map(function (item) {
+      var _item$flat;
+      return (item === null || item === void 0 ? void 0 : item.flat) ? (_item$flat = item.flat()) === null || _item$flat === void 0 ? void 0 : _item$flat.map(toNumberNotNaN) : toNumberNotNaN(item);
+    });
+  } else if (fnName === "SUMIF") {
+    var _params3;
+    params = (_params3 = params) === null || _params3 === void 0 ? void 0 : _params3.map(function (item, index) {
+      if (index === 2 && Array.isArray(item)) {
+        return item === null || item === void 0 ? void 0 : item.map(function (cell) {
+          return [null, undefined, ""].includes(cell === null || cell === void 0 ? void 0 : cell[0]) ? [0] : cell;
+        });
+      }
+      return item;
+    });
+  }
+  return params;
+}
 
 var SYMBOL$5 = '>';
 function func$5(exp1, exp2) {
@@ -500,6 +515,19 @@ function func$9(first) {
 }
 func$9.SYMBOL = SYMBOL$9;
 
+/**
+ * 解决js处理精度问题
+ * 0.3 * 0.1 = 0.03
+ * @param num1
+ * @param num2
+ * @returns
+ */
+var multiplyNumber = function multiplyNumber() {
+  var num1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  var num2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  return new decimal_js.Decimal(num1).mul(num2).toNumber();
+};
+
 var SYMBOL$a = "*";
 
 // export default function func(first, ...rest) {
@@ -524,7 +552,7 @@ function func$a(first) {
         return Array.isArray(rItem) ? rItem[index] : toNumber(rItem);
       });
       var v = _list.reduce(function (acc, value) {
-        return acc * toNumber(value);
+        return multiplyNumber(acc, toNumber(value));
       }, toNumber(item));
       if (isNaN(v)) {
         throw Error(ERROR_VALUE);
@@ -534,7 +562,7 @@ function func$a(first) {
     return dd;
   }
   var result = rest.reduce(function (acc, value) {
-    return acc * toNumber(value);
+    return multiplyNumber(acc, toNumber(value));
   }, toNumber(first));
   if (isNaN(result)) {
     throw Error(ERROR_VALUE);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/formula-parser",
-  "version": "4.0.44",
+  "version": "4.0.46",
   "description": "Formula parser",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
@@ -37,6 +37,7 @@
   },
   "dependencies": {
     "@formulajs/formulajs": "^4.5.6",
+    "decimal.js": "^10.6.0",
     "tiny-emitter": "^2.1.0"
   },
   "jest": {