rapid-spreadjs 1.0.100 → 1.0.102

package/dist/index.cjs.js

@@ -145,7 +145,8 @@ const SheetUtils = {
         let allCellObjs = [];
         selectRanges.forEach((item, index) => {
             // 得到当前item中所有合并的单元格对象集合
-            const itemSpanCells = sheet.getSpans(item);
+            let itemSpanCells = sheet.getSpans(item);
+            itemSpanCells = rapidUtils.orderByJson(itemSpanCells, !isMulColOrder ? ['row', 'col'] : ['col', 'row'], ['asc', 'asc']);
             itemSpanCells.forEach((itemSpanCell) => {
                 allCellObjs.push({
                     row: itemSpanCell.row,
@@ -4660,6 +4661,11 @@ const EChartsUtilsAll = {
             yDataSourceXxOld.some((item) => item != null && item != undefined && item != '/')) {
             yValIsAllNull = false;
         }
+        if (xData.filter((x) => x[1] == 0).length == xData.length &&
+            xDataSx.filter((x) => x[1] == 0).length == xDataSx.length &&
+            xDataXx.filter((x) => x[1] == 0).length == xDataXx.length) {
+            yValIsAllNull = true;
+        }
         let option = {
             grid: {
                 // show: true,// 是否显示外边框线
@@ -4732,7 +4738,7 @@ const EChartsUtilsAll = {
                 {
                     type: 'value',
                     name: yName,
-                    nameGap: !yValIsAllNull ? 30 : 5,
+                    nameGap: !yValIsAllNull ? 30 : 30,
                     nameRotate: 90,
                     nameLocation: 'middle',
                     splitLine: {
@@ -4742,6 +4748,7 @@ const EChartsUtilsAll = {
                             type: 'solid',
                         },
                     },
+                    max: 100,
                     splitNumber: 10, // 设置y轴分隔的段数，如0~100之间默认情况可能会按照0、20、40、60……的间隔显示，设置相应的数字后就会根据实际情况显示的更细，如0、10、20、30……
                     axisLabel: {
                         fontSize: xyFontSize,
@@ -8626,6 +8633,174 @@ const EChartsUtilsAll = {
         };
         return option;
     },
+    /**
+     * 最大剪应力与法向应力关系曲线
+     * @param config 折线配置
+     * @param xDataArr x轴原始数据（二维数组）
+     * @param yDataArr y轴原始数据（二维数组）
+     * @returns 返回ECharts配置项
+     */
+    chart450: (config, xDataArr, yDataArr, sheet) => {
+        let lineData = JSON.parse(config.chartLinesJson);
+        // 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];
+        // 计算线性回归参数（斜率和截距）
+        function linearRegression(x, y) {
+            const n = x.length;
+            let sumX = 0, sumY = 0, sumXY = 0, sumXX = 0;
+            for (let i = 0; i < n; i++) {
+                sumX += x[i];
+                sumY += y[i];
+                sumXY += x[i] * y[i];
+                sumXX += x[i] * x[i];
+            }
+            const slope = (n * sumXY - sumX * sumY) / (n * sumXX - sumX * sumX);
+            const intercept = (sumY - slope * sumX) / n;
+            return { slope, intercept };
+        }
+        const regression = linearRegression(xData, yData);
+        // console.log('斜率:', regression.slope, '截距:', regression.intercept);
+        // 计算趋势线的数据点
+        // 前推0.0，后推50.0
+        Math.min(...xData);
+        const maxX = Math.max(...xData) + 50; // 后推50
+        // 生成趋势线数据点，确保与y轴相交（x=0）
+        const trendData = [];
+        for (let x = 0; x <= maxX; x += 10) {
+            const y = regression.slope * x + regression.intercept;
+            trendData.push([x, y]);
+        }
+        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;
+        }
+        // 配置图表选项
+        const option = {
+            title: [
+                {
+                    show: true,
+                    text: title,
+                    left: 'center',
+                    top: 2,
+                    textStyle: {
+                        fontSize: 14,
+                        fontWeight: 'normal',
+                    },
+                },
+                {
+                    show: true,
+                    text: xName,
+                    left: 'center',
+                    bottom: 0,
+                    textStyle: {
+                        fontSize: 12,
+                        fontWeight: 'normal',
+                    },
+                },
+            ],
+            grid: {
+                top: 25,
+                left: 25,
+                right: 15,
+                bottom: 20,
+                containLabel: true,
+            },
+            tooltip: {
+                trigger: 'axis',
+                formatter: function (params) {
+                    let result = '';
+                    params.forEach((param) => {
+                        if (param.seriesName === '实际数据') {
+                            result += `法向应力: ${param.value[0]} kPA<br/>剪应力: ${param.value[1]} kPA`;
+                        }
+                        else if (param.seriesName === '趋势线') {
+                            result += `趋势线<br/>法向应力: ${param.value[0]} kPA<br/>预测剪应力: ${param.value[1].toFixed(2)} kPA`;
+                        }
+                    });
+                    return result;
+                },
+            },
+            xAxis: {
+                name: xName,
+                nameLocation: 'end',
+                nameGap: 20,
+                nameTextStyle: {
+                    fontSize: 12,
+                    fontWeight: 'bold',
+                },
+                type: 'value',
+                min: 0,
+                max: 450,
+                interval: 50,
+                axisLine: {
+                    lineStyle: {
+                        color: '#333',
+                    },
+                },
+            },
+            yAxis: {
+                name: yName,
+                nameGap: !yValIsAllNull ? 35 : 5,
+                nameRotate: 90,
+                nameLocation: 'middle',
+                type: 'value',
+                min: 0,
+                interval: 50,
+                axisLine: {
+                    lineStyle: {
+                        color: '#333',
+                    },
+                },
+            },
+            series: [
+                {
+                    name: '实际数据',
+                    type: 'scatter',
+                    data: !yValIsAllNull ? xData.map((x, i) => [x, yData[i]]) : [],
+                    symbolSize: 5,
+                    itemStyle: {
+                        color: color,
+                    },
+                },
+                {
+                    name: '趋势线',
+                    type: 'line',
+                    data: !yValIsAllNull ? trendData : [],
+                    symbol: 'none',
+                    lineStyle: {
+                        color: color,
+                        width: 1,
+                        type: 'solid',
+                    },
+                    /*
+                              markPoint: {
+                                  data: [
+                                      {
+                                          type: 'min',
+                                          symbol: 'circle',
+                                          symbolSize: 6,
+                                          label: {
+                                              formatter: '起点',
+                                              position: 'right'
+                                          }
+                                      }
+                                  ]
+                              }
+                              */
+                },
+            ],
+        };
+        return option;
+    },
 };
 
 /**
@@ -20289,6 +20464,83 @@ const FormulaUtils = {
                 return sw;
             },
         },
+        {
+            funName: 'YJWDDLZ',
+            funDesc: '马歇尔稳定度/流值',
+            funDefaultVal: null,
+            isAcceptArea: true,
+            funParams: [
+                {
+                    name: '数值1',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '数值2',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '数值3',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '数值4',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '数值5',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '数值6',
+                    repeatable: false,
+                    optional: false,
+                },
+                {
+                    name: '超过比例，如：0.15、0.2',
+                    repeatable: false,
+                    optional: false,
+                },
+            ],
+            funCallback: (spread, sheet, retData) => {
+                //如果传递的参数小于7个，则返回空字符串
+                if (retData.allCellVals.length < 7) {
+                    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];
+                // 参数类型检查 - 所有参数必须为数字类型
+                const args = [val1, val2, val3, val4, val5, val6, overVal];
+                for (let i = 0; i < args.length; i++) {
+                    if (typeof args[i] !== 'number' || isNaN(args[i])) {
+                        return '/';
+                    }
+                }
+                // 提取前6个值进行计算
+                const values = [val1, val2, val3, val4, val5, val6];
+                // 计算初始平均值avg
+                const sum = values.reduce((acc, val) => rapidUtils.preciseCalc(acc, val, 'add'), 0);
+                const avg = rapidUtils.preciseCalc(sum, values.length, 'div');
+                // 检查是否有值与平均值a的差大于overVal（不取绝对值）
+                const abnormalValues = values.filter((val) => rapidUtils.preciseCalc(val, avg, 'sub') > rapidUtils.preciseCalc(overVal, val, 'mul'));
+                // 如果没有异常值，直接返回平均值a
+                if (abnormalValues.length === 0) {
+                    return avg;
+                }
+                // 舍弃异常值后重新计算平均值
+                const normalValues = values.filter((val) => rapidUtils.preciseCalc(val, avg, 'sub') <= rapidUtils.preciseCalc(overVal, val, 'mul'));
+                // 确保至少有一个正常值
+                if (normalValues.length === 0) {
+                    return '/';
+                }
+                // 计算剩余值的平均值
+                const newSum = normalValues.reduce((acc, val) => rapidUtils.preciseCalc(acc, val, 'add'), 0);
+                return rapidUtils.preciseCalc(newSum, normalValues.length, 'div');
+            },
+        },
         {
             funName: 'YJTREND',
             funDesc: '返回线性回归拟合线的一组纵坐标值(y值)',