rapid-spreadjs 1.0.68 → 1.0.70

package/dist/index.esm.js

@@ -19470,11 +19470,12 @@ const FormulaUtils = {
                 },
             ],
             funCallback: (spread, sheet, retData) => {
-                //如果传递的参数小于6个，则返回空字符串
-                if (retData.allCellValsEw.length < 6) {
-                    return '';
+                // 如果传递的参数小于5个，则返回空字符串
+                // 本来有6个参数，最后一个参数可以不传，默认为：0
+                if (retData.allCellValsEw.length < 5) {
+                    return '/';
                 }
-                let array1 = retData.allCellValsEw[0], array2 = retData.allCellValsEw[1], operator = retData.allCellValsEw[2], value = retData.allCellValsEw[3], delimiter = retData.allCellValsEw[4], isOpposite = retData.allCellValsEw[5];
+                let array1 = retData.allCellValsEw[0], array2 = retData.allCellValsEw[1], operator = retData.allCellValsEw[2], value = retData.allCellValsEw[3], delimiter = retData.allCellValsEw[4], isOpposite = retData.allCellValsEw.length == 5 ? 0 : retData.allCellValsEw[5];
                 try {
                     // 处理array1和array2的默认值
                     if (array1 == null || array1 == undefined || (typeof array1 == 'string' && array1.trim().length == 0)) {
@@ -19687,21 +19688,7 @@ const FormulaUtils = {
                 },
             ],
             funCallback: (spread, sheet, retData) => {
-                //如果传递的参数小于3个，则返回空字符串
-                if (retData.allCellValsEw.length < 3) {
-                    return '';
-                }
-                let xData = FormulaUtils.commFun.convertToInt(retData.allCellValsEw[0].filter((item) => FormulaUtils.commFun.isNumber(item))), yData = FormulaUtils.commFun.convertToInt(retData.allCellValsEw[1].filter((item) => FormulaUtils.commFun.isNumber(item))), x = retData.allCellValsEw[2];
-                if (Array.isArray(x) && x.length > 0) {
-                    x = Number(x[0]);
-                }
-                else {
-                    x = Number(x);
-                }
-                console.log(111, retData);
-                console.log(222, xData);
-                console.log(333, yData);
-                console.log(444, x);
+                console.log(retData);
                 return 'OK';
             },
         },