", -1) - m.PrivatelyOwned = book.PrivatelyOwned - m.PrivateToken = book.PrivateToken - m.DocCount = book.DocCount - m.CommentStatus = book.CommentStatus - m.CommentCount = book.CommentCount - m.CreateTime = book.CreateTime - m.ModifyTime = book.ModifyTime - m.Cover = book.Cover - m.Label = book.Label - m.Status = book.Status - m.Editor = book.Editor - m.Theme = book.Theme - m.AutoRelease = book.AutoRelease == 1 - - if book.Theme == "" { - m.Theme = "default" - } - if book.Editor == "" { - m.Editor = "markdown" - } - return m -} - //重置文档数量 func (m *Book) ResetDocumentNumber(book_id int) { o := orm.NewOrm() diff --git a/models/book_result.go b/models/book_result.go index 579e3637..1eded718 100644 --- a/models/book_result.go +++ b/models/book_result.go @@ -2,10 +2,20 @@ package models import ( "time" + "bytes" "github.com/astaxie/beego/orm" "github.com/astaxie/beego/logs" "github.com/lifei6671/mindoc/conf" + "strings" + "github.com/lifei6671/mindoc/converter" + "strconv" + "github.com/russross/blackfriday" + "path/filepath" + "github.com/astaxie/beego" + "os" + "github.com/PuerkitoBio/goquery" + "github.com/lifei6671/mindoc/utils" ) type BookResult struct { @@ -14,17 +24,19 @@ type BookResult struct { Identify string `json:"identify"` OrderIndex int `json:"order_index"` Description string `json:"description"` + Publisher string `json:"publisher"` + IsCacheEBook bool `json:"is_cache_ebook"` PrivatelyOwned int `json:"privately_owned"` PrivateToken string `json:"private_token"` DocCount int `json:"doc_count"` CommentStatus string `json:"comment_status"` CommentCount int `json:"comment_count"` CreateTime time.Time `json:"create_time"` - CreateName string `json:"create_name"` + CreateName string `json:"create_name"` ModifyTime time.Time `json:"modify_time"` Cover string `json:"cover"` - Theme string `json:"theme"` - Label string `json:"label"` + Theme string `json:"theme"` + Label string `json:"label"` MemberId int `json:"member_id"` Editor string `json:"editor"` AutoRelease bool `json:"auto_release"` @@ -79,13 +91,14 @@ func (m *BookResult) FindByIdentify(identify string,member_id int) (*BookResult, return m, err } - m = book.ToBookResult() + m = NewBookResult().ToBookResult(*book) m.CreateName = member.Account m.MemberId = relationship.MemberId m.RoleId = relationship.RoleId m.RelationshipId = relationship.RelationshipId + if m.RoleId == conf.BookFounder { m.RoleName = "创始人" } else if m.RoleId == conf.BookAdmin { @@ -134,6 +147,183 @@ func (m *BookResult) FindToPager(pageIndex, pageSize int) (books []*BookResult,t return } +//实体转换 +func (m *BookResult) ToBookResult(book Book) *BookResult { + + m.BookId = book.BookId + m.BookName = book.BookName + m.Identify = book.Identify + m.OrderIndex = book.OrderIndex + m.Description = strings.Replace(book.Description, "\r\n", "
", -1) + m.PrivatelyOwned = book.PrivatelyOwned + m.PrivateToken = book.PrivateToken + m.DocCount = book.DocCount + m.CommentStatus = book.CommentStatus + m.CommentCount = book.CommentCount + m.CreateTime = book.CreateTime + m.ModifyTime = book.ModifyTime + m.Cover = book.Cover + m.Label = book.Label + m.Status = book.Status + m.Editor = book.Editor + m.Theme = book.Theme + m.AutoRelease = book.AutoRelease == 1 + m.Publisher = book.Publisher + m.IsCacheEBook = book.IsCacheEBook == 1 + + if book.Theme == "" { + m.Theme = "default" + } + if book.Editor == "" { + m.Editor = "markdown" + } + return m +} + +func (m *BookResult) Converter(sessionId string) (ConvertBookResult,error) { + + convertBookResult := ConvertBookResult{} + outputPath := filepath.Join(beego.AppConfig.DefaultString("book_output_path","cache"),sessionId,strconv.Itoa(m.BookId)) + + if m.IsCacheEBook { + outputPath = filepath.Join(beego.AppConfig.DefaultString("book_output_path","cache"),strconv.Itoa(m.BookId)) + } + + if m.IsCacheEBook { + pdfpath := filepath.Join(outputPath,"output","book.pdf") + epubpath := filepath.Join(outputPath,"output","book.epub") + mobipath := filepath.Join(outputPath,"output","book.mobi") + + if utils.FileExists(pdfpath) && utils.FileExists(epubpath) && utils.FileExists(mobipath){ + convertBookResult.EpubPath = epubpath + convertBookResult.MobiPath = mobipath + convertBookResult.PDFPath = pdfpath + return convertBookResult,nil + } + } + docs, err := NewDocument().FindListByBookId(m.BookId) + if err != nil { + return convertBookResult,err + } + + tocList := make([]converter.Toc,0) + + for _, item := range docs { + if item.ParentId == 0 { + toc := converter.Toc{ + Id: item.DocumentId, + Link: strconv.Itoa(item.DocumentId) + ".html", + Pid: item.ParentId, + Title: item.DocumentName, + } + + tocList = append(tocList,toc) + } + } + for _, item := range docs { + if item.ParentId != 0 { + toc := converter.Toc{ + Id: item.DocumentId, + Link: strconv.Itoa(item.DocumentId) + ".html", + Pid: item.ParentId, + Title: item.DocumentName, + } + tocList = append(tocList,toc) + } + } + + ebookConfig := converter.Config{ + Charset : "utf-8", + Cover : m.Cover, + Timestamp : time.Now().Format("2006-01-02 15:04:05"), + Description : string(blackfriday.MarkdownBasic([]byte(m.Description))), + Footer : "
本文档使用 MinDoc 构建 - _PAGENUM_ -
", + Header : "_SECTION_
", + Identifier : "", + Language : "zh-CN", + Creator : m.CreateName, + Publisher : m.Publisher, + Contributor : m.Publisher, + Title : m.BookName, + Format: []string{"epub", "mobi", "pdf"}, + FontSize : "14", + PaperSize : "a4", + MarginLeft : "72", + MarginRight : "72", + MarginTop : "72", + MarginBottom : "72", + Toc : tocList, + More : []string{}, + + } + + + os.MkdirAll(outputPath, 0766) + if outputPath, err = filepath.Abs(outputPath); err != nil { + beego.Error("导出目录配置错误：" + err.Error()) + return convertBookResult,err + } + + viewPath := beego.BConfig.WebConfig.ViewsPath + baseUrl := beego.AppConfig.DefaultString("baseurl","") + + for _,item := range docs { + name := strconv.Itoa(item.DocumentId) + fpath := filepath.Join(outputPath,name + ".html") + + f, err := os.OpenFile(fpath, os.O_CREATE|os.O_RDWR, 0777) + if err != nil { + return convertBookResult,err + } + var buf bytes.Buffer + + if err := beego.ExecuteViewPathTemplate(&buf,"document/export.tpl",viewPath,map[string]interface{}{"Model": m, "Lists": item, "BaseUrl": baseUrl}); err != nil { + return convertBookResult,err + } + html := buf.String() + + + if err != nil { + + f.Close() + return convertBookResult,err + } + + bufio := bytes.NewReader(buf.Bytes()) + + doc, err := goquery.NewDocumentFromReader(bufio) + doc.Find("img").Each(func(i int, contentSelection *goquery.Selection) { + if src, ok := contentSelection.Attr("src"); ok && strings.HasPrefix(src, "/uploads/") { + contentSelection.SetAttr("src", baseUrl + src) + } + }) + + html, err = doc.Html() + if err != nil { + f.Close() + return convertBookResult,err + } + + // html = strings.Replace(html, "附件
@@ -128,7 +131,7 @@
- ")
for _, attach := range attach_list {
+ if strings.HasPrefix(attach.HttpPath,"/"){
+ attach.HttpPath = strings.TrimSuffix(beego.AppConfig.DefaultString("baseurl",""),"/") + attach.HttpPath
+ }
li := fmt.Sprintf("
- %s ", attach.HttpPath, attach.FileName, attach.FileName) content.WriteString(li) diff --git a/routers/router.go b/routers/router.go index 65ea3408..b384df7b 100644 --- a/routers/router.go +++ b/routers/router.go @@ -72,8 +72,7 @@ func init() { beego.Router("/docs/:key", &controllers.DocumentController{}, "*:Index") beego.Router("/docs/:key/:id", &controllers.DocumentController{}, "*:Read") beego.Router("/docs/:key/search", &controllers.DocumentController{}, "post:Search") - beego.Router("/export/:key", &controllers.DocumentController{}, "*:ExportBook") - beego.Router("/export/:key/:id", &controllers.DocumentController{}, "*:ExportDoc") + beego.Router("/export/:key", &controllers.DocumentController{}, "*:Export") beego.Router("/qrcode/:key.png", &controllers.DocumentController{}, "get:QrCode") beego.Router("/attach_files/:key/:attach_id", &controllers.DocumentController{}, "get:DownloadAttachment") diff --git a/static/js/editor.js b/static/js/editor.js index 1f919139..abe0d558 100644 --- a/static/js/editor.js +++ b/static/js/editor.js @@ -88,7 +88,6 @@ function openDeleteDocumentDialog($node) { layer.close(index); if(res.errcode === 0){ window.treeCatalog.delete_node($node); - resetEditor($node); }else{ layer.msg("删除失败",{icon : 2}) } @@ -153,6 +152,24 @@ function pushVueLists($lists) { } } +/** + * 发布项目 + */ +function releaseBook() { + $.ajax({ + url: window.releaseURL, + data: { "identify": window.book.identify }, + type: "post", + dataType: "json", + success: function (res) { + if (res.errcode === 0) { + layer.msg("发布任务已推送到任务队列，稍后将在后台执行。"); + } else { + layer.msg(res.message); + } + } + }); +} //实现小提示 $("[data-toggle='tooltip']").hover(function () { var title = $(this).attr('data-title'); @@ -238,7 +255,6 @@ function uploadImage($id,$callback) { var imageFile = clipboard.items[i].getAsFile(); - console.log(imageFile) var fileName = Date.parse(new Date()); switch (imageFile.type){ diff --git a/static/js/markdown.js b/static/js/markdown.js index d3699a3b..fb2d86d3 100644 --- a/static/js/markdown.js +++ b/static/js/markdown.js @@ -227,25 +227,7 @@ $(function () { } }); } - - function releaseBook() { - $.ajax({ - url: window.releaseURL, - data: { "identify": window.book.identify }, - type: "post", - dataType: "json", - success: function (res) { - if (res.errcode === 0) { - layer.msg("发布任务已推送到任务队列，稍后将在后台执行。"); - } else { - layer.msg(res.message); - } - } - }); - } - - function resetEditor($node) { - } + /** * 设置编辑器变更状态 diff --git a/static/js/quill.js b/static/js/quill.js index 1e46a3a0..340e3d58 100644 --- a/static/js/quill.js +++ b/static/js/quill.js @@ -8,14 +8,83 @@ $(function () { toolbar :"#editormd-tools" } }); - window.editor.on("editor-change",function () { + window.editor.on("text-change",function () { resetEditorChanged(true); }); - window.menu_save.on("click",function () { - if($(this).hasClass('change')){ - saveDocument(); - } + var $editorEle = $("#editormd-tools"); + + $editorEle.find(".ql-undo").on("click",function () { + window.editor.history.undo(); }); + $editorEle.find(".ql-redo").on("click",function () { + window.editor.history.redo(); + }); + + $("#btnRelease").on("click",function () { + if (Object.prototype.toString.call(window.documentCategory) === '[object Array]' && window.documentCategory.length > 0) { + if ($("#markdown-save").hasClass('change')) { + var comfirm_result = confirm("编辑内容未保存，需要保存吗？") + if (comfirm_result) { + saveDocument(false, releaseBook); + return; + } + } + + releaseBook(); + } else { + layer.msg("没有需要发布的文档") + } + }); + + /** + * 实现自定义图片上传 + */ + window.editor.getModule('toolbar').addHandler('image',function () { + var input = document.createElement('input'); + input.setAttribute('type', 'file'); + input.click(); + + // Listen upload local image and save to server + input.onchange = function () { + var file = input.files[0]; + + // file type is only image. + if (/^image\//.test(file.type)) { + var form = new FormData(); + form.append('editormd-image-file', file, file.name); + + var layerIndex = 0; + + $.ajax({ + url: window.imageUploadURL, + type: "POST", + dataType: "json", + data: form, + processData: false, + contentType: false, + error: function() { + layer.close(layerIndex); + layer.msg("图片上传失败"); + }, + success: function(data) { + layer.close(layerIndex); + if(data.errcode !== 0){ + layer.msg(data.message); + }else{ + var range = window.editor.getSelection(); + editor.insertEmbed(range.index, 'image', data.url); + } + } + }); + } else { + console.warn('You could only upload images.'); + } + }; + }); + /** + * 实现保存 + */ + window.menu_save.on("click",function () {if($(this).hasClass('change')){saveDocument();}}); /** * 设置编辑器变更状态 * @param $is_change @@ -43,13 +112,14 @@ $(function () { if(res.errcode === 0){ window.isLoad = true; - window.editor.setContents([{ insert: res.data.content }]); + window.editor.root.innerHTML = res.data.content; // 将原始内容备份 window.source = res.data.content; var node = { "id" : res.data.doc_id,'parent' : res.data.parent_id === 0 ? '#' : res.data.parent_id ,"text" : res.data.doc_name,"identify" : res.data.identify,"version" : res.data.version}; pushDocumentCategory(node); window.selectNode = node; + window.isLoad = true; pushVueLists(res.data.attach); @@ -70,8 +140,9 @@ $(function () { var index = null; var node = window.selectNode; - var html = window.editor.getContents(); + var html = window.editor.root.innerHTML; + console.log(html) var content = ""; if($.trim(html) !== ""){ content = toMarkdown(html, { gfm: true }); @@ -111,10 +182,9 @@ $(function () { break; } } + resetEditorChanged(false); // 更新内容备份 window.source = res.data.content; - // 触发编辑器 onchange 回调函数 - window.editor.onchange(); if(typeof callback === "function"){ callback(); } @@ -231,8 +301,20 @@ $(function () { } }).on('loaded.jstree', function () { window.treeCatalog = $(this).jstree(); + var $select_node_id = window.treeCatalog.get_selected(); + if ($select_node_id) { + var $select_node = window.treeCatalog.get_node($select_node_id[0]) + if ($select_node) { + $select_node.node = { + id: $select_node.id + }; + + loadDocument($select_node); + } + } + }).on('select_node.jstree', function (node, selected, event) { - if(window.menu_save.hasClass('selected')) { + if(window.menu_save.hasClass('change')) { if(confirm("编辑内容未保存，需要保存吗？")){ saveDocument(false,function () { loadDocument(selected); @@ -242,7 +324,11 @@ $(function () { } loadDocument(selected); - }).on("move_node.jstree", jstree_save); + }).on("move_node.jstree", jstree_save) + .on("delete_node.jstree",function (node,parent) { + window.isLoad = true; + window.editor.root.innerHTML =''; + }); window.saveDocument = saveDocument; diff --git a/static/quill/quill.icons.js b/static/quill/quill.icons.js index 9e0d4ae2..47f6b397 100644 --- a/static/quill/quill.icons.js +++ b/static/quill/quill.icons.js @@ -1,7 +1,7 @@ (function () { var icons = Quill.import('ui/icons'); icons.header[3] = ''; icons.header[4] = '
{{.Title}}
-{{.Info}}
+ {{/*{{.Info}}
*/}}
-