mirror of
https://github.com/fumiama/go-docx.git
synced 2026-06-22 19:40:42 +08:00
feat: new support for nested tables in word tables (#51)
Co-authored-by: wangyifan <348544801@qq.com>
This commit is contained in:
@@ -536,6 +536,7 @@ type WTableCell struct {
|
|||||||
XMLName xml.Name `xml:"w:tc,omitempty"`
|
XMLName xml.Name `xml:"w:tc,omitempty"`
|
||||||
TableCellProperties *WTableCellProperties
|
TableCellProperties *WTableCellProperties
|
||||||
Paragraphs []*Paragraph `xml:"w:p,omitempty"`
|
Paragraphs []*Paragraph `xml:"w:p,omitempty"`
|
||||||
|
Tables []*Table `xml:"w:tbl,omitempty"`
|
||||||
|
|
||||||
file *Docx
|
file *Docx
|
||||||
}
|
}
|
||||||
@@ -568,6 +569,13 @@ func (c *WTableCell) UnmarshalXML(d *xml.Decoder, _ xml.StartElement) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
c.TableCellProperties = &value
|
c.TableCellProperties = &value
|
||||||
|
case "tbl":
|
||||||
|
var table Table
|
||||||
|
table.file = c.file
|
||||||
|
if err = d.DecodeElement(&table, &tt); err != nil && !strings.HasPrefix(err.Error(), "expected") {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
c.Tables = append(c.Tables, &table)
|
||||||
default:
|
default:
|
||||||
err = d.Skip() // skip unsupported tags
|
err = d.Skip() // skip unsupported tags
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user