Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-21 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2025-06-14 14:03:52 +08:00
commit 6d44942cee
5 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
kernel/go.mod
View file

@ -10,7 +10,7 @@ require (
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689
github.com/88250/lute v1.7.7-0.20250614000910-93dd30c355d0
github.com/88250/lute v1.7.7-0.20250614015052-5e02bd9dab4d
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4
github.com/ConradIrwin/font v0.2.1

4
kernel/go.sum
View file

@ -14,8 +14,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT
github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689 h1:39y5g7vnFAIcXhTN3IXPk7h2xBhC4a9hBTykDhHJqRY=
github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689/go.mod h1:c8uVw25vW2W4dhJ/j4iYsX5H1hc19spim266jO5x2hU=
github.com/88250/lute v1.7.7-0.20250614000910-93dd30c355d0 h1:VZvTvCBy1Xa6hcxi+xvYCSMGbk4nh1ThzYNl8/f7mNQ=
github.com/88250/lute v1.7.7-0.20250614000910-93dd30c355d0/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/lute v1.7.7-0.20250614015052-5e02bd9dab4d h1:4O+NFkaO3trpvBfSsHW1FiRDZOY7JNNh5Cg7PdvxSw4=
github.com/88250/lute v1.7.7-0.20250614015052-5e02bd9dab4d/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/pdfcpu v0.3.14-0.20250424122812-f10e8d9d8d46 h1:Bq1JsDfVbHKUxNL/B2JXd8cC/1h6aFjrlXpGycnh0Hk=
github.com/88250/pdfcpu v0.3.14-0.20250424122812-f10e8d9d8d46/go.mod h1:fVfOloBzs2+W2VJCCbq60XIxc3yJHAZ0Gahv1oO0gyI=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

11
kernel/model/export_merge.go
View file

@ -76,8 +76,15 @@ func walkBlock(insertPoint *ast.Node, block *Block, level int) (err error) {
return
}
for j := len(nodes) - 1; -1 < j; j-- {
insertPoint.InsertAfter(nodes[j])
lastIndex := len(nodes) - 1
for j := lastIndex; -1 < j; j-- {
node := nodes[j]
if j == lastIndex && ast.NodeParagraph == node.Type && nil == node.FirstChild {
// 跳过最后一个空段落块
// Ignore the last empty paragraph block when exporting merged sub-documents https://github.com/siyuan-note/siyuan/issues/15028
continue
}
insertPoint.InsertAfter(node)
}
}
block.Children = nil

4
kernel/model/transaction.go
View file

@ -21,7 +21,6 @@ import (
"errors"
"fmt"
"path/filepath"
"runtime/debug"
"slices"
"strings"
"sync"
@ -155,8 +154,7 @@ func performTx(tx *Transaction) (ret *TxErr) {
defer func() {
if e := recover(); nil != e {
stack := debug.Stack()
msg := fmt.Sprintf("PANIC RECOVERED: %v\n\t%s\n", e, stack)
msg := fmt.Sprintf("PANIC RECOVERED: %v\n\t%s\n", e, logging.ShortStack())
logging.LogErrorf(msg)
if 1 == tx.state.Load() {