lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-10-21 11:27:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Minho
2018-01-18 14:17:10 +08:00
parent 763ea81bdf 9440aff51f
commit 848d3752e3
25 changed files with 1106 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitattributes vendored Normal file
View File

@@ -0,0 +1,3 @@
*.js linguist-language=Go
*.css linguist-language=Go
./.env

7
.travis.yml
View File

@@ -13,7 +13,8 @@ before_install:
- go get github.com/golang/freetype
script:
- go get -t -v ./...
- curl https://glide.sh/get | sh
- glide update
- GO_ENABLED=1 go build -v -x -tags "pam" && go install
before_deploy:
@@ -22,9 +23,7 @@ before_deploy:
- rm -rf commands controllers models modules data routers tasks vendor docs search utils graphics .git Godeps uploads/* .gitignore .travis.yml Dockerfile gide.yaml LICENSE main.go README.md conf/enumerate.go conf/mail.go install.lock *.md
- cp conf/app.conf.example conf/app.conf
- zip -r mindoc_linux_amd64.zip conf logs static uploads views lib mindoc_linux_amd64
- zip -r mindoc_darwin_amd64.zip conf logs static uploads views lib mindoc_darwin_amd64
- zip -r mindoc_windows_amd64.zip conf logs static uploads views lib mindoc_windows_amd64.exe
- zip -r mindoc_windows_i386.zip conf logs static uploads views lib mindoc_windows_i386.exe
deploy:

15
Dockerfile
View File

@@ -1,18 +1,19 @@
FROM golang:1.8.1-alpine
FROM golang:1.8.3-alpine3.6
# add china aliyun repo 新增了 alpine 3.6 的阿里源
RUN cp /etc/apk/repositories /etc/apk/repositories.back && \
echo "https://mirrors.aliyun.com/alpine/v3.6/main/" > /etc/apk/repositories && \
echo "https://mirrors.aliyun.com/alpine/v3.6/community/" >> /etc/apk/repositories
RUN apk add --update bash git make gcc
RUN apk add --update bash git make gcc g++
ADD . /go/src/github.com/lifei6671/mindoc
WORKDIR /go/src/github.com/lifei6671/mindoc
RUN chmod +x start.sh
RUN go get -d ./... && \
go get github.com/mitchellh/gox && \
#RUN go get -d ./... && \ # 这行 docker build 不过去,所以注释掉了
RUN go get github.com/mitchellh/gox && \
gox -os "windows linux darwin" -arch amd64
CMD ["./start.sh"]

29
README.md
View File

@@ -17,7 +17,7 @@ MinDoc 的前身是 SmartWiki 文档系统。SmartWiki 是基于 PHP 框架 lara
**如果你的服务器上没有安装golang程序请手动设置一个环境变量如下：键名为 ZONEINFO，值为MinDoc跟目录下的/lib/time/zoneinfo.zip 。**
更多信息请查看手册： [MinDoc 使用手册](https://github.com/lifei6671/mindoc/wiki/MinDoc-%E4%BD%BF%E7%94%A8%E6%89%8B%E5%86%8C)
更多信息请查看手册： [MinDoc 使用手册](https://github.com/lifei6671/mindoc/wiki)
对于没有Golang使用经验的用户，可以从 [https://github.com/lifei6671/mindoc/releases](https://github.com/lifei6671/mindoc/releases) 这里下载编译完的程序。
@@ -40,9 +40,7 @@ MinDoc 使用MySQL储存数据，且编码必须是`utf8mb4_general_ci`。请在
如果conf目录下不存在 app.conf 请重命名 app.conf.example 为 app.conf。
如果 MinDoc 根目录下存在 install.lock 文件表示已经初始化过数据库，想要重新初始化数据库，只需要删除该文件重新启动程序即可。
**默认程序会自动创建表，同时初始化一个超级管理员用户：admin 密码：123456 。请登录后重新设置密码。**
**默认程序会自动初始化一个超级管理员用户：admin 密码：123456 。请登录后重新设置密码。**
## Linux 下后台运行
@@ -110,7 +108,6 @@ mail_expired=30
# 使用Docker部署
如果是Docker用户，可参考项目内置的Dockerfile文件编译镜像。
在启动镜像时需要提供如下的环境变量：
@@ -129,6 +126,28 @@ HTTP_PORT 程序监听的端口号
```bash
docker run -p 8181:8181 -e MYSQL_PORT_3306_TCP_ADDR=127.0.0.1 -e MYSQL_PORT_3306_TCP_PORT=3306 -e MYSQL_INSTANCE_NAME=mindoc_db -e MYSQL_USERNAME=root -e MYSQL_PASSWORD=123456 -e httpport=8181 -d daocloud.io/lifei6671/mindoc:latest
```
### docker-compose 一键安装
1. 生成配置文件
> cp env-example .env
按照自己的环境填写配置信息到.env文件中
2. 一键完成所有环境搭建
> docker-compose up -d mindoc
3. 浏览器访问
> http://localhost:8181/
整个部署完成了
4. 常用命令参考
- 启动
> docker-compose up -d mindoc
- 停止
> docker-compose stop mindoc
- 重启
> docker-compose restart mindoc
- 停止删除容器，释放所有资源
> docker-compose down
更多 docker-compose 的使用相关的内容 请查看官网文档或百度
# 项目截图

10
TODO Normal file
View File

@@ -0,0 +1,10 @@
1、把 log 提取出 dbgout 之类的方法；已改作 beego.Info() 调用；
2、把源代码里的 TODO 完成；
3、Export 的两个 URL 应该可以合并，用是否有 :id 来区分；这样 0 号文档输出整个 book 更顺；已完成；
4、统一代码风格，空格、命名之类的；
5、美化 PDF 的输出格式；
6、自动登录新开标签页而且并不能跳转至起始请求页的问题；
7、用户分组管理；
8、[自动]展示历史版本；增强历史版本对比显示的能力；
9、[自动]展示作者信息；也许可以和上一需求合并考虑；
10、查看了解评论功能；

2
conf/enumerate.go
View File

@@ -19,7 +19,7 @@ const RegexpEmail = `^(\w)+(\.\w+)*@(\w)+((\.\w+)+)$`
const RegexpAccount = `^[a-zA-Z][a-zA-z0-9\.]{2,50}$`
// PageSize 默认分页条数.
const PageSize = 5
const PageSize = 15
// 用户权限
const (

97
controllers/account.go
View File

@@ -1,40 +1,52 @@
package controllers
import (
"time"
"strings"
"regexp"
"strconv"
"strings"
"time"
"net/smtp"
"github.com/lifei6671/mindoc/conf"
"github.com/lifei6671/mindoc/models"
"github.com/lifei6671/mindoc/utils"
"github.com/astaxie/beego"
"github.com/astaxie/beego/logs"
"github.com/lifei6671/gocaptcha"
"strconv"
"github.com/lifei6671/mindoc/conf"
"github.com/lifei6671/mindoc/models"
"github.com/lifei6671/mindoc/utils"
)
// AccountController 用户登录与注册.
// AccountController 用户登录与注册
type AccountController struct {
BaseController
}
// Login 用户登录.
// Login 用户登录
func (c *AccountController) Login() {
c.Prepare()
c.TplName = "account/login.tpl"
var remember struct { MemberId int ; Account string; Time time.Time}
var remember struct {
MemberId int
Account string
Time time.Time
}
// 显式指定的 URL 参数优先；为了统一处理，将之更新到 Session 中
turl := c.GetString("turl", "")
if turl != "" {
c.SetSession("turl", turl)
}
beego.Info("AccountController.Login(): turl is: " + turl)
// 如果 Cookie 中存在登录信息
if cookie, ok := c.GetSecureCookie(conf.GetAppKey(), "login"); ok {
if err := utils.Decode(cookie, &remember); err == nil {
if member, err := models.NewMember().Find(remember.MemberId); err == nil {
c.SetMember(*member)
c.Redirect(beego.URLFor("HomeController.Index"), 302)
c.LoggedIn(false)
c.StopRun()
}
}
@@ -48,14 +60,13 @@ func (c *AccountController) Login() {
// 如果开启了验证码
if v, ok := c.Option["ENABLED_CAPTCHA"]; ok && strings.EqualFold(v, "true") {
v,ok := c.GetSession(conf.CaptchaSessionName).(string);
v, ok := c.GetSession(conf.CaptchaSessionName).(string)
if !ok || !strings.EqualFold(v, captcha) {
c.JsonResult(6001, "验证码不正确")
}
}
member,err := models.NewMember().Login(account,password)
//如果没有数据
member, err := models.NewMember().Login(account, password)
if err == nil {
member.LastLoginTime = time.Now()
member.Update()
@@ -69,20 +80,45 @@ func (c *AccountController) Login() {
if err == nil {
c.SetSecureCookie(conf.GetAppKey(), "login", v)
}
}
c.JsonResult(0,"ok")
data := c.LoggedIn(true)
c.JsonResult(0, "ok", data)
} else {
logs.Error("用户登录 =>", err)
c.JsonResult(500, "账号或密码错误", nil)
}
return
}
}
//用户注册.
// 登录成功后的操作，如重定向到原始请求页面
func (c *AccountController) LoggedIn(isPost bool) interface{} {
turl := ""
value := c.GetSession("turl")
if value != nil {
turl = value.(string)
}
c.DelSession("turl")
beego.Info("AccountController.LoggedIn(): turl is: " + turl)
if !isPost {
// 检查是否存在 turl 参数，如果有则重定向至 turl 处，否则进入 Home 页面
if turl == "" {
turl = beego.URLFor("HomeController.Index")
}
c.Redirect(turl, 302)
return nil
} else {
var data struct {
TURL string `json:"turl"`
}
data.TURL = turl
return data
}
}
// 用户注册
func (c *AccountController) Register() {
c.TplName = "account/register.tpl"
@@ -112,7 +148,7 @@ func (c *AccountController) Register() {
}
// 如果开启了验证码
if v, ok := c.Option["ENABLED_CAPTCHA"]; ok && strings.EqualFold(v, "true") {
v,ok := c.GetSession(conf.CaptchaSessionName).(string);
v, ok := c.GetSession(conf.CaptchaSessionName).(string)
if !ok || !strings.EqualFold(v, captcha) {
c.JsonResult(6001, "验证码不正确")
}
@@ -140,7 +176,7 @@ func (c *AccountController) Register() {
}
}
//找回密码.
// 找回密码
func (c *AccountController) FindPassword() {
c.TplName = "account/find_password_setp1.tpl"
mail_conf := conf.GetMailConfig()
@@ -159,7 +195,7 @@ func (c *AccountController) FindPassword() {
// 如果开启了验证码
if v, ok := c.Option["ENABLED_CAPTCHA"]; ok && strings.EqualFold(v, "true") {
v,ok := c.GetSession(conf.CaptchaSessionName).(string);
v, ok := c.GetSession(conf.CaptchaSessionName).(string)
if !ok || !strings.EqualFold(v, captcha) {
c.JsonResult(6001, "验证码不正确")
}
@@ -215,7 +251,7 @@ func (c *AccountController) FindPassword() {
mail_conf.SmtpHost,
)
mime := "MIME-version: 1.0;\nContent-Type: text/html; charset=\"UTF-8\";\n\n";
mime := "MIME-version: 1.0;\nContent-Type: text/html; charset=\"UTF-8\";\n\n"
subject := "Subject: 找回密码!\n"
err = smtp.SendMail(
@@ -230,7 +266,6 @@ func (c *AccountController) FindPassword() {
}
}(mail_conf, email, body)
c.JsonResult(0, "ok", c.BaseUrl()+beego.URLFor("AccountController.Login"))
}
@@ -260,7 +295,7 @@ func (c *AccountController) FindPassword() {
}
}
//校验邮件并修改密码.
// 校验邮件并修改密码
func (c *AccountController) ValidEmail() {
c.Prepare()
password1 := c.GetString("password1")
@@ -284,7 +319,7 @@ func (c *AccountController) ValidEmail() {
if captcha == "" {
c.JsonResult(6004, "验证码不能为空")
}
v,ok := c.GetSession(conf.CaptchaSessionName).(string);
v, ok := c.GetSession(conf.CaptchaSessionName).(string)
if !ok || !strings.EqualFold(v, captcha) {
c.JsonResult(6001, "验证码不正确")
}
@@ -307,7 +342,7 @@ func (c *AccountController) ValidEmail() {
beego.Error(err)
c.JsonResult(6005, "用户不存在")
}
hash ,err := utils.PasswordHash(password1);
hash, err := utils.PasswordHash(password1)
if err != nil {
beego.Error(err)
@@ -328,17 +363,16 @@ func (c *AccountController) ValidEmail() {
c.JsonResult(0, "ok", c.BaseUrl()+beego.URLFor("AccountController.Login"))
}
// Logout 退出登录.
// Logout 退出登录
func (c *AccountController) Logout() {
c.SetMember(models.Member{});
c.SetMember(models.Member{})
c.SetSecureCookie(conf.GetAppKey(), "login", "", -3600)
c.Redirect(beego.URLFor("AccountController.Login"), 302)
}
//验证码.
// 验证码
func (c *AccountController) Captcha() {
c.Prepare()
@@ -361,7 +395,6 @@ func (c *AccountController) Captcha() {
captchaImage.DrawBorder(gocaptcha.ColorToRGB(0x17A7A7A))
// captchaImage.DrawHollowLine()
captchaImage.SaveImage(c.Ctx.ResponseWriter, gocaptcha.ImageFormatJpeg)
c.StopRun()
}

336
controllers/document.go
View File

File diff suppressed because it is too large Load Diff

5
controllers/manager.go
View File

@@ -248,12 +248,15 @@ func (c *ManagerController) DeleteMember() {
c.JsonResult(404,"参数错误")
}
_ ,err := models.NewMember().Find(member_id)
member ,err := models.NewMember().Find(member_id)
if err != nil {
beego.Error(err)
c.JsonResult(500,"用户不存在")
}
if member.Role == conf.MemberSuperRole {
c.JsonResult(500,"不能删除超级管理员")
}
superMember,err := models.NewMember().FindByFieldFirst("role",0)
if err != nil {

37
docker-compose.yml Normal file
View File

@@ -0,0 +1,37 @@
version: '2'
services:
### Applications Code Container #############################
applications:
image: tianon/true
### Workspace Utilities Container ###########################
mindoc:
build:
context: ./
env_file: .env
environment:
- MYSQL_PORT_3306_TCP_ADDR=${MYSQL_PORT_3306_TCP_ADDR}
- MYSQL_PORT_3306_TCP_PORT=${MYSQL_PORT_3306_TCP_PORT}
- MYSQL_INSTANCE_NAME=${MYSQL_INSTANCE_NAME}
- MYSQL_USERNAME=${MYSQL_USERNAME}
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
- HTTP_PORT=${HTTP_PORT}
ports:
- "${HTTP_PORT}:8181"
volumes_from:
- applications
tty: true
networks:
- backend
### Networks Setup ############################################
networks:
backend:
driver: "bridge"

21
env-example Normal file
View File

@@ -0,0 +1,21 @@
###########################################################
# General Setup
###########################################################
### Application Path ###################################################################################################
# Point to your code, will be available at `/var/www/mindoc`.
APPLICATION=../mindoc_volume/
### GLOBAL ENVIRONMENT #################################################################################################
### 数据库配置 ，如果你的数据库不在容器内或没有用 --link过 那必须要写外部数据库ip
MYSQL_PORT_3306_TCP_ADDR=192.168.4.25
MYSQL_PORT_3306_TCP_PORT=3306
MYSQL_INSTANCE_NAME=mindoc_db
MYSQL_USERNAME=root
MYSQL_PASSWORD=root
# expose port
HTTP_PORT=8181

41
models/member.go
View File

@@ -376,11 +376,44 @@ func (m *Member) Delete(oldId int,newId int) error {
o.Rollback()
return err
}
_,err = o.Raw("UPDATE md_relationship SET member_id = ? WHERE member_id = ?",newId,oldId).Exec()
if err != nil {
o.Rollback()
return err
//_,err = o.Raw("UPDATE md_relationship SET member_id = ? WHERE member_id = ?",newId,oldId).Exec()
//if err != nil {
//
// if err != nil {
// o.Rollback()
// return err
// }
//}
var relationship_list []*Relationship
_,err = o.QueryTable(NewRelationship().TableNameWithPrefix()).Filter("member_id",oldId).All(&relationship_list)
if err == nil {
for _,relationship := range relationship_list {
//如果存在创始人，则删除
if relationship.RoleId == 0 {
rel := NewRelationship()
err = o.QueryTable(relationship.TableNameWithPrefix()).Filter("book_id",relationship.BookId).Filter("member_id",newId).One(rel)
if err == nil {
if _,err := o.Delete(relationship) ; err != nil{
beego.Error(err)
}
relationship.RelationshipId = rel.RelationshipId
}
relationship.MemberId = newId
relationship.RoleId = 0
if _,err := o.Update(relationship) ; err != nil{
beego.Error(err)
}
}else{
if _,err := o.Delete(relationship) ; err != nil{
beego.Error(err)
}
}
}
}
if err = o.Commit();err != nil {
o.Rollback()
return err

5
routers/router.go
View File

@@ -34,7 +34,6 @@ func init() {
beego.Router("/manager/attach/detailed/:id", &controllers.ManagerController{}, "*:AttachDetailed")
beego.Router("/manager/attach/delete", &controllers.ManagerController{}, "post:AttachDelete")
beego.Router("/setting", &controllers.SettingController{}, "*:Index")
beego.Router("/setting/password", &controllers.SettingController{}, "*:Password")
beego.Router("/setting/upload", &controllers.SettingController{}, "*:Upload")
@@ -73,7 +72,8 @@ func init() {
beego.Router("/docs/:key", &controllers.DocumentController{}, "*:Index")
beego.Router("/docs/:key/:id", &controllers.DocumentController{}, "*:Read")
beego.Router("/docs/:key/search", &controllers.DocumentController{}, "post:Search")
beego.Router("/export/:key", &controllers.DocumentController{},"*:Export")
beego.Router("/export/:key", &controllers.DocumentController{}, "*:ExportBook")
beego.Router("/export/:key/:id", &controllers.DocumentController{}, "*:ExportDoc")
beego.Router("/qrcode/:key.png", &controllers.DocumentController{}, "get:QrCode")
beego.Router("/attach_files/:key/:attach_id", &controllers.DocumentController{}, "get:DownloadAttachment")
@@ -87,4 +87,3 @@ func init() {
beego.Router("/tag/:key", &controllers.LabelController{}, "get:Index")
beego.Router("/tags", &controllers.LabelController{}, "get:List")
}

16
static/css/kancloud.css
View File

@@ -417,7 +417,8 @@ table>tbody>tr:hover{
}
.manual-article .article-head {
position: relative;
zoom:1;padding: 10px 20px
zoom: 1;
padding: 10px 20px
}
.manual-reader .book-title{
color: #333333;
@@ -430,7 +431,7 @@ table>tbody>tr:hover{
.manual-article .article-head h1 {
margin: 0;
font-size: 20px;
font-weight: 200;
font-weight: 300;
text-align: center;
line-height: 30px;
overflow: hidden;
@@ -438,6 +439,17 @@ table>tbody>tr:hover{
white-space: nowrap;
color: #444
}
.manual-article .article-head h3 {
margin: 0;
font-size: 12px;
font-weight: 200;
text-align: center;
line-height: 18px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: #444
}
.manual-article .article-content{
min-width: 980px;
max-width: 98%;

1
static/js/editor.js
View File

@@ -135,7 +135,6 @@ function pushDocumentCategory($node) {
if(item.id === $node.id){
window.documentCategory[index] = $node;
console.log( window.documentCategory[index]);
return;
}
}

21
static/js/html-editor.js
View File

@@ -48,6 +48,14 @@ $(function () {
}
};
window.editor.onchange = function () {
// 判断内容是否改变
if (window.source !== this.$txt.html()) {
window.editor.menus.save.$domNormal.addClass('selected');
} else {
window.editor.menus.save.$domNormal.removeClass('selected');
}
};
window.editor.create();
@@ -72,6 +80,8 @@ $(function () {
window.isLoad = true;
window.editor.clear();
window.editor.$txt.html(res.data.content);
// 将原始内容备份
window.source = res.data.content;
var node = { "id" : res.data.doc_id,'parent' : res.data.parent_id === 0 ? '#' : res.data.parent_id ,"text" : res.data.doc_name,"identify" : res.data.identify,"version" : res.data.version};
pushDocumentCategory(node);
window.selectNode = node;
@@ -136,6 +146,10 @@ $(function () {
break;
}
}
// 更新内容备份
window.source = res.data.content;
// 触发编辑器 onchange 回调函数
window.editor.onchange();
if(typeof callback === "function"){
callback();
}
@@ -253,7 +267,7 @@ $(function () {
}).on('loaded.jstree', function () {
window.treeCatalog = $(this).jstree();
}).on('select_node.jstree', function (node, selected, event) {
if($("#markdown-save").hasClass('change')) {
if(window.editor.menus.save.$domNormal.hasClass('selected')) {
if(confirm("编辑内容未保存，需要保存吗？")){
saveDocument(false,function () {
loadDocument(selected);
@@ -269,6 +283,11 @@ $(function () {
window.releaseBook = function () {
if(Object.prototype.toString.call(window.documentCategory) === '[object Array]' && window.documentCategory.length > 0){
if(window.editor.menus.save.$domNormal.hasClass('selected')) {
if(confirm("编辑内容未保存，需要保存吗？")) {
saveDocument();
}
}
$.ajax({
url : window.releaseURL,
data :{"identify" : window.book.identify },

17
static/js/kancloud.js
View File

@@ -12,15 +12,17 @@ function loadDocument($url,$id,$callback) {
var body = events.data('body_' + $id);
var title = events.data('title_' + $id);
var doc_title = events.data('doc_title_' + $id);
var doc_info = events.data('doc_info_' + $id);
if (body && title && doc_title) {
if (typeof $callback === "function") {
body = $callback(body);
}
$("#page-content").html(body);
$("title").text(title);
$("#article-title").text(doc_title);
$("#article-info").text(doc_info);
events.trigger('article.open', { $url : $url, $init : false, $id : $id });
@@ -33,21 +35,26 @@ function loadDocument($url,$id,$callback) {
var body = res.data.body;
var doc_title = res.data.doc_title;
var title = res.data.title;
var doc_info = res.data.doc_info;
$body = body;
if (typeof $callback === "function" ) {
$body = $callback(body);
}
$("#page-content").html($body);
$("title").text(title);
$("#article-title").text(doc_title);
$("#article-info").text(doc_info);
events.data('body_' + $id, body);
events.data('title_' + $id, title);
events.data('doc_title_' + $id, doc_title);
events.data('doc_info_' + $id, doc_info);
events.trigger('article.open', { $url : $url, $init : true, $id : $id });
} else if (res.errcode === 6000) {
window.location.href = "/";
} else {
layer.msg("加载失败");
}
@@ -103,8 +110,8 @@ $(function () {
if (url === window.location.href) {
return false;
}
loadDocument(url,selected.node.id);
loadDocument(url, selected.node.id);
});
$("#slidebar").on("click", function () {
@@ -128,17 +135,16 @@ $(function () {
// 处理打开事件
events.on('article.open', function (event, $param) {
if ('pushState' in history) {
if ($param.$init === false) {
window.history.replaceState($param, $param.$id, $param.$url);
} else {
window.history.pushState($param, $param.$id, $param.$url);
}
} else {
window.location.hash = $param.$url;
}
initHighlighting();
$(".manual-right").scrollTop(0);
});
@@ -184,7 +190,6 @@ $(function () {
});
window.onpopstate = function (e) {
var $param = e.state;
console.log($param);
if($param.hasOwnProperty("$url")) {

52
static/js/markdown.js
View File

@@ -5,7 +5,7 @@ $(function () {
height: "100%",
path: "/static/editor.md/lib/",
toolbar: true,
placeholder: "本编辑器支持Markdown编辑，左边编写，右边预览",
placeholder: "本编辑器支持 Markdown 编辑，左边编写，右边预览。",
imageUpload: true,
imageFormats: ["jpg", "jpeg", "gif", "png", "JPG", "JPEG", "GIF", "PNG"],
imageUploadURL: window.imageUploadURL,
@@ -19,6 +19,7 @@ $(function () {
tocStartLevel: 1,
tocm: true,
saveHTMLToTextarea: true,
onload: function() {
this.hideToolbar();
var keyMap = {
@@ -45,6 +46,7 @@ $(function () {
loadDocument($select_node);
}
}
uploadImage("docEditor", function ($state, $res) {
if ($state === "before") {
return layer.load(1, {
@@ -78,7 +80,6 @@ $(function () {
$("#documentTemplateModal").modal("show");
} else if (name === "sidebar") {
$("#manualCategory").toggle(0, "swing", function () {
var $then = $("#manualEditorContainer");
var left = parseInt($then.css("left"));
if (left > 0) {
@@ -91,19 +92,15 @@ $(function () {
});
} else if (name === "release") {
if (Object.prototype.toString.call(window.documentCategory) === '[object Array]' && window.documentCategory.length > 0) {
$.ajax({
url : window.releaseURL,
data :{"identify" : window.book.identify },
type : "post",
dataType : "json",
success : function (res) {
if(res.errcode === 0){
layer.msg("发布任务已推送到任务队列，稍后将在后台执行。");
}else{
layer.msg(res.message);
if ($("#markdown-save").hasClass('change')) {
var comfirm_result = confirm("编辑内容未保存，需要保存吗？")
if (comfirm_result) {
saveDocument(false, releaseBook);
return;
}
}
});
releaseBook();
} else {
layer.msg("没有需要发布的文档")
}
@@ -114,8 +111,7 @@ $(function () {
if (selection === "") {
cm.replaceSelection("- [x] " + selection);
}
else {
} else {
var selectionText = selection.split("\n");
for (var i = 0, len = selectionText.length; i < len; i++) {
@@ -179,6 +175,7 @@ $(function () {
layer.msg("获取当前文档信息失败");
return;
}
var doc_id = parseInt(node.id);
for (var i in window.documentCategory) {
@@ -226,8 +223,23 @@ $(function () {
});
}
function resetEditor($node) {
function releaseBook() {
$.ajax({
url: window.releaseURL,
data: { "identify": window.book.identify },
type: "post",
dataType: "json",
success: function (res) {
if (res.errcode === 0) {
layer.msg("发布任务已推送到任务队列，稍后将在后台执行。");
} else {
layer.msg(res.message);
}
}
});
}
function resetEditor($node) {
}
/**
@@ -242,6 +254,7 @@ $(function () {
}
window.isLoad = false;
}
/**
* 添加顶级文档
*/
@@ -256,13 +269,11 @@ $(function () {
},
success: function (res) {
if (res.errcode === 0) {
var data = { "id": res.data.doc_id, 'parent': res.data.parent_id === 0 ? '#' : res.data.parent_id , "text": res.data.doc_name, "identify": res.data.identify, "version": res.data.version };
var node = window.treeCatalog.get_node(data.id);
if (node) {
window.treeCatalog.rename_node({ "id": data.id }, data.text);
} else {
window.treeCatalog.create_node(data.parent, data);
window.treeCatalog.deselect_all();
@@ -272,7 +283,7 @@ $(function () {
$("#markdown-save").removeClass('change').addClass('disabled');
$("#addDocumentModal").modal('hide');
} else {
showError(res.message,"#add-error-message")
showError(res.message, "#add-error-message");
}
$("#btnSaveDocument").button("reset");
}
@@ -305,7 +316,6 @@ $(function () {
"label": "添加文档",
"icon": "fa fa-plus",
"action": function (data) {
var inst = $.jstree.reference(data.reference),
node = inst.get_node(data.reference);
@@ -349,8 +359,8 @@ $(function () {
return true;
}
}
loadDocument(selected);
loadDocument(selected);
}).on("move_node.jstree", jstree_save);
$("#documentTemplateModal").on("click", ".section>a[data-type]", function () {

176
static/js/splitbar.js Normal file
View File

@@ -0,0 +1,176 @@
$(function () {
var splitBar = {
// 设置当前屏幕为 840px 时将分割条隐藏
maxWidth: 840,
// 父元素选择器
parentSelector: '.manual-body',
/**
* 初始化分割条
*/
init: function () {
var self = this;
$(self.parentSelector)
.append(
$('\
<div id="manual-vsplitbar" unselectable="on"\
style="\
z-index:301;\
position: absolute;\
user-select: none;\
cursor: col-resize;\
left: 275px;\
height: 100%;\
display: block;\
width: 3px;\
border-right: 1px solid #8f949a;">\
<a href="javascript:void(0)" accesskey="" tabindex="0" title="vsplitbar"></a>\
</div>\
')
.hover(
function (event) {
event.target.style.background = '#8f949ad8';
},
function (event) {
event.target.style.background = '';
}
)
);
self.loadingHtml();
// 设置媒体查询
mediaMatcher.set();
},
/**
* 加载页面时设置分割条是否显示
*/
loadingHtml: function () {
var self = this;
var htmlWidth = document.body.clientWidth;
if (htmlWidth <= self.maxWidth) $('#manual-vsplitbar').css('display', 'none');
},
/**
* 在打开关闭菜单事初始化左右窗口和分割条
*/
reset: function () {
if (isFullScreen) {
// 关闭菜单时，初始化左右窗口
$('#manual-vsplitbar').css('display', 'none');
splitBar.inMaxWidthReset();
$('.manual-left').css('width', '0px');
} else {
// 打开菜单时，初始化左右窗口
$('#manual-vsplitbar').css('display', 'block');
splitBar.outMaxWidthReset();
}
},
/**
* 屏幕小于等于 840px，重置左右窗口
*/
inMaxWidthReset: function () {
$('#manual-vsplitbar').css('display', 'none');
$('.m-manual.manual-reader .manual-right').css('left', '0');
$('.manual-left').css('width', '280px');
},
/**
* 屏幕大于 840px，重置左右窗口
*/
outMaxWidthReset: function () {
$('.manual-right').css('left', '279px');
$('.manual-left').css('width', '279px');
$('#manual-vsplitbar').css('left', '275px').css('display', 'block');
}
}
/**
* 设置媒体查询
* 分割条隐藏
*/
var mediaMatcher = {
mql: window.matchMedia('(max-width:' + splitBar.maxWidth + 'px)'),
/**
* 添加媒体查询监听事件
*/
set: function () {
var self = this;
self.mql.addListener(self.mqCallback);
},
/**
* 删除媒体查询监听事件
*/
remove: function () {
var self = this;
self.mql.removeListener(self.mqCallback);
},
/**
* 媒体查询回调函数
*/
mqCallback: function (event) {
if (event.target.matches) { // 宽度小于等于 840 像素
$(".m-manual").removeClass('manual-fullscreen-active');
splitBar.inMaxWidthReset();
} else { // 宽度大于 840 像素
splitBar.outMaxWidthReset();
}
}
}
// 初始化分割条
splitBar.init();
/**
* 控制菜单宽度
* 最小为 140px
*/
$('#manual-vsplitbar').on('mousedown', function (e) {
var bodyEle = $('.manual-body')[0];
var leftPane = $('.manual-left')[0];
var splitBar = $('#manual-vsplitbar')[0];
var rightPane = $('.manual-right')[0];
var disX = (e || event).clientX;
splitBar.left = splitBar.offsetLeft;
var docMouseMove = document.onmousemove;
var docMouseUp = document.onmouseup;
document.onmousemove = function (e) {
var curPos = splitBar.left + ((e || event).clientX - disX);
var maxPos = bodyEle.clientWidth - splitBar.offsetWidth;
curPos > maxPos && (curPos = maxPos);
curPos < 140 && (curPos = 140);
leftPane.style.width = curPos + "px";
splitBar.style.left = curPos - 3 + "px";
rightPane.style.left = curPos + 3 + "px";
return false;
}
document.onmouseup = function () {
document.onmousemove = docMouseMove;
document.onmouseup = docMouseUp;
splitBar.releaseCapture && splitBar.releaseCapture();
};
splitBar.setCapture && splitBar.setCapture();
return false;
});
/**
* 关闭侧边栏时，同步分割条；
*/
$(".manual-fullscreen-switch").on("click", splitBar.reset);
});

14
views/account/login.tpl
View File

@@ -93,7 +93,7 @@
<script type="text/javascript">
$(function () {
$("#account,#passwd,#code").on('focus', function () {
$(this).tooltip('destroy').parents('.form-group').removeClass('has-error');;
$(this).tooltip('destroy').parents('.form-group').removeClass('has-error');
});
$(document).keydown(function (e) {
@@ -102,19 +102,20 @@
$("#btn-login").click();
}
});
$("#btn-login").on('click', function () {
var $btn = $(this).button('loading');
var account = $.trim($("#account").val());
var password = $.trim($("#password").val());
var code = $("#code").val();
if (account === "") {
$("#account").tooltip({ placement: "auto", title: "账号不能为空", trigger: 'manual' })
.tooltip('show')
.parents('.form-group').addClass('has-error');
$btn.button('reset');
return false;
} else if (password === "") {
$("#password").tooltip({ title: '密码不能为空', trigger: 'manual' })
.tooltip('show')
@@ -134,16 +135,18 @@
dataType: "json",
type: "POST",
success: function (res) {
if (res.errcode !== 0) {
$("#captcha-img").click();
$("#code").val('');
layer.msg(res.message);
$btn.button('reset');
} else {
window.location = "/";
turl = res.data.turl;
if (turl === "") {
turl = "/";
}
window.location = turl;
}
},
error: function () {
$("#captcha-img").click();
@@ -154,7 +157,6 @@
});
}
return false;
});
});

2
views/book/index.tpl
View File

@@ -92,7 +92,7 @@
</template>
</div>
<template v-if="lists.length >= 0">
<nav>
<nav class="pagination-container">
{{.PageHtml}}
</nav>
</template>

30
views/document/default_read.tpl
View File

@@ -47,16 +47,19 @@
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dLabel">
{{if gt .Member.MemberId 0}}
{{if gt .Model.RelationshipId 0}}
{{if eq .Model.RoleId 0 1 2}}
<li><a href="{{urlfor "DocumentController.Edit" ":key" .Model.Identify ":id" ""}}">返回编辑</a> </li>
{{end}}
{{end}}
<li><a href="{{urlfor "BookController.Index"}}">我的项目</a> </li>
<li role="presentation" class="divider"></li>
{{end}}
{{if eq .Model.PrivatelyOwned 0}}
<li><a href="javascript:" data-toggle="modal" data-target="#shareProject">项目分享</a> </li>
<li role="presentation" class="divider"></li>
<li><a href="{{urlfor "DocumentController.Export" ":key" .Model.Identify "output" "pdf"}}" target="_blank">项目导出PDF</a> </li>
<li><a href="javascript:void(0);" onclick="ExportPdfDoc()">文档导出为 PDF</a> </li>
<li><a href="{{urlfor "DocumentController.ExportBook" ":key" .Model.Identify "output" "pdf"}}" target="_blank">项目导出为 PDF</a> </li>
{{end}}
<li><a href="{{urlfor "HomeController.Index"}}" title="返回首页">返回首页</a> </li>
@@ -125,6 +128,7 @@
</div>
<div class="col-md-8 text-center">
<h1 id="article-title">{{.Title}}</h1>
<h3 id="article-info">{{.Info}}</h3>
</div>
<div class="col-md-2">
</div>
@@ -226,12 +230,20 @@
<script src="{{cdnjs "/static/bootstrap/js/bootstrap.min.js"}}"></script>
<script src="{{cdnjs "/static/js/jquery.form.js"}}" type="text/javascript"></script>
<script src="{{cdnjs "/static/jstree/3.3.4/jstree.min.js"}}" type="text/javascript"></script>
<script type="text/javascript" src="{{cdnjs "/static/nprogress/nprogress.js"}}"></script>
<script type="text/javascript" src="{{cdnjs "/static/highlight/highlight.js"}}"></script>
<script type="text/javascript" src="{{cdnjs "/static/highlight/highlightjs-line-numbers.min.js"}}"></script>
<script type="text/javascript" src="/static/js/jquery.highlight.js"></script>
<script type="text/javascript" src="/static/js/kancloud.js"></script>
<script src="{{cdnjs "/static/nprogress/nprogress.js"}}" type="text/javascript"></script>
<script src="{{cdnjs "/static/highlight/highlight.js"}}" type="text/javascript"></script>
<script src="{{cdnjs "/static/highlight/highlightjs-line-numbers.min.js"}}" type="text/javascript"></script>
<script src="/static/js/jquery.highlight.js" type="text/javascript"></script>
<script src="/static/js/kancloud.js" type="text/javascript"></script>
<script src="/static/js/splitbar.js" type="text/javascript"></script>
<script type="text/javascript">
active_book_id = {{.Model.Identify}};
active_doc_id = {{.DocumentId}};
$(function () {
$("body").on('article.open', function (event, $param) {
active_doc_id = $param.$id;
});
});
$(function () {
$("#searchList").on("click","a",function () {
var id = $(this).attr("data-id");
@@ -243,6 +255,12 @@ $(function () {
});
});
});
function ExportPdfDoc() {
var id = active_book_id;
if(active_doc_id != "0")
id += "/" + active_doc_id;
window.location.href = "/export/" + id + "?output=pdf";
}
</script>
</body>
</html>

2
views/manager/books.tpl
View File

@@ -88,7 +88,7 @@
<div class="text-center">暂无数据</div>
{{end}}
</div>
<nav>
<nav class="pagination-container">
{{.PageHtml}}
</nav>
</div>

2
views/manager/users.tpl
View File

@@ -119,7 +119,7 @@
</tbody>
</table>
</template>
<nav>
<nav class="pagination-container">
{{.PageHtml}}
</nav>
</div>

2
views/search/index.tpl
View File

@@ -47,7 +47,7 @@
<span class="empty-text">暂无相关搜索结果</span>
</div>
{{end}}
<nav>
<nav class="pagination-container">
{{.PageHtml}}
</nav>
<div class="clearfix"></div>