rapid-spreadjs 1.0.168 → 1.0.170
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs.js +7 -5
- package/dist/index.cjs.js.map +1 -1
- package/dist/index.cjs.min.js +1 -1
- package/dist/index.cjs.min.js.map +1 -1
- package/dist/index.esm.js +7 -5
- package/dist/index.esm.js.map +1 -1
- package/dist/index.esm.min.js +1 -1
- package/dist/index.esm.min.js.map +1 -1
- package/package.json +1 -1
package/dist/index.esm.js
CHANGED
|
@@ -1447,7 +1447,7 @@ const BusinessUtils = {
|
|
|
1447
1447
|
}
|
|
1448
1448
|
}
|
|
1449
1449
|
let rowObjs = { row: parseInt(rowIndexKey), rows: curRowIndexs, cells: cellItems, hasValue: curRowHasValue };
|
|
1450
|
-
if (!rowCells.some((x) => x.rowSpan == seqColSpanObj.row)) {
|
|
1450
|
+
if (seqColSpanObj && !rowCells.some((x) => x.rowSpan == seqColSpanObj.row)) {
|
|
1451
1451
|
let rowIndexs = [];
|
|
1452
1452
|
const seqColSpanRowSpan = sheet.getSpans({ row: seqColSpanObj.row, col: 1, rowCount: 1, colCount: 1 })[0];
|
|
1453
1453
|
for (let i = 0; i < seqColSpanRowSpan.rowCount; i++) {
|
|
@@ -1460,8 +1460,10 @@ const BusinessUtils = {
|
|
|
1460
1460
|
});
|
|
1461
1461
|
}
|
|
1462
1462
|
else {
|
|
1463
|
-
|
|
1464
|
-
|
|
1463
|
+
if (seqColSpanObj) {
|
|
1464
|
+
let curRow = rowCells.find((x) => x.rowSpan == seqColSpanObj.row);
|
|
1465
|
+
curRow.rows.push(rowObjs);
|
|
1466
|
+
}
|
|
1465
1467
|
}
|
|
1466
1468
|
});
|
|
1467
1469
|
// 有值和没有值的行索引集合
|
|
@@ -8716,7 +8718,7 @@ const EChartsUtilsAll = {
|
|
|
8716
8718
|
z: 6,
|
|
8717
8719
|
data: [
|
|
8718
8720
|
{ value: [logX1, y1], realX: x1, realY: y1, name: 'a1' },
|
|
8719
|
-
{ value: [logX2, y2], realX: x2, realY: +y2.toFixed(2), name: 'a2' },
|
|
8721
|
+
{ value: [logX2, y2], realX: x2, realY: isNaN(y2) ? 0 : +y2.toFixed(2), name: 'a2' },
|
|
8720
8722
|
{ value: [logX3, y3], realX: x3, realY: y3, name: 'a3' },
|
|
8721
8723
|
],
|
|
8722
8724
|
symbol: 'circle',
|
|
@@ -8743,7 +8745,7 @@ const EChartsUtilsAll = {
|
|
|
8743
8745
|
data: [{ coord: [logX2, y2] }],
|
|
8744
8746
|
label: {
|
|
8745
8747
|
show: true,
|
|
8746
|
-
formatter: '(' + x2 + ', ' + y2.toFixed(2) + ')',
|
|
8748
|
+
formatter: '(' + x2 + ', ' + (isNaN(y2) ? 0 : y2.toFixed(2)) + ')',
|
|
8747
8749
|
position: 'right',
|
|
8748
8750
|
distance: 10,
|
|
8749
8751
|
fontSize: 13,
|