0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2024-04-30 22:41:59 +08:00
commit c1bde4f917
10 changed files with 597 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/appearance/langs/en_US.json
View file

@ -480,9 +480,9 @@
"syncConfGuide5": "If the amount of data is large, the first sync will be slow, please wait patiently<br>Do not switch apps and keep the screen bright while the iOS/iPad is syncing",
"copyPlainText": "Copy plain text",
"findInDoc": "Match ${y} items in ${x} docs",
"jumpToParentNext": "Jump to the next block in the parent level",
"jumpToParentPrev": "Jump to the previous block in the parent level",
"jumpToParent": "Jump to the parent",
"jumpToParentNext": "Jump to the next block of the parent block",
"jumpToParentPrev": "Jump to the previous block of the parent block",
"jumpToParent": "Jump to parent block",
"initRepoKeyTip": "If the key has been initialized on other devices, please use [Import Key] or generate the key with the same passphrase, otherwise the data cannot be synced to the cloud, so be sure to use the same key on all devices",
"crossKeepLazyLoad": "Cross-page multi-selection needs to select [Keep Loaded Content] in the more menu",
"keepLazyLoad": "Keep loaded content",

6
app/appearance/langs/es_ES.json
View file

@ -480,9 +480,9 @@
"syncConfGuide5": "Si la cantidad de datos es grande, la primera sincronización será lenta, espere pacientemente<br>No cambie de aplicación y mantenga la pantalla brillante mientras iOS/iPad se sincroniza",
"copyPlainText": "Copiar texto sin formato",
"findInDoc": "Hacer coincidir ${y} elementos en ${x} documentos",
"jumpToParentNext": "Saltar al siguiente bloque en el nivel principal",
"jumpToParentPrev": "Saltar al bloque anterior en el nivel principal",
"jumpToParent": "Saltar al padre",
"jumpToParentNext": "Saltar al siguiente bloque del bloque principal",
"jumpToParentPrev": "Saltar al bloque anterior del bloque principal",
"jumpToParent": "Saltar al bloque principal",
"initRepoKeyTip": "Si la clave se ha inicializado en otros dispositivos, use [Importar la clave] o genere la clave con la misma contraseña; de lo contrario, los datos no se pueden sincronizar con la nube, así que asegúrese de usar la misma clave en todos los dispositivos.",
"crossKeepLazyLoad": "La selección múltiple entre páginas debe seleccionar [Mantener contenido cargado] en el menú más",
"keepLazyLoad": "Mantener el contenido cargado",

6
app/appearance/langs/fr_FR.json
View file

@ -480,9 +480,9 @@
"syncConfGuide5": "Si la quantité de données est importante, la première synchronisation sera lente, veuillez patienter<br> Ne changez pas d'application et gardez l'écran lumineux pendant la synchronisation de l'iOS/iPad",
"copyPlainText": "Copier du texte brut",
"findInDoc": "Faire correspondre les éléments ${y} dans les documents ${x}",
"jumpToParentNext": "Passer au bloc suivant du niveau parent",
"jumpToParentPrev": "Sauter au bloc précédent du niveau parent",
"jumpToParent": "Aller au parent",
"jumpToParentNext": "Sauter au bloc suivant du bloc parent",
"jumpToParentPrev": "Sauter au bloc précédent du bloc parent",
"jumpToParent": "Sauter au bloc parent",
"initRepoKeyTip": "Si la clé a été initialisée sur d'autres appareils, veuillez utiliser [Importer la clé] ou générer la clé avec le même mot de passe, sinon les données ne peuvent pas être synchronisées avec le cloud, alors assurez-vous d'utiliser la même clé sur tous les appareils",
"crossKeepLazyLoad": "La multi-sélection sur plusieurs pages doit sélectionner [Conserver le contenu chargé] dans le menu plus",
"keepLazyLoad": "Conserver le contenu chargé",

6
app/appearance/langs/zh_CHT.json
View file

