lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-06-28 15:45:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复编辑器滚动条BUG

Browse Source
This commit is contained in:
Minho 2017-05-12 11:41:59 +08:00
parent 095957eecf
commit b476567233
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
controllers/document.go
View File

@ -121,6 +121,7 @@ func (c *DocumentController) Index() {
c.Data["Title"] = "概要" c.Data["Title"] = "概要"
c.Data["Content"] = bookResult.Description c.Data["Content"] = bookResult.Description
} }
//阅读文档. //阅读文档.
func (c *DocumentController) Read() { func (c *DocumentController) Read() {
c.Prepare() c.Prepare()
@ -197,6 +198,7 @@ func (c *DocumentController) Edit() {
} }
bookResult := models.NewBookResult() bookResult := models.NewBookResult()
var err error
//如果是超级管理者，则不判断权限 //如果是超级管理者，则不判断权限
if c.Member.Role == conf.MemberSuperRole { if c.Member.Role == conf.MemberSuperRole {
book,err := models.NewBook().FindByFieldFirst("identify",identify) book,err := models.NewBook().FindByFieldFirst("identify",identify)
@ -206,7 +208,7 @@ func (c *DocumentController) Edit() {
bookResult = book.ToBookResult() bookResult = book.ToBookResult()
}else { }else {
bookResult, err := models.NewBookResult().FindByIdentify(identify, c.Member.MemberId) bookResult, err = models.NewBookResult().FindByIdentify(identify, c.Member.MemberId)
if err != nil { if err != nil {
beego.Error("DocumentController.Edit => ", err) beego.Error("DocumentController.Edit => ", err)
@ -227,6 +229,7 @@ func (c *DocumentController) Edit() {
}else{ }else{
c.TplName = "document/" + bookResult.Editor + "_edit_template.tpl" c.TplName = "document/" + bookResult.Editor + "_edit_template.tpl"
} }
beego.Info(bookResult)
c.Data["Model"] = bookResult c.Data["Model"] = bookResult

12
models/book.go
View File

@ -154,8 +154,8 @@ func (m *Book) FindToPager(pageIndex, pageSize ,memberId int) (books []*BookResu
qb.Select("COUNT(book.book_id) AS total_count"). qb.Select("COUNT(book.book_id) AS total_count").
From(m.TableNameWithPrefix() + " AS book"). From(m.TableNameWithPrefix() + " AS book").
LeftJoin(relationship.TableNameWithPrefix() + " AS rel"). LeftJoin(relationship.TableNameWithPrefix() + " AS rel").
On("book.book_id=rel.book_id"). On("book.book_id=rel.book_id AND rel.member_id = ?").
Where("rel.member_id=?") Where("rel.relationship_id > 0")
err = o.Raw(qb.String(),memberId).QueryRow(&totalCount) err = o.Raw(qb.String(),memberId).QueryRow(&totalCount)
@ -168,15 +168,15 @@ func (m *Book) FindToPager(pageIndex, pageSize ,memberId int) (books []*BookResu
qb2.Select("book.*,rel.member_id","rel.role_id","m.account as create_name"). qb2.Select("book.*,rel.member_id","rel.role_id","m.account as create_name").
From(m.TableNameWithPrefix() + " AS book"). From(m.TableNameWithPrefix() + " AS book").
LeftJoin(relationship.TableNameWithPrefix() + " AS rel").On("book.book_id=rel.book_id"). LeftJoin(relationship.TableNameWithPrefix() + " AS rel").On("book.book_id=rel.book_id AND rel.member_id = ?").
LeftJoin(relationship.TableNameWithPrefix() + " AS rel1").On("book.book_id=rel1.book_id AND rel.role_id=0"). LeftJoin(relationship.TableNameWithPrefix() + " AS rel1").On("book.book_id=rel1.book_id AND rel1.role_id=0").
LeftJoin(NewMember().TableNameWithPrefix() + " AS m").On("rel1.member_id=m.member_id"). LeftJoin(NewMember().TableNameWithPrefix() + " AS m").On("rel1.member_id=m.member_id").
Where("rel.member_id=?"). Where("rel.relationship_id > 0").
OrderBy("book.order_index DESC ","book.book_id").Desc(). OrderBy("book.order_index DESC ","book.book_id").Desc().
Limit(pageSize). Limit(pageSize).
Offset(offset) Offset(offset)
//logs.Info("",qb2.String()) logs.Info("",qb2.String())
_,err = o.Raw(qb2.String(),memberId).QueryRows(&books) _,err = o.Raw(qb2.String(),memberId).QueryRows(&books)
if err != nil { if err != nil {
logs.Error("分页查询项目列表 => ",err) logs.Error("分页查询项目列表 => ",err)

7
static/css/markdown.css
View File

@ -49,6 +49,13 @@ body{
} }
.manual-category .manual-tree{ .manual-category .manual-tree{
margin-top: 10px; margin-top: 10px;
width: 280px;
position: absolute;
top: 30px;
right: 0;
left: 0;
bottom: 0;
overflow-y: auto;
} }
.manual-category .manual-nav .nav-item{ .manual-category .manual-nav .nav-item{
font-size: 14px; font-size: 14px;