rapid-spreadjs 1.0.60 → 1.0.62

package/dist/index.cjs.js

@@ -19398,11 +19398,10 @@ const FormulaUtils = {
                 if (retData.allCellVals.length < 2) {
                     return '';
                 }
-                retData.allCellVals[0]; retData.allCellVals[1];
                 try {
                     const rangeStr = retData.allCellVals[0], num = retData.allCellVals[1];
                     // 参数基础校验
-                    if (typeof rangeStr !== 'string' || typeof num !== 'number' || isNaN(num)) {
+                    if (rangeStr == null || rangeStr == undefined || typeof rangeStr !== 'string' || typeof num !== 'number' || isNaN(num)) {
                         return '/';
                     }
                     // 去除字符串中的空格
@@ -19489,22 +19488,81 @@ 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]);
+                //如果传递的参数小于5个，则返回空字符串
+                if (retData.allCellValsEw.length < 5) {
+                    return '';
                 }
-                else {
-                    x = Number(x);
+                const array1 = retData.allCellValsEw[0], array2 = retData.allCellValsEw[1], operator = retData.allCellValsEw[2], value = retData.allCellValsEw[3], delimiter = retData.allCellValsEw[4];
+                try {
+                    // 参数基础校验
+                    if (!Array.isArray(array1) ||
+                        !Array.isArray(array2) ||
+                        array1.length !== array2.length ||
+                        typeof operator !== 'string' ||
+                        typeof delimiter !== 'string') {
+                        return '/';
+                    }
+                    // 验证operator参数的有效性
+                    const validOperators = ['>', '<', '>=', '<=', '='];
+                    if (!validOperators.includes(operator)) {
+                        return '/';
+                    }
+                    // 判断第一个数组的元素类型
+                    const isNumericArray = array1.length > 0 && (typeof array1[0] === 'number' || !isNaN(parseFloat(array1[0])));
+                    // 收集满足条件的索引
+                    const validIndices = [];
+                    for (let i = 0; i < array1.length; i++) {
+                        let conditionMet = false;
+                        if (isNumericArray) {
+                            // 数字数组：使用指定的比较运算符
+                            const num1 = parseFloat(array1[i]);
+                            const numValue = parseFloat(value);
+                            if (isNaN(num1) || isNaN(numValue)) {
+                                continue; // 跳过非数字元素
+                            }
+                            switch (operator) {
+                                case '>':
+                                    conditionMet = num1 > numValue;
+                                    break;
+                                case '<':
+                                    conditionMet = num1 < numValue;
+                                    break;
+                                case '>=':
+                                    conditionMet = num1 >= numValue;
+                                    break;
+                                case '<=':
+                                    conditionMet = num1 <= numValue;
+                                    break;
+                                case '=':
+                                    conditionMet = num1 === numValue;
+                                    break;
+                            }
+                        }
+                        else {
+                            // 字符串数组：只进行相等比较
+                            conditionMet = String(array1[i]) === String(value);
+                        }
+                        if (conditionMet) {
+                            validIndices.push(i);
+                        }
+                    }
+                    // 从第二个数组中获取对应索引的值
+                    const resultValues = validIndices
+                        .map((index) => {
+                        // 确保索引在第二个数组范围内
+                        if (index >= 0 && index < array2.length) {
+                            return String(array2[index]);
+                        }
+                        return '';
+                    })
+                        .filter((val) => val !== ''); // 过滤空值
+                    // 使用指定的分隔符连接结果[2,3,5](@ref)
+                    return resultValues.join(delimiter);
+                }
+                catch (error) {
+                    // 任何错误都返回"/"
+                    return '/';
                 }
-                console.log(111, retData);
-                console.log(222, xData);
-                console.log(333, yData);
-                console.log(444, x);
-                return 'OK';
             },
         },
         {