From 9e17a2f1dae16ce6935878f33803a084d51f5b69 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 6 May 2023 15:23:48 +0800 Subject: [PATCH 1/4] :bug: Overlay block ref on PDF annotation ref lead to failure to query unreferenced assets https://github.com/siyuan-note/siyuan/issues/8186 --- kernel/model/assets.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/model/assets.go b/kernel/model/assets.go index 9dbc95741..7aef777a0 100644 --- a/kernel/model/assets.go +++ b/kernel/model/assets.go @@ -729,6 +729,10 @@ func assetsLinkDestsInTree(tree *parse.Tree) (ret []string) { return ast.WalkContinue } + if !strings.Contains(n.TextMarkFileAnnotationRefID, "/") { + return ast.WalkSkipChildren + } + dest := n.TextMarkFileAnnotationRefID[:strings.LastIndexByte(n.TextMarkFileAnnotationRefID, '/')] dest = strings.TrimSpace(dest) ret = append(ret, dest) From 9f6983cd092b9e72244e2936110ad4049027f5ed Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 6 May 2023 15:23:56 +0800 Subject: [PATCH 2/4] :bug: Overlay block ref on PDF annotation ref lead to failure to query unreferenced assets https://github.com/siyuan-note/siyuan/issues/8186 --- kernel/model/assets.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/model/assets.go b/kernel/model/assets.go index 7aef777a0..afb13ef36 100644 --- a/kernel/model/assets.go +++ b/kernel/model/assets.go @@ -730,7 +730,7 @@ func assetsLinkDestsInTree(tree *parse.Tree) (ret []string) { } if !strings.Contains(n.TextMarkFileAnnotationRefID, "/") { - return ast.WalkSkipChildren + return ast.WalkContinue } dest := n.TextMarkFileAnnotationRefID[:strings.LastIndexByte(n.TextMarkFileAnnotationRefID, '/')] From 825822ec9354b4f48e389f9c74d0d34c5ecb7492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A2=96=E9=80=B8?= <49649786+Zuoqiu-Yingyi@users.noreply.github.com> Date: Sat, 6 May 2023 15:32:07 +0800 Subject: [PATCH 3/4] Custom IAL attr name support more symbol (#8172) * :art: custom ial key support '_' symbol * Revert ":art: custom ial key support '_' symbol" This reverts commit 50883cb4e158463d4a4f87cce145cc10b8cff526. * :art: custom ial key support `_` and `.` symbol * Update commonMenuItem.ts --- app/src/menus/commonMenuItem.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/menus/commonMenuItem.ts b/app/src/menus/commonMenuItem.ts index 6f220ba2c..f596bd909 100644 --- a/app/src/menus/commonMenuItem.ts +++ b/app/src/menus/commonMenuItem.ts @@ -310,7 +310,7 @@ export const openFileAttr = (attrs: IObject, id: string, focusName = "bookmark") name = "custom-" + (item.parentElement.querySelector(".b3-text-field") as HTMLInputElement).value; } if (item.value.trim()) { - if (!/^[0-9a-zA-Z\-]*$/.test(name.replace("custom-", "")) || name === "custom-") { + if (!/^custom-[_.\-0-9a-zA-Z]+$/.test(name)) { errorTip += name.replace("custom-", "") + ", "; return; } @@ -381,7 +381,7 @@ export const openAttr = (nodeElement: Element, protyle: IProtyle, focusName = "b name = "custom-" + (item.parentElement.querySelector(".b3-text-field") as HTMLInputElement).value; } if (item.value.trim()) { - if (!/^[0-9a-zA-Z\-]*$/.test(name.replace("custom-", "")) || name === "custom-") { + if (!/^custom-[_.\-0-9a-zA-Z]+$/.test(name)) { errorTip += name.replace("custom-", "") + ", "; return; } From d71207dce5535556448489b079c6f57d110d1603 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 6 May 2023 15:35:48 +0800 Subject: [PATCH 4/4] :art: Update attribute name text --- app/appearance/langs/en_US.json | 2 +- app/appearance/langs/es_ES.json | 2 +- app/appearance/langs/fr_FR.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 206d4f31d..dae4aa859 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -423,7 +423,7 @@ "addAttr": "Add", "addTag": "Add Tag", "width": "Width", - "attrName": "Key", + "attrName": "Attribute name", "attr": "Attribute", "updatePath": "Change dir", "default": "Default", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 2deac54f6..d7fd2ff8e 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -423,7 +423,7 @@ "addAttr": "Añadir", "addTag": "Añadir etiqueta", "width": "Ancho", - "attrName": "Clave", + "attrName": "Nombre del atributo", "attr": "Atributo", "updatePath": "Cambiar directorio", "default": "Por defecto", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index e6948e5df..9287b5a9d 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -423,7 +423,7 @@ "addAttr": "Ajouter", "addTag": "Ajouter Tag", "width": "Largeur", - "attrName": "Key", + "attrName": "Nom de l'attribut", "attr": "Attribut", "updatePath": "modifier le répertoire", "default": "Default",