Kaynağa Gözat

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

Vanessa 2 yıl önce
ebeveyn
işleme
223011f84b

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
app/stage/protyle/js/lute/lute.min.js


+ 6 - 10
kernel/api/workspace.go

@@ -52,16 +52,12 @@ func createWorkspaceDir(c *gin.Context) {
 		return
 	}
 
-	if gulu.File.IsExist(absPath) {
-		ret.Code = -1
-		ret.Msg = model.Conf.Language(78)
-		return
-	}
-
-	if err := os.MkdirAll(absPath, 0755); nil != err {
-		ret.Code = -1
-		ret.Msg = fmt.Sprintf("create workspace dir [%s] failed: %s", absPath, err)
-		return
+	if !gulu.File.IsExist(absPath) {
+		if err := os.MkdirAll(absPath, 0755); nil != err {
+			ret.Code = -1
+			ret.Msg = fmt.Sprintf("create workspace dir [%s] failed: %s", absPath, err)
+			return
+		}
 	}
 
 	workspacePaths, err := util.ReadWorkspacePaths()

+ 1 - 1
kernel/go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/88250/clipboard v0.1.5
 	github.com/88250/css v0.1.2
 	github.com/88250/gulu v1.2.3-0.20221117052724-cd06804db798
-	github.com/88250/lute v1.7.6-0.20230207141533-e80e4b21d7e1
+	github.com/88250/lute v1.7.6-0.20230212103910-a5da0bd24ec4
 	github.com/88250/pdfcpu v0.3.13
 	github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
 	github.com/ConradIrwin/font v0.0.0-20210318200717-ce8d41cc0732

+ 2 - 2
kernel/go.sum

@@ -8,8 +8,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5 h1:8HdZozCsXS
 github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/88250/gulu v1.2.3-0.20221117052724-cd06804db798 h1:sR/s/Y9wyl79ZRCUERwLPo9zqaB3KhNRodCMTJ4ozEU=
 github.com/88250/gulu v1.2.3-0.20221117052724-cd06804db798/go.mod h1:I1qBzsksFL2ciGSuqDE7R3XW4BUMrfDgOvSXEk7FsAI=
-github.com/88250/lute v1.7.6-0.20230207141533-e80e4b21d7e1 h1:uA3Vj4EBHNUaHt3gh4nx5dymQazxNtTcwRh+MrDgttQ=
-github.com/88250/lute v1.7.6-0.20230207141533-e80e4b21d7e1/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
+github.com/88250/lute v1.7.6-0.20230212103910-a5da0bd24ec4 h1:2txqEs36VH3kmJSX/SmFdOVQmiSRAtWvuOchGeQu/Vk=
+github.com/88250/lute v1.7.6-0.20230212103910-a5da0bd24ec4/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
 github.com/88250/pdfcpu v0.3.13 h1:touMWMZkCGalMIbEg9bxYp7rETM+zwb9hXjwhqi4I7Q=
 github.com/88250/pdfcpu v0.3.13/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
 github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor