Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-21 17:10:12 +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 2023-05-06 15:44:39 +08:00
commit db6521181e
5 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -423,7 +423,7 @@
"addAttr": "Add", "addAttr": "Add",
"addTag": "Add Tag", "addTag": "Add Tag",
"width": "Width", "width": "Width",
"attrName": "Key", "attrName": "Attribute name",
"attr": "Attribute", "attr": "Attribute",
"updatePath": "Change dir", "updatePath": "Change dir",
"default": "Default", "default": "Default",

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

@ -423,7 +423,7 @@
"addAttr": "Añadir", "addAttr": "Añadir",
"addTag": "Añadir etiqueta", "addTag": "Añadir etiqueta",
"width": "Ancho", "width": "Ancho",
"attrName": "Clave", "attrName": "Nombre del atributo",
"attr": "Atributo", "attr": "Atributo",
"updatePath": "Cambiar directorio", "updatePath": "Cambiar directorio",
"default": "Por defecto", "default": "Por defecto",

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

@ -423,7 +423,7 @@
"addAttr": "Ajouter", "addAttr": "Ajouter",
"addTag": "Ajouter Tag", "addTag": "Ajouter Tag",
"width": "Largeur", "width": "Largeur",
"attrName": "Key", "attrName": "Nom de l'attribut",
"attr": "Attribut", "attr": "Attribut",
"updatePath": "modifier le répertoire", "updatePath": "modifier le répertoire",
"default": "Default", "default": "Default",

4
app/src/menus/commonMenuItem.ts
View file

@ -310,7 +310,7 @@ export const openFileAttr = (attrs: IObject, id: string, focusName = "bookmark")
name = "custom-" + (item.parentElement.querySelector(".b3-text-field") as HTMLInputElement).value; name = "custom-" + (item.parentElement.querySelector(".b3-text-field") as HTMLInputElement).value;
} }
if (item.value.trim()) { 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-", "") + ", "; errorTip += name.replace("custom-", "") + ", ";
return; 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; name = "custom-" + (item.parentElement.querySelector(".b3-text-field") as HTMLInputElement).value;
} }
if (item.value.trim()) { 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-", "") + ", "; errorTip += name.replace("custom-", "") + ", ";
return; return;
} }

4
kernel/model/assets.go
View file

@ -729,6 +729,10 @@ func assetsLinkDestsInTree(tree *parse.Tree) (ret []string) {
return ast.WalkContinue return ast.WalkContinue
} }
if !strings.Contains(n.TextMarkFileAnnotationRefID, "/") {
return ast.WalkContinue
}
dest := n.TextMarkFileAnnotationRefID[:strings.LastIndexByte(n.TextMarkFileAnnotationRefID, '/')] dest := n.TextMarkFileAnnotationRefID[:strings.LastIndexByte(n.TextMarkFileAnnotationRefID, '/')]
dest = strings.TrimSpace(dest) dest = strings.TrimSpace(dest)
ret = append(ret, dest) ret = append(ret, dest)