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", 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; } diff --git a/kernel/model/assets.go b/kernel/model/assets.go index 9dbc95741..afb13ef36 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.WalkContinue + } + dest := n.TextMarkFileAnnotationRefID[:strings.LastIndexByte(n.TextMarkFileAnnotationRefID, '/')] dest = strings.TrimSpace(dest) ret = append(ret, dest)