rapid-spreadjs 1.0.42 → 1.0.44

package/dist/index.esm.js

@@ -15607,12 +15607,19 @@ const FormulaUtils = {
                 }
                 let array = new Array();
                 for (let i = 0; i < arr.length; i++) {
-                    if (!isNaN(arr[i]) && arr[i] != '/') {
+                    // if (!isNaN(arr[i]) && arr[i] != '/') {
+                    //   array[i] = arr[i];
+                    // }
+                    if (!isNaN(arr[i]) && arr[i] != '/' && arr[i] != '') {
                         array[i] = arr[i];
                     }
                 }
                 //avg为舍弃前的平均值
                 let avg = FormulaUtils.commFun.getAverage(array);
+                if (array.length === 0 || array.every((value) => value === array[0])) {
+                    // console.log('表示所有数据都一样，则直接返回');
+                    return avg;
+                }
                 //标准差
                 let stand = FormulaUtils.commFun.GetDataOddIncreaseEvenDecrease(FormulaUtils.commFun.GetS(array), -2);
                 //得到舍弃的范围
@@ -18835,6 +18842,103 @@ const FormulaUtils = {
                 return ndcs;
             },
         },
+        {
+            funName: 'YJTXHF',
+            funDesc: '沥青弹性恢复率',
+            funDefaultVal: null,
+            // isContainNullUndefinedVal: true,
+            funParams: [
+                {
+                    name: '数值1',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '数值2',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '数值3',
+                    repeatable: false,
+                    optional: false,
+                },
+            ],
+            funCallback: (spread, sheet, retData) => {
+                //如果传递的参数小于3个，则返回空字符串
+                if (retData.allCellVals.length < 3) {
+                    return '';
+                }
+                let a1 = retData.allCellVals[0], a2 = retData.allCellVals[1], a3 = retData.allCellVals[2];
+                var arr = [a1, a2, a3];
+                var avg = (a1 * 1 + a2 * 1 + a3 * 1) / 3; // 算术平均值
+                var max = Math.max(...arr);
+                var min = Math.min(...arr);
+                var dxc = max - min; // 最大值与最小值之差
+                var jg; //输出的结果值
+                // 差值是否超过平均值的 5%
+                if (dxc <= avg * 0.05) {
+                    jg = avg;
+                    return jg; // 情形1：直接取三值平均
+                }
+                // 情形2、3：差值超过 5%
+                var sx = arr.slice().sort((x, y) => x - y); // 升序
+                var jgc = sx[2] * 1 - sx[1] * 1; // 两个较高值之差
+                if (jgc <= avg * 0.05) {
+                    jg = (sx[1] * 1 + sx[2] * 1) / 2;
+                    return jg; // 情形2：取两个较高值平均
+                }
+                return '/'; // 情形3：无法取值
+            },
+        },
+        {
+            funName: 'YJSZF',
+            funDesc: '沥青四组分FID法',
+            funDefaultVal: null,
+            funParams: [
+                {
+                    name: '数值数组',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '标准差',
+                    repeatable: false,
+                    optional: false,
+                },
+            ],
+            funCallback: (spread, sheet, retData) => {
+                //如果传递的参数小于2个，则返回空字符串
+                if (retData.allCellVals.length < 2) {
+                    return '';
+                }
+                //获取retData.allCellVals中除最后一个值的数组
+                let arr = [];
+                for (let index = 0; index < retData.allCellVals.length - 1; index++) {
+                    arr.push(retData.allCellVals[index]);
+                }
+                let bzc = retData.allCellVals[retData.allCellVals.length - 1];
+                var avg;
+                avg = FormulaUtils.commFun.GetAverage(arr);
+                if (bzc <= 5) {
+                    return avg;
+                }
+                else {
+                    arr.sort((a, b) => a - b); //排序
+                    arr.shift(); // 删除首元素
+                    arr.pop(); // 删除尾元素
+                    var bzc1 = FormulaUtils.commFun.GetS(arr); //剔除后的标准差
+                    var avg1 = FormulaUtils.commFun.GetAverage(arr); //剔除后的平均值
+                    if (bzc1 <= 5) {
+                        avg = avg1;
+                    }
+                    else {
+                        avg = '无效';
+                    }
+                }
+                return avg;
+            },
+        },
     ],
 };