rapid-spreadjs 1.0.110 → 1.0.112

package/dist/index.esm.js

@@ -4683,13 +4683,12 @@ const EChartsUtilsAll = {
             !yDataArr[2].some((x) => x != '' && x != '/' && x != null && x != undefined)) {
             yValIsAllNull = true;
         }
-        console.log(yValIsAllNull);
         let option = {
             grid: {
                 // show: true,// 是否显示外边框线
                 // borderColor: '#f00',// 外边框线颜色
                 top: 20,
-                left: !yValIsAllNull ? 30 : 25,
+                left: 30,
                 right: 10,
                 bottom: 35,
                 containLabel: true,
@@ -4732,6 +4731,7 @@ const EChartsUtilsAll = {
             ],
             // 图例，参考文档：https://echarts.apache.org/zh/option.html#legend
             legend: {
+                // show: !yValIsAllNull,
                 left: 'center',
                 data: ['筛分曲线', '上限', '下限'],
                 selected: {
@@ -4756,7 +4756,7 @@ const EChartsUtilsAll = {
                 {
                     type: 'value',
                     name: yName,
-                    nameGap: !yValIsAllNull ? 30 : 30,
+                    nameGap: 30,
                     nameRotate: 90,
                     nameLocation: 'middle',
                     splitLine: {
@@ -4766,6 +4766,7 @@ const EChartsUtilsAll = {
                             type: 'solid',
                         },
                     },
+                    min: 0,
                     max: 100,
                     splitNumber: 10, // 设置y轴分隔的段数，如0~100之间默认情况可能会按照0、20、40、60……的间隔显示，设置相应的数字后就会根据实际情况显示的更细，如0、10、20、30……
                     axisLabel: {
@@ -4774,9 +4775,9 @@ const EChartsUtilsAll = {
                 },
             ],
             series: [
-                !yValIsAllNull ? getLineObj(1, xData) : [],
-                !yValIsAllNull ? getLineObj(2, xDataSx) : [],
-                !yValIsAllNull ? getLineObj(3, xDataXx) : [],
+                getLineObj(1, !yValIsAllNull ? xData : []),
+                getLineObj(2, !yValIsAllNull ? xDataSx : []),
+                getLineObj(3, !yValIsAllNull ? xDataXx : []),
             ],
         };
         return option;
@@ -5277,6 +5278,9 @@ const EChartsUtilsAll = {
         if (yDataCopy.some((item) => item != 0 || item[1] == null || item[1] == undefined)) {
             yValIsAllNull = false;
         }
+        if (!yDataArr[0].some((x) => x != '' && x != '/' && x != null && x != undefined)) {
+            yValIsAllNull = true;
+        }
         let option = {
             grid: {
                 // show: true,//是否显示外边框线
@@ -9246,7 +9250,7 @@ const EChartsUtilsAll = {
                 nameLocation: 'middle', // 名称居中显示
                 nameGap: yValIsAllNull ? 5 : 25, // 名称与轴线的距离
                 logBase: 10,
-                min: 10,
+                // min: 10,
                 min: function (value) {
                     // 确保最小值不会太小
                     return Math.max(1, Math.pow(10, Math.floor(Math.log10(value.min))));
@@ -21055,23 +21059,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) => preciseCalc(acc, val, 'add'), 0);
                 const avg = preciseCalc(sum, values.length, 'div');