@ -480,9 +480,9 @@
"syncConfGuide5": "如果資料量較大，第一次同步會比較慢，請耐心等待<br>iOS/iPad 端在同步時請勿切換應用並保持螢幕恆亮",
"copyPlainText": "複製純文字",
"findInDoc": "${x} 個文檔中匹配 ${y} 項",
"jumpToParentNext": "跳轉到父級的下一個塊",
"jumpToParentPrev": "跳轉到父級的上一個塊",
"jumpToParent": "跳轉到父級",
"jumpToParentNext": "跳到父區塊的下一個區塊",
"jumpToParentPrev": "跳到父區塊的上一個區塊",
"jumpToParent": "跳到父區塊",
"initRepoKeyTip": "如果其他設備上已經初始化過密鑰，請使用 [導入密鑰] 或者通過相同的密碼生成密鑰，否則無法雲端同步資料，所以請務必在所有設備上使用相同的密鑰",
"crossKeepLazyLoad": "跨頁多選需在更多菜單中選中【保持已載入內容】",
"keepLazyLoad": "保持已載入的內容",

6
app/appearance/langs/zh_CN.json
View file

@ -480,9 +480,9 @@
"syncConfGuide5": "如果数据量较大，第一次同步会比较慢，请耐心等待<br>iOS/iPad 端在同步时请勿切换应用并保持亮屏",
"copyPlainText": "复制纯文本",
"findInDoc": "${x} 个文档中匹配 ${y} 项",
"jumpToParentNext": "跳转到父级的下一个块",
"jumpToParentPrev": "跳转到父级的上一个块",
"jumpToParent": "跳转到父级",
"jumpToParentNext": "跳转到父块的下一个块",
"jumpToParentPrev": "跳转到父块的上一个块",
"jumpToParent": "跳转到父块",
"initRepoKeyTip": "如果其他设备上已经初始化过密钥，请使用 [导入密钥] 或者通过相同的密码生成密钥，否则无法云端同步数据，所以请务必在所有设备上使用相同的密钥",
"crossKeepLazyLoad": "跨页多选需在更多菜单中选中 [保持已加载内容]",
"keepLazyLoad": "保持已加载的内容",

