From 295cf5e06651a603a77e42192ee533fce20d0f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Tue, 14 Mar 2023 22:58:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=AD=90=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0crud?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ArticleContentInfo.vue     |   1 -
 Yi.BBS.Vue3/src/components/AvatarInfo.vue     |   1 -
 .../src/components/TreeArticleInfo.vue        |  16 ++++--
 Yi.BBS.Vue3/src/views/Article.vue             |  49 +++++++++++++++++-
 Yi.BBS.Vue3/src/views/EditArticle.vue         |  25 +++++----
 .../project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db | Bin 245760 -> 245760 bytes
 .../Forum/Dtos/Article/ArticleAllOutputDto.cs |   2 +
 .../Dtos/Article/ArticleUpdateInputVo.cs      |   1 -
 .../Forum/ArticleService.cs                   |   4 +-
 .../project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db | Bin 245760 -> 245760 bytes
 10 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/Yi.BBS.Vue3/src/components/ArticleContentInfo.vue b/Yi.BBS.Vue3/src/components/ArticleContentInfo.vue
index b268e420..1d5d5589 100644
--- a/Yi.BBS.Vue3/src/components/ArticleContentInfo.vue
+++ b/Yi.BBS.Vue3/src/components/ArticleContentInfo.vue
@@ -15,7 +15,6 @@ import { ref,watch  } from 'vue';
 const outputHtml=ref("")
 const props = defineProps(['code'])
 watch(props,(n,o)=>{
-
     marked.setOptions({
         renderer: new marked.Renderer(),
         highlight: function(code) {
diff --git a/Yi.BBS.Vue3/src/components/AvatarInfo.vue b/Yi.BBS.Vue3/src/components/AvatarInfo.vue
index 55adb5a6..45be7081 100644
--- a/Yi.BBS.Vue3/src/components/AvatarInfo.vue
+++ b/Yi.BBS.Vue3/src/components/AvatarInfo.vue
@@ -38,7 +38,6 @@ onMounted(() => {
     //使用传入值
     if(props.userInfo!= undefined)
     {
-        console.log(props.userInfo,"props.userInfo333");
         userInfo.icon=props.userInfo.icon;
         userInfo.name=props.userInfo.name;
         userInfo.role=props.userInfo.role;
diff --git a/Yi.BBS.Vue3/src/components/TreeArticleInfo.vue b/Yi.BBS.Vue3/src/components/TreeArticleInfo.vue
index 862bdf3c..3ebb7e09 100644
--- a/Yi.BBS.Vue3/src/components/TreeArticleInfo.vue
+++ b/Yi.BBS.Vue3/src/components/TreeArticleInfo.vue
@@ -1,7 +1,7 @@
 <template>
       <el-tree
-                  :data="props.data"
-                  :props="defaultProps"
+                  :data="data"
+                  :props="props.defaultProps"
                   @node-click="handleNodeClick"
                   :expand-on-click-node="false"
                   node-key="id"
@@ -9,8 +9,15 @@
 
                 <template #default="{ node, data }">
         <span class="custom-tree-node">
-          <span>{{ node.label }}</span>
+          <span>{{data.name}}</span>
           <span>
+            
+            <a style="color: #409EFF; margin-left: 8px" @click="$emit('create',node, data)" 
+  
+  > + </a>
+            <a style="color: #409EFF; margin-left: 8px" @click="$emit('update',node, data)" 
+  
+  > 编辑 </a>
             <a style="color: #f56c6c; margin-left: 8px" @click="$emit('remove',node, data)" 
   
             > 删除 </a>
@@ -22,6 +29,7 @@
 <script setup>
 
 const props = defineProps(['data'])
+const emits= defineEmits(["handleNodeClick"])
 //数据定义
 //子文章数据
 // const articleData =ref([]);
@@ -37,6 +45,6 @@ const defaultProps = {
 // }
 //点击事件
 const handleNodeClick = (data) => {
-  console.log(data);
+  emits('handleNodeClick',data)
 };
 </script>
diff --git a/Yi.BBS.Vue3/src/views/Article.vue b/Yi.BBS.Vue3/src/views/Article.vue
index 1165702b..6286c1ce 100644
--- a/Yi.BBS.Vue3/src/views/Article.vue
+++ b/Yi.BBS.Vue3/src/views/Article.vue
@@ -8,17 +8,19 @@
             <InfoCard header="主题信息" text="展开" hideDivider="true">
               <template #content>
                 <el-button style="width: 100%; margin-bottom: 0.8rem"
+                @click="loadDiscuss"
                   >首页</el-button
                 >
                 <el-button
-                 v-hasPer="['bbs:acticle:add']"
+                 v-hasPer="['bbs:article:add']"
                   @click="addArticle(0)"
                   type="primary"
                   style="width: 100%; margin-bottom: 0.8rem; margin-left: 0"
                   >添加子文章</el-button
                 >
           <!--目录在这里 -->
-          <TreeArticleInfo :data="articleData" @remove="delArticle" />
+          <TreeArticleInfo :data="articleData" @remove="delArticle" @update="updateArticle"
+          @create="addNextArticle" @handleNodeClick="handleNodeClick" />
               </template>
             </InfoCard>
           </el-col>
@@ -78,6 +80,7 @@
               <template #content>
                 <div>
                   <ul class="art-info-ul">
+                    
                     <li>
                       <el-button
                         type="primary"
@@ -227,6 +230,48 @@ const updateHander = (discussId) => {
   router.push(routerPer);
 };
 
+//跳转添加子菜单
+const addNextArticle=(node,data)=>{
+  //跳转路由
+  var routerPer = {
+    path: "/editArt",
+    query: {
+      operType: "create",
+      artType: "article",
+      discussId: data.discussId,
+      parentArticleId: data.id,
+    },
+  };
+  router.push(routerPer);
+}
+
+//跳转更新子菜单
+const updateArticle=(node,data)=>{
+  //跳转路由
+  var routerPer = {
+    path: "/editArt",
+    query: {
+      operType: "update",
+      artType: "article",
+      discussId: data.discussId,
+      parentArticleId: data.parentId,
+      articleId:data.id
+    },
+  };
+  router.push(routerPer);
+}
+//单机节点
+const handleNodeClick=(data)=>{
+  //加载目录
+  var reg = /(#{1,6})\s(.*)/g;
+  discuss.value.content=data.content;
+  var myArray = discuss.value.content.match(reg);
+  if (myArray != null) {
+    catalogueData.value = myArray.map((x) => {
+      return x.replace(/#/g, "").replace(/\s/g, "");
+    });
+  }
+}
 //删除子文章
 const delArticle=( node,data)=>{
     ElMessageBox.confirm(`确定是否删除编号[${data.id}]的子文章吗?`, "警告", {
diff --git a/Yi.BBS.Vue3/src/views/EditArticle.vue b/Yi.BBS.Vue3/src/views/EditArticle.vue
index e7e0925c..78429bc7 100644
--- a/Yi.BBS.Vue3/src/views/EditArticle.vue
+++ b/Yi.BBS.Vue3/src/views/EditArticle.vue
@@ -23,7 +23,7 @@
         >
           <el-input placeholder="请输入" v-model="editForm.name" />
         </el-form-item>
-        <el-form-item label="标题：" prop="title">
+        <el-form-item v-else label="标题：" prop="title">
           <el-input placeholder="请输入" v-model="editForm.title" />
         </el-form-item>
         <el-form-item label="描述：" prop="introduction">
@@ -67,9 +67,9 @@ import {
 } from "@/apis/discussApi.js";
 
 import {
-  add as acticleAdd,
-  update as acticleUpdate,
-  get as acticleGet,
+  add as articleAdd,
+  update as articleUpdate,
+  get as articleGet,
 } from "@/apis/articleApi.js";
 
 //数据定义
@@ -136,20 +136,19 @@ const submit = async (formEl) => {
       //artcle文章处理
       else if (route.query.artType == "article") {
 //组装文章内容：需要添加的文章信息
-
-        article. content= editForm.content;
+        article.content= editForm.content;
         article.name= editForm.name;
         article.discussId=route.query.discussId;
+        article.parentId=route.query.parentArticleId
         //文章创建
         if (route.query.operType == "create") {
-          await acticleAdd(article);
+          await articleAdd(article);
         }
         //文章更新
         else if (route.query.operType == "update") {
           await articleUpdate(route.query.articleId, article);
         }
       }
-
       //添加成功后跳转到该页面
       var routerPer = { path: `/discuss/${discuss.plateId}` };
       router.push(routerPer);
@@ -168,8 +167,8 @@ onMounted(async () => {
       await loadDiscuss();
 
       //更新文章
-    } else if (route.query.artType == "acticle") {
-      await loadActicle();
+    } else if (route.query.artType == "article") {
+      await loadArticle();
     }
   }
 });
@@ -183,11 +182,11 @@ const loadDiscuss = async () => {
   discuss.plateId=response.plateId;
 };
 //加载文章
-const loadActicle = async () => {
-  const response = await acticleGet(route.query.acticleId);
+const loadArticle = async () => {
+  const response = await articleGet(route.query.articleId);
   editForm.content = response.content;
   editForm.name = response.name;
-  // editForm.discussId = response.discussId;
+  editForm.discussId = response.discussId;
 };
 </script>
 <style scoped>
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 c5dd2ab833ef352a937ef488f3d5e9a2f8cd3400..ae8d10af771d2531016a96d3e3c9da0b12c3db6e 100644
GIT binary patch
delta 772
zcmZo@;BRQ)pCHXRf1->t<NS>Y3*Q^^NHK_VTQcz9;$Ola#IMcI!gro;7GEKs3-3?f
zLp*nRJ-8R}_VUc(3FA@VKF^)UZMj)cfStSESd5d6Q&p0Uje$XIGjrVrCIN=T;uHuf
zPE0WZ1F;R}&Vq*oKq@j$ISDWrhypd~O0#i*HGzc;jSY=p2t*qtf&omYE<Yz5hps4C
z$EFY8T7lN2fIvMEgDe9PNl8h`F!i1yK=rn|U}tUm=EDZGR9RUeF{L;$4FuB@i_?Lw
zgXo017Q!t~ff*sT>6?@Y&>mhX1~v{&6Jel%n&MCc!4ie#sfG1G3_+=2_aiia-N)J_
zz~CYT)TV6;(f0M^G@y{7QEGW&YDziW`eI0EK}nEn&`q%y1e#*12sH(4Fi=?<&;&h@
z-+?XwxuU!fWD>+%NG5cA1bV`n7ifaM{^Z`jx;BY0N!~UFJq}%Aj6g*VQ<!QSK47Fx
z_Wf&V!e7V0&Y`bsEC31;RfzVlU~6D82#iV~6A`0E#+!Hj^<v@?<@><E{{@)F&hkH>
zEO0;xn1=T8O;$L^nhZ@lVm!=jjId-P3g$qgPXx*V2fZ+a0|`(eC<h!af=~|FIRX$4
UB)#yrNANQOG1K-4e&!V$0N9e)2><{9

delta 139
zcmZo@;BRQ)pCHZHKT*b+v43O2!uN{&bqu_`9t`}q_?Pep@oV$5@SW$I#aGDZ!uyl=
z5N{i=$7VqRHC|R5K2A1{$-aLr*{yhiEPdU{PyXm`-u2guNsgC4f`R`F(15f2&-oAV
pZ{}adKa;<Qzn;H{Kb1cMsNIZzvcfsG_Beh<AZFSg$IrZI0{~~{DoFqU

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 e800be39..aa0502bc 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
@@ -14,5 +14,7 @@ namespace Yi.BBS.Application.Contracts.Forum.Dtos
         public string Name { get; set; }
         public long DiscussId { get; set; }
         public long ParentId { get; set; }
+
+        public List<ArticleAllOutputDto> Children { get; set; }
     }
 }
diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Article/ArticleUpdateInputVo.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Article/ArticleUpdateInputVo.cs
index f8607650..a9877566 100644
--- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Article/ArticleUpdateInputVo.cs
+++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application.Contracts/Forum/Dtos/Article/ArticleUpdateInputVo.cs
@@ -8,7 +8,6 @@ namespace Yi.BBS.Application.Contracts.Forum.Dtos
 {
     public class ArticleUpdateInputVo
     {
-        public long Id { 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/Forum/ArticleService.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/ArticleService.cs
index 12eb207a..31b306d5 100644
--- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/ArticleService.cs
+++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/ArticleService.cs
@@ -41,8 +41,8 @@ namespace Yi.BBS.Application.Forum
             }
 
             var entities = await _articleRepository.GetTreeAsync(x => x.DiscussId == discussId);
-            var result = entities.Tile();
-            var items = _mapper.Map<List<ArticleAllOutputDto>>(result);
+            //var result = entities.Tile();
+            var items = _mapper.Map<List<ArticleAllOutputDto>>(entities);
             return items;
         }
 
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 c5dd2ab833ef352a937ef488f3d5e9a2f8cd3400..ae8d10af771d2531016a96d3e3c9da0b12c3db6e 100644
GIT binary patch
delta 772
zcmZo@;BRQ)pCHXRf1->t<NS>Y3*Q^^NHK_VTQcz9;$Ola#IMcI!gro;7GEKs3-3?f
zLp*nRJ-8R}_VUc(3FA@VKF^)UZMj)cfStSESd5d6Q&p0Uje$XIGjrVrCIN=T;uHuf
zPE0WZ1F;R}&Vq*oKq@j$ISDWrhypd~O0#i*HGzc;jSY=p2t*qtf&omYE<Yz5hps4C
z$EFY8T7lN2fIvMEgDe9PNl8h`F!i1yK=rn|U}tUm=EDZGR9RUeF{L;$4FuB@i_?Lw
zgXo017Q!t~ff*sT>6?@Y&>mhX1~v{&6Jel%n&MCc!4ie#sfG1G3_+=2_aiia-N)J_
zz~CYT)TV6;(f0M^G@y{7QEGW&YDziW`eI0EK}nEn&`q%y1e#*12sH(4Fi=?<&;&h@
z-+?XwxuU!fWD>+%NG5cA1bV`n7ifaM{^Z`jx;BY0N!~UFJq}%Aj6g*VQ<!QSK47Fx
z_Wf&V!e7V0&Y`bsEC31;RfzVlU~6D82#iV~6A`0E#+!Hj^<v@?<@><E{{@)F&hkH>
zEO0;xn1=T8O;$L^nhZ@lVm!=jjId-P3g$qgPXx*V2fZ+a0|`(eC<h!af=~|FIRX$4
UB)#yrNANQOG1K-4e&!V$0N9e)2><{9

delta 139
zcmZo@;BRQ)pCHZHKT*b+v43O2!uN{&bqu_`9t`}q_?Pep@oV$5@SW$I#aGDZ!uyl=
z5N{i=$7VqRHC|R5K2A1{$-aLr*{yhiEPdU{PyXm`-u2guNsgC4f`R`F(15f2&-oAV
pZ{}adKa;<Qzn;H{Kb1cMsNIZzvcfsG_Beh<AZFSg$IrZI0{~~{DoFqU