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

fix: tableRow and cell json type (#418)

main
bokuweb 2022-01-24 22:48:01 +09:00 committed by GitHub
parent 515812ffc8
commit c036c0e6a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 3967 additions and 3616 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,4 @@
use serde::ser::{SerializeStruct, Serializer};
use serde::Serialize; use serde::Serialize;
use super::*; use super::*;
@ -8,17 +9,31 @@ use crate::xml_builder::*;
#[derive(Debug, Clone, PartialEq, Serialize)] #[derive(Debug, Clone, PartialEq, Serialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Table { pub struct Table {
pub rows: Vec<TableRow>, pub rows: Vec<TableChild>,
pub grid: Vec<usize>, pub grid: Vec<usize>,
pub has_numbering: bool, pub has_numbering: bool,
pub property: TableProperty, pub property: TableProperty,
} }
#[derive(Debug, Clone, PartialEq)]
pub enum TableChild {
TableRow(TableRow),
}
impl BuildXML for TableChild {
fn build(&self) -> Vec<u8> {
match self {
TableChild::TableRow(v) => v.build(),
}
}
}
impl Table { impl Table {
pub fn new(rows: Vec<TableRow>) -> Table { pub fn new(rows: Vec<TableRow>) -> Table {
let property = TableProperty::new(); let property = TableProperty::new();
let has_numbering = rows.iter().any(|c| c.has_numbering); let has_numbering = rows.iter().any(|c| c.has_numbering);
let grid = vec![]; let grid = vec![];
let rows = rows.into_iter().map(TableChild::TableRow).collect();
Self { Self {
property, property,
rows, rows,
@ -31,6 +46,7 @@ impl Table {
let property = TableProperty::without_borders(); let property = TableProperty::without_borders();
let has_numbering = rows.iter().any(|c| c.has_numbering); let has_numbering = rows.iter().any(|c| c.has_numbering);
let grid = vec![]; let grid = vec![];
let rows = rows.into_iter().map(TableChild::TableRow).collect();
Self { Self {
property, property,
rows, rows,
@ -40,7 +56,7 @@ impl Table {
} }
pub fn add_row(mut self, row: TableRow) -> Table { pub fn add_row(mut self, row: TableRow) -> Table {
self.rows.push(row); self.rows.push(TableChild::TableRow(row));
self self
} }
@ -112,6 +128,22 @@ impl BuildXML for Table {
} }
} }
impl Serialize for TableChild {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
match *self {
TableChild::TableRow(ref r) => {
let mut t = serializer.serialize_struct("TableRow", 2)?;
t.serialize_field("type", "tableRow")?;
t.serialize_field("data", r)?;
t.end()
}
}
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {

35
docx-core/src/documents/elements/table_row.rs
View File

@ -1,3 +1,4 @@
use serde::ser::{SerializeStruct, Serializer};
use serde::Serialize; use serde::Serialize;
use super::{TableCell, TableRowProperty}; use super::{TableCell, TableRowProperty};
@ -7,15 +8,29 @@ use crate::{documents::BuildXML, HeightRule};
#[derive(Debug, Clone, PartialEq, Serialize)] #[derive(Debug, Clone, PartialEq, Serialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct TableRow { pub struct TableRow {
pub cells: Vec<TableCell>, pub cells: Vec<TableRowChild>,
pub has_numbering: bool, pub has_numbering: bool,
pub property: TableRowProperty, pub property: TableRowProperty,
} }
#[derive(Debug, Clone, PartialEq)]
pub enum TableRowChild {
TableCell(TableCell),
}
impl BuildXML for TableRowChild {
fn build(&self) -> Vec<u8> {
match self {
TableRowChild::TableCell(v) => v.build(),
}
}
}
impl TableRow { impl TableRow {
pub fn new(cells: Vec<TableCell>) -> TableRow { pub fn new(cells: Vec<TableCell>) -> TableRow {
let property = TableRowProperty::new(); let property = TableRowProperty::new();
let has_numbering = cells.iter().any(|c| c.has_numbering); let has_numbering = cells.iter().any(|c| c.has_numbering);
let cells = cells.into_iter().map(TableRowChild::TableCell).collect();
Self { Self {
cells, cells,
property, property,
@ -64,6 +79,22 @@ impl BuildXML for TableRow {
} }
} }
impl Serialize for TableRowChild {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
match *self {
TableRowChild::TableCell(ref r) => {
let mut t = serializer.serialize_struct("TableCell", 2)?;
t.serialize_field("type", "tableCell")?;
t.serialize_field("data", r)?;
t.end()
}
}
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
@ -86,7 +117,7 @@ mod tests {
let r = TableRow::new(vec![TableCell::new()]); let r = TableRow::new(vec![TableCell::new()]);
assert_eq!( assert_eq!(
serde_json::to_string(&r).unwrap(), serde_json::to_string(&r).unwrap(),
r#"{"cells":[{"children":[],"property":{"width":null,"borders":null,"gridSpan":null,"verticalMerge":null,"verticalAlign":null,"textDirection":null,"shading":null},"hasNumbering":false}],"hasNumbering":false,"property":{"gridAfter":null,"widthAfter":null,"gridBefore":null,"widthBefore":null,"rowHeight":null,"heightRule":null}}"# r#"{"cells":[{"type":"tableCell","data":{"children":[],"property":{"width":null,"borders":null,"gridSpan":null,"verticalMerge":null,"verticalAlign":null,"textDirection":null,"shading":null},"hasNumbering":false}}],"hasNumbering":false,"property":{"gridAfter":null,"widthAfter":null,"gridBefore":null,"widthBefore":null,"rowHeight":null,"heightRule":null}}"#
); );
} }
} }

16
docx-core/src/documents/mod.rs
View File

@ -586,8 +586,8 @@ impl Docx {
} }
} }
DocumentChild::Table(table) => { DocumentChild::Table(table) => {
for row in &table.rows { for TableChild::TableRow(row) in &table.rows {
for cell in &row.cells { for TableRowChild::TableCell(cell) in &row.cells {
for content in &cell.children { for content in &cell.children {
match content { match content {
TableCellContent::Paragraph(paragraph) => { TableCellContent::Paragraph(paragraph) => {
@ -646,8 +646,8 @@ impl Docx {
} }
} }
DocumentChild::Table(table) => { DocumentChild::Table(table) => {
for row in &table.rows { for TableChild::TableRow(row) in &table.rows {
for cell in &row.cells { for TableRowChild::TableCell(cell) in &row.cells {
for content in &cell.children { for content in &cell.children {
match content { match content {
TableCellContent::Paragraph(paragraph) => { TableCellContent::Paragraph(paragraph) => {
@ -739,8 +739,8 @@ impl Docx {
} }
} }
DocumentChild::Table(table) => { DocumentChild::Table(table) => {
for row in &mut table.rows { for TableChild::TableRow(row) in &mut table.rows {
for cell in &mut row.cells { for TableRowChild::TableCell(cell) in &mut row.cells {
for content in &mut cell.children { for content in &mut cell.children {
match content { match content {
TableCellContent::Paragraph(paragraph) => { TableCellContent::Paragraph(paragraph) => {
@ -828,8 +828,8 @@ impl Docx {
} }
} }
DocumentChild::Table(table) => { DocumentChild::Table(table) => {
for row in &mut table.rows { for TableChild::TableRow(row) in &mut table.rows {
for cell in &mut row.cells { for TableRowChild::TableCell(cell) in &mut row.cells {
for content in &mut cell.children { for content in &mut cell.children {
match content { match content {
TableCellContent::Paragraph(paragraph) => { TableCellContent::Paragraph(paragraph) => {

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

6
docx-wasm/js/json/table.ts
View File

@ -36,13 +36,19 @@ export type TableRowPropertyJSON = {
}; };
export type TableCellJSON = { export type TableCellJSON = {
type: "tableCell";
data: {
children: TableCellChildJSON[]; children: TableCellChildJSON[];
property: TableCellPropertyJSON; property: TableCellPropertyJSON;
};
}; };
export type TableRowJSON = { export type TableRowJSON = {
type: "tableRow";
data: {
cells: TableCellJSON[]; cells: TableCellJSON[];
property: TableRowPropertyJSON; property: TableRowPropertyJSON;
};
}; };
export type TableCellMarginJSON = { val: number; widthType: WidthType }; export type TableCellMarginJSON = { val: number; widthType: WidthType };

2
docx-wasm/src/table.rs
View File

@ -20,7 +20,7 @@ impl Table {
#[wasm_bindgen] #[wasm_bindgen]
impl Table { impl Table {
pub fn add_row(mut self, row: TableRow) -> Table { pub fn add_row(mut self, row: TableRow) -> Table {
self.0.rows.push(row.take()); self.0.rows.push(docx_rs::TableChild::TableRow(row.take()));
self self
} }

2
docx-wasm/src/table_row.rs
View File

@ -19,7 +19,7 @@ impl TableRow {
#[wasm_bindgen] #[wasm_bindgen]
impl TableRow { impl TableRow {
pub fn add_cell(mut self, cell: TableCell) -> TableRow { pub fn add_cell(mut self, cell: TableCell) -> TableRow {
self.0.cells.push(cell.take()); self.0.cells.push(docx_rs::TableRowChild::TableCell(cell.take()));
self self
} }

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

@ -3775,8 +3775,10 @@ Object {
}, },
"rows": Array [ "rows": Array [
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -3844,6 +3846,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -3855,9 +3859,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -3934,7 +3942,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -4011,6 +4022,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -4022,9 +4035,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -4101,7 +4118,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -4178,6 +4198,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -4189,9 +4211,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -4267,7 +4293,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -4343,6 +4372,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -4354,9 +4385,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -4432,7 +4467,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -4508,6 +4546,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -4519,9 +4559,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -4597,7 +4641,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -4673,7 +4720,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -4749,6 +4799,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -4760,9 +4812,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -4838,7 +4894,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -4914,7 +4973,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -4990,6 +5052,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -5001,9 +5065,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -5073,7 +5141,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -5143,7 +5214,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -5219,6 +5293,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -5230,9 +5306,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -5308,7 +5388,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -5384,7 +5467,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -5460,6 +5546,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -5471,6 +5559,8 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
], ],
}, },
"type": "table", "type": "table",
@ -14989,8 +15079,10 @@ Object {
}, },
"rows": Array [ "rows": Array [
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15039,7 +15131,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15088,7 +15183,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15137,7 +15235,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15186,7 +15287,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15235,6 +15339,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -15246,9 +15352,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15295,7 +15405,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15364,7 +15477,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15411,7 +15527,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15458,7 +15577,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15499,6 +15621,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -15510,9 +15634,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15559,7 +15687,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15606,7 +15737,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15653,7 +15787,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15700,7 +15837,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15747,6 +15887,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -15758,9 +15900,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15807,7 +15953,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15854,7 +16003,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15901,7 +16053,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15948,7 +16103,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -15995,6 +16153,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -16006,9 +16166,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -16055,7 +16219,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -16102,7 +16269,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -16149,7 +16319,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -16196,7 +16369,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -16237,6 +16413,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -16248,9 +16426,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -16297,7 +16479,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -16344,7 +16529,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -16391,7 +16579,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -16438,7 +16629,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -16485,6 +16679,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -16496,9 +16692,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -16545,7 +16745,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -16592,7 +16795,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -16639,7 +16845,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -16686,7 +16895,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -16733,6 +16945,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -16744,6 +16958,8 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
], ],
}, },
"type": "table", "type": "table",
@ -35331,8 +35547,10 @@ Object {
}, },
"rows": Array [ "rows": Array [
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -35361,7 +35579,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -35390,7 +35611,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -35419,7 +35643,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -35448,6 +35675,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -35459,9 +35688,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -35490,7 +35723,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -35519,7 +35755,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -35548,7 +35787,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -35577,6 +35819,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -35588,9 +35832,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -35619,7 +35867,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -35648,7 +35899,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -35677,7 +35931,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -35706,6 +35963,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -35717,6 +35976,8 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
], ],
}, },
"type": "table", "type": "table",
@ -41280,8 +41541,10 @@ Object {
}, },
"rows": Array [ "rows": Array [
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -41325,7 +41588,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -41369,6 +41635,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -41380,9 +41648,13 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
Object { Object {
"data": Object {
"cells": Array [ "cells": Array [
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -41426,7 +41698,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -41476,7 +41751,10 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
Object { Object {
"data": Object {
"children": Array [ "children": Array [
Object { Object {
"data": Object { "data": Object {
@ -41505,6 +41783,8 @@ Object {
}, },
}, },
}, },
"type": "tableCell",
},
], ],
"hasNumbering": false, "hasNumbering": false,
"property": Object { "property": Object {
@ -41516,6 +41796,8 @@ Object {
"widthBefore": null, "widthBefore": null,
}, },
}, },
"type": "tableRow",
},
], ],
}, },
"type": "table", "type": "table",