From 152d71a5a0d0f85f964eb4c98d7d7365dfe1c8e2 Mon Sep 17 00:00:00 2001
From: Minho <longfei6671@163.com>
Date: Wed, 6 Jun 2018 20:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E9=A1=B5=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/{book_result.go => BookResult.go}      |  0
 ...rt_book_result.go => ConvertBookResult.go} |  0
 ...document_history.go => DocumentHistory.go} |  0
 models/{document.go => DocumentModel.go}      |  9 +++++--
 ...arch_result.go => DocumentSearchResult.go} |  0
 models/{document_tree.go => DocumentTree.go}  | 24 +++++++++----------
 models/{errors.go => Errors.go}               |  0
 models/{label.go => LabelModel.go}            |  0
 models/{logs.go => Logs.go}                   |  0
 models/{member.go => Member.go}               |  0
 models/{member_result.go => MemberResult.go}  |  0
 models/{member_token.go => MemberToken.go}    |  0
 models/{migrations.go => Migrations.go}       |  0
 models/{options.go => Options.go}             |  0
 models/{relationship.go => Relationship.go}   |  0
 static/js/kancloud.js                         |  3 +++
 16 files changed, 22 insertions(+), 14 deletions(-)
 rename models/{book_result.go => BookResult.go} (100%)
 rename models/{convert_book_result.go => ConvertBookResult.go} (100%)
 rename models/{document_history.go => DocumentHistory.go} (100%)
 rename models/{document.go => DocumentModel.go} (93%)
 rename models/{document_search_result.go => DocumentSearchResult.go} (100%)
 rename models/{document_tree.go => DocumentTree.go} (77%)
 rename models/{errors.go => Errors.go} (100%)
 rename models/{label.go => LabelModel.go} (100%)
 rename models/{logs.go => Logs.go} (100%)
 rename models/{member.go => Member.go} (100%)
 rename models/{member_result.go => MemberResult.go} (100%)
 rename models/{member_token.go => MemberToken.go} (100%)
 rename models/{migrations.go => Migrations.go} (100%)
 rename models/{options.go => Options.go} (100%)
 rename models/{relationship.go => Relationship.go} (100%)

