rapid-spreadjs 1.0.87 → 1.0.89

package/dist/index.cjs.js

@@ -8384,6 +8384,16 @@ const EChartsUtilsAll = {
         // 原始数据
         const xData = xDataArr[0];
         const yData = yDataArr[0];
+        let yValIsAllNull = false;
+        if (xData.length == 0 ||
+            yData.length == 0 ||
+            (!xData.some((x) => x != '' && x != '/' && x != null && x != undefined) &&
+                !yData.some((x) => x != '' && x != '/' && x != null && x != undefined))) {
+            yValIsAllNull = true;
+        }
+        if (xData.filter((x) => x == 0).length == xData.length || yData.filter((x) => x == 0).length == yData.length) {
+            yValIsAllNull = true;
+        }
         // 手动计算多项式回归系数（与Excel一致）
         function polynomialRegression(x, y, degree) {
             const n = x.length;
@@ -8450,20 +8460,23 @@ const EChartsUtilsAll = {
             }
             return coefficients;
         }
-        // 计算多项式回归系数（阶数为2）
-        const coefficients = polynomialRegression(xData, yData, 2);
         // 提取系数（与Excel一致）
-        const a = coefficients[2].toFixed(2);
-        const b = coefficients[1].toFixed(2);
-        const c = coefficients[0].toFixed(2);
+        let a = '/', b = '/', c = '/';
         // 生成回归线的数据点
-        const regressionPoints = [];
-        const minX = Math.min(...xData);
+        let regressionPoints = [];
         const maxX = Math.max(...xData);
-        const step = (maxX - minX) / 100;
-        for (let x = minX; x <= maxX; x += step) {
-            const y = a * x * x + b * x + parseFloat(c);
-            regressionPoints.push([x, y]);
+        if (!yValIsAllNull) {
+            // 计算多项式回归系数（阶数为2）
+            const coefficients = polynomialRegression(xData, yData, 2);
+            a = coefficients[2].toFixed(2);
+            b = coefficients[1].toFixed(2);
+            c = coefficients[0].toFixed(2);
+            const minX = Math.min(...xData);
+            const step = (maxX - minX) / 100;
+            for (let x = minX; x <= maxX; x += step) {
+                const y = parseFloat(a) * x * x + parseFloat(b) * x + parseFloat(c);
+                regressionPoints.push([x, y]);
+            }
         }
         // 输出方程
         if (chartExtJson != null) {
@@ -8480,13 +8493,6 @@ const EChartsUtilsAll = {
                 sheet.setValue(chartExtJson.dwylHtbxC.row, chartExtJson.dwylHtbxC.col, c != 'NaN' ? c : '/');
             }
         }
-        let yValIsAllNull = false;
-        if (xData.length == 0 ||
-            yData.length == 0 ||
-            (!xData.some((x) => x != '' && x != '/' && x != null && x != undefined) &&
-                !yData.some((x) => x != '' && x != '/' && x != null && x != undefined))) {
-            yValIsAllNull = true;
-        }
         // 配置图表选项
         let option = {
             title: [
@@ -19997,7 +20003,7 @@ const FormulaUtils = {
             isAcceptArea: true,
             funParams: [
                 {
-                    name: '需要用作判断的数字数组或字符串数组',
+                    name: '需要用作判断的数字数组、字符串数组或单值',
                     repeatable: false,
                     optional: false,
                 },
@@ -20033,7 +20039,7 @@ const FormulaUtils = {
                 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.length == 5 ? 0 : 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 < 6 ? 0 : retData.allCellValsEw[5];
                 try {
                     // 处理array1和array2的默认值
                     if (array1 == null || array1 == undefined || (typeof array1 == 'string' && array1.trim().length == 0)) {
@@ -20102,7 +20108,7 @@ const FormulaUtils = {
                                 case '>':
                                 case '＞':
                                     if (isSingleValue1) {
-                                        conditionMet = num1 > num2;
+                                        conditionMet = num2 > num1;
                                     }
                                     else {
                                         conditionMet = num1 > numValue;
@@ -20111,7 +20117,7 @@ const FormulaUtils = {
                                 case '<':
                                 case '＜':
                                     if (isSingleValue1) {
-                                        conditionMet = num1 < num2;
+                                        conditionMet = num2 < num1;
                                     }
                                     else {
                                         conditionMet = num1 < numValue;
@@ -20121,7 +20127,7 @@ const FormulaUtils = {
                                 case '≥':
                                 case '≧':
                                     if (isSingleValue1) {
-                                        conditionMet = num1 >= num2;
+                                        conditionMet = num2 >= num1;
                                     }
                                     else {
                                         conditionMet = num1 >= numValue;
@@ -20131,7 +20137,7 @@ const FormulaUtils = {
                                 case '≤':
                                 case '≦':
                                     if (isSingleValue1) {
-                                        conditionMet = num1 <= num2;
+                                        conditionMet = num2 <= num1;
                                     }
                                     else {
                                         conditionMet = num1 <= numValue;
@@ -20140,7 +20146,7 @@ const FormulaUtils = {
                                 case '=':
                                 case '＝':
                                     if (isSingleValue1) {
-                                        conditionMet = num1 === num2;
+                                        conditionMet = num2 === num1;
                                     }
                                     else {
                                         conditionMet = num1 === numValue;