rapid-spreadjs 1.0.111 → 1.0.112

package/dist/index.cjs.js

@@ -21081,23 +21081,28 @@ const FormulaUtils = {
                     return '/';
                 }
                 const val1 = retData.allCellVals[0], val2 = retData.allCellVals[1], val3 = retData.allCellVals[2], val4 = retData.allCellVals[3], val5 = retData.allCellVals[4], val6 = retData.allCellVals[5], overVal = retData.allCellVals[6];
+                if (typeof overVal !== 'number' || isNaN(overVal)) {
+                    return '/';
+                }
                 // 参数类型检查 - 所有参数必须为数字类型
-                const args = [
-                    parseFloat(val1),
-                    parseFloat(val2),
-                    parseFloat(val3),
-                    parseFloat(val4),
-                    parseFloat(val5),
-                    parseFloat(val6),
-                    parseFloat(overVal),
-                ];
+                const args = [parseFloat(val1), parseFloat(val2), parseFloat(val3), parseFloat(val4), parseFloat(val5), parseFloat(val6)];
+                let notNumCount = 0;
+                // 提取前6个值进行计算
+                let values = [];
                 for (let i = 0; i < args.length; i++) {
                     if (typeof args[i] !== 'number' || isNaN(args[i])) {
-                        return '/';
+                        notNumCount++;
+                        // return "/";
+                    }
+                    else {
+                        values.push(args[i]);
                     }
                 }
-                // 提取前6个值进行计算
-                const values = [parseFloat(val1), parseFloat(val2), parseFloat(val3), parseFloat(val4), parseFloat(val5), parseFloat(val6)];
+                if (notNumCount == args.length) {
+                    return '/';
+                }
+                // // 提取前6个值进行计算
+                // const values = [parseFloat(val1), parseFloat(val2), parseFloat(val3), parseFloat(val4), parseFloat(val5), parseFloat(val6)];
                 // 计算初始平均值avg
                 const sum = values.reduce((acc, val) => rapidUtils.preciseCalc(acc, val, 'add'), 0);
                 const avg = rapidUtils.preciseCalc(sum, values.length, 'div');