This commit is contained in:
limqhz
2022-05-14 01:14:16 +08:00
parent a3df75bd66
commit 9e1dd3af77
31 changed files with 625 additions and 2240 deletions

View File

@@ -32,13 +32,13 @@
<div class="row">
<div class="col-md-10 mb-3">
<label for="firstName">论坛标题</label>
<input required th:value="${blog.getTitle()}" name="title" type="text" class="form-control" id="firstName">
<label for="title">论坛标题</label>
<input required th:value="${blog.getTitle()}" name="title" type="text" class="form-control" id="title">
</div>
<div class="col-md-2 mb-3">
<label for="country">标签</label>
<select name="categoryId" class="custom-select d-block w-100" id="country">
<label for="categoryId">标签</label>
<select name="categoryId" class="custom-select d-block w-100" id="categoryId" required>
<option th:each="category:${categoryList}"
th:selected="${blog.getCategoryId() == category.getId()}"
th:value="${category.getId()}" th:text="${category.getCategory()}">
@@ -50,7 +50,7 @@
<p>论坛详情</p>
<div id="blog-content">
<div id="editor-toolbar"></div>
<div id="editor-text-area" style="height: 400px;border: 1px solid lightgrey"></div>
<div id="editor-text-area" style="height: 600px;border: 1px solid lightgrey"></div>
<textarea id="content-textarea" name="content" th:text="${blog.getContent()}" style="display: none;"></textarea>
<textarea id="contentText-textarea" name="contentJson" style="display: none;"></textarea>
</div>
@@ -58,7 +58,7 @@
</div>
<button class="btn btn-primary btn-lg btn-block" onclick="this.disabled=true; this.form.submit();" type="submit">提交修改</button>
<button class="btn btn-primary btn-lg btn-block" onclick="talkWith()" type="submit">提交修改</button>
</form>
</div>
</div>
@@ -76,7 +76,32 @@
<script th:src="@{/wangedit/js/wang.min.js}"></script>
<script th:src="@{/wangedit/js/wang.init.js}"></script>
<script th:src="@{/layer/layer.js}"></script>
<script th:src="@{/layer/mobile/layer.js}"></script>
<script th:src="@{/js/axios.js}"></script>
<script type="text/javascript">
function talkWith(){
var title = $('#title').val();
var content = $('#content-textarea').val();
var categoryId = $('#categoryId').val();
if (!title){
layer.open({ content: '请输入标题', skin: 'msg', time: 2 });
return;
}
if(title.length>30){
layer.open({ content: '标题过长', skin: 'msg', time: 2 });
return;
}
if (!categoryId){
layer.open({ content: '请选择博客分类', skin: 'msg', time: 2 });
return;
}
if (content.length < 30){
layer.open({ content: '内容过短!请多表达一点思想吧?', skin: 'msg', time: 2 });
return;
}
this.disabled = true;
this.submit();
}
</script>
</body>
</html>

View File

@@ -38,7 +38,7 @@
[[${blog.getViews()}]]
</span>
<!-- 自己写的文章可以编辑和删除 -->
<a th:if="${session.loginUser.getUid()==blog.getAuthorId()}"
<a th:if="@{${session.loginUser} ? ${session.loginUser.getUid()==blog.getAuthorId()} : false}"
class="float-right text-decoration-none" style="color: red"
th:href="@{'/blog/delete/'+${blog.getBid()}}"
onclick="if(!confirm('你确认要删除吗?')) return false;">
@@ -49,7 +49,7 @@
</svg>
删除
</a>
<a th:if="${session.loginUser.getUid()==blog.getAuthorId()}"
<a th:if="@{${session.loginUser} ? ${session.loginUser.getUid()==blog.getAuthorId()} : false}"
class="float-right mr-3 text-decoration-none"
th:href="@{'/blog/editor/'+${blog.getBid()}}">
<svg class="bi bi-pencil-square" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
@@ -58,7 +58,7 @@
</svg>
编辑
</a>
<span class="float-right" th:if="${session.loginUser.getUid()!=blog.getAuthorId()}">
<span class="float-right" th:if="@{${session.loginUser} ? ${session.loginUser.getUid()!=blog.getAuthorId()} : false}">
<a class="text-danger text-decoration-none" th:fragment="star_refresh" th:id="id_star_refresh"
href="javascript:starFun(this);">
<svg th:if="${starValue.isStar() == true}" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-heart-fill" viewBox="0 0 16 16">
@@ -76,7 +76,7 @@
<hr style="margin-top: 18px">
<!--文章主体内容-->
<div id="editor-text-area" style="height: 400px"></div>
<div id="editor-text-area" style="height: 600px"></div>
<textarea id="content-textarea" th:text="${blog.getContent()}" name="content" style="display: none;"></textarea>
</div>
@@ -87,14 +87,13 @@
<div class="col-md-12 blog-main" style="margin-top: 20px">
<form th:action="@{'/blog/comment/'+${blog.getBid()}}" method="post">
<input type="hidden" id="userId" name="userId" th:value="${session.loginUser.getUid()}">
<input type="hidden" name="userName" th:value="${session.loginUser.getUsername()}">
<input type="hidden" name="userAvatar" th:value="${session.loginUser.getAvatar()}">
<input type="hidden" id="userId" name="userId" th:value="@{${session.loginUser} ? ${session.loginUser.getUid()} : ''}">
<input type="hidden" name="userName" th:value="@{${session.loginUser} ? ${session.loginUser.getUsername()} : ''}">
<input type="hidden" id="topicId" name="topicId" th:value="${blog.getBid()}">
<div class="form-group">
<input name="content" class="form-control" rows="3" required />
<input id="commentTo" name="content" class="form-control" rows="3" required/>
</div>
<button type="submit" onclick="this.disabled=true; this.form.submit();" class="btn btn-primary float-right">提交评论</button>
<button type="submit" onclick="comment()" class="btn btn-primary float-right">提交评论</button>
</form>
</div>
@@ -132,6 +131,7 @@
<script th:src="@{/live/js/addlive2d.js}"></script>
<script th:src="@{/wangedit/js/wang.min.js}"></script>
<script th:src="@{/wangedit/js/wang.read.js}"></script>
<script th:src="@{/layer/mobile/layer.js}"></script>
<script type="text/javascript">
function starFun(btn){
btn.disabled = true;
@@ -147,6 +147,15 @@
}
});
}
function comment(){
var content = $('#commentTo').val();
console.log(content);
if (!content){
layer.open({ content: '评论内容不能为空', skin: 'msg', time: 2 });
return;
}
this.submit();
}
</script>
</body>
</html>

