From fd3142bc193caf459419579181cf342783d93484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Fri, 24 Mar 2023 17:33:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E5=96=84=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.BBS.Vue3/src/components/CommentInfo.vue    |  12 +++++++-----
 Yi.BBS.Vue3/src/views/Article.vue             |   6 ++++--
 .../project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db | Bin 323584 -> 323584 bytes
 .../Forum/Dtos/Article/ArticleAllOutputDto.cs |   4 +++-
 .../Dtos/Article/ArticleGetListOutputDto.cs   |   3 ++-
 .../Dtos/Comment/CommentGetListOutputDto.cs   |   4 ++--
 .../project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db | Bin 323584 -> 323584 bytes
 7 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Yi.BBS.Vue3/src/components/CommentInfo.vue b/Yi.BBS.Vue3/src/components/CommentInfo.vue
index b5ad4ed1..4df5fe33 100644
--- a/Yi.BBS.Vue3/src/components/CommentInfo.vue
+++ b/Yi.BBS.Vue3/src/components/CommentInfo.vue
@@ -5,7 +5,7 @@
   </el-tabs>
 
   <div class="total">
-    <div style="align-self: center;"> {{total}}个评论</div>
+    <div style="align-self: center;"> 共{{total}}个评论</div>
     <div> <el-radio-group v-model="selectRadio">
         <el-radio-button label="new" name="new">最新</el-radio-button>
         <el-radio-button label="host" name="host">最热</el-radio-button>
@@ -15,7 +15,7 @@
 
   <el-divider />
 
-  <el-input v-model="form.content" placeholder="发表一个友善的评论吧~" :rows="5" type="textarea"></el-input>
+  <el-input v-model="topContent" placeholder="发表一个友善的评论吧~" :rows="5" type="textarea"></el-input>
   <el-button @click="addTopComment" type="primary" class="btn-top-comment">发表评论</el-button>
   <el-button class="btn-top-comment">其他</el-button>
 
@@ -66,11 +66,10 @@
 
     </div>
 
-   
     <el-divider />
+ 
   </div>
-
-
+     <el-empty v-show="commentList.length<=0"  description="评论空空如也，快来抢占沙发~" />
 </template>
 <script setup>
 import { onMounted, reactive, ref } from "vue";
@@ -82,6 +81,7 @@ const route = useRoute();
 const router = useRouter();
 const commentList = ref([]);
 const query = reactive({});
+const topContent=ref('');
 //当前回复id
 const replayId = ref('');
 //回复文本框
