@syncfusion/ej2-pdf-export 24.2.3 → 25.1.38

package/dist/es6/ej2-pdf-export.es2015.js

@@ -27498,7 +27498,8 @@ class PdfGridCell {
                 }
                 if (param.page != childGridResult.page) //&& (isWidthGreaterthanParent != true))
                  {
-                    childGridResult.bounds.height = this.row.rowBreakHeightValue;
+                    if (this.row.rowBreakHeightValue !== null && typeof this.row.rowBreakHeightValue !== 'undefined')
+                        childGridResult.bounds.height = this.row.rowBreakHeightValue;
                     if (this.row.rowBreakHeight == 0)
                         this.row.NestedGridLayoutResult = childGridResult;
                     else
@@ -30007,11 +30008,11 @@ class PdfGridLayouter extends ElementLayouter {
                     this.currentBounds.y = recalHeight;
                     //this.currentBounds.y = row.NestedGridLayoutResult.bounds.height;
                     if (startPage != this.currentPage) {
-                        let secion = this.currentPage.section;
-                        let startIndex = secion.indexOf(startPage) + 1;
-                        let endIndex = secion.indexOf(this.currentPage);
+                        let section = this.currentPage.section;
+                        let startIndex = section.indexOf(startPage) + 1;
+                        let endIndex = section.indexOf(this.currentPage);
                         for (let page = startIndex; page < endIndex + 1; page++) {
-                            let pageGraphics = this.currentPage.graphics;
+                            let pageGraphics = section.getPages()[page].graphics;
                             let location = new PointF(format.paginateBounds.x, format.paginateBounds.y);
                             let height = page == endIndex ? (row.NestedGridLayoutResult.bounds.height - param.bounds.y) :
                                 (this.currentBounds.height - location.y);
@@ -30033,14 +30034,14 @@ class PdfGridLayouter extends ElementLayouter {
                                 else {
                                     totalwidth = cell.width;
                                 }
-                                // if (cell.columnSpan > 1)
-                                // {
-                                //     for (; c < cell.columnSpan; c++)
-                                //         cellWidth += row.grid.columns.getColumn(c).width;
-                                // }
-                                // else
-                                cellWidth = Math.max(totalwidth, row.grid.columns.getColumn(c).width);
+                                if (cell.columnSpan > 1) {
+                                    for (; c < cell.columnSpan; c++)
+                                        cellWidth += row.grid.columns.getColumn(c).width;
+                                }
+                                else
+                                    cellWidth = Math.max(totalwidth, row.grid.columns.getColumn(c).width);
                                 cell.drawCellBorders(pageGraphics, new RectangleF(location, new SizeF(cellWidth, height)));
+                                cell.drawCellBorders(pageGraphics, new RectangleF(location, new SizeF(this.Grid.rows.getRow(this.Grid.rows.count - 1).width, height)));
                                 location.x += cellWidth;
                                 c += (cell.columnSpan - 1);
                             }
@@ -30638,14 +30639,16 @@ class PdfGridLayouter extends ElementLayouter {
             // }
         }
         for (let i = this.cellStartIndex; i <= this.cellEndIndex; i++) {
+            let gridColumnWidth = this.Grid.columns.getColumn(i).width;
             let cancelSpans = ((row.cells.getCell(i).columnSpan + i > this.cellEndIndex + 1) &&
                 (row.cells.getCell(i).columnSpan > 1));
-            // if (!cancelSpans) {
-            //     for (let k : number = 1; k < row.cells.getCell(i).columnSpan; k++) {
-            //         row.cells.getCell(i + k).isCellMergeContinue = true;
-            //     }
-            //}
-            let size = new SizeF(this.Grid.columns.getColumn(i).width, this.gridHeight > 0.0 ? this.gridHeight :
+            if (!cancelSpans) {
+                for (let k = 1; k < row.cells.getCell(i).columnSpan; k++) {
+                    row.cells.getCell(i + k).isCellMergeContinue = true;
+                    gridColumnWidth += this.Grid.columns.getColumn(i + k).width;
+                }
+            }
+            let size = new SizeF(gridColumnWidth, this.gridHeight > 0.0 ? this.gridHeight :
                 this.currentPageBounds.height);
             // if (size.width === 0) {
             //     size = new SizeF(row.cells.getCell(i).width, size.height);