View File

@@ -31,17 +31,15 @@
<!-- 隐藏域 -->
<input type="hidden" name="authorId" th:value="${session.loginUser.getUid()}">
<input type="hidden" name="authorName" th:value="${session.loginUser.getUsername()}">
<input type="hidden" name="authorAvatar" th:value="${session.loginUser.getAvatar()}">
<div class="row">
<div class="col-md-10 mb-3">
<label for="firstName">文章标题</label>
<input type="text" name="title" class="form-control" id="firstName" value="" required>
<label for="title">文章标题</label>
<input type="text" name="title" maxlength="30" class="form-control" id="title" placeholder="请输入标题" required>
</div>
<div class="col-md-2 mb-3">
<label for="country">文章标签</label>
<select name="categoryId" class="custom-select d-block w-100" id="country">
<label for="categoryId">文章标签</label>
<select name="categoryId" class="custom-select d-block w-100" id="categoryId" required>
<option th:each="category:${categoryList}"
th:value="${category.getId()}" th:text="${category.getCategory()}">
</option>
@@ -52,7 +50,7 @@
<p>文章内容</p>
<div id="blog-content">
<div id="editor-toolbar"></div>
<div id="editor-text-area" style="height: 400px;border: 1px solid lightgrey"></div>
<div id="editor-text-area" style="height: 600px;border: 1px solid lightgrey"></div>
<textarea id="content-textarea" name="content" style="display: none;"></textarea>
<textarea id="contentText-textarea" name="contentJson" style="display: none;"></textarea>
</div>
@@ -60,7 +58,7 @@
</div>
<button class="btn btn-primary btn-lg btn-block" type="submit" onclick="this.disabled=true; this.form.submit();" >发布文章</button>
<button class="btn btn-primary btn-lg btn-block" type="submit" onclick="talkWith()" >发布文章</button>
</form>
</div>
</div>
@@ -77,8 +75,31 @@
<script th:src="@{/wangedit/js/wang.min.js}"></script>
<script th:src="@{/wangedit/js/wang.init.js}"></script>
<script th:src="@{/layer/layer.js}"></script>
<script th:src="@{/js/axios.js}"></script>
<script th:src="@{/layer/mobile/layer.js}"></script>
<script type="text/javascript">
function talkWith(){
var title = $('#title').val();
var content = $('#content-textarea').val();
var categoryId = $('#categoryId').val();
if (!title){
layer.open({ content: '请输入标题', skin: 'msg', time: 2 });
return;
}
if(title.length>30){
layer.open({ content: '标题过长', skin: 'msg', time: 2 });
return;
}
if (!categoryId){
layer.open({ content: '请选择博客分类', skin: 'msg', time: 2 });
return;
}
if (content.length < 30){
layer.open({ content: '内容过短!请多表达一点思想吧?', skin: 'msg', time: 2 });
return;
}
this.disabled = true;
this.submit();
}
</script>
</body>
</html>