@@ -104,6 +104,7 @@ onMounted(async () => {
   await loadComment();
 });
 const loadComment = async () => {
+topContent.value='';
   form.content = '';
   const response = await getListByDiscussId(route.params.discussId, query);
   commentList.value = response.data.items;
@@ -112,6 +113,7 @@ const loadComment = async () => {
 const addTopComment = async () => {
   form.parentId = 0;
   form.rootId = 0;
+ form.content=topContent.value;
   await addComment();
 }
 const addComment = async () => {
diff --git a/Yi.BBS.Vue3/src/views/Article.vue b/Yi.BBS.Vue3/src/views/Article.vue
index b34ca0fb..48f70454 100644
--- a/Yi.BBS.Vue3/src/views/Article.vue
+++ b/Yi.BBS.Vue3/src/views/Article.vue
@@ -261,12 +261,14 @@ const updateArticle = (node, data) => {
   router.push(routerPer);
 }
 //单机节点
-const handleNodeClick = (data) => {
+const handleNodeClick = async(data) => {
 
   //跳转路由
 
   router.push(`/article/${route.params.discussId}/${data.id}`);
-  discuss.value.content = data.content;
+
+  const response=await articleGet(data.id);
+  discuss.value.content = response.data.content;
   ContentHander();
 }
 //删除子文章
diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db
index c5300664bf69e7e2108d964507a5455bc79ee39e..38c22e75f41e3c23e8ce364b9cd900c742bab2c4 100644
GIT binary patch
delta 553
zcmZp8Al&dkc!D%z>qHr6#@5D!)&$1Z1g5PC%uDi_3%OjTvllQwWa4t!EGQ7gIXz%5
zGb_jbX|JN41Q-gp2UangYA|w4HrS^+ea#|f6(JJ^Lvt%53oAo&Jp(fXBSS-r?T;2Q
z9}{PEn=ZABIZ|^~TF)T?2C*5d(psAY7>o>zjCBo+b&Vj}EUiop^(;-yO-(IKw`=ca
zzPW{2iKzr=KZ`RHQwh+14JN&$LM}FEL3Md?MNJMds5?-N0Xo3gP|w)V!raJkx?v5A
z+4dVnEIP5w`V7;ivtM9|WMwpExXmzq;RYtddS`uZHV$z%4rdNF1_rVHvkU})t}_Aw
zv7N?2cY%IHHQU(G%EVI7(8$!p+{hT_iwHfSA&P8l&TJ4vR4)Ma85<fwkO|Brv3+w-
z??v@=HrTCJ#uj>JM&>34hQ=^8Fr&S6fkvys-8XaVY@h+px)wdzvFh2TnNRyCimjWb
zu=fzUGmR{*OpNu+jSVf0O-!L?ZEv{9(!$5A&pU5A`vb;!U}#$Kf@4z&>TP`<W;RA(
U7=WFx2jM_0)ZKpcEsHf10OzBc`2YX_

delta 209
zcmZp8Al&dkc!D%z$wV1v#*)T_)&$1Z1g5PC%uDi_3%CNOvllQw+$<=N$vHh>E;H-)
zuqtK)4Mx_<2K!W}uUW*bB4nswWN2k-Y-MDjXK7+&Y-wP!{m~-kW8#c9)1`JXM{2H0
z>p3LAAT|R+8yOfG>lzsA8W}4X8Cw||S{WMX8JQXz8XKE$*WS&1a|^Q~(+!}VEY3hX
z`<S-hC}PoxW!7PAoX&oMB@!s6$hf`nB1<zLvkvdk>Ff^}L1L-A5VxIr%VNd^0Npr1
A{r~^~

diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Article/ArticleAllOutputDto.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Article/ArticleAllOutputDto.cs
index aa0502bc..eff34670 100644
--- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Article/ArticleAllOutputDto.cs
+++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Article/ArticleAllOutputDto.cs
@@ -10,7 +10,9 @@ namespace Yi.BBS.Application.Contracts.Forum.Dtos
     public class ArticleAllOutputDto : IEntityDto<long>
     {
         public long Id { get; set; }
-        public string Content { get; set; }
+
+        //批量查询，不给内容，性能考虑
+        //public string Content { get; set; }
         public string Name { get; set; }
         public long DiscussId { get; set; }
         public long ParentId { get; set; }
diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Article/ArticleGetListOutputDto.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Article/ArticleGetListOutputDto.cs
index 466433fd..569097ed 100644
--- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Article/ArticleGetListOutputDto.cs
+++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Article/ArticleGetListOutputDto.cs
@@ -10,7 +10,8 @@ namespace Yi.BBS.Application.Contracts.Forum.Dtos
     public class ArticleGetListOutputDto : IEntityDto<long>
     {
         public long Id { get; set; }
-        public string Content { get; set; }
+        //������ѯ���������ݣ����ܿ���
+        //public string Content { get; set; }
         public string Name { get; set; }
         public long DiscussId { get; set; }
 
diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Comment/CommentGetListOutputDto.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Comment/CommentGetListOutputDto.cs
index 77339816..156180bd 100644
--- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Comment/CommentGetListOutputDto.cs
+++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Comment/CommentGetListOutputDto.cs
@@ -21,8 +21,8 @@ namespace Yi.BBS.Application.Contracts.Forum.Dtos
 
 
 
-        //������ѯ���������ݣ����ܿ���
-        //public string Content { get; set; }
+     
+        public string Content { get; set; }
 
 
         /// <summary>
diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db
index c5300664bf69e7e2108d964507a5455bc79ee39e..38c22e75f41e3c23e8ce364b9cd900c742bab2c4 100644
GIT binary patch
delta 553
zcmZp8Al&dkc!D%z>qHr6#@5D!)&$1Z1g5PC%uDi_3%OjTvllQwWa4t!EGQ7gIXz%5
zGb_jbX|JN41Q-gp2UangYA|w4HrS^+ea#|f6(JJ^Lvt%53oAo&Jp(fXBSS-r?T;2Q
z9}{PEn=ZABIZ|^~TF)T?2C*5d(psAY7>o>zjCBo+b&Vj}EUiop^(;-yO-(IKw`=ca
zzPW{2iKzr=KZ`RHQwh+14JN&$LM}FEL3Md?MNJMds5?-N0Xo3gP|w)V!raJkx?v5A
z+4dVnEIP5w`V7;ivtM9|WMwpExXmzq;RYtddS`uZHV$z%4rdNF1_rVHvkU})t}_Aw
zv7N?2cY%IHHQU(G%EVI7(8$!p+{hT_iwHfSA&P8l&TJ4vR4)Ma85<fwkO|Brv3+w-
z??v@=HrTCJ#uj>JM&>34hQ=^8Fr&S6fkvys-8XaVY@h+px)wdzvFh2TnNRyCimjWb
zu=fzUGmR{*OpNu+jSVf0O-!L?ZEv{9(!$5A&pU5A`vb;!U}#$Kf@4z&>TP`<W;RA(
U7=WFx2jM_0)ZKpcEsHf10OzBc`2YX_

delta 209
zcmZp8Al&dkc!D%z$wV1v#*)T_)&$1Z1g5PC%uDi_3%CNOvllQw+$<=N$vHh>E;H-)
zuqtK)4Mx_<2K!W}uUW*bB4nswWN2k-Y-MDjXK7+&Y-wP!{m~-kW8#c9)1`JXM{2H0
z>p3LAAT|R+8yOfG>lzsA8W}4X8Cw||S{WMX8JQXz8XKE$*WS&1a|^Q~(+!}VEY3hX
z`<S-hC}PoxW!7PAoX&oMB@!s6$hf`nB1<zLvkvdk>Ff^}L1L-A5VxIr%VNd^0Npr1
A{r~^~