lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-09-18 09:44:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add froala (#945)

Browse Source 
* update images upload

* modify js res.url

* add froala

* froala-editor.js
This commit is contained in:
hotqin888
2024-06-05 13:17:08 +08:00
committed by GitHub
parent db620be8df
commit 0ce6c5bbf9
6 changed files with 837 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
controllers/BookController.go
View File

@@ -164,7 +164,8 @@ func (c *BookController) SaveBook() {
if !models.NewItemsets().Exist(itemId) {
c.JsonResult(6006, i18n.Tr(c.Lang, "message.project_space_not_exist"))
}
if editor != EditorMarkdown && editor != EditorCherryMarkdown && editor != EditorHtml && editor != EditorNewHtml {
// if editor != EditorMarkdown && editor != EditorCherryMarkdown && editor != EditorHtml && editor != EditorNewHtml {
if editor != EditorMarkdown && editor != EditorCherryMarkdown && editor != EditorHtml && editor != EditorNewHtml && editor != EditorFroala {
editor = EditorMarkdown
}

23
controllers/DocumentController.go
View File

@@ -503,8 +503,15 @@ func (c *DocumentController) Upload() {
name = "editormd-image-file"
files, err = c.GetFiles(name)
if err == http.ErrMissingFile {
c.JsonResult(6003, i18n.Tr(c.Lang, "message.upload_file_empty"))
return
// c.JsonResult(6003, i18n.Tr(c.Lang, "message.upload_file_empty"))
// return
name = "file"
files, err = c.GetFiles(name)
// logs.Info(files)
if err == http.ErrMissingFile {
c.JsonResult(6003, i18n.Tr(c.Lang, "message.upload_file_empty"))
return
}
}
}
@@ -515,6 +522,7 @@ func (c *DocumentController) Upload() {
// jMap := make(map[string]interface{})
// s := []map[int]interface{}{}
result2 := []map[string]interface{}{}
var result map[string]interface{}
for i, _ := range files {
//for each fileheader, get a handle to the actual file
file, err := files[i].Open()
@@ -680,19 +688,24 @@ func (c *DocumentController) Upload() {
c.JsonResult(6005, i18n.Tr(c.Lang, "message.failed"))
}
}
result := map[string]interface{}{
result = map[string]interface{}{
"errcode": 0,
"success": 1,
"message": "ok",
"url": attachment.HttpPath,
"link": attachment.HttpPath,
"alt": attachment.FileName,
"is_attach": isAttach,
"attach": attachment,
}
result2 = append(result2, result)
}
c.Ctx.Output.JSON(result2, true, false)
if name == "file" {
// froala单图片上传
c.Ctx.Output.JSON(result, true, false)
} else {
c.Ctx.Output.JSON(result2, true, false)
}
c.StopRun()
}

1
controllers/const.go
View File

@@ -6,4 +6,5 @@ const (
EditorCherryMarkdown = "cherry_markdown"
EditorHtml = "html"
EditorNewHtml = "new_html"
EditorFroala = "froala"
)