Chuyaoyuan/Jiscuss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

模态框跟换为layx，代码优化，新建帖子时可新建标签

Browse Source
This commit is contained in:
yaoyuan2.chu
2020-11-09 23:25:33 +08:00
parent d343255e09
commit 3663f44989
34 changed files with 1274 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/static/js/comm/util.js
+3
View File
@@ -0,0 +1,3 @@
function massage(msg,type,title){
layx.msg(msg,{dialogIcon:type});
}
src/main/resources/static/js/user/discussions.js
+5 -5
View File
@@ -20,7 +20,7 @@ $("#addPost").click(function () {
console.log(content);
$.ajax({
type: "POST",
url: "/newpost",
url: "/newPost",
data: JSON.stringify({
content: content,
discussionId: discussionsId,
@@ -34,17 +34,17 @@ $("#addPost").click(function () {
success: function (data) {
console.log(data);
if(data.flag){
massage(content+',添加成功!','');
massage(content+',添加成功!','success','');
location.reload();
massage('评论添加成功!','');
massage('评论添加成功!','success','');
}else{
massage(data.msg,'');
massage(data.msg,'error','');
return false;
}
}
});
}else{
massage('您未登录，请先登录!','');
massage('您未登录，请先登录!','error','');
}
});
src/main/resources/static/js/user/newdiscussiontag.js
+110
View File
@@ -0,0 +1,110 @@
let pageNum = null;
let pageAll = null;
let pageUrl = '/';
$("#newdiscussions").click(function () {
var token = $("meta[name='_csrf']").attr("content");
var header = $("meta[name='_csrf_header']").attr("content");
console.warn(header)
console.warn(token)
var title = $("#discussionstitle").val();
var tag = $("#selectTag").val();
// $("#discussionscontent").val();
console.log(tinyMCE.editors[0].getContent());
var content = tinyMCE.editors[0].getContent();
console.log(title);
console.log(content);
$.ajax({
type: "POST",
url: "/newdiscussions",
data: JSON.stringify({
title: title,
content: content
}),
contentType: 'application/json',
beforeSend: function (request) {
request.setRequestHeader(header, token); // 添加 CSRF Token
},
dataType: "JSON",
success: function (data) {
console.log(data);
if (data.flag) {
massage(title + ',添加成功!','success', '');
$('.ui.modal.createNewDiccuss').modal('hide');
location.reload();
} else {
massage(data.msg,'error', '');
return false;
}
}
});
});
$("#cancelnewtags").click(function () {
$('#createNewtagsDiv').hide();
$('#tagDescriptionDiv').hide();
$('#parentTagDiv').hide();
$('#colorIconDiv').hide();
});
$("#newtags").click(function () {
debugger
$('#createNewtagsDiv').show();
$('#tagDescriptionDiv').show();
$('#colorIconDiv').show();
});
$("#commitnewtags").click(function () {
var header = $("meta[name='_csrf_header']").attr("content");
var token = $("meta[name='_csrf']").attr("content");
var name = $("#tagsname").val();
var tagColor = $("#tagColor").val();
var tagIcon = $("#tagIcon").val();
var parentTag = $("#parentTag").val();
let coloricon = tagColor + ',' + tagIcon
var tagdescription = $("#tagdescription").val();
console.log(tagColor);
console.log(tagIcon);
console.log(parentTag);
console.log(tagdescription);
console.log(name);
$.ajax({
type: "POST",
url: "/newtags",
data: JSON.stringify({
name: name,
color: coloricon,
description: tagdescription,
parentId: parentTag
}),
contentType: 'application/json',
beforeSend: function (xhr) {
xhr.setRequestHeader(header, token);
},
dataType: "JSON",
success: function (data) {
console.log(data);
if (data.flag) {
massage(name + ',添加成功!', 'success','');
$("#selectTag").html("");
} else {
massage(name + ',添加失败!', 'error','');
}
}
});
});
src/main/resources/static/js/user/system.js
+28 -109
View File
@@ -20,7 +20,7 @@ $("#upPage").click(function () {
let page = pageNum - 1
window.location.href = pageUrl + "?pageNum=" + page;
} else {
massage('已经是首页!', '');
massage('已经是首页!','warn', '');
}
});
@@ -32,133 +32,52 @@ $("#nextPage").click(function () {
let page = pageNum + 1
window.location.href = pageUrl + "?pageNum=" + page;
} else {
massage('已经是尾页!', '');
massage('已经是尾页!','warn', '');
}
});
$("#createNewDiccuss").click(function () {
console.log("点击 createNewDiccuss");
$("#createNewDiccuss2").click(function () {
console.log("点击 createNewDiccuss2");
console.log(username);
if (username && username != null) {
$('.ui.modal.createNewDiccuss')
.modal('show')
;
tinymce.init({
selector: '#discussionscontent',
layx.iframe('createNewDiccussContent','新建主题','./newDiscussionsPage',{
shadable:0.8,
event: {
ondestroy: {
before: function (layxWindow, winform, inside, escKey) {
massage('操作成功!','success', '')
console.log(new Date() + "关闭之前~")
console.log(winform);
console.log("=============分割线===============")
},
after: function () {
location.reload();
console.log(new Date() + "关闭之后~")
massage('操作成功!','success', '')
console.log("=============分割线===============")
}
}
}
});
} else {
massage('您未登录，请先登录!', '');
massage('您未登录，请先登录!','error', '');
}
});
$("#newdiscussions").click(function () {
var token = $("meta[name='_csrf']").attr("content");
var header = $("meta[name='_csrf_header']").attr("content");
console.warn(header)
console.warn(token)
var title = $("#discussionstitle").val();
var tag = $("#selectTag").val();
// $("#discussionscontent").val();
console.log(tinyMCE.editors[0].getContent());
var content = tinyMCE.editors[0].getContent();
console.log(title);
console.log(content);
$.ajax({
type: "POST",
url: "/newdiscussions",
data: JSON.stringify({
title: title,
content: content
}),
contentType: 'application/json',
beforeSend: function (request) {
request.setRequestHeader(header, token); // 添加 CSRF Token
},
dataType: "JSON",
success: function (data) {
console.log(data);
if (data.flag) {
massage(title + ',添加成功!', '');
$('.ui.modal.createNewDiccuss').modal('hide');
location.reload();
} else {
massage(data.msg, '');
return false;
}
}
});
});
$("#cancelnewtags").click(function () {
$('#createNewtagsDiv').hide();
$('#tagDescriptionDiv').hide();
$('#parentTagDiv').hide();
$('#colorIconDiv').hide();
});
$("#newtags").click(function () {
$('#createNewtagsDiv').show();
$('#tagDescriptionDiv').show();
$('#parentTagDiv').show();
$('#colorIconDiv').show();
});
function onTags(data) {
console.log('123');
console.log(data);
}
$("#commitnewtags").click(function () {
var header = $("meta[name='_csrf_header']").attr("content");
var token = $("meta[name='_csrf']").attr("content");
var name = $("#tagsname").val();
var tagColor = $("#tagColor").val();
var tagIcon = $("#tagIcon").val();
var parentTag = $("#parentTag").val();
let coloricon = tagColor + ',' + tagIcon
var tagdescription = $("#tagdescription").val();
console.log(tagColor);
console.log(tagIcon);
console.log(parentTag);
console.log(tagdescription);
console.log(name);
$.ajax({
type: "POST",
url: "/newtags",
data: JSON.stringify({
name: name,
color: coloricon,
description: tagdescription,
parentId: parentTag
}),
contentType: 'application/json',
beforeSend: function (xhr) {
xhr.setRequestHeader(header, token);
},
dataType: "JSON",
success: function (data) {
console.log(data);
if (data.flag) {
massage(name + ',添加成功!', '');
$("#selectTag").html("");
} else {
massage(name + ',添加失败!', '');
}
}
});
});
$('#menu')
src/main/resources/static/js/user/user.js
+9
View File
@@ -0,0 +1,9 @@
$("#userButton").click(function () {
console.log("点击 userButton");
$('#userButtonsidebar')
.sidebar({
transition:'scale down' //默认uncover，可以取值push\overlay\slide along\slide out\scale down
})
.sidebar('toggle')
;
});
src/main/resources/static/layx/layx.min.css
Vendored
+10
View File
File diff suppressed because one or more lines are too long
src/main/resources/static/layx/layx.min.js
Vendored
+10
View File
File diff suppressed because one or more lines are too long