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

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

Browse source
This commit is contained in:
Vanessa 2025-04-05 23:18:41 +08:00
commit 967dc29741
8 changed files with 43 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy
View file

@ -9381,7 +9381,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "E"
"TextMarkTextContent": "D"
},
{
"Type": "NodeText",
@ -9390,7 +9390,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⌥E"
"TextMarkTextContent": "⌥D"
},
{
"Type": "NodeText",
@ -11348,16 +11348,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Shift"
},
{
"Type": "NodeText",
"Data": "​+"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "M"
"TextMarkTextContent": "O"
},
{
"Type": "NodeText",
@ -11366,7 +11357,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⇧⌘M"
"TextMarkTextContent": "⌘O"
},
{
"Type": "NodeText",

21
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy
View file

@ -9385,7 +9385,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "E"
"TextMarkTextContent": "D"
},
{
"Type": "NodeText",
@ -9394,7 +9394,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⌥E"
"TextMarkTextContent": "⌥D"
},
{
"Type": "NodeText",
@ -11338,16 +11338,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Shift"
},
{
"Type": "NodeText",
"Data": "​+"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "M"
"TextMarkTextContent": "O"
},
{
"Type": "NodeText",
@ -11356,7 +11347,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⇧⌘M"
"TextMarkTextContent": "⌘O"
},
{
"Type": "NodeText",
@ -12477,7 +12468,7 @@
"Children": [
{
"Type": "NodeText",
"Data": "退出搜素"
"Data": "退出搜索"
}
]
},
@ -13311,7 +13302,7 @@
"Children": [
{
"Type": "NodeText",
"Data": "文本选则工具"
"Data": "文本选择工具"
}
]
},

19
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy
View file

@ -9428,7 +9428,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "E"
"TextMarkTextContent": "D"
},
{
"Type": "NodeText",
@ -9437,7 +9437,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⌥E"
"TextMarkTextContent": "⌥D"
},
{
"Type": "NodeText",
@ -11398,16 +11398,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Shift"
},
{
"Type": "NodeText",
"Data": "​+"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "M"
"TextMarkTextContent": "O"
},
{
"Type": "NodeText",
@ -11416,7 +11407,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⇧⌘M"
"TextMarkTextContent": "⌘O"
},
{
"Type": "NodeText",
@ -13380,7 +13371,7 @@
"Children": [
{
"Type": "NodeText",
"Data": "文字選則工具"
"Data": "文字選擇工具"
}
]
},

20
app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-xsbxokr.sy
View file

@ -9348,7 +9348,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "E"
"TextMarkTextContent": "D"
},
{
"Type": "NodeText",
@ -9357,7 +9357,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⌥E"
"TextMarkTextContent": "⌥D"
},
{
"Type": "NodeText",
@ -11326,7 +11326,19 @@
"id": ""
},
"TextMarkType": "kbd",
"TextMarkTextContent": "Ctrl+Shift+M"
"TextMarkTextContent": "Ctrl"
},
{
"Type": "NodeText",
"Data": "​+"
},
{
"Type": "NodeTextMark",
"Properties": {
"id": ""
},
"TextMarkType": "kbd",
"TextMarkTextContent": "O"
},
{
"Type": "NodeText",
@ -11341,7 +11353,7 @@
"id": ""
},
"TextMarkType": "kbd",
"TextMarkTextContent": "⇧⌘M"
"TextMarkTextContent": "⌘O"
},
{
"Type": "NodeText",

4
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.20250403074251-fd2d4ffa705c
github.com/88250/lute v1.7.7-0.20250404112626-6633163ba03b
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.20250403074251-fd2d4ffa705c h1:WdGQUp3fmBzlFqalFDO7LdkOXamNZ3p1zZJh604vM2s=
github.com/88250/lute v1.7.7-0.20250403074251-fd2d4ffa705c/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/lute v1.7.7-0.20250404112626-6633163ba03b h1:kvGbMhVrE8erJLSWAZx+7LpdouBsu2TD0c1XCzGAjUY=
github.com/88250/lute v1.7.7-0.20250404112626-6633163ba03b/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/pdfcpu v0.3.14-0.20241201033812-5a93b7586a01 h1:AcFe63RXjIh1XtX/dc4Es3U8bYKjlEkvavHd1nFBOHM=
github.com/88250/pdfcpu v0.3.14-0.20241201033812-5a93b7586a01/go.mod h1:fVfOloBzs2+W2VJCCbq60XIxc3yJHAZ0Gahv1oO0gyI=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

9
kernel/util/ocr.go
View file

@ -242,8 +242,13 @@ func Tesseract(imgAbsPath string) (ret []map[string]interface{}) {
fields := strings.Split(line, "\t")
// 将字段名和字段值映射到一个 map 中
dataMap := make(map[string]interface{})
for i, header := range strings.Split(lines[0], "\t") {
dataMap[header] = fields[i]
headers := strings.Split(lines[0], "\t")
for i, header := range headers {
if i < len(fields) {
dataMap[header] = fields[i]
} else {
dataMap[header] = ""
}
}
ret = append(ret, dataMap)
}