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

fix: remove default border when read table (#231) 

* fix: remove default border when read table

* env: update test
main
bokuweb 2021-02-25 16:16:20 +09:00 committed by GitHub
parent ff03496182
commit 9587d47c38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 33 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docx-core/src/documents/elements/table.rs
View File

@ -27,6 +27,18 @@ impl Table {
}
}
pub fn without_borders(rows: Vec<TableRow>) -> Table {
let property = TableProperty::without_borders();
let has_numbering = rows.iter().any(|c| c.has_numbering);
let grid = vec![];
Self {
property,
rows,
grid,
has_numbering,
}
}
pub fn add_row(mut self, row: TableRow) -> Table {
self.rows.push(row);
self

7
docx-core/src/documents/elements/table_property.rs
View File

@ -34,6 +34,13 @@ impl TableProperty {
Default::default()
}
pub fn without_borders() -> TableProperty {
TableProperty {
borders: TableBorders::with_empty(),
..Default::default()
}
}
pub fn indent(mut self, v: i32) -> TableProperty {
self.indent = Some(TableIndent::new(v, WidthType::DXA));
self

6
docx-core/src/reader/table.rs
View File

@ -9,7 +9,7 @@ use crate::types::*;
impl ElementReader for Table {
fn read<R: Read>(r: &mut EventReader<R>, _: &[OwnedAttribute]) -> Result<Self, ReaderError> {
let mut t = Table::new(vec![]);
let mut t = Table::without_borders(vec![]);
let mut grid_col: Vec<usize> = vec![];
loop {
let e = r.next();
@ -99,7 +99,7 @@ mod tests {
let t = Table::read(&mut parser, &[]).unwrap();
assert_eq!(
t,
Table::new(vec![])
Table::without_borders(vec![])
.set_grid(vec![3212, 3213, 3213])
.width(9638, WidthType::DXA)
);
@ -119,7 +119,7 @@ mod tests {
let t = Table::read(&mut parser, &[]).unwrap();
assert_eq!(
t,
Table::new(vec![])
Table::without_borders(vec![])
.align(TableAlignmentType::Center)
.indent(100)
);

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/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-wasm/package.json
View File

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

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

@ -9107,48 +9107,12 @@ Object {
"hasNumbering": false,
"property": Object {
"borders": Object {
"bottom": Object {
"borderType": "single",
"color": "000000",
"position": "bottom",
"size": 2,
"space": 0,
},
"insideH": Object {
"borderType": "single",
"color": "000000",
"position": "insideH",
"size": 2,
"space": 0,
},
"insideV": Object {
"borderType": "single",
"color": "000000",
"position": "insideV",
"size": 2,
"space": 0,
},
"left": Object {
"borderType": "single",
"color": "000000",
"position": "left",
"size": 2,
"space": 0,
},
"right": Object {
"borderType": "single",
"color": "000000",
"position": "right",
"size": 2,
"space": 0,
},
"top": Object {
"borderType": "single",
"color": "000000",
"position": "top",
"size": 2,
"space": 0,
},
"bottom": null,
"insideH": null,
"insideV": null,
"left": null,
"right": null,
"top": null,
},
"indent": null,
"justification": "left",