wynd
/
docx-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.0.276 rc8 (#524) 

* fix: packagejson

* fix: changelog

* fix: js

* fix: table row rule

* fix
main
bokuweb 2022-08-26 11:14:16 +09:00 committed by GitHub
parent b4be4bbe9b
commit 69e5654872
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 55 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## docx-wasm@0.0.276-rc11 (25. Aug, 2022)
- [Breaking] change table row `hightRule` to `auto` in reader.
## docx-wasm@0.0.276-rc10 (25. Aug, 2022)
- Support `adjustLineHeightInTable` in document setting
## docx-rs@0.4.2 (25. Aug, 2022) ## docx-rs@0.4.2 (25. Aug, 2022)
- [Breaking] Hyperlink interface. - [Breaking] Hyperlink interface.

2
docx-core/src/reader/table_row.rs
View File

@ -19,7 +19,7 @@ impl ElementReader for TableRow {
let mut row_height = None; let mut row_height = None;
let mut del = None; let mut del = None;
let mut ins = None; let mut ins = None;
let mut height_rule = Some(HeightRule::AtLeast); let mut height_rule = Some(HeightRule::Auto);
loop { loop {
let e = r.next(); let e = r.next();
match e { match e {

2
docx-core/tests/snapshots/lib__reader__read_from_doc.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_insert_table.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_table_docx.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_table_merged_libre_office.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_from_doc.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_insert_table.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_table_docx.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_table_merged_libre_office.snap
View File

File diff suppressed because one or more lines are too long

5
docx-wasm/js/index.ts
View File

@ -228,6 +228,11 @@ export class Docx {
return this; return this;
} }
adjustLineHeightInTable() {
this.sectionProperty.adjustLineHeightInTable();
return this;
}
defaultSize(size: number) { defaultSize(size: number) {
this.styles.defaultSize(size); this.styles.defaultSize(size);
return this; return this;

6
docx-wasm/js/section-property.ts
View File

@ -24,6 +24,7 @@ export class SectionProperty {
_footer: Footer | null = null; _footer: Footer | null = null;
_firstFooter: Footer | null = null; _firstFooter: Footer | null = null;
_evenFooter: Footer | null = null; _evenFooter: Footer | null = null;
_adjustLineHeightInTable: boolean = false;
pageSize(w: number, h: number) { pageSize(w: number, h: number) {
this._pageSize.w = w; this._pageSize.w = w;
@ -51,6 +52,11 @@ export class SectionProperty {
return this; return this;
} }
adjustLineHeightInTable() {
this._adjustLineHeightInTable = true;
return this;
}
firstHeader(header: Header) { firstHeader(header: Header) {
this._firstHeader = header; this._firstHeader = header;
return this; return this;

2
docx-wasm/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "docx-wasm", "name": "docx-wasm",
"version": "0.0.276-rc7", "version": "0.0.276-rc11",
"main": "dist/node/index.js", "main": "dist/node/index.js",
"browser": "dist/web/index.js", "browser": "dist/web/index.js",
"author": "bokuweb <bokuweb12@gmail.com>", "author": "bokuweb <bokuweb12@gmail.com>",

50
docx-wasm/test/__snapshots__/index.test.js.snap
View File

@ -8407,7 +8407,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": 970, "rowHeight": 970,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -8583,7 +8583,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": 1, "gridAfter": 1,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": 55, "rowHeight": 55,
"widthAfter": 1065, "widthAfter": 1065,
"widthBefore": null, "widthBefore": null,
@ -8759,7 +8759,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": 1, "gridAfter": 1,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": 675, "rowHeight": 675,
"widthAfter": 1065, "widthAfter": 1065,
"widthBefore": null, "widthBefore": null,
@ -8933,7 +8933,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": 2, "gridAfter": 2,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": 397, "rowHeight": 397,
"widthAfter": 3717, "widthAfter": 3717,
"widthBefore": null, "widthBefore": null,
@ -9107,7 +9107,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": 2, "gridAfter": 2,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": 397, "rowHeight": 397,
"widthAfter": 3717, "widthAfter": 3717,
"widthBefore": null, "widthBefore": null,
@ -9360,7 +9360,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": 2, "gridAfter": 2,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": 397, "rowHeight": 397,
"widthAfter": 3717, "widthAfter": 3717,
"widthBefore": null, "widthBefore": null,
@ -9613,7 +9613,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": 2, "gridAfter": 2,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": 397, "rowHeight": 397,
"widthAfter": 3717, "widthAfter": 3717,
"widthBefore": null, "widthBefore": null,
@ -9854,7 +9854,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": 2, "gridAfter": 2,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": 397, "rowHeight": 397,
"widthAfter": 3717, "widthAfter": 3717,
"widthBefore": null, "widthBefore": null,
@ -10107,7 +10107,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": 2, "gridAfter": 2,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": 397, "rowHeight": 397,
"widthAfter": 3717, "widthAfter": 3717,
"widthBefore": null, "widthBefore": null,
@ -20020,7 +20020,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": null, "rowHeight": null,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -20100,7 +20100,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": null, "rowHeight": null,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -20178,7 +20178,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": null, "rowHeight": null,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -20258,7 +20258,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": null, "rowHeight": null,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -26905,7 +26905,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": null, "rowHeight": null,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -27187,7 +27187,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": null, "rowHeight": null,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -27453,7 +27453,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": null, "rowHeight": null,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -27719,7 +27719,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": null, "rowHeight": null,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -27979,7 +27979,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": null, "rowHeight": null,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -28245,7 +28245,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": null, "rowHeight": null,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -28511,7 +28511,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": null, "rowHeight": null,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -45187,7 +45187,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": null, "rowHeight": null,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -45331,7 +45331,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": null, "rowHeight": null,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -45475,7 +45475,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": null, "rowHeight": null,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -52176,7 +52176,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": 730, "rowHeight": 730,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,
@ -52324,7 +52324,7 @@ Object {
"property": Object { "property": Object {
"gridAfter": null, "gridAfter": null,
"gridBefore": null, "gridBefore": null,
"heightRule": "atLeast", "heightRule": "auto",
"rowHeight": null, "rowHeight": null,
"widthAfter": null, "widthAfter": null,
"widthBefore": null, "widthBefore": null,