From 84b947d1488e3ff0cac94f5cc0c47fac2d5d3723 Mon Sep 17 00:00:00 2001 From: zhanzhenping <128675240+Zzhenping@users.noreply.github.com> Date: Mon, 26 Aug 2024 13:38:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20#976=20=E8=AF=84=E8=AE=BA=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=A4=B4=E5=83=8F=20(#977)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: #976 评论增加头像 * fix: update cherry markdown read comment user to avatar style --- models/CommentModel.go | 16 ++++++------ static/css/kancloud.css | 7 ++++++ static/js/kancloud.js | 44 +++++++++++++++++++++------------ views/document/default_read.tpl | 8 +++--- 4 files changed, 48 insertions(+), 27 deletions(-) diff --git a/models/CommentModel.go b/models/CommentModel.go index 1ada1c09..109f273e 100644 --- a/models/CommentModel.go +++ b/models/CommentModel.go @@ -8,7 +8,7 @@ import ( "github.com/mindoc-org/mindoc/conf" ) -//Comment struct +// Comment struct type Comment struct { CommentId int `orm:"pk;auto;unique;column(comment_id)" json:"comment_id"` Floor int `orm:"column(floor);type(unsigned);default(0)" json:"floor"` @@ -30,11 +30,12 @@ type Comment struct { // UserAgent 评论者浏览器内容 UserAgent string `orm:"column(user_agent);size(500)" json:"user_agent"` // Parent 评论所属父级 - ParentId int `orm:"column(parent_id);type(int);default(0)" json:"parent_id"` - AgreeCount int `orm:"column(agree_count);type(int);default(0)" json:"agree_count"` - AgainstCount int `orm:"column(against_count);type(int);default(0)" json:"against_count"` - Index int `orm:"-" json:"index"` - ShowDel int `orm:"-" json:"show_del"` + ParentId int `orm:"column(parent_id);type(int);default(0)" json:"parent_id"` + AgreeCount int `orm:"column(agree_count);type(int);default(0)" json:"agree_count"` + AgainstCount int `orm:"column(against_count);type(int);default(0)" json:"against_count"` + Index int `orm:"-" json:"index"` + ShowDel int `orm:"-" json:"show_del"` + Avatar string `orm:"-" json:"avatar"` } // TableName 获取对应数据库表名. @@ -90,6 +91,7 @@ func (m *Comment) QueryCommentByDocumentId(doc_id, page, pagesize int, member *M comments[i].Index = (i + 1) + (page-1)*pagesize if member != nil && comments[i].CanDelete(member.MemberId, bookRole) { comments[i].ShowDel = 1 + comments[i].Avatar = member.Avatar } } return @@ -103,7 +105,7 @@ func (m *Comment) Update(cols ...string) error { return err } -//Insert 添加一条评论. +// Insert 添加一条评论. func (m *Comment) Insert() error { if m.DocumentId <= 0 { return errors.New("评论文档不存在") diff --git a/static/css/kancloud.css b/static/css/kancloud.css index 2c1f1ebf..04fe1db6 100644 --- a/static/css/kancloud.css +++ b/static/css/kancloud.css @@ -798,6 +798,13 @@ table>tbody>tr:hover { line-height: 24px } +.m-comment .comment-item .info img { + height: 22px; + border-radius: 50%; + margin-right: 4px; + display: ruby; +} + .m-comment .comment-item .vote { display: inline-block; margin-right: 12px diff --git a/static/js/kancloud.js b/static/js/kancloud.js index d6ebd370..f759cd85 100644 --- a/static/js/kancloud.js +++ b/static/js/kancloud.js @@ -77,26 +77,39 @@ function pageClicked($page, $docid) { }); } +function renderOperateSection(comment) { + const deleteIcon = comment.show_del == 1 + ? `` + : ''; + + return ` + + ${comment.index}# + ${deleteIcon} + `; +} + // 加载评论 function loadComment($page, $docid) { $("#commentList").empty(); - var html = "" - var c = $page.List; - for (var i = 0; c && i < c.length; i++) { - html += "
"; - html += "

" + c[i].author + "" + timeFormat(c[i].comment_date) + "

"; - html += "
" + c[i].content + "
"; - html += "

"; - if (c[i].show_del == 1) html += ""; - else html += ""; - html += "" + c[i].index + "#"; - if (c[i].show_del == 1) html += ""; - html += ""; - html += "

"; - html += "
"; + let html = "" + let c = $page.List; + for (let i = 0; c && i < c.length; i++) { + const comment = c[i]; + html += ` +
+

+ + ${comment.author} + ${timeFormat(comment.comment_date)} +

+
${comment.content}
+

+ ${renderOperateSection(comment)} +

+
`; } $("#commentList").append(html); - if ($page.TotalPage > 1) { $("#page").bootstrapPaginator({ currentPage: $page.PageNo, @@ -114,7 +127,6 @@ function loadComment($page, $docid) { // 删除评论 function onDelComment($id) { - console.log($id); $.ajax({ url: "/comment/delete", data: { "id": $id }, diff --git a/views/document/default_read.tpl b/views/document/default_read.tpl index 039daa3c..9f672345 100644 --- a/views/document/default_read.tpl +++ b/views/document/default_read.tpl @@ -35,7 +35,7 @@ window.IS_DOCUMENT_INDEX = '{{if .IS_DOCUMENT_INDEX}}true{{end}}' === 'true'; window.IS_DISPLAY_COMMENT = '{{if .Model.IsDisplayComment}}true{{end}}' === 'true'; - +