205
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": "20240428230146"
"updated": "20240430215520"
},
"Children": [
{
@ -3079,7 +3079,7 @@
"Properties": {
"colgroup": "||",
"id": "20240112150534-wiik5sl",
"updated": "20240426233832"
"updated": "20240430215520"
},
"Children": [
{
@ -3491,6 +3491,207 @@
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
},
{
"Type": "NodeText",
"Data": "Jump to the next block of the parent block"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Ctrl+Shift+N"
},
{
"Type": "NodeText",
"Data": "​ / "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⇧⌘N"
},
{
"Type": "NodeText",
"Data": "​"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
},
{
"Type": "NodeText",
"Data": "Jump to the previous block of the parent block"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Ctrl+Shift+M"
},
{
"Type": "NodeText",
"Data": "​ / "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⇧⌘M"
},
{
"Type": "NodeText",
"Data": "​"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
},
{
"Type": "NodeText",
"Data": "Jump to parent block"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Ctrl+Shift+J"
},
{
"Type": "NodeText",
"Data": "​ / "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⇧⌘J"
},
{
"Type": "NodeText",
"Data": "​"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",

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

@ -7,7 +7,7 @@
"id": "20200813004551-gm0pbn1",
"title": "快捷键",
"type": "doc",
"updated": "20240428230058"
"updated": "20240430215420"
},
"Children": [
{
@ -3075,7 +3075,7 @@
"Properties": {
"colgroup": "||",
"id": "20201227133317-vopotjc",
"updated": "20240426233401"
"updated": "20240430215420"
},
"Children": [
{
@ -3483,6 +3483,169 @@
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
},
{
"Type": "NodeText",
"Data": "跳转到父块的下一个块"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Ctrl+Shift+N"
},
{
"Type": "NodeText",
"Data": "​ / "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⇧⌘N"
},
{
"Type": "NodeText",
"Data": "​"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "跳转到父块的上一个块"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "​"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Ctrl+Shift+M"
},
{
"Type": "NodeText",
"Data": "​ / "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⇧⌘M"
},
{
"Type": "NodeText",
"Data": "​"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td"
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "跳转到父块"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "​"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Ctrl+Shift+J"
},
{
"Type": "NodeText",
"Data": "​ / "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⇧⌘J"
},
{
"Type": "NodeText",
"Data": "​"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td"
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",

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

@ -7,7 +7,7 @@
"id": "20211226122549-jktxego",
"title": "快捷鍵",
"type": "doc",
"updated": "20240428230152"
"updated": "20240430215519"
},
"Children": [
{
@ -3067,7 +3067,7 @@
"Properties": {
"colgroup": "||",
"id": "20240112151141-ggglv0f",
"updated": "20240426233618"
"updated": "20240430215519"
},
"Children": [
{
@ -3479,6 +3479,188 @@
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
},
{
"Type": "NodeText",
"Data": "跳到父區塊的下一個區塊"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Ctrl+Shift+N"
},
{
"Type": "NodeText",
"Data": "​ / "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⇧⌘N"
},
{
"Type": "NodeText",
"Data": "​"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
},
{
"Type": "NodeText",
"Data": "跳到父區塊的上一個區塊"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Ctrl+Shift+M"
},
{
"Type": "NodeText",
"Data": "​ / "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⇧⌘M"
},
{
"Type": "NodeText",
"Data": "​"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Properties": {
"colspan": "1"
},
"Children": [
{
"Type": "NodeKramdownSpanIAL",
"Data": "{: colspan=\"1\"}"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "跳到父區塊"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "​"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Ctrl+Shift+J"
},
{
"Type": "NodeText",
"Data": "​ / "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⇧⌘J"
},
{
"Type": "NodeText",
"Data": "​"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td"
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",

14
kernel/bazaar/package.go
View file

@ -506,14 +506,22 @@ func GetPackageREADME(repoURL, repoHash, packageType string) (ret string) {
data, err := downloadPackage(repoURLHash+"/"+readme, false, "")
if nil != err {
ret = "Load bazaar package's README.md failed: " + err.Error()
return
ret = fmt.Sprintf("Load bazaar package's README.md(%s) failed: %s", readme, err.Error())
if readme == repo.Package.Readme.Default || "" == strings.TrimSpace(repo.Package.Readme.Default) {
return
}
readme = repo.Package.Readme.Default
data, err = downloadPackage(repoURLHash+"/"+readme, false, "")
if nil != err {
ret += fmt.Sprintf("<br>Load bazaar package's README.md(%s) failed: %s", readme, err.Error())
return
}
}
if 2 < len(data) {
if 255 == data[0] && 254 == data[1] {
data, _, err = transform.Bytes(textUnicode.UTF16(textUnicode.LittleEndian, textUnicode.ExpectBOM).NewDecoder(), data)
} else if 254 == data[1] && 255 == data[0] {
} else if 254 == data[0] && 255 == data[1] {
data, _, err = transform.Bytes(textUnicode.UTF16(textUnicode.BigEndian, textUnicode.ExpectBOM).NewDecoder(), data)
}
}

19
kernel/model/block.go
View file

@ -129,6 +129,25 @@ func GetBlockSiblingID(id string) (parent, previous, next string) {
return
}
var parentList *ast.Node
for p := node.Parent; nil != p; p = p.Parent {
if ast.NodeList == p.Type {
parentList = p
break
}
}
if nil != parentList {
parent = parentList.ID
if node.Previous != nil {
previous = node.Previous.ID
}
if node.Next != nil {
next = node.Next.ID
}
return
}
if nil != node.Parent && node.Parent.IsBlock() {
parent = node.Parent.ID
}