@talrace/ngx-noder 19.0.70 → 19.0.71
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.
|
@@ -13740,20 +13740,20 @@ class NoderTableComponent extends BaseNoderComponent {
|
|
|
13740
13740
|
return { rowHeight, hasMerges };
|
|
13741
13741
|
}
|
|
13742
13742
|
getCellHeight(rowIndex, cellIndex, cell) {
|
|
13743
|
-
if (cell.componentRef.instance.cell.verticalMerge
|
|
13744
|
-
|
|
13745
|
-
|
|
13746
|
-
|
|
13747
|
-
|
|
13748
|
-
while (cell.cell === this.rowMatrix[i]?.cells[cellIndex].cell) {
|
|
13749
|
-
currentHeight -= this.rowMatrix[i].height;
|
|
13750
|
-
i--;
|
|
13751
|
-
}
|
|
13752
|
-
return { height: currentHeight, isMerged: false };
|
|
13753
|
-
}
|
|
13743
|
+
if (!cell.componentRef.instance.cell.verticalMerge) {
|
|
13744
|
+
return { height: cell.cellContentHeight, isMerged: false };
|
|
13745
|
+
}
|
|
13746
|
+
const isNotLastVerticalMergedCell = cell.cell === this.rowMatrix[rowIndex + 1]?.cells[cellIndex].cell;
|
|
13747
|
+
if (isNotLastVerticalMergedCell) {
|
|
13754
13748
|
return { height: 0, isMerged: true };
|
|
13755
13749
|
}
|
|
13756
|
-
|
|
13750
|
+
let i = rowIndex - 1;
|
|
13751
|
+
let currentHeight = cell.cellContentHeight;
|
|
13752
|
+
while (cell.cell === this.rowMatrix[i]?.cells[cellIndex].cell) {
|
|
13753
|
+
currentHeight -= this.rowMatrix[i].height;
|
|
13754
|
+
i--;
|
|
13755
|
+
}
|
|
13756
|
+
return { height: currentHeight, isMerged: false };
|
|
13757
13757
|
}
|
|
13758
13758
|
fillTableCells() {
|
|
13759
13759
|
for (let i = 0; i < this.rowMatrix.length; i++) {
|