rapid-spreadjs 1.0.168 → 1.0.170

package/dist/index.cjs.js

@@ -1469,7 +1469,7 @@ const BusinessUtils = {
                 }
             }
             let rowObjs = { row: parseInt(rowIndexKey), rows: curRowIndexs, cells: cellItems, hasValue: curRowHasValue };
-            if (!rowCells.some((x) => x.rowSpan == seqColSpanObj.row)) {
+            if (seqColSpanObj && !rowCells.some((x) => x.rowSpan == seqColSpanObj.row)) {
                 let rowIndexs = [];
                 const seqColSpanRowSpan = sheet.getSpans({ row: seqColSpanObj.row, col: 1, rowCount: 1, colCount: 1 })[0];
                 for (let i = 0; i < seqColSpanRowSpan.rowCount; i++) {
@@ -1482,8 +1482,10 @@ const BusinessUtils = {
                 });
             }
             else {
-                let curRow = rowCells.find((x) => x.rowSpan == seqColSpanObj.row);
-                curRow.rows.push(rowObjs);
+                if (seqColSpanObj) {
+                    let curRow = rowCells.find((x) => x.rowSpan == seqColSpanObj.row);
+                    curRow.rows.push(rowObjs);
+                }
             }
         });
         // 有值和没有值的行索引集合
@@ -8738,7 +8740,7 @@ const EChartsUtilsAll = {
                     z: 6,
                     data: [
                         { value: [logX1, y1], realX: x1, realY: y1, name: 'a1' },
-                        { value: [logX2, y2], realX: x2, realY: +y2.toFixed(2), name: 'a2' },
+                        { value: [logX2, y2], realX: x2, realY: isNaN(y2) ? 0 : +y2.toFixed(2), name: 'a2' },
                         { value: [logX3, y3], realX: x3, realY: y3, name: 'a3' },
                     ],
                     symbol: 'circle',
@@ -8765,7 +8767,7 @@ const EChartsUtilsAll = {
                         data: [{ coord: [logX2, y2] }],
                         label: {
                             show: true,
-                            formatter: '(' + x2 + ', ' + y2.toFixed(2) + ')',
+                            formatter: '(' + x2 + ', ' + (isNaN(y2) ? 0 : y2.toFixed(2)) + ')',
                             position: 'right',
                             distance: 10,
                             fontSize: 13,