rapid-spreadjs 1.0.94 → 1.0.96

package/dist/index.cjs.js

@@ -629,9 +629,10 @@ const SheetUtils = {
      * 获取工作表中所有纯值、无值或公式单元格的范围选择字符串
      * @param sheet 工作表对象
      * @param getType 获取类型（1：纯值、2：无值、3：公式），默认为：1
+     * @param range 单元格范围，格式为：{ row: number; col: number; rowCount: number; colCount: number }
      */
-    getCellsRangeStr: (sheet, getType = 1) => {
-        const range = { row: 0, col: 1, rowCount: sheet.getRowCount(), colCount: 77 };
+    getCellsRangeStr: (sheet, getType, range) => {
+        // const range = { row: 0, col: 1, rowCount: sheet.getRowCount(), colCount: 77 };
         // 所有单元格对象集合
         const allCells = SheetUtils.getAllCellObjsByRanges(sheet, [range]);
         // 最终需要的单元格对象集合
@@ -4092,430 +4093,539 @@ const EChartsUtilsAll = {
         yDataSource1 = yDataArr[0], // [2.25, 2.29, 2.34, 2.29, 2.23],
         yDataSource2 = isTwoLine ? yDataArr[1] : []; // [2.27, 2.32, 2.36, 2.33, 2.26];
         let title = config.chartTitle, xName = config.chartXName, yName = config.chartYName, legendName = '图例1';
-        const lineFunc = (xDataSource, yDataSource, isShowMarkPoint, isShowMarkLine, isTwoLineData) => {
-            //原始数据
-            let dxsJs = chartExtJson != null ? chartExtJson.dxsJs : 5, xData = [], yData = [], seriesData = []; //处理原始数据为空的值，不然参与mathjs计算会报错
-            //处理原始数据为空的值，不然参与mathjs计算会报错
-            xDataSource.forEach((item, index) => {
-                if (/^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(item) &&
-                    item != 0 &&
-                    /^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(yDataSource[index]) &&
-                    yDataSource[index] != 0) {
-                    xData.push(item);
-                    yData.push(yDataSource[index]);
-                }
-            });
-            //y轴没有任何数据的时候，不参与绘制图表
-            if (yData.length == 0) {
-                return;
-            }
-            if (dxsJs >= yData.length) {
-                dxsJs = yData.length - 1;
-            }
-            let xMin = Math.min(...xData), xMax = Math.max(...xData), yMin = Math.min(...yData), yMax = Math.max(...yData), xAxisMax = Math.ceil(xMax + 0.1), xAxisMin = Math.trunc(xMin - 0.1), yAxisMax = Number(EChartsUtilsComm.getRound(yMax + 0.02, 0.01)), yAxisMin = Number(EChartsUtilsComm.getRound(yMin - 0.02, 0.01));
-            //如果界面设置了校正最佳含水率和最大干密度，则显示界面中的顶点坐标（此时就不显示辅助线了）
-            let cellValJzZjhsl, cellValJzZdgmd;
-            if (chartExtJson != null && chartExtJson.jsIsJz) {
-                if (chartExtJson.jsZjhslJz != null && chartExtJson.jsZjhslJz != undefined) {
-                    cellValJzZjhsl = sheet.getValue(chartExtJson.jsZjhslJz.row, chartExtJson.jsZjhslJz.col);
+        try {
+            const lineFunc = (xDataSource, yDataSource, isShowMarkPoint, isShowMarkLine, isTwoLineData) => {
+                //原始数据
+                let dxsJs = chartExtJson != null ? chartExtJson.dxsJs : 5, xData = [], yData = [], seriesData = []; //处理原始数据为空的值，不然参与mathjs计算会报错
+                //处理原始数据为空的值，不然参与mathjs计算会报错
+                xDataSource.forEach((item, index) => {
+                    if (/^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(item) &&
+                        item != 0 &&
+                        /^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(yDataSource[index]) &&
+                        yDataSource[index] != 0) {
+                        xData.push(item);
+                        yData.push(yDataSource[index]);
+                    }
+                });
+                //y轴没有任何数据的时候，不参与绘制图表
+                if (yData.length == 0) {
+                    return;
                 }
-                if (chartExtJson.jsZdgmdJz != null && chartExtJson.jsZdgmdJz != undefined) {
-                    cellValJzZdgmd = sheet.getValue(chartExtJson.jsZdgmdJz.row, chartExtJson.jsZdgmdJz.col);
+                if (dxsJs >= yData.length) {
+                    dxsJs = yData.length - 1;
                 }
-                //如果界面输入的最大干密度大于了y轴最大值，则需要重新设置y轴的最大值
-                if (/^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(cellValJzZdgmd) && cellValJzZdgmd > yAxisMax) {
-                    yAxisMax = Number(EChartsUtilsComm.getRound(cellValJzZdgmd + 0.02, 0.01));
+                let xMin = Math.min(...xData), xMax = Math.max(...xData), yMin = Math.min(...yData), yMax = Math.max(...yData), xAxisMax = Math.ceil(xMax + 0.1), xAxisMin = Math.trunc(xMin - 0.1), yAxisMax = Number(EChartsUtilsComm.getRound(yMax + 0.02, 0.01)), yAxisMin = Number(EChartsUtilsComm.getRound(yMin - 0.02, 0.01));
+                //如果界面设置了校正最佳含水率和最大干密度，则显示界面中的顶点坐标（此时就不显示辅助线了）
+                let cellValJzZjhsl, cellValJzZdgmd;
+                if (chartExtJson != null && chartExtJson.jsIsJz) {
+                    if (chartExtJson.jsZjhslJz != null && chartExtJson.jsZjhslJz != undefined) {
+                        cellValJzZjhsl = sheet.getValue(chartExtJson.jsZjhslJz.row, chartExtJson.jsZjhslJz.col);
+                    }
+                    if (chartExtJson.jsZdgmdJz != null && chartExtJson.jsZdgmdJz != undefined) {
+                        cellValJzZdgmd = sheet.getValue(chartExtJson.jsZdgmdJz.row, chartExtJson.jsZdgmdJz.col);
+                    }
+                    //如果界面输入的最大干密度大于了y轴最大值，则需要重新设置y轴的最大值
+                    if (/^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(cellValJzZdgmd) && cellValJzZdgmd > yAxisMax) {
+                        yAxisMax = Number(EChartsUtilsComm.getRound(cellValJzZdgmd + 0.02, 0.01));
+                    }
                 }
-            }
-            let points = [];
-            xData.forEach((item, index) => {
-                points.push([item, yData[index]]);
-            });
-            // 构造范德蒙德矩阵的函数
-            function vandermondeMatrix(x, N) {
-                const matrix = [];
-                for (let i = 0; i < x.length; i++) {
-                    const row = [];
-                    for (let j = 0; j <= N; j++) {
-                        // 注意这里从0到N，包含N
-                        row.push(math__namespace.pow(x[i], j));
-                    }
-                    matrix.push(row);
-                }
-                return math__namespace.matrix(matrix);
-            }
-            // 构造原始的范德蒙德矩阵
-            const vandermonde_matrix = vandermondeMatrix(xData, dxsJs); // 注意这里N=4，因为我们从0开始计数
-            // 使用最小二乘法求解
-            const A = vandermonde_matrix;
-            const AT = math__namespace.transpose(A);
-            const ATA = math__namespace.multiply(AT, A);
-            const ATb = math__namespace.multiply(AT, math__namespace.matrix(yData));
-            // 解线性方程组
-            let result = null, coefficients = [];
-            try {
-                result = math__namespace.lusolve(ATA, ATb);
-                coefficients = result.valueOf();
-            }
-            catch (err) {
-                for (let index = 0; index < xData.length; index++) {
-                    coefficients.push([0]);
-                }
-                // console.log('无法解决该线性系统');
-            }
-            // const result = math.lusolve(ATA, ATb);
-            // const coefficients = result.valueOf();
-            function funequation(x) {
-                let y = 0;
-                coefficients.forEach((item, index) => {
-                    //fx^0
-                    //fx^0+ax^1
-                    //fx^0+ax^1+bx^2
-                    //fx^0+ax^1+bx^2+cx^3
-                    //fx^0+x^1+x^2+x^3+x^4
-                    y += item * Math.pow(x, index);
+                let points = [];
+                xData.forEach((item, index) => {
+                    points.push([item, yData[index]]);
                 });
-                return y;
-            }
-            // x=[3.5, 4, 4.5, 5, 5.5,6 ],y= [2.262, 2.321, 2.319, 2.292, 2.285, 2.28]
-            let arrX = [];
-            let arrY = [];
-            for (let i = xMin; i <= xMax; i += 0.01) {
-                let temp = Number(EChartsUtilsComm.getRound(i, 0.01));
-                //重新设置i，防止i丢失精度
-                i = Number(temp);
-                //arrY.push(lagrangeInterpolation(points, temp));
-                arrY.push(funequation(temp));
-                arrX.push(temp);
-            }
-            let max = Math.max(...arrY);
-            // 找到最大值的索引
-            let maxIndex = arrY.findIndex((value) => value === max);
-            // console.log('最大点数据：', arrX[maxIndex], max);
-            // console.log(chartExtJson);
-            //默认输出精度
-            let outJdZjhsl = 0.01, outJdZdgmd = 0.001;
-            //顶点数据
-            let outValZjhsl = 0, outValZdgmd = 0;
-            //设置Sheet单元格的值（最佳含水率和最大干密度）
-            if (chartExtJson != null) {
-                // console.log(4444, chartExtJson.jsZjhsl.row, chartExtJson.jsZjhsl.col, arrX[maxIndex]);
-                if (chartExtJson.jsZjhslJd != null && chartExtJson.jsZjhslJd != undefined) {
-                    outJdZjhsl = chartExtJson.jsZjhslJd;
-                }
-                if (chartExtJson.jsZdgmdJd != null && chartExtJson.jsZdgmdJd != undefined) {
-                    outJdZdgmd = chartExtJson.jsZdgmdJd;
-                }
-                if (arrX[maxIndex] == 0 && max == 0) {
-                    sheet.setValue(chartExtJson.jsZjhsl.row, chartExtJson.jsZjhsl.col, '/');
-                    sheet.setValue(chartExtJson.jsZdgmd.row, chartExtJson.jsZdgmd.col, '/');
-                }
-                else {
-                    outValZjhsl = EChartsUtilsComm.getRound(arrX[maxIndex], outJdZjhsl);
-                    outValZdgmd = EChartsUtilsComm.getRound(max, outJdZdgmd);
-                    sheet.setValue(chartExtJson.jsZjhsl.row, chartExtJson.jsZjhsl.col, outValZjhsl);
-                    sheet.setValue(chartExtJson.jsZdgmd.row, chartExtJson.jsZdgmd.col, outValZdgmd);
+                // 构造范德蒙德矩阵的函数
+                function vandermondeMatrix(x, N) {
+                    const matrix = [];
+                    for (let i = 0; i < x.length; i++) {
+                        const row = [];
+                        for (let j = 0; j <= N; j++) {
+                            // 注意这里从0到N，包含N
+                            row.push(math__namespace.pow(x[i], j));
+                        }
+                        matrix.push(row);
+                    }
+                    return math__namespace.matrix(matrix);
+                }
+                // 构造原始的范德蒙德矩阵
+                const vandermonde_matrix = vandermondeMatrix(xData, dxsJs); // 注意这里N=4，因为我们从0开始计数
+                // 使用最小二乘法求解
+                const A = vandermonde_matrix;
+                const AT = math__namespace.transpose(A);
+                const ATA = math__namespace.multiply(AT, A);
+                const ATb = math__namespace.multiply(AT, math__namespace.matrix(yData));
+                // 解线性方程组
+                let result = null, coefficients = [];
+                try {
+                    result = math__namespace.lusolve(ATA, ATb);
+                    coefficients = result.valueOf();
+                }
+                catch (err) {
+                    for (let index = 0; index < xData.length; index++) {
+                        coefficients.push([0]);
+                    }
+                    // console.log('无法解决该线性系统');
+                }
+                // const result = math.lusolve(ATA, ATb);
+                // const coefficients = result.valueOf();
+                function funequation(x) {
+                    let y = 0;
+                    coefficients.forEach((item, index) => {
+                        //fx^0
+                        //fx^0+ax^1
+                        //fx^0+ax^1+bx^2
+                        //fx^0+ax^1+bx^2+cx^3
+                        //fx^0+x^1+x^2+x^3+x^4
+                        y += item * Math.pow(x, index);
+                    });
+                    return y;
                 }
-            }
-            arrX.forEach((item, index) => {
-                if (xData.includes(item)) {
-                    seriesData.push({ value: [item, arrY[index]] });
+                // console.log('计算公式：', coefficients);
+                function lagrangeInterpolation(points, x) {
+                    let result = 0;
+                    for (let i = 0; i < points.length; i++) {
+                        let term = points[i][1];
+                        let xi = points[i][0];
+                        for (let j = 0; j < points.length; j++) {
+                            if (j !== i) {
+                                let xj = points[j][0];
+                                term *= (x - xj) / (xi - xj);
+                            }
+                        }
+                        result += term;
+                    }
+                    return result;
                 }
-                else {
-                    seriesData.push({
-                        value: [item, arrY[index]],
-                        symbol: 'none',
-                    });
+                // x=[3.5, 4, 4.5, 5, 5.5,6 ],y= [2.262, 2.321, 2.319, 2.292, 2.285, 2.28]
+                let arrX = [];
+                let arrY = [];
+                for (let i = xMin; i <= xMax; i += 0.01) {
+                    let temp = Number(EChartsUtilsComm.getRound(i, 0.01));
+                    //重新设置i，防止i丢失精度
+                    i = Number(temp);
+                    //arrY.push(lagrangeInterpolation(points, temp));
+                    arrY.push(funequation(temp));
+                    arrX.push(temp);
+                }
+                let max = Math.max(...arrY);
+                // 找到最大值的索引
+                let maxIndex = arrY.findIndex((value) => value === max);
+                // console.log('最大点数据：', arrX[maxIndex], max);
+                // console.log(chartExtJson);
+                //默认输出精度
+                let outJdZjhsl = 0.01, outJdZdgmd = 0.001;
+                //顶点数据
+                let outValZjhsl = 0, outValZdgmd = 0;
+                //设置Sheet单元格的值（最佳含水率和最大干密度）
+                if (chartExtJson != null) {
+                    // console.log(4444, chartExtJson.jsZjhsl.row, chartExtJson.jsZjhsl.col, arrX[maxIndex]);
+                    if (chartExtJson.jsZjhslJd != null && chartExtJson.jsZjhslJd != undefined) {
+                        outJdZjhsl = chartExtJson.jsZjhslJd;
+                    }
+                    if (chartExtJson.jsZdgmdJd != null && chartExtJson.jsZdgmdJd != undefined) {
+                        outJdZdgmd = chartExtJson.jsZdgmdJd;
+                    }
+                    if (arrX[maxIndex] == 0 && max == 0) {
+                        sheet.setValue(chartExtJson.jsZjhsl.row, chartExtJson.jsZjhsl.col, '/');
+                        sheet.setValue(chartExtJson.jsZdgmd.row, chartExtJson.jsZdgmd.col, '/');
+                    }
+                    else {
+                        outValZjhsl = EChartsUtilsComm.getRound(arrX[maxIndex], outJdZjhsl);
+                        outValZdgmd = EChartsUtilsComm.getRound(max, outJdZdgmd);
+                        sheet.setValue(chartExtJson.jsZjhsl.row, chartExtJson.jsZjhsl.col, outValZjhsl);
+                        sheet.setValue(chartExtJson.jsZdgmd.row, chartExtJson.jsZdgmd.col, outValZdgmd);
+                    }
                 }
-            });
-            //xData.forEach((item, index) => {
-            //seriesData.push([item, yData[index]]);
-            //});
-            //计算峰值----目前没有公式 值写死的
-            const peakvalue = [arrX[maxIndex], Number(EChartsUtilsComm.getRound(max, outJdZdgmd))], coordX = [peakvalue[0], yAxisMin], coordY = [xAxisMin, peakvalue[1]];
-            let markPointObj = {
-                data: [
-                    {
-                        xAxis: EChartsUtilsComm.getRound(peakvalue[0], outJdZjhsl),
-                        yAxis: EChartsUtilsComm.getRound(peakvalue[1], outJdZdgmd),
-                        symbolOffset: [0, 15],
-                        symbol: 'circle',
-                        symbolSize: 6,
-                        label: {
-                            show: true,
-                            color: '#000',
-                            formatter: function (data) {
-                                // 自定义标签内容
-                                if (Number(data.data.xAxis) == 0 && Number(data.data.yAxis) == 0) {
-                                    return '';
-                                }
-                                else {
-                                    return '( ' + data.data.xAxis + ',' + data.data.yAxis + ')';
-                                }
-                            },
-                        },
-                        itemStyle: { color: 'transparent' },
-                    },
-                ],
-            }, markLineObj = {
-                symbol: ['none', 'none'], //去掉箭头
-                itemStyle: {
-                    lineStyle: {
-                        type: 'solid',
-                        color: '#333',
-                        width: 2,
-                    },
-                },
-                data: [
-                    [
+                arrX.forEach((item, index) => {
+                    if (xData.includes(item)) {
+                        seriesData.push({ value: [item, arrY[index]] });
+                    }
+                    else {
+                        seriesData.push({
+                            value: [item, arrY[index]],
+                            symbol: 'none',
+                        });
+                    }
+                });
+                //xData.forEach((item, index) => {
+                //seriesData.push([item, yData[index]]);
+                //});
+                //计算峰值----目前没有公式 值写死的
+                const peakvalue = [arrX[maxIndex], Number(EChartsUtilsComm.getRound(max, outJdZdgmd))], coordX = [peakvalue[0], yAxisMin], coordY = [xAxisMin, peakvalue[1]];
+                let markPointObj = {
+                    data: [
                         {
-                            coord: coordX,
-                            lineStyle: {
-                                color: '#333', //X轴
-                                type: 'dashed',
+                            xAxis: EChartsUtilsComm.getRound(peakvalue[0], outJdZjhsl),
+                            yAxis: EChartsUtilsComm.getRound(peakvalue[1], outJdZdgmd),
+                            symbolOffset: [0, 15],
+                            symbol: 'circle',
+                            symbolSize: 6,
+                            label: {
+                                show: true,
+                                color: '#000',
+                                formatter: function (data) {
+                                    // 自定义标签内容
+                                    if (Number(data.data.xAxis) == 0 && Number(data.data.yAxis) == 0) {
+                                        return '';
+                                    }
+                                    else {
+                                        return '( ' + data.data.xAxis + ',' + data.data.yAxis + ')';
+                                    }
+                                },
                             },
-                        },
-                        {
-                            coord: peakvalue,
+                            itemStyle: { color: 'transparent' },
                         },
                     ],
-                    [
-                        {
-                            coord: coordY,
-                            lineStyle: {
-                                color: '#333', //y轴
-                                type: 'dashed',
-                            },
-                        },
-                        {
-                            coord: peakvalue,
+                }, markLineObj = {
+                    symbol: ['none', 'none'], //去掉箭头
+                    itemStyle: {
+                        lineStyle: {
+                            type: 'solid',
+                            color: '#333',
+                            width: 2,
                         },
+                    },
+                    data: [
+                        [
+                            {
+                                coord: coordX,
+                                lineStyle: {
+                                    color: '#333', //X轴
+                                    type: 'dashed',
+                                },
+                            },
+                            {
+                                coord: peakvalue,
+                            },
+                        ],
+                        [
+                            {
+                                coord: coordY,
+                                lineStyle: {
+                                    color: '#333', //y轴
+                                    type: 'dashed',
+                                },
+                            },
+                            {
+                                coord: peakvalue,
+                            },
+                        ],
                     ],
-                ],
-            };
-            //如果界面设置了校正最佳含水率和最大干密度，则显示界面中的顶点坐标（此时就不显示辅助线了）
-            if (chartExtJson.jsIsJz && /^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(cellValJzZjhsl) && /^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(cellValJzZdgmd)) {
-                markLineObj = null;
-                markPointObj.data[0].label = null;
-                markPointObj.data[0].symbolOffset = null;
-                markPointObj.data[0].itemStyle.color = '#F56C6C';
-                markPointObj.data[0].xAxis = cellValJzZjhsl;
-                markPointObj.data[0].yAxis = cellValJzZdgmd;
-                markLineObj = null;
-            }
-            let seriesDataObj = {
-                name: legendName,
-                type: 'line',
-                smooth: true, //平滑的线条
-                //设置数据点形状（实心），参考文档：https://echarts.apache.org/zh/option.html#series-line.symbol
-                symbol: 'circle', //符号类型
-                symbolSize: 6, //符号大小
-                //线条的颜色
-                lineStyle: {
-                    color: lineData[isTwoLineData ? 1 : 0].lineColor,
-                    //线条类型（solid：实线、dashed：粗虚线、dotted：细虚线）
-                    type: isTwoLineData ? 'dotted' : 'solid',
-                },
-                //线条上数据点的颜色
-                itemStyle: {
-                    color: lineData[isTwoLineData ? 1 : 0].lineColor,
-                },
-                data: seriesData,
-                markPoint: isShowMarkPoint ? markPointObj : null,
-                markLine: isShowMarkLine ? markLineObj : null,
-            };
-            return {
-                xAxisMin: xAxisMin,
-                xAxisMax: xAxisMax,
-                yAxisMin: yAxisMin,
-                yAxisMax: yAxisMax,
-                xData: xData,
-                seriesDataObj: seriesDataObj,
-                maxPointData: [arrX[maxIndex], max],
+                };
+                //如果界面设置了校正最佳含水率和最大干密度，则显示界面中的顶点坐标（此时就不显示辅助线了）
+                if (chartExtJson.jsIsJz && /^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(cellValJzZjhsl) && /^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(cellValJzZdgmd)) {
+                    markLineObj = null;
+                    markPointObj.data[0].label = null;
+                    markPointObj.data[0].symbolOffset = null;
+                    markPointObj.data[0].itemStyle.color = '#F56C6C';
+                    markPointObj.data[0].xAxis = cellValJzZjhsl;
+                    markPointObj.data[0].yAxis = cellValJzZdgmd;
+                    markLineObj = null;
+                }
+                let seriesDataObj = {
+                    name: legendName,
+                    type: 'line',
+                    smooth: true, //平滑的线条
+                    //设置数据点形状（实心），参考文档：https://echarts.apache.org/zh/option.html#series-line.symbol
+                    symbol: 'circle', //符号类型
+                    symbolSize: 6, //符号大小
+                    //线条的颜色
+                    lineStyle: {
+                        color: lineData[isTwoLineData ? 1 : 0].lineColor,
+                        //线条类型（solid：实线、dashed：粗虚线、dotted：细虚线）
+                        type: isTwoLineData ? 'dotted' : 'solid',
+                    },
+                    //线条上数据点的颜色
+                    itemStyle: {
+                        color: lineData[isTwoLineData ? 1 : 0].lineColor,
+                    },
+                    data: seriesData,
+                    markPoint: isShowMarkPoint ? markPointObj : null,
+                    markLine: isShowMarkLine ? markLineObj : null,
+                };
+                return {
+                    xAxisMin: xAxisMin,
+                    xAxisMax: xAxisMax,
+                    yAxisMin: yAxisMin,
+                    yAxisMax: yAxisMax,
+                    xData: xData,
+                    seriesDataObj: seriesDataObj,
+                    maxPointData: [arrX[maxIndex], max],
+                };
             };
-        };
-        let xAxisMin = 0, xAxisMax = 0, yAxisMin = 0, yAxisMax = 0, xData = [], seriesData = [], maxPointDataX = 0, maxPointDataY = 0;
-        let lineObj1 = lineFunc(xDataSource1, yDataSource1, !isTwoLine, !isTwoLine, false), lineObj2;
-        if (isTwoLine) {
-            lineObj2 = lineFunc(xDataSource2, yDataSource2, false, false, true);
-        }
-        //此处的作用是，有可能x和y轴的数据都为空，造成lineObj1为undefined，避免报错
-        if (lineObj1 == undefined || lineObj1 == null) {
-            return;
-        }
-        //一条线的时候
-        if (!isTwoLine) {
-            xAxisMin = lineObj1.xAxisMin;
-            xAxisMax = lineObj1.xAxisMax;
-            yAxisMin = lineObj1.yAxisMin;
-            yAxisMax = lineObj1.yAxisMax;
-            xData = lineObj1.xData;
-            seriesData.push(lineObj1.seriesDataObj);
-        }
-        //2条线的时候
-        else {
-            if (lineObj2 == undefined || lineObj2 == null) {
-                return;
-            }
-            xAxisMax = lineObj1.xAxisMax;
-            if (lineObj2.xAxisMax > xAxisMax) {
-                xAxisMax = lineObj2.xAxisMax;
-            }
-            xAxisMin = lineObj1.xAxisMin;
-            if (lineObj2.xAxisMin < xAxisMin) {
-                xAxisMin = lineObj2.xAxisMin;
+            let xAxisMin = 0, xAxisMax = 0, yAxisMin = 0, yAxisMax = 0, xData = [], seriesData = [], maxPointDataX = 0, maxPointDataY = 0;
+            let lineObj1 = lineFunc(xDataSource1, yDataSource1, !isTwoLine, !isTwoLine, false), lineObj2;
+            if (isTwoLine) {
+                lineObj2 = lineFunc(xDataSource2, yDataSource2, false, false, true);
             }
-            yAxisMax = lineObj1.yAxisMax;
-            if (lineObj2.yAxisMax > yAxisMax) {
-                yAxisMax = lineObj2.yAxisMax;
+            //此处的作用是，有可能x和y轴的数据都为空，造成lineObj1为undefined，避免报错
+            if (lineObj1 == undefined || lineObj1 == null) {
+                return;
             }
-            yAxisMin = lineObj1.yAxisMin;
-            if (lineObj2.yAxisMin < yAxisMin) {
-                yAxisMin = lineObj2.yAxisMin;
+            //一条线的时候
+            if (!isTwoLine) {
+                xAxisMin = lineObj1.xAxisMin;
+                xAxisMax = lineObj1.xAxisMax;
+                yAxisMin = lineObj1.yAxisMin;
+                yAxisMax = lineObj1.yAxisMax;
+                xData = lineObj1.xData;
+                seriesData.push(lineObj1.seriesDataObj);
             }
-            lineObj1.xData.forEach((item) => {
-                xData.push(item);
-            });
-            lineObj2.xData.forEach((item) => {
-                xData.push(item);
-            });
-            seriesData.push(lineObj1.seriesDataObj);
-            seriesData.push(lineObj2.seriesDataObj);
-            maxPointDataX = (lineObj1.maxPointData[0] + lineObj2.maxPointData[0]) / 2;
-            maxPointDataY = (lineObj1.maxPointData[1] + lineObj2.maxPointData[1]) / 2;
-            // console.log(
-            // 	"两条线最大点的平均值：",
-            // 	maxPointDataX,
-            // 	maxPointDataY
-            // );
-            //默认输出精度
-            let outJdZjhsl = 0.01, outJdZdgmd = 0.001;
-            //顶点数据
-            let outValZjhsl = 0, outValZdgmd = 0;
-            //设置Sheet单元格的值（最佳含水率和最大干密度）
-            if (chartExtJson != null) {
-                // console.log(4444, chartExtJson.jsZjhsl.row, chartExtJson.jsZjhsl.col, arrX[maxIndex]);
-                if (chartExtJson.jsZjhslJd != null && chartExtJson.jsZjhslJd != undefined) {
-                    outJdZjhsl = chartExtJson.jsZjhslJd;
-                }
-                if (chartExtJson.jsZdgmdJd != null && chartExtJson.jsZdgmdJd != undefined) {
-                    outJdZdgmd = chartExtJson.jsZdgmdJd;
-                }
-                if (maxPointDataX == 0 && maxPointDataY == 0) {
-                    sheet.setValue(chartExtJson.jsZjhsl.row, chartExtJson.jsZjhsl.col, '/');
-                    sheet.setValue(chartExtJson.jsZdgmd.row, chartExtJson.jsZdgmd.col, '/');
+            //2条线的时候
+            else {
+                if (lineObj2 == undefined || lineObj2 == null) {
+                    return;
                 }
-                else {
-                    outValZjhsl = EChartsUtilsComm.getRound(maxPointDataX, outJdZjhsl);
-                    outValZdgmd = EChartsUtilsComm.getRound(maxPointDataY, outJdZdgmd);
-                    sheet.setValue(chartExtJson.jsZjhsl.row, chartExtJson.jsZjhsl.col, outValZjhsl);
-                    sheet.setValue(chartExtJson.jsZdgmd.row, chartExtJson.jsZdgmd.col, outValZdgmd);
+                xAxisMax = lineObj1.xAxisMax;
+                if (lineObj2.xAxisMax > xAxisMax) {
+                    xAxisMax = lineObj2.xAxisMax;
+                }
+                xAxisMin = lineObj1.xAxisMin;
+                if (lineObj2.xAxisMin < xAxisMin) {
+                    xAxisMin = lineObj2.xAxisMin;
+                }
+                yAxisMax = lineObj1.yAxisMax;
+                if (lineObj2.yAxisMax > yAxisMax) {
+                    yAxisMax = lineObj2.yAxisMax;
+                }
+                yAxisMin = lineObj1.yAxisMin;
+                if (lineObj2.yAxisMin < yAxisMin) {
+                    yAxisMin = lineObj2.yAxisMin;
+                }
+                lineObj1.xData.forEach((item) => {
+                    xData.push(item);
+                });
+                lineObj2.xData.forEach((item) => {
+                    xData.push(item);
+                });
+                seriesData.push(lineObj1.seriesDataObj);
+                seriesData.push(lineObj2.seriesDataObj);
+                maxPointDataX = (lineObj1.maxPointData[0] + lineObj2.maxPointData[0]) / 2;
+                maxPointDataY = (lineObj1.maxPointData[1] + lineObj2.maxPointData[1]) / 2;
+                // console.log(
+                // 	"两条线最大点的平均值：",
+                // 	maxPointDataX,
+                // 	maxPointDataY
+                // );
+                //默认输出精度
+                let outJdZjhsl = 0.01, outJdZdgmd = 0.001;
+                //顶点数据
+                let outValZjhsl = 0, outValZdgmd = 0;
+                //设置Sheet单元格的值（最佳含水率和最大干密度）
+                if (chartExtJson != null) {
+                    // console.log(4444, chartExtJson.jsZjhsl.row, chartExtJson.jsZjhsl.col, arrX[maxIndex]);
+                    if (chartExtJson.jsZjhslJd != null && chartExtJson.jsZjhslJd != undefined) {
+                        outJdZjhsl = chartExtJson.jsZjhslJd;
+                    }
+                    if (chartExtJson.jsZdgmdJd != null && chartExtJson.jsZdgmdJd != undefined) {
+                        outJdZdgmd = chartExtJson.jsZdgmdJd;
+                    }
+                    if (maxPointDataX == 0 && maxPointDataY == 0) {
+                        sheet.setValue(chartExtJson.jsZjhsl.row, chartExtJson.jsZjhsl.col, '/');
+                        sheet.setValue(chartExtJson.jsZdgmd.row, chartExtJson.jsZdgmd.col, '/');
+                    }
+                    else {
+                        outValZjhsl = EChartsUtilsComm.getRound(maxPointDataX, outJdZjhsl);
+                        outValZdgmd = EChartsUtilsComm.getRound(maxPointDataY, outJdZdgmd);
+                        sheet.setValue(chartExtJson.jsZjhsl.row, chartExtJson.jsZjhsl.col, outValZjhsl);
+                        sheet.setValue(chartExtJson.jsZdgmd.row, chartExtJson.jsZdgmd.col, outValZdgmd);
+                    }
                 }
             }
-        }
-        //判断数据是否为/，‘’，null，undefined
-        let yValIsAllNull = false;
-        seriesData.forEach((item) => {
-            yValIsAllNull = item.data[0].value.every((ele) => {
-                return ele == 0;
+            //判断数据是否为/，‘’，null，undefined
+            let yValIsAllNull = false;
+            seriesData.forEach((item) => {
+                yValIsAllNull = item.data[0].value.every((ele) => {
+                    return ele == 0;
+                });
             });
-        });
-        if (yValIsAllNull) {
-            xAxisMin = null;
-            xAxisMax = null;
-            yAxisMin = null;
-            yAxisMax = null;
-            seriesData = [];
-        }
-        let option = {
-            grid: {
-                // show: true,//是否显示外边框线
-                // borderColor: '#f00',//外边框线颜色
-                top: 25,
-                left: !yValIsAllNull ? 30 : 25,
-                right: 10,
-                bottom: 20,
-                containLabel: true,
-            },
-            //提示框组件，参考文档：https://echarts.apache.org/zh/option.html#tooltip
-            tooltip: {
-                trigger: 'axis',
-                formatter: function (datas, ticket) {
-                    //console.log(datas," datas")
-                    return datas && datas.length > 0
-                        ? datas[0].seriesName + '（' + datas[0].value[0] + '）' + '：' + Number(EChartsUtilsComm.getRound(datas[0].value[1], 0.001))
-                        : datas[0].data;
-                },
-            },
-            //顶部的标题，参考文档：https://echarts.apache.org/zh/option.html#title
-            title: [
-                {
-                    show: true,
-                    text: title,
-                    left: 'center',
-                    top: 0,
-                    textStyle: {
-                        fontSize: 14,
-                        fontWeight: 'normal',
+            if (yValIsAllNull) {
+                xAxisMin = null;
+                xAxisMax = null;
+                yAxisMin = null;
+                yAxisMax = null;
+                seriesData = [];
+            }
+            let option = {
+                grid: {
+                    // show: true,//是否显示外边框线
+                    // borderColor: '#f00',//外边框线颜色
+                    top: 25,
+                    left: !yValIsAllNull ? 30 : 25,
+                    right: 10,
+                    bottom: 20,
+                    containLabel: true,
+                },
+                //提示框组件，参考文档：https://echarts.apache.org/zh/option.html#tooltip
+                tooltip: {
+                    trigger: 'axis',
+                    formatter: function (datas, ticket) {
+                        //console.log(datas," datas")
+                        return datas && datas.length > 0
+                            ? datas[0].seriesName + '（' + datas[0].value[0] + '）' + '：' + Number(EChartsUtilsComm.getRound(datas[0].value[1], 0.001))
+                            : datas[0].data;
                     },
                 },
-                {
-                    show: true,
-                    text: xName,
-                    left: 'center',
-                    bottom: 0,
-                    textStyle: {
-                        fontSize: 12,
-                        fontWeight: 'normal',
+                //顶部的标题，参考文档：https://echarts.apache.org/zh/option.html#title
+                title: [
+                    {
+                        show: true,
+                        text: title,
+                        left: 'center',
+                        top: 0,
+                        textStyle: {
+                            fontSize: 14,
+                            fontWeight: 'normal',
+                        },
+                    },
+                    {
+                        show: true,
+                        text: xName,
+                        left: 'center',
+                        bottom: 0,
+                        textStyle: {
+                            fontSize: 12,
+                            fontWeight: 'normal',
+                        },
+                    },
+                ],
+                //图例，参考文档：https://echarts.apache.org/zh/option.html#legend
+                legend: {
+                    show: false,
+                    left: 'right',
+                    data: [legendName],
+                    selected: {
+                        legendName: true, //显示
                     },
+                    selectedMode: 'multiple', //用于控制图例的选择模式（single：单选、multiple：多选、false：禁止选择）
                 },
-            ],
-            //图例，参考文档：https://echarts.apache.org/zh/option.html#legend
-            legend: {
-                show: false,
-                left: 'right',
-                data: [legendName],
-                selected: {
-                    legendName: true, //显示
+                xAxis: {
+                    type: 'value',
+                    max: xAxisMax,
+                    min: xAxisMin,
+                    data: xData,
+                    axisTick: {
+                        alignWithLabel: true, //使得刻度线和标签对齐
+                    },
+                    splitLine: { show: true },
                 },
-                selectedMode: 'multiple', //用于控制图例的选择模式（single：单选、multiple：多选、false：禁止选择）
-            },
-            xAxis: {
-                type: 'value',
-                max: xAxisMax,
-                min: xAxisMin,
-                data: xData,
-                axisTick: {
-                    alignWithLabel: true, //使得刻度线和标签对齐
+                yAxis: [
+                    {
+                        type: 'value',
+                        max: yAxisMax,
+                        min: yAxisMin,
+                        name: yName,
+                        nameGap: !yValIsAllNull ? 40 : 5,
+                        nameRotate: 90,
+                        nameLocation: 'middle',
+                        splitLine: {
+                            show: true,
+                            lineStyle: {
+                                color: '#e0e6f1', //'#e0e6f1',
+                                type: 'solid',
+                            },
+                        },
+                        //splitNumber: 10, //设置y轴分隔的段数，如0~100之间默认情况可能会按照0、20、40、60……的间隔显示，设置相应的数字后就会根据实际情况显示的更细，如0、10、20、30……
+                        axisLine: {
+                            //设置y轴箭头效果
+                            show: true, //y轴默认是不显示的
+                        },
+                    },
+                ],
+                series: seriesData,
+            };
+            return option;
+        }
+        catch (error) {
+            let option = {
+                grid: {
+                    // show: true,//是否显示外边框线
+                    // borderColor: '#f00',//外边框线颜色
+                    top: 25,
+                    left: 25,
+                    right: 10,
+                    bottom: 20,
+                    containLabel: true,
+                },
+                //提示框组件，参考文档：https://echarts.apache.org/zh/option.html#tooltip
+                tooltip: {
+                    trigger: 'axis',
+                    formatter: function (datas, ticket) {
+                        //console.log(datas," datas")
+                        return datas && datas.length > 0
+                            ? datas[0].seriesName + '（' + datas[0].value[0] + '）' + '：' + Number(EChartsUtilsComm.getRound(datas[0].value[1], 0.001))
+                            : datas[0].data;
+                    },
                 },
-                splitLine: { show: true },
-            },
-            yAxis: [
-                {
-                    type: 'value',
-                    max: yAxisMax,
-                    min: yAxisMin,
-                    name: yName,
-                    nameGap: !yValIsAllNull ? 40 : 5,
-                    nameRotate: 90,
-                    nameLocation: 'middle',
-                    splitLine: {
+                //顶部的标题，参考文档：https://echarts.apache.org/zh/option.html#title
+                title: [
+                    {
                         show: true,
-                        lineStyle: {
-                            color: '#e0e6f1', //'#e0e6f1',
-                            type: 'solid',
+                        text: title,
+                        left: 'center',
+                        top: 0,
+                        textStyle: {
+                            fontSize: 14,
+                            fontWeight: 'normal',
                         },
                     },
-                    //splitNumber: 10, //设置y轴分隔的段数，如0~100之间默认情况可能会按照0、20、40、60……的间隔显示，设置相应的数字后就会根据实际情况显示的更细，如0、10、20、30……
-                    axisLine: {
-                        //设置y轴箭头效果
-                        show: true, //y轴默认是不显示的
+                    {
+                        show: true,
+                        text: xName,
+                        left: 'center',
+                        bottom: 0,
+                        textStyle: {
+                            fontSize: 12,
+                            fontWeight: 'normal',
+                        },
+                    },
+                ],
+                //图例，参考文档：https://echarts.apache.org/zh/option.html#legend
+                legend: {
+                    show: false,
+                    left: 'right',
+                    data: [legendName],
+                    selected: {
+                        legendName: true, //显示
                     },
+                    selectedMode: 'multiple', //用于控制图例的选择模式（single：单选、multiple：多选、false：禁止选择）
                 },
-            ],
-            series: seriesData,
-        };
-        return option;
+                xAxis: {
+                    type: 'value',
+                    max: 0,
+                    min: 0,
+                    data: [],
+                    axisTick: {
+                        alignWithLabel: true, //使得刻度线和标签对齐
+                    },
+                    splitLine: { show: true },
+                },
+                yAxis: [
+                    {
+                        type: 'value',
+                        max: 0,
+                        min: 0,
+                        name: yName,
+                        nameGap: 5,
+                        nameRotate: 90,
+                        nameLocation: 'middle',
+                        splitLine: {
+                            show: true,
+                            lineStyle: {
+                                color: '#e0e6f1', //'#e0e6f1',
+                                type: 'solid',
+                            },
+                        },
+                        //splitNumber: 10, //设置y轴分隔的段数，如0~100之间默认情况可能会按照0、20、40、60……的间隔显示，设置相应的数字后就会根据实际情况显示的更细，如0、10、20、30……
+                        axisLine: {
+                            //设置y轴箭头效果
+                            show: true, //y轴默认是不显示的
+                        },
+                    },
+                ],
+                series: [],
+            };
+            return option;
+        }
     },
     /**
      * 筛分