1、修复编辑器不显示滚动条的BUG

2、优化按钮交互方式
3、新增Html编辑器按钮
pull/25/merge
Minho 2017-05-10 13:43:36 +08:00
parent b393b07a86
commit 42b08a0b18
9 changed files with 96 additions and 11 deletions

View File

@ -78,6 +78,7 @@ func (c *AccountController) Login() {
}
}
//用户注册.
func (c *AccountController) Register() {
c.TplName = "account/register.tpl"
@ -329,6 +330,7 @@ func (c *AccountController) Logout(){
c.Redirect(beego.URLFor("AccountController.Login"),302)
}
//验证码.
func (c *AccountController) Captcha() {
c.Prepare()

View File

@ -557,7 +557,7 @@ func (c *BookController) SaveSort() {
beego.Error(err)
c.JsonResult(6003,"数据错误")
}
fmt.Printf("%+v",docs)
for _,item := range docs {
if doc_id,ok := item["id"].(float64);ok {
doc,err := models.NewDocument().Find(int(doc_id));

View File

@ -32,10 +32,8 @@ func main() {
beego.SetStaticPath("uploads","uploads")
beego.ErrorController(&controllers.ErrorController{})
beego.Run()
}

View File

@ -33,9 +33,12 @@ body{
width: 280px;
position: fixed;
border-top: 1px solid #DDDDDD;
bottom: 0;
bottom: 15px;
top: 40px;
background-color: #FAFAFA;
left: 0;
right: 0;
overflow-y:auto;
}
.manual-category .manual-nav {
font-size: 14px;

View File

@ -187,7 +187,3 @@ function showSuccess($msg,$id) {
$($id).addClass("success-message").removeClass("error-message").text($msg);
return true;
}

View File

@ -10,6 +10,24 @@ $(function () {
};
wangEditor.config.menus.splice(0,0,"|");
wangEditor.config.menus.splice(0,0,"save");
wangEditor.config.menus.splice(0,0,"release");
//移除地图、背景色
editor.config.menus = $.map(wangEditor.config.menus, function(item, key) {
if (item === 'bgcolor') {
return null;
}
if (item === 'fullscreen') {
return null;
}
if (item === "undo"){
return null;
}
if (item === "redo"){
return null;
}
return item;
});
window.editor.ready(function () {
if(window.documentCategory.length > 0){
@ -251,4 +269,24 @@ $(function () {
}).on("move_node.jstree", jstree_save);
window.saveDocument = saveDocument;
window.releaseBook = function () {
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);
}
}
});
}else{
layer.msg("没有需要发布的文档")
}
};
});

View File

@ -0,0 +1,47 @@
(function () {
// 获取 wangEditor 构造函数和 jquery
var E = window.wangEditor;
var $ = window.jQuery;
// 用 createMenu 方法创建菜单
E.createMenu(function (check) {
// 定义菜单id不要和其他菜单id重复。编辑器自带的所有菜单id可通过『参数配置-自定义菜单』一节查看
var menuId = 'release';
// check将检查菜单配置『参数配置-自定义菜单』一节描述中是否该菜单id如果没有则忽略下面的代码。
if (!check(menuId)) {
return;
}
// this 指向 editor 对象自身
var editor = this;
// 创建 menu 对象
var menu = new E.Menu({
editor: editor, // 编辑器对象
id: menuId, // 菜单id
title: '发布', // 菜单标题
// 正常状态和选中状态下的dom对象样式需要自定义
$domNormal: $('<a href="#" tabindex="-1"><i class="fa fa-cloud-upload" aria-hidden="true" name="release"></i></a>'),
$domSelected: $('<a href="#" tabindex="-1" class="selected"><i class="fa fa-cloud-upload" aria-hidden="true" name="release"></i></a>')
});
// 菜单正常状态下,点击将触发该事件
menu.clickEvent = function (e) {
window.releaseBook();
};
// 菜单选中状态下,点击将触发该事件
menu.clickEventSelected = function (e) {
};
// 增加到editor对象中
editor.menus[menuId] = menu;
});
})();

View File

@ -58,9 +58,9 @@
</a>
</div>
<div class="pull-right">
<a :href="'{{urlfor "DocumentController.Index" ":key" ""}}' + item.identify" title="查看文档" data-toggle="tooltip"><i class="fa fa-eye"></i> 查看文档</a>
<a :href="'{{urlfor "DocumentController.Index" ":key" ""}}' + item.identify" title="查看文档" data-toggle="tooltip" target="_blank"><i class="fa fa-eye"></i> 查看文档</a>
<template v-if="item.role_id != 3">
<a :href="'/api/' + item.identify + '/edit'" title="编辑文档" data-toggle="tooltip"><i class="fa fa-edit" aria-hidden="true"></i> 编辑文档</a>
<a :href="'/api/' + item.identify + '/edit'" title="编辑文档" data-toggle="tooltip" target="_blank"><i class="fa fa-edit" aria-hidden="true"></i> 编辑文档</a>
</template>
</div>
<div class="clearfix"></div>

View File

@ -126,6 +126,7 @@
<script src="/static/jstree/3.3.4/jstree.min.js" type="text/javascript"></script>
<script src="/static/wangEditor/js/wangEditor.min.js" type="text/javascript"></script>
<script src="/static/wangEditor/plugins/save-menu.js" type="text/javascript"></script>
<script src="/static/wangEditor/plugins/release-menu.js" type="text/javascript"></script>
<script type="text/javascript" src="/static/layer/layer.js"></script>
<script src="/static/to-markdown/dist/to-markdown.js" type="text/javascript"></script>
<script src="/static/js/jquery.form.js" type="text/javascript"></script>