smartyellow/docx-js
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #324 from Scarface2013/master

Browse Source 
Fix merging of 3+ cells vertically
This commit is contained in:
Dolan
2019-05-16 21:06:20 +01:00
committed by GitHub
parent 373c890354 3a593a53d3
commit 622331ad24
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/file/table/table-column.spec.ts
View File

@ -43,7 +43,9 @@ describe("TableColumn", () => {
}); });
const tree2 = new Formatter().format(cells[1]); const tree2 = new Formatter().format(cells[1]);
expect(tree2).to.deep.equal({ "w:tc": [{ "w:p": EMPTY_OBJECT }] }); expect(tree2).to.deep.equal({
"w:tc": [{ "w:tcPr": [{ "w:vMerge": { _attr: { "w:val": "continue" } } }] }, { "w:p": EMPTY_OBJECT }],
});
const tree3 = new Formatter().format(cells[2]); const tree3 = new Formatter().format(cells[2]);
expect(tree3).to.deep.equal({ expect(tree3).to.deep.equal({

5
src/file/table/table-column.ts
View File

@ -15,7 +15,10 @@ export class TableColumn {
public mergeCells(startIndex: number, endIndex: number): TableCell { public mergeCells(startIndex: number, endIndex: number): TableCell {
this.cells[startIndex].addVerticalMerge(VMergeType.RESTART); this.cells[startIndex].addVerticalMerge(VMergeType.RESTART);
this.cells[endIndex].addVerticalMerge(VMergeType.CONTINUE);
for (let i = startIndex + 1; i <= endIndex; i++) {
this.cells[i].addVerticalMerge(VMergeType.CONTINUE);
}
return this.cells[startIndex]; return this.cells[startIndex];
} }