github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-02 18:01:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa 2025-03-04 10:52:10 +08:00
commit e8859ea3c1
7 changed files with 238 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@
"id": "20200924100950-9op5xi1",
"title": "Shortcuts",
"type": "doc",
"updated": "20250220132741"
"updated": "20250303234918"
},
"Children": [
{
@ -3679,7 +3679,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20210106154056-koo4wdj",
"updated": "20250220132741"
"updated": "20250303234918"
},
"Children": [
{
@ -3698,7 +3698,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20210106154319-v9tt3e2",
"updated": "20250220132741"
"updated": "20250303234918"
},
"Children": [
{
@ -3718,7 +3718,7 @@
"Properties": {
"colgroup": "||",
"id": "20240112150534-wiik5sl",
"updated": "20250220132741"
"updated": "20250303234918"
},
"Children": [
{
@ -8980,6 +8980,60 @@
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "Open in New Tab"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "-"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "Go to "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Settings"
},
{
"Type": "NodeText",
"Data": "​ - "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Shortcuts"
},
{
"Type": "NodeText",
"Data": "​ to configure"
}
]
}
]
}
]
},

62
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy
View File

@ -7,7 +7,7 @@
"id": "20200813004551-gm0pbn1",
"title": "快捷键",
"type": "doc",
"updated": "20250220131115"
"updated": "20250303234645"
},
"Children": [
{
@ -3677,7 +3677,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20201227133317-rkh4bji",
"updated": "20250220131115"
"updated": "20250303234645"
},
"Children": [
{
@ -3692,7 +3692,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20201227133317-kazyttz",
"updated": "20250220131115"
"updated": "20250303234645"
},
"Children": [
{
@ -3716,7 +3716,7 @@
"Properties": {
"colgroup": "||",
"id": "20201227133317-vopotjc",
"updated": "20250220131115"
"updated": "20250303234645"
},
"Children": [
{
@ -8992,6 +8992,60 @@
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "在新页签中打开"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "-"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "可前往 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "设置"
},
{
"Type": "NodeText",
"Data": "​ - "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "快捷键"
},
{
"Type": "NodeText",
"Data": "​ 中配置"
}
]
}
]
}
]
},

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

@ -7,7 +7,7 @@
"id": "20211226122549-jktxego",
"title": "快捷鍵",
"type": "doc",
"updated": "20250220133235"
"updated": "20250303234747"
},
"Children": [
{
@ -3671,7 +3671,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20211226122652-htptsmh",
"updated": "20250220133235"
"updated": "20250303234747"
},
"Children": [
{
@ -3686,7 +3686,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20211226122652-xp1hi60",
"updated": "20250220133235"
"updated": "20250303234747"
},
"Children": [
{
@ -3706,7 +3706,7 @@
"Properties": {
"colgroup": "||",
"id": "20240112151141-ggglv0f",
"updated": "20250220133235"
"updated": "20250303234747"
},
"Children": [
{
@ -9035,6 +9035,60 @@
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "在新分頁中打開"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "-"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "可前往 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "設置"
},
{
"Type": "NodeText",
"Data": "​ - "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "快捷鍵"
},
{
"Type": "NodeText",
"Data": "​ 中配置"
}
]
}
]
}
]
},

62
app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-xsbxokr.sy
View File

@ -9,7 +9,7 @@
"id": "20240530101000-xsbxokr",
"title": "ショートカット",
"type": "doc",
"updated": "20250220134806"
"updated": "20250303234901"
},
"Children": [
{
@ -3627,7 +3627,7 @@
"Properties": {
"ID": "20240530101000-twmuxke",
"id": "20240530101000-675gu9g",
"updated": "20250220134806"
"updated": "20250303234901"
},
"Children": [
{
@ -3653,7 +3653,7 @@
"Properties": {
"ID": "20240530101000-tkbdrth",
"id": "20240530101000-9wkmh8w",
"updated": "20250220134806"
"updated": "20250303234901"
},
"Children": [
{
@ -3673,7 +3673,7 @@
"Properties": {
"colgroup": "||",
"id": "20240530101000-1isfzez",
"updated": "20250220134806"
"updated": "20250303234901"
},
"Children": [
{
@ -8940,6 +8940,60 @@
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "新しいタブで開く"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "-"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "​"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "設定"
},
{
"Type": "NodeText",
"Data": "​ - "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "ショートカット"
},
{
"Type": "NodeText",
"Data": "​ で設定できます"
}
]
}
]
}
]
},

3
kernel/go.mod
View File

@ -199,8 +199,7 @@ replace github.com/mattn/go-sqlite3 => github.com/88250/go-sqlite3 v1.14.13-0.20
replace github.com/pdfcpu/pdfcpu => github.com/88250/pdfcpu v0.3.14-0.20241201033812-5a93b7586a01
replace github.com/88250/lute => F:\golang\gopath\src\github.com\88250\lute
//replace github.com/88250/lute => F:\golang\gopath\src\github.com\88250\lute
//replace github.com/siyuan-note/dejavu => D:\88250\dejavu
//replace github.com/siyuan-note/riff => D:\88250\riff
//replace github.com/siyuan-note/httpclient => D:\88250\httpclient

2
kernel/go.sum
View File

@ -14,6 +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.20250303081743-1c097ae13c96 h1:RxF/NyVBi0rr5at7VGkwm5wD6eS8TPiX5U7RFrPXNOU=
github.com/88250/lute v1.7.7-0.20250303081743-1c097ae13c96/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=

4
kernel/util/rune.go
View File

@ -72,7 +72,9 @@ func RemoveInvalid(text string) (ret string) {
func RemoveInvalidRetainCtrl(text string) (ret string) {
ret = strings.ReplaceAll(text, "\u00A0", " ") // NBSP 转换为普通空格
ret = gulu.Str.RemoveZeroWidthCharacters(ret)
ret = gulu.Str.RemoveZeroWidthNoBreakSpace(ret)
ret = gulu.Str.RemoveZeroWidthSpace(ret)
// 不要移除零宽连字符，因为 emoji 需要 https://github.com/siyuan-note/siyuan/issues/14272
ret = gulu.Str.RemovePUA(ret)
return
}