rapid-spreadjs 1.0.155 → 1.0.157

package/dist/index.cjs.js

@@ -16267,6 +16267,10 @@ const FormulaUtils = {
                 let symbol = '/';
                 //如果传递的参数小于2个，则返回符号
                 if (retData.allCellVals.length < 2) {
+                    if (sheet.getValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col) != '/') {
+                        sheet.setValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col, '/');
+                        return symbol;
+                    }
                     return symbol;
                 }
                 if (retData.allCellVals[0]._error != undefined && retData.allCellVals[0]._error != null) {
@@ -16283,11 +16287,21 @@ const FormulaUtils = {
                         }
                     }
                 });
+                if (syjglist.length == 0) {
+                    if (sheet.getValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col) != '/') {
+                        sheet.setValue(retData.arguments[1].$gt[0].row, retData.arguments[1].$gt[0].col, '/');
+                        return symbol;
+                    }
+                }
                 // console.log(retData);
                 // console.log(jsyq);
                 // console.log(syjglist);
                 var kk = '合格';
-                if (jsyq == '/' || jsyq == '' || syjglist.some((item) => item == '无效')) {
+                if (jsyq == '/' ||
+                    jsyq == '' ||
+                    syjglist.some((item) => item == '无效') ||
+                    syjglist.length === 0 ||
+                    (syjglist.length === 1 && (syjglist[0] === '/' || syjglist[0] === ''))) {
                     return '/';
                 }
                 for (var i = 0; i < syjglist.length; i++) {
@@ -16394,7 +16408,7 @@ const FormulaUtils = {
                         }
                         else {
                             var num = k2.replace('≥', '').replace('不小于', '').replace('≮', '') * 1;
-                            if (IsNumber(k1)) {
+                            if (FormulaUtils.commFun.isNumber(k1)) {
                                 if (k1 > num || k1 == num) {
                                     kk = '合格';
                                 }
@@ -16541,7 +16555,7 @@ const FormulaUtils = {
                         }
                     }
                     else {
-                        if (IsNumber(k2))
+                        if (FormulaUtils.commFun.isNumber(k2))
                             k2 = k2 * 1;
                         if (k1 >= k2) {
                             kk = '合格';