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

Clean up table with improved demo

Browse Source
This commit is contained in:
Dolan Miu
2021-03-05 03:03:02 +00:00
parent 9557015c6c
commit e5da573041
4 changed files with 114 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,9 @@ export type SectionPropertiesOptions = IPageSizeAttributes &
// Need to decouple this from the attributes
export class SectionProperties extends XmlComponent {
private readonly options: SectionPropertiesOptions;
public readonly width: number;
public readonly rightMargin: number;
public readonly leftMargin: number;
constructor(options: SectionPropertiesOptions = { column: {} }) {
super("w:sectPr");
@ -98,7 +100,10 @@ export class SectionProperties extends XmlComponent {
type,
} = options;
this.options = options;
this.leftMargin = left;
this.rightMargin = right;
this.width = width;
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(column.space ? column.space : 708, column.count ? column.count : 1, column.separate ?? false));
@ -201,8 +206,4 @@ export class SectionProperties extends XmlComponent {
}
}
}
public get Options(): SectionPropertiesOptions {
return this.options;
}
}

38
src/file/table/table-cell/table-cell.ts
View File

@ -48,69 +48,59 @@ export interface ITableCellOptions {
}
export class TableCell extends XmlComponent {
private readonly properties: TableCellProperties;
constructor(readonly options: ITableCellOptions) {
super("w:tc");
this.properties = new TableCellProperties();
this.root.push(this.properties);
const properties = new TableCellProperties();
this.root.push(properties);
for (const child of options.children) {
this.root.push(child);
}
if (options.verticalAlign) {
this.properties.setVerticalAlign(options.verticalAlign);
properties.setVerticalAlign(options.verticalAlign);
}
if (options.textDirection) {
this.properties.setTextDirection(options.textDirection);
properties.setTextDirection(options.textDirection);
}
if (options.verticalMerge) {
this.properties.addVerticalMerge(options.verticalMerge);
properties.addVerticalMerge(options.verticalMerge);
} else if (options.rowSpan && options.rowSpan > 1) {
// if cell already have a `verticalMerge`, don't handle `rowSpan`
this.properties.addVerticalMerge(VerticalMergeType.RESTART);
properties.addVerticalMerge(VerticalMergeType.RESTART);
}
if (options.margins) {
this.properties.addMargins(options.margins);
properties.addMargins(options.margins);
}
if (options.shading) {
this.properties.setShading(options.shading);
properties.setShading(options.shading);
}
if (options.columnSpan) {
this.properties.addGridSpan(options.columnSpan);
properties.addGridSpan(options.columnSpan);
}
if (options.width) {
this.properties.setWidth(options.width.size, options.width.type);
properties.setWidth(options.width.size, options.width.type);
}
if (options.borders) {
if (options.borders.top) {
this.properties.Borders.addTopBorder(options.borders.top.style, options.borders.top.size, options.borders.top.color);
properties.Borders.addTopBorder(options.borders.top.style, options.borders.top.size, options.borders.top.color);
}
if (options.borders.bottom) {
this.properties.Borders.addBottomBorder(
options.borders.bottom.style,
options.borders.bottom.size,
options.borders.bottom.color,
);
properties.Borders.addBottomBorder(options.borders.bottom.style, options.borders.bottom.size, options.borders.bottom.color);
}
if (options.borders.left) {
this.properties.Borders.addLeftBorder(options.borders.left.style, options.borders.left.size, options.borders.left.color);
properties.Borders.addLeftBorder(options.borders.left.style, options.borders.left.size, options.borders.left.color);
}
if (options.borders.right) {
this.properties.Borders.addRightBorder(
options.borders.right.style,
options.borders.right.size,
options.borders.right.color,
);
properties.Borders.addRightBorder(options.borders.right.style, options.borders.right.size, options.borders.right.color);
}
}
}

4
src/file/table/table-row/table-row.ts
View File

@ -42,10 +42,6 @@ export class TableRow extends XmlComponent {
return this.options.children.length;
}
public get Children(): TableCell[] {
return this.options.children;
}
public get cells(): TableCell[] {
return this.root.filter((xmlComponent) => xmlComponent instanceof TableCell);
}