office-viewer 0.3.9 → 0.3.10
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.
|
@@ -22,8 +22,8 @@ function calcCellDisplaySize(row, col, rowHeight, colWidth, getRowHeight, getCol
|
|
|
22
22
|
for (var mergeCells_1 = __values(mergeCells), mergeCells_1_1 = mergeCells_1.next(); !mergeCells_1_1.done; mergeCells_1_1 = mergeCells_1.next()) {
|
|
23
23
|
var mergeCell = mergeCells_1_1.value;
|
|
24
24
|
var startRow = mergeCell.startRow, endRow = mergeCell.endRow, startCol = mergeCell.startCol, endCol = mergeCell.endCol;
|
|
25
|
-
mergeCellId = "".concat(startRow, "-").concat(endRow, "-").concat(startCol, "-").concat(endCol);
|
|
26
25
|
if (row >= startRow && row <= endRow && col >= startCol && col <= endCol) {
|
|
26
|
+
mergeCellId = "".concat(startRow, "-").concat(endRow, "-").concat(startCol, "-").concat(endCol);
|
|
27
27
|
isMergeCell = true;
|
|
28
28
|
matchMergeCell = mergeCell;
|
|
29
29
|
// 补上合并单元格的高宽
|
|
@@ -26,8 +26,8 @@ function calcCellDisplaySize(row, col, rowHeight, colWidth, getRowHeight, getCol
|
|
|
26
26
|
for (var mergeCells_1 = tslib.__values(mergeCells), mergeCells_1_1 = mergeCells_1.next(); !mergeCells_1_1.done; mergeCells_1_1 = mergeCells_1.next()) {
|
|
27
27
|
var mergeCell = mergeCells_1_1.value;
|
|
28
28
|
var startRow = mergeCell.startRow, endRow = mergeCell.endRow, startCol = mergeCell.startCol, endCol = mergeCell.endCol;
|
|
29
|
-
mergeCellId = "".concat(startRow, "-").concat(endRow, "-").concat(startCol, "-").concat(endCol);
|
|
30
29
|
if (row >= startRow && row <= endRow && col >= startCol && col <= endCol) {
|
|
30
|
+
mergeCellId = "".concat(startRow, "-").concat(endRow, "-").concat(startCol, "-").concat(endCol);
|
|
31
31
|
isMergeCell = true;
|
|
32
32
|
matchMergeCell = mergeCell;
|
|
33
33
|
// 补上合并单元格的高宽
|