diff --git a/models/book_result.go b/models/BookResult.go
similarity index 100%
rename from models/book_result.go
rename to models/BookResult.go
diff --git a/models/convert_book_result.go b/models/ConvertBookResult.go
similarity index 100%
rename from models/convert_book_result.go
rename to models/ConvertBookResult.go
diff --git a/models/document_history.go b/models/DocumentHistory.go
similarity index 100%
rename from models/document_history.go
rename to models/DocumentHistory.go
diff --git a/models/document.go b/models/DocumentModel.go
similarity index 93%
rename from models/document.go
rename to models/DocumentModel.go
index d5131382..b1214acd 100644
--- a/models/document.go
+++ b/models/DocumentModel.go
@@ -90,10 +90,15 @@ func (m *Document) InsertOrUpdate(cols ...string) error {
 		if m.Identify == "" {
 			book := NewBook()
 			identify := "docs"
-			if err := o.QueryTable(book.TableNameWithPrefix()).One(book,"identify");err == nil {
+			if err := o.QueryTable(book.TableNameWithPrefix()).Filter("book_id",m.BookId).One(book,"identify");err == nil {
 				identify = book.Identify
 			}
-			m.Identify = fmt.Sprintf("%s-%d%d",identify,m.BookId,time.Now().Unix())
+
+			m.Identify = fmt.Sprintf("%s-%s",identify,strconv.FormatInt(time.Now().UnixNano(), 32))
+		}
+		if m.OrderSort == 0{
+			sort,_ := o.QueryTable(m.TableNameWithPrefix()).Filter("book_id",m.BookId).Filter("parent_id",m.ParentId).Count()
+			m.OrderSort = int(sort) + 1
 		}
 		_, err = o.Insert(m)
 		NewBook().ResetDocumentNumber(m.BookId)
diff --git a/models/document_search_result.go b/models/DocumentSearchResult.go
similarity index 100%
rename from models/document_search_result.go
rename to models/DocumentSearchResult.go
diff --git a/models/document_tree.go b/models/DocumentTree.go
similarity index 77%
rename from models/document_tree.go
rename to models/DocumentTree.go
index 39e8d7cd..30d126c2 100644
--- a/models/document_tree.go
+++ b/models/DocumentTree.go
@@ -25,19 +25,19 @@ type DocumentSelected struct {
 }
 
 //获取项目的文档树状结构
-func (m *Document) FindDocumentTree(book_id int) ([]*DocumentTree, error) {
+func (m *Document) FindDocumentTree(bookId int) ([]*DocumentTree, error) {
 	o := orm.NewOrm()
 
 	trees := make([]*DocumentTree, 0)
 
 	var docs []*Document
 
-	count, err := o.QueryTable(m).Filter("book_id", book_id).OrderBy("order_sort", "document_id").Limit(math.MaxInt32).All(&docs, "document_id", "version", "document_name", "parent_id", "identify")
+	count, err := o.QueryTable(m).Filter("book_id", bookId).OrderBy("order_sort", "document_id").Limit(math.MaxInt32).All(&docs, "document_id", "version", "document_name", "parent_id", "identify")
 
 	if err != nil {
 		return trees, err
 	}
-	book, _ := NewBook().Find(book_id)
+	book, _ := NewBook().Find(bookId)
 
 	trees = make([]*DocumentTree, count)
 
@@ -64,16 +64,16 @@ func (m *Document) FindDocumentTree(book_id int) ([]*DocumentTree, error) {
 	return trees, nil
 }
 
-func (m *Document) CreateDocumentTreeForHtml(book_id, selected_id int) (string, error) {
-	trees, err := m.FindDocumentTree(book_id)
+func (m *Document) CreateDocumentTreeForHtml(bookId, selectedId int) (string, error) {
+	trees, err := m.FindDocumentTree(bookId)
 	if err != nil {
 		return "", err
 	}
-	parentId := getSelectedNode(trees, selected_id)
+	parentId := getSelectedNode(trees, selectedId)
 
 	buf := bytes.NewBufferString("")
 
-	getDocumentTree(trees, 0, selected_id, parentId, buf)
+	getDocumentTree(trees, 0, selectedId, parentId, buf)
 
 	return buf.String(), nil
 
@@ -92,7 +92,7 @@ func getSelectedNode(array []*DocumentTree, parent_id int) int {
 	return 0
 }
 
-func getDocumentTree(array []*DocumentTree, parent_id int, selected_id int, selected_parent_id int, buf *bytes.Buffer) {
+func getDocumentTree(array []*DocumentTree, parentId int, selectedId int, selectedParentId int, buf *bytes.Buffer) {
 	buf.WriteString("<ul>")
 
 	for _, item := range array {
@@ -101,14 +101,14 @@ func getDocumentTree(array []*DocumentTree, parent_id int, selected_id int, sele
 		if p, ok := item.ParentId.(int); ok {
 			pid = p
 		}
-		if pid == parent_id {
+		if pid == parentId {
 
 			selected := ""
-			if item.DocumentId == selected_id {
+			if item.DocumentId == selectedId {
 				selected = ` class="jstree-clicked"`
 			}
 			selected_li := ""
-			if item.DocumentId == selected_parent_id {
+			if item.DocumentId == selectedParentId {
 				selected_li = ` class="jstree-open"`
 			}
 			buf.WriteString("<li id=\"")
@@ -130,7 +130,7 @@ func getDocumentTree(array []*DocumentTree, parent_id int, selected_id int, sele
 
 			for _, sub := range array {
 				if p, ok := sub.ParentId.(int); ok && p == item.DocumentId {
-					getDocumentTree(array, p, selected_id, selected_parent_id, buf)
+					getDocumentTree(array, p, selectedId, selectedParentId, buf)
 					break
 				}
 			}
diff --git a/models/errors.go b/models/Errors.go
similarity index 100%
rename from models/errors.go
rename to models/Errors.go
diff --git a/models/label.go b/models/LabelModel.go
similarity index 100%
rename from models/label.go
rename to models/LabelModel.go
diff --git a/models/logs.go b/models/Logs.go
similarity index 100%
rename from models/logs.go
rename to models/Logs.go
diff --git a/models/member.go b/models/Member.go
similarity index 100%
rename from models/member.go
rename to models/Member.go
diff --git a/models/member_result.go b/models/MemberResult.go
similarity index 100%
rename from models/member_result.go
rename to models/MemberResult.go
diff --git a/models/member_token.go b/models/MemberToken.go
similarity index 100%
rename from models/member_token.go
rename to models/MemberToken.go
diff --git a/models/migrations.go b/models/Migrations.go
similarity index 100%
rename from models/migrations.go
rename to models/Migrations.go
diff --git a/models/options.go b/models/Options.go
similarity index 100%
rename from models/options.go
rename to models/Options.go
diff --git a/models/relationship.go b/models/Relationship.go
similarity index 100%
rename from models/relationship.go
rename to models/Relationship.go
diff --git a/static/js/kancloud.js b/static/js/kancloud.js
index 2229dc2f..ec916fd3 100644
--- a/static/js/kancloud.js
+++ b/static/js/kancloud.js
@@ -61,6 +61,9 @@ function loadDocument($url, $id, $callback) {
         },
         complete : function () {
             NProgress.done();
+        },
+        error : function () {
+            layer.msg("加载失败");
         }
     });
 }