修复编辑器滚动条BUG

controllers/document.go

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

models/book.go

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

static/css/markdown.css

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