评论功能修复

pull/794/head
玖亖伍 2022-05-14 20:54:59 +08:00
parent 5661157f14
commit 07204d6d7f
5 changed files with 731 additions and 4 deletions

View File

@ -67,6 +67,11 @@ func (c *DocumentController) Index() {
c.Data["Content"] = template.HTML(doc.Release) c.Data["Content"] = template.HTML(doc.Release)
c.Data["Description"] = utils.AutoSummary(doc.Release, 120) c.Data["Description"] = utils.AutoSummary(doc.Release, 120)
// 获取评论、分页
comments, count, _ := models.NewComment().QueryCommentByDocumentId(doc.DocumentId, 1, conf.PageSize, c.Member)
page := pagination.PageUtil(int(count), 1, conf.PageSize, comments)
c.Data["Page"] = page
} }
} else { } else {
c.Data["Title"] = i18n.Tr(c.Lang, "blog.summary") c.Data["Title"] = i18n.Tr(c.Lang, "blog.summary")
@ -83,6 +88,7 @@ func (c *DocumentController) Index() {
c.ShowErrorPage(500, i18n.Tr(c.Lang, "message.build_doc_tree_error")) c.ShowErrorPage(500, i18n.Tr(c.Lang, "message.build_doc_tree_error"))
} }
} }
c.Data["IS_DOCUMENT_INDEX"] = true
c.Data["Model"] = bookResult c.Data["Model"] = bookResult
c.Data["Result"] = template.HTML(tree) c.Data["Result"] = template.HTML(tree)
@ -96,8 +102,6 @@ func (c *DocumentController) Read() {
token := c.GetString("token") token := c.GetString("token")
id := c.GetString(":id") id := c.GetString(":id")
c.Data["DocumentId"] = id
if identify == "" || id == "" { if identify == "" || id == "" {
c.ShowErrorPage(404, i18n.Tr(c.Lang, "message.item_not_exist")) c.ShowErrorPage(404, i18n.Tr(c.Lang, "message.item_not_exist"))
} }
@ -150,12 +154,16 @@ func (c *DocumentController) Read() {
if c.IsAjax() { if c.IsAjax() {
var data struct { var data struct {
DocId int `json:"doc_id"`
DocIdentify string `json:"doc_identify"`
DocTitle string `json:"doc_title"` DocTitle string `json:"doc_title"`
Body string `json:"body"` Body string `json:"body"`
Title string `json:"title"` Title string `json:"title"`
Version int64 `json:"version"` Version int64 `json:"version"`
ViewCount int `json:"view_count"` ViewCount int `json:"view_count"`
} }
data.DocId = doc.DocumentId
data.DocIdentify = doc.Identify
data.DocTitle = doc.DocumentName data.DocTitle = doc.DocumentName
data.Body = doc.Release data.Body = doc.Release
data.Title = doc.DocumentName + " - Powered by MinDoc" data.Title = doc.DocumentName + " - Powered by MinDoc"
@ -163,6 +171,13 @@ func (c *DocumentController) Read() {
data.ViewCount = doc.ViewCount data.ViewCount = doc.ViewCount
c.JsonResult(0, "ok", data) c.JsonResult(0, "ok", data)
} else {
c.Data["DocumentId"] = doc.DocumentId
c.Data["DocIdentify"] = doc.Identify
// 获取评论、分页
comments, count, _ := models.NewComment().QueryCommentByDocumentId(doc.DocumentId, 1, conf.PageSize, c.Member)
page := pagination.PageUtil(int(count), 1, conf.PageSize, comments)
c.Data["Page"] = page
} }
tree, err := models.NewDocument().CreateDocumentTreeForHtml(bookResult.BookId, doc.DocumentId) tree, err := models.NewDocument().CreateDocumentTreeForHtml(bookResult.BookId, doc.DocumentId)

View File

@ -0,0 +1,657 @@
/**
* bootstrap-paginator.js v0.5
* --
* Copyright 2013 Yun Lai <lyonlai1984@gmail.com>
* --
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
(function ($) {
"use strict"; // jshint ;_;
/* Paginator PUBLIC CLASS DEFINITION
* ================================= */
/**
* Boostrap Paginator Constructor
*
* @param element element of the paginator
* @param options the options to config the paginator
*
* */
var BootstrapPaginator = function (element, options) {
this.init(element, options);
},
old = null;
BootstrapPaginator.prototype = {
/**
* Initialization function of the paginator, accepting an element and the options as parameters
*
* @param element element of the paginator
* @param options the options to config the paginator
*
* */
init: function (element, options) {
this.$element = $(element);
var version = (options && options.bootstrapMajorVersion) ? options.bootstrapMajorVersion : $.fn.bootstrapPaginator.defaults.bootstrapMajorVersion,
id = this.$element.attr("id");
if (version === 2 && !this.$element.is("div")) {
throw "in Bootstrap version 2 the pagination must be a div element. Or if you are using Bootstrap pagination 3. Please specify it in bootstrapMajorVersion in the option";
} else if (version > 2 && !this.$element.is("ul")) {
throw "in Bootstrap version 3 the pagination root item must be an ul element."
}
this.currentPage = 1;
this.lastPage = 1;
this.setOptions(options);
this.initialized = true;
},
/**
* Update the properties of the paginator element
*
* @param options options to config the paginator
* */
setOptions: function (options) {
this.options = $.extend({}, (this.options || $.fn.bootstrapPaginator.defaults), options);
this.totalPages = parseInt(this.options.totalPages, 10); //setup the total pages property.
this.numberOfPages = parseInt(this.options.numberOfPages, 10); //setup the numberOfPages to be shown
//move the set current page after the setting of total pages. otherwise it will cause out of page exception.
if (options && typeof (options.currentPage) !== 'undefined') {
this.setCurrentPage(options.currentPage);
}
this.listen();
//render the paginator
this.render();
if (!this.initialized && this.lastPage !== this.currentPage) {
this.$element.trigger("page-changed", [this.lastPage, this.currentPage]);
}
},
/**
* Sets up the events listeners. Currently the pageclicked and pagechanged events are linked if available.
*
* */
listen: function () {
this.$element.off("page-clicked");
this.$element.off("page-changed");// unload the events for the element
if (typeof (this.options.onPageClicked) === "function") {
this.$element.bind("page-clicked", this.options.onPageClicked);
}
if (typeof (this.options.onPageChanged) === "function") {
this.$element.on("page-changed", this.options.onPageChanged);
}
this.$element.bind("page-clicked", this.onPageClicked);
},
/**
*
* Destroys the paginator element, it unload the event first, then empty the content inside.
*
* */
destroy: function () {
this.$element.off("page-clicked");
this.$element.off("page-changed");
this.$element.removeData('bootstrapPaginator');
this.$element.empty();
},
/**
* Shows the page
*
* */
show: function (page) {
this.setCurrentPage(page);
this.render();
if (this.lastPage !== this.currentPage) {
this.$element.trigger("page-changed", [this.lastPage, this.currentPage]);
}
},
/**
* Shows the next page
*
* */
showNext: function () {
var pages = this.getPages();
if (pages.next) {
this.show(pages.next);
}
},
/**
* Shows the previous page
*
* */
showPrevious: function () {
var pages = this.getPages();
if (pages.prev) {
this.show(pages.prev);
}
},
/**
* Shows the first page
*
* */
showFirst: function () {
var pages = this.getPages();
if (pages.first) {
this.show(pages.first);
}
},
/**
* Shows the last page
*
* */
showLast: function () {
var pages = this.getPages();
if (pages.last) {
this.show(pages.last);
}
},
/**
* Internal on page item click handler, when the page item is clicked, change the current page to the corresponding page and
* trigger the pageclick event for the listeners.
*
*
* */
onPageItemClicked: function (event) {
var type = event.data.type,
page = event.data.page;
this.$element.trigger("page-clicked", [event, type, page]);
},
onPageClicked: function (event, originalEvent, type, page) {
//show the corresponding page and retrieve the newly built item related to the page clicked before for the event return
var currentTarget = $(event.currentTarget);
switch (type) {
case "first":
currentTarget.bootstrapPaginator("showFirst");
break;
case "prev":
currentTarget.bootstrapPaginator("showPrevious");
break;
case "next":
currentTarget.bootstrapPaginator("showNext");
break;
case "last":
currentTarget.bootstrapPaginator("showLast");
break;
case "page":
currentTarget.bootstrapPaginator("show", page);
break;
}
},
/**
* Renders the paginator according to the internal properties and the settings.
*
*
* */
render: function () {
//fetch the container class and add them to the container
var containerClass = this.getValueFromOption(this.options.containerClass, this.$element),
size = this.options.size || "normal",
alignment = this.options.alignment || "left",
pages = this.getPages(),
listContainer = this.options.bootstrapMajorVersion === 2 ? $("<ul></ul>") : this.$element,
listContainerClass = this.options.bootstrapMajorVersion === 2 ? this.getValueFromOption(this.options.listContainerClass, listContainer) : null,
first = null,
prev = null,
next = null,
last = null,
p = null,
i = 0;
this.$element.prop("class", "");
this.$element.addClass("pagination");
switch (size.toLowerCase()) {
case "large":
case "small":
case "mini":
this.$element.addClass($.fn.bootstrapPaginator.sizeArray[this.options.bootstrapMajorVersion][size.toLowerCase()]);
break;
default:
break;
}
if (this.options.bootstrapMajorVersion === 2) {
switch (alignment.toLowerCase()) {
case "center":
this.$element.addClass("pagination-centered");
break;
case "right":
this.$element.addClass("pagination-right");
break;
default:
break;
}
}
this.$element.addClass(containerClass);
//empty the outter most container then add the listContainer inside.
this.$element.empty();
if (this.options.bootstrapMajorVersion === 2) {
this.$element.append(listContainer);
listContainer.addClass(listContainerClass);
}
//update the page element reference
this.pageRef = [];
if (pages.first) {//if the there is first page element
first = this.buildPageItem("first", pages.first);
if (first) {
listContainer.append(first);
}
}
if (pages.prev) {//if the there is previous page element
prev = this.buildPageItem("prev", pages.prev);
if (prev) {
listContainer.append(prev);
}
}
for (i = 0; i < pages.length; i = i + 1) {//fill the numeric pages.
p = this.buildPageItem("page", pages[i]);
if (p) {
listContainer.append(p);
}
}
if (pages.next) {//if there is next page
next = this.buildPageItem("next", pages.next);
if (next) {
listContainer.append(next);
}
}
if (pages.last) {//if there is last page
last = this.buildPageItem("last", pages.last);
if (last) {
listContainer.append(last);
}
}
},
/**
*
* Creates a page item base on the type and page number given.
*
* @param page page number
* @param type type of the page, whether it is the first, prev, page, next, last
*
* @return Object the constructed page element
* */
buildPageItem: function (type, page) {
var itemContainer = $("<li></li>"),//creates the item container
itemContent = $("<a></a>"),//creates the item content
text = "",
title = "",
itemContainerClass = this.options.itemContainerClass(type, page, this.currentPage),
itemContentClass = this.getValueFromOption(this.options.itemContentClass, type, page, this.currentPage),
tooltipOpts = null;
switch (type) {
case "first":
if (!this.getValueFromOption(this.options.shouldShowPage, type, page, this.currentPage)) { return; }
text = this.options.itemTexts(type, page, this.currentPage);
title = this.options.tooltipTitles(type, page, this.currentPage);
break;
case "last":
if (!this.getValueFromOption(this.options.shouldShowPage, type, page, this.currentPage)) { return; }
text = this.options.itemTexts(type, page, this.currentPage);
title = this.options.tooltipTitles(type, page, this.currentPage);
break;
case "prev":
if (!this.getValueFromOption(this.options.shouldShowPage, type, page, this.currentPage)) { return; }
text = this.options.itemTexts(type, page, this.currentPage);
title = this.options.tooltipTitles(type, page, this.currentPage);
break;
case "next":
if (!this.getValueFromOption(this.options.shouldShowPage, type, page, this.currentPage)) { return; }
text = this.options.itemTexts(type, page, this.currentPage);
title = this.options.tooltipTitles(type, page, this.currentPage);
break;
case "page":
if (!this.getValueFromOption(this.options.shouldShowPage, type, page, this.currentPage)) { return; }
text = this.options.itemTexts(type, page, this.currentPage);
title = this.options.tooltipTitles(type, page, this.currentPage);
break;
}
itemContainer.addClass(itemContainerClass).append(itemContent);
itemContent.addClass(itemContentClass).html(text).on("click", null, {type: type, page: page}, $.proxy(this.onPageItemClicked, this));
if (this.options.pageUrl) {
itemContent.attr("href", this.getValueFromOption(this.options.pageUrl, type, page, this.currentPage));
}
if (this.options.useBootstrapTooltip) {
tooltipOpts = $.extend({}, this.options.bootstrapTooltipOptions, {title: title});
itemContent.tooltip(tooltipOpts);
} else {
itemContent.attr("title", title);
}
return itemContainer;
},
setCurrentPage: function (page) {
if (page > this.totalPages || page < 1) {// if the current page is out of range, throw exception.
throw "Page out of range";
}
this.lastPage = this.currentPage;
this.currentPage = parseInt(page, 10);
},
/**
* Gets an array that represents the current status of the page object. Numeric pages can be access via array mode. length attributes describes how many numeric pages are there. First, previous, next and last page can be accessed via attributes first, prev, next and last. Current attribute marks the current page within the pages.
*
* @return object output objects that has first, prev, next, last and also the number of pages in between.
* */
getPages: function () {
var totalPages = this.totalPages,// get or calculate the total pages via the total records
pageStart = (this.currentPage % this.numberOfPages === 0) ? (parseInt(this.currentPage / this.numberOfPages, 10) - 1) * this.numberOfPages + 1 : parseInt(this.currentPage / this.numberOfPages, 10) * this.numberOfPages + 1,//calculates the start page.
output = [],
i = 0,
counter = 0;
pageStart = pageStart < 1 ? 1 : pageStart;//check the range of the page start to see if its less than 1.
for (i = pageStart, counter = 0; counter < this.numberOfPages && i <= totalPages; i = i + 1, counter = counter + 1) {//fill the pages
output.push(i);
}
output.first = 1;//add the first when the current page leaves the 1st page.
if (this.currentPage > 1) {// add the previous when the current page leaves the 1st page
output.prev = this.currentPage - 1;
} else {
output.prev = 1;
}
if (this.currentPage < totalPages) {// add the next page when the current page doesn't reach the last page
output.next = this.currentPage + 1;
} else {
output.next = totalPages;
}
output.last = totalPages;// add the last page when the current page doesn't reach the last page
output.current = this.currentPage;//mark the current page.
output.total = totalPages;
output.numberOfPages = this.options.numberOfPages;
return output;
},
/**
* Gets the value from the options, this is made to handle the situation where value is the return value of a function.
*
* @return mixed value that depends on the type of parameters, if the given parameter is a function, then the evaluated result is returned. Otherwise the parameter itself will get returned.
* */
getValueFromOption: function (value) {
var output = null,
args = Array.prototype.slice.call(arguments, 1);
if (typeof value === 'function') {
output = value.apply(this, args);
} else {
output = value;
}
return output;
}
};
/* TYPEAHEAD PLUGIN DEFINITION
* =========================== */
old = $.fn.bootstrapPaginator;
$.fn.bootstrapPaginator = function (option) {
var args = arguments,
result = null;
$(this).each(function (index, item) {
var $this = $(item),
data = $this.data('bootstrapPaginator'),
options = (typeof option !== 'object') ? null : option;
if (!data) {
data = new BootstrapPaginator(this, options);
$this = $(data.$element);
$this.data('bootstrapPaginator', data);
return;
}
if (typeof option === 'string') {
if (data[option]) {
result = data[option].apply(data, Array.prototype.slice.call(args, 1));
} else {
throw "Method " + option + " does not exist";
}
} else {
result = data.setOptions(option);
}
});
return result;
};
$.fn.bootstrapPaginator.sizeArray = {
"2": {
"large": "pagination-large",
"small": "pagination-small",
"mini": "pagination-mini"
},
"3": {
"large": "pagination-lg",
"small": "pagination-sm",
"mini": ""
}
};
$.fn.bootstrapPaginator.defaults = {
containerClass: "",
size: "normal",
alignment: "left",
bootstrapMajorVersion: 2,
listContainerClass: "",
itemContainerClass: function (type, page, current) {
return (page === current) ? "active" : "";
},
itemContentClass: function (type, page, current) {
return "";
},
currentPage: 1,
numberOfPages: 5,
totalPages: 1,
pageUrl: function (type, page, current) {
return null;
},
onPageClicked: null,
onPageChanged: null,
useBootstrapTooltip: false,
shouldShowPage: function (type, page, current) {
var result = true;
switch (type) {
case "first":
result = (current !== 1);
break;
case "prev":
result = (current !== 1);
break;
case "next":
result = (current !== this.totalPages);
break;
case "last":
result = (current !== this.totalPages);
break;
case "page":
result = true;
break;
}
return result;
},
itemTexts: function (type, page, current) {
switch (type) {
case "first":
return "&lt;&lt;";
case "prev":
return "&lt;";
case "next":
return "&gt;";
case "last":
return "&gt;&gt;";
case "page":
return page;
}
},
tooltipTitles: function (type, page, current) {
switch (type) {
case "first":
return "Go to first page";
case "prev":
return "Go to previous page";
case "next":
return "Go to next page";
case "last":
return "Go to last page";
case "page":
return (page === current) ? "Current page is " + page : "Go to page " + page;
}
},
bootstrapTooltipOptions: {
animation: true,
html: true,
placement: 'top',
selector: false,
title: "",
container: false
}
};
$.fn.bootstrapPaginator.Constructor = BootstrapPaginator;
}(window.jQuery));

File diff suppressed because one or more lines are too long

View File

@ -60,6 +60,7 @@ function timeFormat($time) {
// 点击翻页 // 点击翻页
function pageClicked($page, $docid) { function pageClicked($page, $docid) {
$("#articleComment").removeClass('not-show-comment');
$.ajax({ $.ajax({
url : "/comment/lists?page=" + $page + "&docid=" + $docid, url : "/comment/lists?page=" + $page + "&docid=" + $docid,
type : "GET", type : "GET",
@ -137,7 +138,12 @@ function renderPage($data) {
$("#article-info").text($data.doc_info); $("#article-info").text($data.doc_info);
$("#view_count").text("阅读次数:" + $data.view_count); $("#view_count").text("阅读次数:" + $data.view_count);
$("#doc_id").val($data.doc_id); $("#doc_id").val($data.doc_id);
loadComment($data.page, $data.doc_id); if ($data.page) {
loadComment($data.page, $data.doc_id);
}
else {
pageClicked(-1, $data.doc_id);
}
} }
/*** /***

View File

@ -31,6 +31,7 @@
<script type="text/javascript"> <script type="text/javascript">
window.IS_ENABLE_IFRAME = '{{conf "enable_iframe" }}' === 'true'; window.IS_ENABLE_IFRAME = '{{conf "enable_iframe" }}' === 'true';
window.BASE_URL = '{{urlfor "HomeController.Index" }}'; window.BASE_URL = '{{urlfor "HomeController.Index" }}';
window.IS_DOCUMENT_INDEX = '{{if .IS_DOCUMENT_INDEX}}true{{end}}' === 'true';
</script> </script>
<script type="text/javascript">window.book={"identify":"{{.Model.Identify}}"};</script> <script type="text/javascript">window.book={"identify":"{{.Model.Identify}}"};</script>
<style> <style>
@ -40,6 +41,10 @@
top: 10px; top: 10px;
} }
.not-show-comment {
display: none;
}
@media screen and (min-width: 840px) { @media screen and (min-width: 840px) {
.btn-mobile{ .btn-mobile{
display: none; display: none;
@ -174,6 +179,45 @@
<div class="article-body {{if eq .Model.Editor "markdown"}}markdown-body editormd-preview-container{{else}}editor-content{{end}}" id="page-content"> <div class="article-body {{if eq .Model.Editor "markdown"}}markdown-body editormd-preview-container{{else}}editor-content{{end}}" id="page-content">
{{.Content}} {{.Content}}
</div> </div>
{{if .Model.IsDisplayComment}}
<div id="articleComment" class="m-comment{{if .IS_DOCUMENT_INDEX}} not-show-comment{{end}}">
<!-- 评论列表 -->
<div class="comment-list" id="commentList">
{{range $i, $c := .Page.List}}
<div class="comment-item" data-id="{{$c.CommentId}}">
<p class="info"><a class="name">{{$c.Author}}</a><span class="date">{{date $c.CommentDate "Y-m-d H:i:s"}}</span></p>
<div class="content">{{$c.Content}}</div>
<p class="util">
<span class="operate {{if eq $c.ShowDel 1}}toggle{{end}}">
<span class="number">{{$c.Index}}#</span>
{{if eq $c.ShowDel 1}}
<i class="delete e-delete glyphicon glyphicon-remove" style="color:red" onclick="onDelComment({{$c.CommentId}})"></i>
{{end}}
</span>
</p>
</div>
{{end}}
</div>
<!-- 翻页 -->
<ul id="page"></ul>
<!-- 发表评论 -->
<div class="comment-post">
<form class="form" id="commentForm" action="{{urlfor "CommentController.Create"}}" method="post">
<label class="enter w-textarea textarea-full">
<textarea class="textarea-input form-control" name="content" id="commentContent" placeholder="文明上网,理性发言" style="height: 72px;"></textarea>
<input type="hidden" name="doc_id" id="doc_id" value="{{.DocumentId}}">
</label>
<div class="pull-right">
<button class="btn btn-success btn-sm" type="submit" id="btnSubmitComment" data-loading-text="提交中...">提交评论</button>
</div>
</form>
</div>
</div>
{{end}}
<div class="jump-top"> <div class="jump-top">
<a href="javascript:;" class="view-backtop"><i class="fa fa-arrow-up" aria-hidden="true"></i></a> <a href="javascript:;" class="view-backtop"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
</div> </div>
@ -246,6 +290,7 @@
<script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script> <script src="{{cdnjs "/static/jquery/1.12.4/jquery.min.js"}}"></script>
<script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script> <script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script>
<script src="{{cdnjs "/static/bootstrap-paginator/bootstrap-paginator.min.js"}}"></script>
<script src="{{cdnjs "/static/js/jquery.form.js"}}" type="text/javascript"></script> <script src="{{cdnjs "/static/js/jquery.form.js"}}" type="text/javascript"></script>
<script src="{{cdnjs "/static/layer/layer.js"}}" type="text/javascript"></script> <script src="{{cdnjs "/static/layer/layer.js"}}" type="text/javascript"></script>
<script src="{{cdnjs "/static/jstree/3.3.4/jstree.min.js"}}" type="text/javascript"></script> <script src="{{cdnjs "/static/jstree/3.3.4/jstree.min.js"}}" type="text/javascript"></script>
@ -303,7 +348,10 @@ $(function () {
$(this).find('i').attr("class","fa fa-angle-down") $(this).find('i').attr("class","fa fa-angle-down")
window.jsTree.jstree().open_all() window.jsTree.jstree().open_all()
} }
}) });
if (!window.IS_DOCUMENT_INDEX) {
pageClicked(-1, parseInt($('#doc_id').val()));
}
}); });
</script> </script>
{{.Scripts}} {{.Scripts}}