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

Fix ordering of elements in table-cell-borders and section-properties

Browse Source
This commit is contained in:
Tom Hunkapiller
2021-05-20 02:18:17 +03:00
parent 56b18d3793
commit 30912e7aaf
6 changed files with 55 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/file/document/body/section-properties/section-properties.ts
View File

@ -89,20 +89,16 @@ export class SectionProperties extends XmlComponent {
}: ISectionPropertiesOptions = {}) {
super("w:sectPr");
this.root.push(new PageSize(width, height, orientation));
this.root.push(new PageMargin(top, right, bottom, left, header, footer, gutter, mirror));
this.root.push(new Columns(space, count, separate));
this.root.push(new DocumentGrid(linePitch));
this.addHeaders(headerWrapperGroup);
this.addFooters(footerWrapperGroup);
this.root.push(new PageNumberType(pageNumberStart, pageNumberFormatType, pageNumberSeparator));
if (lineNumberCountBy || lineNumberStart || lineNumberRestart || lineNumberDistance) {
this.root.push(new LineNumberType(lineNumberCountBy, lineNumberStart, lineNumberRestart, lineNumberDistance));
if (type) {
this.root.push(new Type(type));
}
this.root.push(new PageSize(width, height, orientation));
this.root.push(new PageMargin(top, right, bottom, left, header, footer, gutter, mirror));
if (pageBorders || pageBorderTop || pageBorderRight || pageBorderBottom || pageBorderLeft) {
this.root.push(
new PageBorders({
@ -115,17 +111,23 @@ export class SectionProperties extends XmlComponent {
);
}
if (titlePage) {
this.root.push(new TitlePage());
if (lineNumberCountBy || lineNumberStart || lineNumberRestart || lineNumberDistance) {
this.root.push(new LineNumberType(lineNumberCountBy, lineNumberStart, lineNumberRestart, lineNumberDistance));
}
this.root.push(new PageNumberType(pageNumberStart, pageNumberFormatType, pageNumberSeparator));
this.root.push(new Columns(space, count, separate));
if (verticalAlign) {
this.root.push(new SectionVerticalAlign(verticalAlign));
}
if (type) {
this.root.push(new Type(type));
if (titlePage) {
this.root.push(new TitlePage());
}
this.root.push(new DocumentGrid(linePitch));
}
private addHeaders(headers: IHeaderFooterGroup<HeaderWrapper>): void {