rapid-spreadjs 1.0.173 → 1.0.175

package/dist/index.cjs.js

@@ -1463,6 +1463,7 @@ const BusinessUtils = {
                     cellValue !== undefined &&
                     cellValue !== '' &&
                     cellValue !== '/' &&
+                    cellValue !== '#VALUE!' &&
                     !(cellValue instanceof GC.Spread.CalcEngine.CalcError)) {
                     curRowHasValue = true;
                     break;
@@ -9811,8 +9812,41 @@ const EChartsUtilsAll = {
         const chartExtJson = config.chartExtJson == null || config.chartExtJson == undefined ? null : JSON.parse(config.chartExtJson);
         let title = config.chartTitle, xName = config.chartXName, yName = config.chartYName, color = lineData[0].lineColor;
         // 原始数据
-        const xData = xDataArr[0];
-        const yData = yDataArr[0];
+        let xData = xDataArr[0];
+        let yData = yDataArr[0];
+        /**
+         * 判断值是否为无效占位符
+         * 无效值包括: 0, '/', null, undefined, NaN, ''
+         */
+        function isValid(val) {
+            if (val === 0 || val === '/' || val === null || val === undefined || val === '')
+                return false;
+            if (typeof val === 'number' && Number.isNaN(val))
+                return false;
+            return true;
+        }
+        /**
+         * 根据两个数组对应位置的值进行联合过滤，去除任一为无效值的项
+         * @param {Array} arr1 - 第一个数组
+         * @param {Array} arr2 - 第二个数组
+         * @returns {[Array, Array]} 返回过滤后的两个数组组成的元组
+         */
+        function filterArrData(arr1, arr2) {
+            const filtered1 = [];
+            const filtered2 = [];
+            const len = Math.min(arr1.length, arr2.length);
+            for (let i = 0; i < len; i++) {
+                // 只有当两个数组在当前位置都是有效值时，才保留
+                if (isValid(arr1[i]) && isValid(arr2[i])) {
+                    filtered1.push(arr1[i]);
+                    filtered2.push(arr2[i]);
+                }
+            }
+            return [filtered1, filtered2];
+        }
+        const [xDataFiltered, yDataFiltered] = filterArrData(xData, yData);
+        xData = xDataFiltered;
+        yData = yDataFiltered;
         // 手动计算线性回归参数
         function linearRegression(x, y) {
             const n = x.length;