rapid-spreadjs 1.0.167 → 1.0.168

package/dist/index.esm.js

@@ -8517,256 +8517,99 @@ const EChartsUtilsAll = {
      * @returns 返回ECharts配置项
      */
     chart350: (config, xDataArr, yDataArr, sheet) => {
-        let lineData = JSON.parse(config.chartLinesJson), lineColor = lineData[0].lineColor;
+        let lineData = JSON.parse(config.chartLinesJson); lineData[0].lineColor;
         const chartExtJson = config.chartExtJson == null || config.chartExtJson == undefined ? null : JSON.parse(config.chartExtJson);
-        //击数N(次)、含水率w(%)、y轴第一个趋势数据、y轴第二个趋势数据、25的趋势数据、y轴最小值、y轴最大值
-        const jsN = [xDataArr[0][0], xDataArr[0][1]], // [18, 30],
-        hsl = [yDataArr[0][0], yDataArr[0][1]], // [22.1, 11.5],
-        //通过calcTrend获取y轴第一个趋势数据、y轴第二个趋势数据、25的趋势数据
-        yVal1 = Number(EChartsUtilsComm.getRound(EChartsUtilsComm.calcTrend(jsN, hsl, jsN[0]).y, 0.1)), yVal2 = Number(EChartsUtilsComm.getRound(EChartsUtilsComm.calcTrend(jsN, hsl, jsN[1]).y, 0.1)), yVal25 = Number(EChartsUtilsComm.getRound(EChartsUtilsComm.calcTrend(jsN, hsl, 25).y, 0.1)), 
-        //通过calcTrend获取y轴的趋势数据，然后分别-2和+2
-        yAxisMin = Math.floor(Number(yVal2)) - 2, yAxisMax = Math.floor(Number(yVal1)) + 2;
-        let title = config.chartTitle, xName = config.chartXName, yName = config.chartYName, legendName = '图例1';
+        // //击数N(次)、含水率w(%)、y轴第一个趋势数据、y轴第二个趋势数据、25的趋势数据、y轴最小值、y轴最大值
+        // const jsN = [xDataArr[0][0], xDataArr[0][1]], // [18, 30],
+        //   hsl = [yDataArr[0][0], yDataArr[0][1]], // [22.1, 11.5],
+        //   //通过calcTrend获取y轴第一个趋势数据、y轴第二个趋势数据、25的趋势数据
+        //   yVal1 = Number(EChartsUtilsComm.getRound(EChartsUtilsComm.calcTrend(jsN, hsl, jsN[0]).y, 0.1)),
+        //   yVal2 = Number(EChartsUtilsComm.getRound(EChartsUtilsComm.calcTrend(jsN, hsl, jsN[1]).y, 0.1)),
+        //   yVal25 = Number(EChartsUtilsComm.getRound(EChartsUtilsComm.calcTrend(jsN, hsl, 25).y, 0.1)),
+        //   //通过calcTrend获取y轴的趋势数据，然后分别-2和+2
+        //   yAxisMin = Math.floor(Number(yVal2)) - 2,
+        //   yAxisMax = Math.floor(Number(yVal1)) + 2;
+        let title = config.chartTitle, xName = config.chartXName, yName = config.chartYName;
         //检测是否所有数据都为空
         let isAllNull = true;
         isAllNull = xDataArr[0].filter((item) => item != null && item != undefined && item != '/').length == 0;
         if (isAllNull) {
             isAllNull = yDataArr[0].filter((item) => item != null && item != undefined && item != '/').length == 0;
         }
-        //x和y轴的字体大小
-        const xyFontSize = 8;
-        let seriesObjs = [
+        var LOG = Math.log10;
+        /* ==========================================================
+           1. 数据源（只需改这里，其余全部自动适配）
+           ========================================================== */
+        var x1 = xDataArr[0][0], y1 = yDataArr[0][0]; // a1
+        var x3 = xDataArr[0][1], y3 = yDataArr[0][1]; // a3
+        var x2 = 25; // 待求插值点
+        /* ==========================================================
+           2. 插值计算（对数空间线性插值）
+           ========================================================== */
+        var logX1 = LOG(x1), logX2 = LOG(x2), logX3 = LOG(x3);
+        var t = (logX2 - logX1) / (logX3 - logX1);
+        var y2 = y1 + t * (y3 - y1);
+        var slope = (y3 - y1) / (logX3 - logX1);
+        // 两端延长：取数据对数跨度的 15%，保证"延长一点"且随数据自适应
+        var ext = (logX3 - logX1) * 0.15;
+        var extLX = logX1 - ext, extLY = y1 + slope * -ext;
+        var extRX = logX3 + ext, extRY = y3 + slope * ext;
+        /* ==========================================================
+           3. Y 轴范围自适应算法
+           ========================================================== */
+        // 把任意数值规整为 1 / 2 / 5 × 10^n 的"整洁数"
+        function niceNum(range, round) {
+            var exponent = Math.floor(Math.log10(range));
+            var fraction = range / Math.pow(10, exponent);
+            var niceFraction;
             {
-                name: legendName,
-                type: 'line',
-                //设置数据点形状（实心），参考文档：https://echarts.apache.org/zh/option.html#series-line.symbol
-                symbol: 'circle',
-                z: 10, //控制曲线的浮动层级，避免在markLine下方被遮住
-                //线条的颜色
-                lineStyle: {
-                    color: lineColor,
-                    //线条类型（solid：实线、dashed：粗虚线、dotted：细虚线）
-                    // type: 'dotted',
-                },
-                //线条上数据点的颜色
-                itemStyle: {
-                    color: lineColor,
-                },
-                connectNulls: true, //是否连接空数据
-                data: [
-                    [0, null],
-                    [2, null],
-                    [3.5, null],
-                    [4.9, null],
-                    [5.9, null],
-                    [6.9, null],
-                    {
-                        //延长线1
-                        value: [10.4, yVal25 - (2.7 * (yVal25 - yVal1)) / 2.1],
-                        symbol: 'none', //隐藏线条上的数据点
-                    },
-                    [11, yVal1], //第一个点
-                    [11.8, null],
-                    [13.1, yVal25], //第二个点
-                    [14.6, yVal2], //第三个点
-                    {
-                        //延长线2
-                        value: [15.2, (2.1 / 1.5) * (yVal2 - yVal25) + yVal25],
-                        symbol: 'none', //隐藏线条上的数据点
-                    },
-                    [16.4, null],
-                    [17.4, null],
-                    [18.9, null],
-                    [19.8, null],
-                    [20.7, null],
-                    [21.6, null],
-                    [22.6, null],
-                ],
-                markPoint: {
-                    data: [
-                        {
-                            xAxis: 13.1,
-                            yAxis: yVal25,
-                            symbolOffset: [40, 25],
-                            label: {
-                                show: true,
-                                color: '#000',
-                                formatter: function (data) {
-                                    //显示25这个坐标点数据
-                                    return isAllNull ? '' : '(' + 25 + ' , ' + data.data.yAxis + ')';
-                                },
-                            },
-                            itemStyle: { color: 'transparent' },
-                        },
-                    ],
-                },
-                markLine: {
-                    symbol: '', //取消箭头
-                    silent: true, //取消鼠标hover事件
-                    label: {
-                        //标线的文本，模拟x轴显示的内容
-                        position: 'start', //改变label位置
-                        // rotate: 45, //设置文字旋转度数（注意：ECharts官网文档居然没有rotate这个属性的说明）
-                        // backgroundColor:'#fff'
-                        // color:'#f00',//文字颜色
-                        formatter: (data) => {
-                            return data.name;
-                        },
-                    },
-                    lineStyle: { color: '#e0e6f1', type: 'solid' },
-                    data: [
-                        {
-                            name: '5',
-                            xAxis: 0,
-                            label: {
-                                fontSize: xyFontSize,
-                            },
-                        },
-                        {
-                            name: '6',
-                            xAxis: 2,
-                            label: {
-                                fontSize: xyFontSize,
-                            },
-                        },
-                        {
-                            name: '7',
-                            xAxis: 3.5,
-                            label: {
-                                fontSize: xyFontSize,
-                            },
-                        },
-                        {
-                            name: '8',
-                            xAxis: 4.9,
-                            label: {
-                                fontSize: xyFontSize,
-                            },
-                        },
-                        {
-                            name: '9',
-                            xAxis: 5.9,
-                            label: {
-                                fontSize: xyFontSize,
-                            },
-                        },
-                        {
-                            name: '10',
-                            xAxis: 6.9,
-                            label: {
-                                fontSize: xyFontSize,
-                            },
-                        },
-                        {
-                            //延长线1
-                            name: '',
-                            xAxis: 10.4,
-                            lineStyle: {
-                                opacity: 0,
-                            },
-                        },
-                        {
-                            //第一个点
-                            name: '',
-                            xAxis: 11,
-                        },
-                        {
-                            name: '20',
-                            xAxis: 11.8,
-                            label: {
-                                fontSize: xyFontSize,
-                            },
-                        },
-                        {
-                            //第二个点
-                            name: '25',
-                            xAxis: 13.1,
-                            label: {
-                                fontSize: xyFontSize,
-                            },
-                        },
-                        {
-                            //第三个点
-                            name: '30',
-                            xAxis: 14.6,
-                            label: {
-                                fontSize: xyFontSize,
-                            },
-                        },
-                        {
-                            //延长线2
-                            name: '',
-                            xAxis: 15.2,
-                            lineStyle: {
-                                opacity: 0,
-                            },
-                        },
-                        {
-                            name: '40',
-                            xAxis: 16.4,
-                            label: {
-                                fontSize: xyFontSize,
-                            },
-                        },
-                        {
-                            name: '50',
-                            xAxis: 17.4,
-                            label: {
-                                fontSize: xyFontSize,
-                            },
-                        },
-                        {
-                            name: '',
-                            xAxis: 18.9,
-                        },
-                        {
-                            name: '',
-                            xAxis: 19.8,
-                        },
-                        {
-                            name: '',
-                            xAxis: 20.7,
-                        },
-                        {
-                            name: '',
-                            xAxis: 21.6,
-                        },
-                        {
-                            name: '100',
-                            xAxis: 22.6,
-                            label: {
-                                fontSize: xyFontSize,
-                            },
-                        },
-                        //横线
-                        [
-                            {
-                                coord: [0, yVal25],
-                                lineStyle: {
-                                    color: '#529b2e',
-                                    type: 'solid',
-                                },
-                            },
-                            { coord: [13.1, yVal25] },
-                        ],
-                        //纵线
-                        [
-                            {
-                                coord: [13.1, yAxisMin],
-                                lineStyle: {
-                                    color: '#000',
-                                    type: 'silid',
-                                },
-                            },
-                            { coord: [13.1, yVal25] },
-                        ],
-                    ],
-                },
-            },
-        ];
-        if (isAllNull) {
-            seriesObjs = [];
-        }
+                if (fraction < 1.5)
+                    niceFraction = 1;
+                else if (fraction < 3)
+                    niceFraction = 2;
+                else if (fraction < 7)
+                    niceFraction = 5;
+                else
+                    niceFraction = 10;
+            }
+            return niceFraction * Math.pow(10, exponent);
+        }
+        // 根据一组 y 值自动计算 yMin / yMax / interval
+        function calcYBounds(values, marginRatio, targetTicks) {
+            marginRatio = marginRatio === undefined ? 0.12 : marginRatio;
+            targetTicks = targetTicks || 5;
+            var dataMin = Math.min.apply(null, values);
+            var dataMax = Math.max.apply(null, values);
+            var range = dataMax - dataMin;
+            if (range === 0) {
+                range = Math.abs(dataMax) || 1;
+            } // 防止所有值相同
+            var margin = range * marginRatio; // 上下留白
+            var rawMin = dataMin - margin;
+            var rawMax = dataMax + margin;
+            var interval = niceNum((rawMax - rawMin) / (targetTicks - 1));
+            var yMin = Math.floor(rawMin / interval) * interval;
+            var yMax = Math.ceil(rawMax / interval) * interval;
+            // 消除浮点误差
+            yMin = +yMin.toFixed(10);
+            yMax = +yMax.toFixed(10);
+            interval = +interval.toFixed(10);
+            return { min: yMin, max: yMax, interval: interval };
+        }
+        // 把三个点 + 两端延长点一起纳入计算，确保整条线都显示得下
+        var yBounds = calcYBounds([y1, y2, y3, extLY, extRY], 0.12, 5);
+        var yMin = yBounds.min;
+        var yMax = yBounds.max;
+        var yInterval = yBounds.interval;
+        /* ==========================================================
+           4. X 轴刻度定义
+           ========================================================== */
+        var allTicks = [5, 6, 7, 8, 9, 10, 20, 25, 30, 40, 50, 60, 70, 80, 90, 100, 150];
+        var labeledTicks = [5, 6, 7, 8, 9, 10, 20, 25, 30, 40, 50, 100];
+        var xMin = LOG(5), xMax = LOG(150);
+        var vLines = allTicks.map(function (v) {
+            return { xAxis: LOG(v) };
+        });
         if (chartExtJson != null && chartExtJson != undefined && chartExtJson.yxdsyHsl != null && chartExtJson.yxdsyHsl != undefined) {
             // 默认输出精度
             let outJdYxdsyHsl = 0.1;
@@ -8776,103 +8619,163 @@ const EChartsUtilsAll = {
             if (chartExtJson.yxdsyHslJd != null && chartExtJson.yxdsyHslJd != undefined) {
                 outJdYxdsyHsl = chartExtJson.yxdsyHslJd;
             }
-            outValYxdsyHsl = EChartsUtilsComm.getRound(yVal25, outJdYxdsyHsl);
-            sheet.setValue(chartExtJson.yxdsyHsl.row, chartExtJson.yxdsyHsl.col, outValYxdsyHsl);
+            outValYxdsyHsl = EChartsUtilsComm.getRound(y2, outJdYxdsyHsl);
+            sheet.setValue(chartExtJson.yxdsyHsl.row, chartExtJson.yxdsyHsl.col, typeof outValYxdsyHsl == 'string' && (outValYxdsyHsl + '').indexOf('NaN') != -1 ? '/' : outValYxdsyHsl);
         }
-        let option = {
-            grid: {
-                // show: true,//是否显示外边框线
-                // borderColor: '#f00',//外边框线颜色
-                top: 25,
-                left: 30,
-                right: 10,
-                bottom: 35,
-                containLabel: true,
+        /* ==========================================================
+           5. 图表配置
+           ========================================================== */
+        var option = {
+            /* --- 标题 --- */
+            title: {
+                text: title,
+                left: 'center',
+                top: 0,
+                textStyle: { fontSize: 14, fontWeight: 'normal' },
             },
-            //提示框组件，参考文档：https://echarts.apache.org/zh/option.html#tooltip
+            /* --- tooltip --- */
             tooltip: {
-                trigger: 'axis',
-                formatter: function (datas, ticket) {
-                    return datas && datas[0].data.length > 1
-                        ? datas[0].data[1] == null
-                            ? ''
-                            : datas[0].seriesName + '（' + datas[0].data[0] + '）' + '：' + datas[0].data[1]
-                        : datas[0].data;
+                trigger: 'item',
+                formatter: function (params) {
+                    if (params.seriesType === 'scatter' && params.data && params.data.realX !== undefined) {
+                        return '(' + params.data.realX + ', ' + params.data.realY + ')';
+                    }
+                    return '';
                 },
+                backgroundColor: 'rgba(255,255,255,0.95)',
+                borderColor: '#ccc',
+                borderWidth: 1,
+                textStyle: { color: '#333', fontSize: 13 },
+                padding: [6, 10],
             },
-            //顶部的标题，参考文档：https://echarts.apache.org/zh/option.html#title
-            title: [
+            grid: { left: 50, right: 10, top: 20, bottom: 0 },
+            /* --- X 轴 --- */
+            xAxis: {
+                type: 'value',
+                min: xMin,
+                max: xMax,
+                axisLine: { show: true },
+                axisTick: { show: false },
+                axisLabel: { show: false },
+                splitLine: { show: false },
+                name: xName,
+                nameLocation: 'center',
+                nameGap: 18,
+                nameTextStyle: { fontSize: 12, color: '#333' },
+            },
+            /* --- Y 轴 --- */
+            yAxis: {
+                type: 'value',
+                min: yMin,
+                max: yMax,
+                interval: yInterval,
+                position: 'left',
+                axisLine: { show: true, lineStyle: { color: '#333', width: 1.5 } },
+                axisTick: { show: true, length: 5, lineStyle: { color: '#333' } },
+                axisLabel: { show: true, fontSize: 12, color: '#333', margin: 10 },
+                splitLine: { show: true, lineStyle: { color: '#e0e6f1', width: 1 } },
+                name: yName,
+                nameLocation: 'center',
+                nameGap: 30,
+                nameRotate: 90,
+                nameTextStyle: { fontSize: 12, color: '#333' },
+            },
+            series: [
+                /* --- ① 纵向灰色网格线 --- */
                 {
-                    show: true,
-                    text: title,
-                    left: 'center',
-                    top: 0,
-                    textStyle: {
-                        fontSize: 14,
-                        fontWeight: 'normal',
+                    type: 'line',
+                    data: [],
+                    silent: true,
+                    z: 1,
+                    markLine: {
+                        silent: true,
+                        symbol: 'none',
+                        lineStyle: { color: '#e0e6f1', width: 1, type: 'solid' },
+                        label: { show: false },
+                        data: vLines,
                     },
                 },
+                /* --- ② 主直线（含两端延长） --- */
                 {
-                    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, //显示
+                    type: 'line',
+                    z: 30,
+                    silent: true,
+                    data: [
+                        [extLX, extLY],
+                        [logX1, y1],
+                        [logX2, y2],
+                        [logX3, y3],
+                        [extRX, extRY],
+                    ],
+                    lineStyle: { color: '#409EFF', width: 2 },
+                    symbol: 'none',
                 },
-                selectedMode: 'multiple', //用于控制图例的选择模式（single：单选、multiple：多选、false：禁止选择）
-            },
-            xAxis: {
-                type: 'value',
-                axisTick: { show: false }, //隐藏刻度线
-                axisLabel: { show: false }, //隐藏刻度值
-                //网格线，参考文档：https://echarts.apache.org/zh/option.html#xAxis.splitLine
-                splitLine: {
-                    show: false, //隐藏分割线
+                /* --- ③ a1 / a2 / a3 圆点（带 tooltip） --- */
+                {
+                    type: 'scatter',
+                    z: 6,
+                    data: [
+                        { value: [logX1, y1], realX: x1, realY: y1, name: 'a1' },
+                        { value: [logX2, y2], realX: x2, realY: +y2.toFixed(2), name: 'a2' },
+                        { value: [logX3, y3], realX: x3, realY: y3, name: 'a3' },
+                    ],
+                    symbol: 'circle',
+                    symbolSize: 10,
+                    itemStyle: { color: '#409EFF', borderColor: '#fff', borderWidth: 1.5 },
                 },
-                min: 0,
-                max: 23.5,
-            },
-            yAxis: [
+                /* --- ④ a2 横向绿色线（从 y 轴到 a2）+ 文字标注 --- */
                 {
-                    type: 'value',
-                    name: yName,
-                    nameGap: !isAllNull ? 30 : 10,
-                    nameRotate: 90,
-                    nameLocation: 'middle',
-                    splitLine: {
-                        show: true,
-                        lineStyle: {
-                            color: '#e0e6f1', //'#e0e6f1',
-                            type: 'solid',
-                        },
+                    type: 'scatter',
+                    z: 4,
+                    silent: true,
+                    data: [],
+                    markLine: {
+                        silent: true,
+                        symbol: 'none',
+                        lineStyle: { color: '#2eaf4a', width: 2, type: 'solid' },
+                        label: { show: false },
+                        data: [[{ coord: [xMin, y2] }, { coord: [logX2, y2] }]],
                     },
-                    splitNumber: 4, //设置y轴分隔的段数，如0~100之间默认情况可能会按照0、20、40、60……的间隔显示，设置相应的数字后就会根据实际情况显示的更细，如0、10、20、30……
-                    min: !isAllNull ? yAxisMin : null,
-                    max: yAxisMax,
-                    axisLabel: {
-                        show: !isAllNull ? true : false,
-                        fontSize: xyFontSize,
+                    markPoint: {
+                        silent: true,
+                        symbol: 'circle',
+                        symbolSize: 0,
+                        data: [{ coord: [logX2, y2] }],
+                        label: {
+                            show: true,
+                            formatter: '(' + x2 + ', ' + y2.toFixed(2) + ')',
+                            position: 'right',
+                            distance: 10,
+                            fontSize: 13,
+                            fontWeight: 'bold',
+                            color: '#2eaf4a',
+                        },
                     },
-                    axisTick: {
-                        show: !isAllNull ? true : false,
+                },
+                /* --- ⑤ a2 纵向黑色线（从 x 轴到 a2） --- */
+                {
+                    type: 'scatter',
+                    z: 4,
+                    silent: true,
+                    data: [],
+                    markLine: {
+                        silent: true,
+                        symbol: 'none',
+                        lineStyle: { color: '#000000', width: 2, type: 'solid' },
+                        label: { show: false },
+                        data: [[{ coord: [logX2, yMin] }, { coord: [logX2, y2] }]],
                     },
                 },
             ],
-            series: seriesObjs,
         };
-        return option;
+        return {
+            option: option,
+            ext: {
+                labeledTicks: labeledTicks,
+                LOG: LOG,
+                yMin: yMin,
+            },
+        };
     },
     /**
      * 土工合成材料（垂直渗透系数）
@@ -10623,7 +10526,7 @@ const EChartsUtils = {
             console.log('xDataArr：', xDataArr);
             console.log('yDataArr：', yDataArr);
         }
-        let option;
+        let option, ext;
         if (config.chartType == 10) {
             option = EChartsUtilsAll.chart10(config, xDataArr, yDataArr, sheet);
         }
@@ -10697,7 +10600,9 @@ const EChartsUtils = {
             option = EChartsUtilsAll.chart330(config, xDataArr, yDataArr, sheet);
         }
         else if (config.chartType == 350) {
-            option = EChartsUtilsAll.chart350(config, xDataArr, yDataArr, sheet);
+            const allOpts = EChartsUtilsAll.chart350(config, xDataArr, yDataArr, sheet);
+            option = allOpts.option;
+            ext = allOpts.ext;
         }
         else if (config.chartType == 370) {
             option = EChartsUtilsAll.chart370(config, xDataArr, yDataArr, sheet);
@@ -10732,6 +10637,34 @@ const EChartsUtils = {
             ecObj.setOption(option);
         }
         ecObj.setOption(option);
+        if (config.chartType == 350) {
+            /* ==========================================================
+             6. X 轴刻度文字（graphic 精确定位）
+             ========================================================== */
+            setTimeout(function () {
+                var graphicList = [];
+                ext.labeledTicks.forEach(function (tick) {
+                    var px = ecObj.convertToPixel({ gridIndex: 0 }, [ext.LOG(tick), ext.yMin]);
+                    if (!isNaN(px[1] + 12)) {
+                        graphicList.push({
+                            type: 'text',
+                            bottom: 20,
+                            x: px[0],
+                            y: px[1] + 12,
+                            style: {
+                                text: String(tick),
+                                fontSize: 12,
+                                fill: '#333',
+                                textAlign: 'center',
+                                textVerticalAlign: 'top',
+                            },
+                            silent: true,
+                        });
+                    }
+                });
+                ecObj.setOption({ graphic: graphicList });
+            }, 120);
+        }
         return ecObj;
     },
     /**