rapid-spreadjs 1.0.172 → 1.0.174

package/dist/index.cjs.js

@@ -9811,8 +9811,31 @@ 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的项
+         * @param {number[]} arr1 - 第一个数字数组
+         * @param {number[]} arr2 - 第二个数字数组
+         * @returns {[number[], number[]]} 返回过滤后的两个数组组成的元组
+         */
+        function filterArrData(arr1, arr2) {
+            const filtered1 = [];
+            const filtered2 = [];
+            // 以较短的数组长度为基准，防止越界
+            const len = Math.min(arr1.length, arr2.length);
+            for (let i = 0; i < len; i++) {
+                // 只有当两个数组在当前位置都非0时，才保留该数据
+                if (arr1[i] !== 0 && arr2[i] !== 0) {
+                    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;
@@ -23802,6 +23825,78 @@ const FormulaUtils = {
                 return qdhsz;
             },
         },
+        {
+            funName: 'YJZBPD',
+            funDesc: '报告上根据技术要求进行坐标判定',
+            funDefaultVal: null,
+            funParams: [
+                {
+                    name: '四边形坐标，格式如 (0,0):(3,7):(15,8):(9.5,3.3)',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '目标点x坐标',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '目标点y坐标',
+                    repeatable: false,
+                    optional: false,
+                },
+            ],
+            funCallback: (spread, sheet, retData) => {
+                // 如果传递的参数小于3个，则返回/
+                if (retData.allCellVals.length < 3) {
+                    return '/';
+                }
+                let points = retData.allCellVals[0], xPoint = retData.allCellVals[1], yPoint = retData.allCellVals[2];
+                // 1. 格式校验
+                if (typeof points !== 'string' || !points)
+                    return '/';
+                const regex = /^\s*\(\s*(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)\s*\)\s*:\s*\(\s*(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)\s*\)\s*:\s*\(\s*(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)\s*\)\s*:\s*\(\s*(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)\s*\)\s*$/;
+                const match = points.match(regex);
+                if (!match)
+                    return '/';
+                // 2. 解析坐标
+                const coords = [];
+                for (let i = 1; i < match.length; i += 2) {
+                    coords.push({ x: parseFloat(match[i]), y: parseFloat(match[i + 1]) });
+                }
+                const tx = Number(xPoint), ty = Number(yPoint);
+                if (isNaN(tx) || isNaN(ty))
+                    return '/';
+                // 3. 【新增】边界判定：点到线段距离 ≤ 容差 → 直接合格
+                const EPSILON = 1e-9;
+                function pointToSegmentDistSq(px, py, ax, ay, bx, by) {
+                    const dx = bx - ax, dy = by - ay;
+                    const lenSq = dx * dx + dy * dy;
+                    if (lenSq === 0)
+                        return (px - ax) ** 2 + (py - ay) ** 2; // 退化为点
+                    let t = ((px - ax) * dx + (py - ay) * dy) / lenSq;
+                    t = Math.max(0, Math.min(1, t)); // 钳制到 [0,1]
+                    const projX = ax + t * dx, projY = ay + t * dy;
+                    return (px - projX) ** 2 + (py - projY) ** 2;
+                }
+                const n = coords.length;
+                for (let i = 0, j = n - 1; i < n; j = i++) {
+                    const distSq = pointToSegmentDistSq(tx, ty, coords[j].x, coords[j].y, coords[i].x, coords[i].y);
+                    if (distSq <= EPSILON * EPSILON)
+                        return '合格';
+                }
+                // 4. 射线法判定内部
+                let inside = false;
+                for (let i = 0, j = n - 1; i < n; j = i++) {
+                    const xi = coords[i].x, yi = coords[i].y;
+                    const xj = coords[j].x, yj = coords[j].y;
+                    const intersect = yi > ty !== yj > ty && tx < ((xj - xi) * (ty - yi)) / (yj - yi) + xi;
+                    if (intersect)
+                        inside = !inside;
+                }
+                return inside ? '合格' : '不合格';
+            },
+        },
         {
             funName: 'YJTEST',
             funDesc: '云检测试函数',