diff --git a/kernel/api/filetree.go b/kernel/api/filetree.go index 6a1512601..40a683b92 100644 --- a/kernel/api/filetree.go +++ b/kernel/api/filetree.go @@ -528,6 +528,14 @@ func getDocCreateSavePath(c *gin.Context) { if "" == docCreateSavePathTpl { docCreateSavePathTpl = model.Conf.FileTree.DocCreateSavePath } + docCreateSavePathTpl = strings.TrimSpace(docCreateSavePathTpl) + if "../" == docCreateSavePathTpl { + docCreateSavePathTpl = "../Untitled" + } + for strings.HasSuffix(docCreateSavePathTpl, "/") { + docCreateSavePathTpl = strings.TrimSuffix(docCreateSavePathTpl, "/") + docCreateSavePathTpl = strings.TrimSpace(docCreateSavePathTpl) + } p, err := model.RenderGoTemplate(docCreateSavePathTpl) if nil != err { diff --git a/kernel/api/notebook.go b/kernel/api/notebook.go index 80196235b..0dee040e6 100644 --- a/kernel/api/notebook.go +++ b/kernel/api/notebook.go @@ -300,6 +300,15 @@ func setNotebookConf(c *gin.Context) { } } + boxConf.DocCreateSavePath = strings.TrimSpace(boxConf.DocCreateSavePath) + if "../" == boxConf.DocCreateSavePath { + boxConf.DocCreateSavePath = "../Untitled" + } + for strings.HasSuffix(boxConf.DocCreateSavePath, "/") { + boxConf.DocCreateSavePath = strings.TrimSuffix(boxConf.DocCreateSavePath, "/") + boxConf.DocCreateSavePath = strings.TrimSpace(boxConf.DocCreateSavePath) + } + box.SaveConf(boxConf) ret.Data = boxConf } diff --git a/kernel/api/setting.go b/kernel/api/setting.go index 4fd26b616..ba2e925a9 100644 --- a/kernel/api/setting.go +++ b/kernel/api/setting.go @@ -265,6 +265,9 @@ func setFiletree(c *gin.Context) { } fileTree.DocCreateSavePath = strings.TrimSpace(fileTree.DocCreateSavePath) + if "../" == fileTree.DocCreateSavePath { + fileTree.DocCreateSavePath = "../Untitled" + } for strings.HasSuffix(fileTree.DocCreateSavePath, "/") { fileTree.DocCreateSavePath = strings.TrimSuffix(fileTree.DocCreateSavePath, "/") fileTree.DocCreateSavePath = strings.TrimSpace(fileTree.DocCreateSavePath) diff --git a/kernel/model/conf.go b/kernel/model/conf.go index 9096d814e..8fe8dc65f 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -175,6 +175,9 @@ func InitConf() { Conf.FileTree.MaxOpenTabCount = 32 } Conf.FileTree.DocCreateSavePath = strings.TrimSpace(Conf.FileTree.DocCreateSavePath) + if "../" == Conf.FileTree.DocCreateSavePath { + Conf.FileTree.DocCreateSavePath = "../Untitled" + } for strings.HasSuffix(Conf.FileTree.DocCreateSavePath, "/") { Conf.FileTree.DocCreateSavePath = strings.TrimSuffix(Conf.FileTree.DocCreateSavePath, "/") Conf.FileTree.DocCreateSavePath = strings.TrimSpace(Conf.FileTree.DocCreateSavePath)