Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-21 17:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve database text field exporting https://github.com/siyuan-note/siyuan/issues/12261

Browse source
This commit is contained in:
Daniel 2024-08-17 08:32:49 +08:00
parent 347d4c7554
commit 6c2c003718
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kernel/model/export.go
View file

@ -2230,9 +2230,12 @@ func exportTree(tree *parse.Tree, wysiwyg, keepFold, avHiddenCol bool,
} }
cell := &ast.Node{Type: ast.NodeTableCell} cell := &ast.Node{Type: ast.NodeTableCell}
name := string(lex.EscapeProtyleMarkers([]byte(col.Name))) name := col.Name
if !wysiwyg {
name = string(lex.EscapeProtyleMarkers([]byte(col.Name)))
name = strings.ReplaceAll(name, "\\|", "|") name = strings.ReplaceAll(name, "\\|", "|")
name = strings.ReplaceAll(name, "|", "\\|") name = strings.ReplaceAll(name, "|", "\\|")
}
cell.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: []byte(name)}) cell.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: []byte(name)})
mdTableHeadRow.AppendChild(cell) mdTableHeadRow.AppendChild(cell)
} }
@ -2255,9 +2258,11 @@ func exportTree(tree *parse.Tree, wysiwyg, keepFold, avHiddenCol bool,
if av.KeyTypeBlock == cell.Value.Type { if av.KeyTypeBlock == cell.Value.Type {
if nil != cell.Value.Block { if nil != cell.Value.Block {
val = cell.Value.Block.Content val = cell.Value.Block.Content
if !wysiwyg {
val = string(lex.EscapeProtyleMarkers([]byte(val))) val = string(lex.EscapeProtyleMarkers([]byte(val)))
val = strings.ReplaceAll(val, "\\|", "|") val = strings.ReplaceAll(val, "\\|", "|")
val = strings.ReplaceAll(val, "|", "\\|") val = strings.ReplaceAll(val, "|", "\\|")
}
col := table.GetColumn(cell.Value.KeyID) col := table.GetColumn(cell.Value.KeyID)
if nil != col && col.Wrap { if nil != col && col.Wrap {
lines := strings.Split(val, "\n") lines := strings.Split(val, "\n")
@ -2274,9 +2279,11 @@ func exportTree(tree *parse.Tree, wysiwyg, keepFold, avHiddenCol bool,
} else if av.KeyTypeText == cell.Value.Type { } else if av.KeyTypeText == cell.Value.Type {
if nil != cell.Value.Text { if nil != cell.Value.Text {
val = cell.Value.Text.Content val = cell.Value.Text.Content
if !wysiwyg {
val = string(lex.EscapeProtyleMarkers([]byte(val))) val = string(lex.EscapeProtyleMarkers([]byte(val)))
val = strings.ReplaceAll(val, "\\|", "|") val = strings.ReplaceAll(val, "\\|", "|")
val = strings.ReplaceAll(val, "|", "\\|") val = strings.ReplaceAll(val, "|", "\\|")
}
col := table.GetColumn(cell.Value.KeyID) col := table.GetColumn(cell.Value.KeyID)
if nil != col && col.Wrap { if nil != col && col.Wrap {
lines := strings.Split(val, "\n") lines := strings.Split(val, "\n")