github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-17 09:30:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel 2024-07-14 10:14:32 +08:00
parent 1a881e35f7
commit f22bec9fd6
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/model/export.go
View File

@ -2220,6 +2220,8 @@ func exportTree(tree *parse.Tree, wysiwyg, keepFold bool,
for _, col := range table.Columns { for _, col := range table.Columns {
cell := &ast.Node{Type: ast.NodeTableCell} cell := &ast.Node{Type: ast.NodeTableCell}
name := string(lex.EscapeProtyleMarkers([]byte(col.Name))) name := string(lex.EscapeProtyleMarkers([]byte(col.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)
} }
@ -2233,11 +2235,25 @@ func exportTree(tree *parse.Tree, wysiwyg, keepFold bool,
mdTableRow.AppendChild(mdTableCell) mdTableRow.AppendChild(mdTableCell)
var val string var val string
if nil != cell.Value { if nil != cell.Value {
if av.KeyTypeText == cell.Value.Type { if av.KeyTypeBlock == cell.Value.Type {
if nil != cell.Value.Block {
val = cell.Value.Block.Content
val = string(lex.EscapeProtyleMarkers([]byte(val)))
val = strings.ReplaceAll(val, "\\|", "|")
val = strings.ReplaceAll(val, "|", "\\|")
lines := strings.Split(val, "\n")
for _, line := range lines {
mdTableCell.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: []byte(line)})
mdTableCell.AppendChild(&ast.Node{Type: ast.NodeHardBreak})
}
continue
}
} else if av.KeyTypeText == cell.Value.Type {
if nil != cell.Value.Text { if nil != cell.Value.Text {
// 文本字段需要替换换行符并转义标记符 https://github.com/siyuan-note/siyuan/issues/11945
val = cell.Value.Text.Content val = cell.Value.Text.Content
val = string(lex.EscapeProtyleMarkers([]byte(val))) val = string(lex.EscapeProtyleMarkers([]byte(val)))
val = strings.ReplaceAll(val, "\\|", "|")
val = strings.ReplaceAll(val, "|", "\\|")
lines := strings.Split(val, "\n") lines := strings.Split(val, "\n")
for _, line := range lines { for _, line := range lines {
mdTableCell.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: []byte(line)}) mdTableCell.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: []byte(line)})