Compare commits

...

4 Commits

Author SHA1 Message Date
99b000ecf4 v0.0.504
All checks were successful
Build Docker and Deploy / Run goext test-suite (push) Successful in 3m53s
2024-08-07 19:44:45 +02:00
a173e30090 v0.0.503
All checks were successful
Build Docker and Deploy / Run goext test-suite (push) Successful in 3m52s
2024-08-07 19:37:38 +02:00
a3481a7d2d v0.0.502
Some checks failed
Build Docker and Deploy / Run goext test-suite (push) Has been cancelled
2024-08-07 19:35:23 +02:00
a8e6f98a89 v0.0.501
Some checks failed
Build Docker and Deploy / Run goext test-suite (push) Has been cancelled
2024-08-07 19:31:36 +02:00
5 changed files with 16 additions and 6 deletions

View File

@@ -1,5 +1,5 @@
package goext
const GoextVersion = "0.0.500"
const GoextVersion = "0.0.504"
const GoextVersionTimestamp = "2024-08-07T19:30:38+0200"
const GoextVersionTimestamp = "2024-08-07T19:44:45+0200"

View File

@@ -53,8 +53,8 @@ func (b *TableBuilder) Widths(v ...string) *TableBuilder {
return b
}
func (b *TableBuilder) DefaultStyle(s TableCellStyleOpt) *TableBuilder {
b.defaultCellStyle = &s
func (b *TableBuilder) DefaultStyle(s *TableCellStyleOpt) *TableBuilder {
b.defaultCellStyle = s
return b
}
@@ -137,11 +137,15 @@ func (b *TableBuilder) Build() {
ellipsize := langext.Coalesce(style.ellipsize, true)
cellPaddingHorz := langext.Coalesce(style.paddingHorz, 2)
fillHeight := langext.Coalesce(style.fillHeight, false)
bx := builder.GetX()
by := builder.GetY()
cellWidth := columnWidths[cellIdx]
_ = fillHeight // TODO implement, but how?? ( cells with fillHeight=true should have a border of the full column height, even if another column is growing it, but we do not know teh height beforehand ... )
if langext.Coalesce(style.multiCell, true) {
builder.MultiCell(str, style.PDFCellOpt.Copy().ToMulti().Width(cellWidth).Debug(debug))

View File

@@ -20,6 +20,10 @@ type TableCellStyleOpt struct {
PDFCellOpt
}
func NewTableCellStyleOpt() *TableCellStyleOpt {
return &TableCellStyleOpt{}
}
func (o *TableCellStyleOpt) FillHeight(b bool) *TableCellStyleOpt {
o.fillHeight = &b
return o

View File

@@ -41,8 +41,8 @@ func (r *TableRowBuilder) CellObjects(cells ...TableCell) *TableRowBuilder {
return r
}
func (r *TableRowBuilder) CellWithStyle(cell string, style TableCellStyleOpt) *TableRowBuilder {
r.cells = append(r.cells, TableCell{Content: cell, Style: style})
func (r *TableRowBuilder) CellWithStyle(cell string, style *TableCellStyleOpt) *TableRowBuilder {
r.cells = append(r.cells, TableCell{Content: cell, Style: *style})
return r
}

View File

@@ -81,6 +81,8 @@ func TestPDFBuilder(t *testing.T) {
Debug(false).
Build()
builder.Ln(8)
builder.Table().
Widths("auto", "20", "1fr", "20").
PadX(2).