From c613b185da881327aef12ca6abf4a2475d38a341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sat, 18 Mar 2023 01:34:07 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=AE=8C=E5=96=84=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/TreeArticleInfo.vue        |   8 +-
 Yi.BBS.Vue3/src/layout/AppHeader.vue          |   8 +-
 Yi.BBS.Vue3/src/layout/LoginLayout.vue        |  91 ++++--------------
 Yi.BBS.Vue3/src/views/Article.vue             |  12 ++-
 Yi.BBS.Vue3/src/views/EditArticle.vue         |  17 +++-
 Yi.BBS.Vue3/src/views/Login.vue               |  20 +++-
 .../project/BBS/Yi.BBS.Web/yi-sqlsugar-dev.db | Bin 245760 -> 245760 bytes
 .../project/bbs/Yi.BBS.Web/yi-sqlsugar-dev.db | Bin 245760 -> 245760 bytes
 8 files changed, 71 insertions(+), 85 deletions(-)

diff --git a/Yi.BBS.Vue3/src/components/TreeArticleInfo.vue b/Yi.BBS.Vue3/src/components/TreeArticleInfo.vue
index f41cd5e3..ea72196c 100644
--- a/Yi.BBS.Vue3/src/components/TreeArticleInfo.vue
+++ b/Yi.BBS.Vue3/src/components/TreeArticleInfo.vue
@@ -6,6 +6,8 @@
                   :expand-on-click-node="false"
                   node-key="id"
                   :default-expand-all='true'
+                  :highlight-current="true"
+                  :current-node-key="currentNodeKey"
                 >
 
                 <template #default="{ node, data }">
@@ -28,9 +30,13 @@
                 </el-tree>
 </template>
 <script setup>
+import { ref } from 'vue';
 
-const props = defineProps(['data'])
+
+const props = defineProps(['data',"currentNodeKey"])
 const emits= defineEmits(["handleNodeClick"])
+
+const currentNodeKey=props.currentNodeKey;
 //数据定义
 //子文章数据
 // const articleData =ref([]);
diff --git a/Yi.BBS.Vue3/src/layout/AppHeader.vue b/Yi.BBS.Vue3/src/layout/AppHeader.vue
index c6670511..36606a4e 100644
--- a/Yi.BBS.Vue3/src/layout/AppHeader.vue
+++ b/Yi.BBS.Vue3/src/layout/AppHeader.vue
@@ -3,7 +3,7 @@
     :default-active="activeIndex"
     class="el-menu-demo"
     mode="horizontal"
-    ellipsis="false"
+    :ellipsis="false"
     @select="handleSelect"
     
   >
@@ -31,7 +31,10 @@
 
     <div class="flex-grow" />
 
-    <RouterLink to="/discuss"> <el-menu-item index="5">搜索</el-menu-item></RouterLink>
+   <el-menu-item index="5">
+      <el-input  placeholder="请输入关键字" clearable />
+      
+      搜索</el-menu-item>
     <el-menu-item index="6">
         <AvatarInfo :size='30' :isSelf="true"   />
     </el-menu-item>
@@ -42,7 +45,6 @@
       <el-menu-item index="6-3" @click="logout">登出</el-menu-item>
     </el-sub-menu>
 
-    <el-menu-item index="7">分享</el-menu-item>
   </el-menu>
 
 </template>
diff --git a/Yi.BBS.Vue3/src/layout/LoginLayout.vue b/Yi.BBS.Vue3/src/layout/LoginLayout.vue
index 905f0996..e10ddc7a 100644
--- a/Yi.BBS.Vue3/src/layout/LoginLayout.vue
+++ b/Yi.BBS.Vue3/src/layout/LoginLayout.vue
@@ -1,21 +1,17 @@
 <template>
 <div class="body-div" id="body">
 
-
-
-
   <div  class="left">
-    <video class="videoBG" controls autoplay playsinline loop disablepictureinpicture  poster="/loginBg.png">
-    <source src="/loginBg.mp4" type="video/mp4">
-    您的浏览器不支持 video 标签。
-</video>
-</div>
-
-
-<div class="right">
-  <RouterView />
-</div>
+    <video class="videoBG"  autoplay playsinline loop disablepictureinpicture  poster="/loginBg.png">
+    <!-- <source src="/loginBg.mp4" type="video/mp4"> -->
+    </video>
+  </div>
 
+  <div class="right">
+    <div class="right-div">
+    <RouterView />
+  </div>
+  </div>
 
 </div>
 
@@ -25,78 +21,33 @@
   <script setup>
 import { onMounted } from 'vue';
 
-const screenSize=()=>{
-
-  var screenHeight=document.documentElementclientHeight;
-		var screenWidth=document.documentElement.clientWidth;
-		var body=document.getElementById('body');
-		body.style.width=screenWidth+"px";
-		body.style.height=screenHeight+"px";
-}
-onMounted(()=>{
-  screenSize();
-  window.onresize = () => (() => {
-    screenSize();
-    })();
-})
-
 </script>
 <style scoped>
 .left
 {
-  width: 100%;
-  background-color:#00020E
+
+ background-color: #010413;
 }
 .right
 {
-  max-width: 520px;
-  width:40% ;
-  background-color: blue;
+
+}
+.right-div
+{
+margin-top: 60%;
+padding: 2rem;
 }
 .body-div
 {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
 
+display: flex;
+justify-content: space-between;
+height: 930px;
 }
 .videoBG
 {
+
 width:100% ;
 }
 
-    video::-webkit-media-controls-fullscreen-button {
-        display: none;
-    }
-
-    video::-webkit-media-controls-play-button {
-        display: none;
-    }
-
-    video::-webkit-media-controls-timeline {
-        display: none;
-    }
-
-    video::-webkit-media-controls-current-time-display{
-        display: none;            
-    }
-
-    video::-webkit-media-controls-time-remaining-display {
-        display: none;            
-    }
-
-    video::-webkit-media-controls-mute-button {
-        display: none;            
-    }
-    video::-webkit-media-controls-toggle-closed-captions-button {
-        display: none;            
-    }
-
-    video::-webkit-media-controls-volume-slider {
-        display: none;            
-    }
-
-    video::-webkit-media-controls-enclosure{ 
-        display: none;
-    }
 </style>
diff --git a/Yi.BBS.Vue3/src/views/Article.vue b/Yi.BBS.Vue3/src/views/Article.vue
index 10e3c3af..cf4c0965 100644
--- a/Yi.BBS.Vue3/src/views/Article.vue
+++ b/Yi.BBS.Vue3/src/views/Article.vue
@@ -12,7 +12,7 @@
                   style="width: 100%; margin-bottom: 0.8rem; margin-left: 0">添加子文章</el-button>
                 <!--目录在这里 -->
                 <TreeArticleInfo :data="articleData" @remove="delArticle" @update="updateArticle" @create="addNextArticle"
-                  @handleNodeClick="handleNodeClick" />
+                  @handleNodeClick="handleNodeClick" :currentNodeKey="currentNodeKey"/>
               </template>
             </InfoCard>
           </el-col>
@@ -83,7 +83,8 @@
             <InfoCard class="art-info-right" header="目录" hideDivider="true">
               <template #content>
                 <div>
-                  <ul class="art-info-ul">
+                  <el-empty :image-size="100" style="padding: 20px 0;" v-if="catalogueData.length==0" description="无目录" />
+                  <ul v-else class="art-info-ul">
                     <li v-for="(item, i) in catalogueData" :key="i">
                       <el-button style="width: 100%; justify-content: left" type="primary" text>{{ `${i + 1} ： ${item}`
                       }}</el-button>
@@ -134,23 +135,26 @@ const items = [{ user: "用户1" }, { user: "用户2" }, { user: "用户3" }];
 const articleData = ref([]);
 //主题内容
 const discuss = ref({});
-
+//当前默认选择的子文章
+const currentNodeKey=route.params.articleId;
 //目录数据
 const catalogueData = ref([]);
 
 //子文章初始化
 const loadArticleData = async () => {
+
   articleData.value = await articleall(route.params.discussId);
 }
 
 //主题初始化
 const loadDiscuss = async (isRewrite) => {
+
   if (isRewrite) {
     //跳转路由
     router.push(`/article/${route.params.discussId}`);
   }
   discuss.value = await discussGet(route.params.discussId);
-  if (route.params.articleId != undefined) {
+  if (route.params.articleId != "") {
     const respose = await articleGet(route.params.articleId);
     discuss.value.content = respose.content;
   }
diff --git a/Yi.BBS.Vue3/src/views/EditArticle.vue b/Yi.BBS.Vue3/src/views/EditArticle.vue
index 78429bc7..2ef44f6d 100644
--- a/Yi.BBS.Vue3/src/views/EditArticle.vue
+++ b/Yi.BBS.Vue3/src/views/EditArticle.vue
@@ -125,11 +125,15 @@ const submit = async (formEl) => {
 
         //主题创建
         if (route.query.operType == "create") {
-          await discussAdd(discuss);
+       const response=   await discussAdd(discuss);
+       var routerPer = { path: `/article/${response.id}` };
+      router.push(routerPer);
         }
         //主题更新
         else if (route.query.operType == "update") {
           await discussUpdate(route.query.discussId, discuss);
+          var routerPer = { path: `/article/${route.query.discussId}` };
+      router.push(routerPer);
         }
       }
 
@@ -142,16 +146,21 @@ const submit = async (formEl) => {
         article.parentId=route.query.parentArticleId
         //文章创建
         if (route.query.operType == "create") {
-          await articleAdd(article);
+         const response= await articleAdd(article);
+          var routerPer = { path: `/article/${route.query.discussId}/${response.id}` };
+      router.push(routerPer);
         }
         //文章更新
         else if (route.query.operType == "update") {
           await articleUpdate(route.query.articleId, article);
+
+          var routerPer = { path: `/article/${route.query.discussId}/${route.query.articleId}` };
+      router.push(routerPer);
         }
       }
       //添加成功后跳转到该页面
-      var routerPer = { path: `/discuss/${discuss.plateId}` };
-      router.push(routerPer);
+      // var routerPer = { path: `/discuss/${discuss.plateId}` };
+      // router.push(routerPer);
       // ruleFormRef.value.resetFields();
       // discuss.plateId = route.query.plateId;
     }
diff --git a/Yi.BBS.Vue3/src/views/Login.vue b/Yi.BBS.Vue3/src/views/Login.vue
index 30fa9299..7810a7b3 100644
--- a/Yi.BBS.Vue3/src/views/Login.vue
+++ b/Yi.BBS.Vue3/src/views/Login.vue
@@ -1,8 +1,8 @@
 <template>
-    这个是登录页面
+  <h2>  登录-欢迎</h2>
     <el-input v-model="loginForm.userName" placeholder="用户名" />
     <el-input v-model="loginForm.password" placeholder="密码" />
-    <el-button type="primary" @click="login">登录</el-button>
+    <el-button class="login-btn" type="primary" @click="login">登录</el-button>
 </template>
 <script setup>
 import { reactive } from 'vue';
@@ -25,4 +25,18 @@ if( response.code==undefined)
 }
 }
 
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+h2{
+    text-align: center;
+}
+.el-input
+{
+margin:0rem 0 0.5rem 0;
+
+}
+.login-btn
+{
+    width: 100%;
+}
+</style>
\ No newline at end of file
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 9d30001f2cc484540de617dc6e593e942f682f45..cea6ac789ee41ed093678d81eb4b36be7052ad7e 100644
GIT binary patch
delta 1320
zcmbtUTSyd97@pa&X_}ogGg7QXLhEg{((#-*d!2&vlBn2&J@gWU+v-DfBiD#}NQ*95
zblqY@N|fyKB!%e~<XX~05a~lbL?GSN?9GR+l+nMQEheR>;LJbspL4$RegA*{f7;r#
zwl?kTGXC+o><a$z?S`Hqp$L78FMQ3{_hstcDCQnnkUQ{m-?T&LiWEWQT?0S2bPnrW
zVcJ=<u3YCleeRL*9PE<saoS6*N86~a(lXRhwL{&bR-$ic7;&iD*@aFimz7P5+d1mo
z<qXO9fZ?dzdN4~Cr9-|FQQ|l_eGI|r&Aa!uG#PvLHZ|`z!p$w)B0HLD8vk>WOk6xM
z(c3xM9s~Qn;|Or2!iojIzjY{MvFslYGte<EFZSlg^3p1_NR-x>&PuvfdFu9Ios*-D
z;b>zt3^p8f!>4<tEW;}`5#wi;_Epc^cPK9P9jASSBs|sL$MgsJ{bl?eRZ2&db$nXo
z;c+CURbffJ;NffI3mb$oMOfo_;b?K_d@o-c%hW#?Z}rGxMP}jhteh2+E3v@*>d-k8
zo3sSe5)yP{Vo_>gVgxA0@papUU~xl%EUx{H7?>HoKM#Si<@Ff^`@Qjzh!8OHZ4?7v
zUyYUjO@S>MvIsUpm;%I%k46N)k!Qzznesti?6LskwR{1CVlSZq$}qWqVd|dE$Cwrg
z8YE;=9P~3xjve#qR`Kv$9@A$Lp8>i|Vlr)s?uZak1dqBnRlOVf!Veyynsn+stXNrA
z3Yfzp&Swq_B`@vFYRqL0BhN{M4+>X_Ymu{;(=KUs>X>?3U5%=ger2Vz7wY(ev-Loc
zB8Je?3Q5|`Nn*OXxDS_x#_zUI^xT*_c?L>v^8ES9_;nCXVc1hgEKDs5sq^{*Arb-@
zU|=`1;7(pire|zr?20~DpTNZ(k_uZDu>utUdzi7$cIg~;d-=oC)Y+SGB#e1N2r;}S
z4#I`ln+A5;qhN>smezXXj~LaH%0ww>*~zrb{v^f+yC$v;vdD?)O^;Lu*+w)xM~i7u
zzhRnwlTee11=Ul@<UCuHo?;nh_K%|G0wk_L2oxP|ioX~Xyu2J&l0sny^zgsG1XxYb
Ir0|sg1+Kr!HUIzs

delta 272
zcmZo@;BRQ)pCHY+Yod%Z<F1VfOZGFX@+nMaKj6JtP~aTz^!oFRteaKO-B;8T<+fzt
zzs0|VKZswOpM~!{-z>gDJ{R7fyoY%1@_KMD;O*s^!xP4%z<r)OkJ}Qco1J^I<?n|~
zyi${8{v2en=H+CY{P2%FqrznUzmn{{Z47!Gy26u}|CZnE@b?H4k0{><2L3NV3(oRC
zpDb`d324ARKCt!eU-=k;m}&c0K4$(vW(DR2)7cZ49f1lWn71!TW=`Q@R^UqnIvFG+
z3DL7Xt&Vw~p#U52SqA<Y{62hl`TF>*dCvkB?BwOnQRQLN<mGkd;E0|cyqDQz`n|o(
M>f4R?F`s1w0J5=H*Z=?k

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 9d30001f2cc484540de617dc6e593e942f682f45..cea6ac789ee41ed093678d81eb4b36be7052ad7e 100644
GIT binary patch
delta 1320
zcmbtUTSyd97@pa&X_}ogGg7QXLhEg{((#-*d!2&vlBn2&J@gWU+v-DfBiD#}NQ*95
zblqY@N|fyKB!%e~<XX~05a~lbL?GSN?9GR+l+nMQEheR>;LJbspL4$RegA*{f7;r#
zwl?kTGXC+o><a$z?S`Hqp$L78FMQ3{_hstcDCQnnkUQ{m-?T&LiWEWQT?0S2bPnrW
zVcJ=<u3YCleeRL*9PE<saoS6*N86~a(lXRhwL{&bR-$ic7;&iD*@aFimz7P5+d1mo
z<qXO9fZ?dzdN4~Cr9-|FQQ|l_eGI|r&Aa!uG#PvLHZ|`z!p$w)B0HLD8vk>WOk6xM
z(c3xM9s~Qn;|Or2!iojIzjY{MvFslYGte<EFZSlg^3p1_NR-x>&PuvfdFu9Ios*-D
z;b>zt3^p8f!>4<tEW;}`5#wi;_Epc^cPK9P9jASSBs|sL$MgsJ{bl?eRZ2&db$nXo
z;c+CURbffJ;NffI3mb$oMOfo_;b?K_d@o-c%hW#?Z}rGxMP}jhteh2+E3v@*>d-k8
zo3sSe5)yP{Vo_>gVgxA0@papUU~xl%EUx{H7?>HoKM#Si<@Ff^`@Qjzh!8OHZ4?7v
zUyYUjO@S>MvIsUpm;%I%k46N)k!Qzznesti?6LskwR{1CVlSZq$}qWqVd|dE$Cwrg
z8YE;=9P~3xjve#qR`Kv$9@A$Lp8>i|Vlr)s?uZak1dqBnRlOVf!Veyynsn+stXNrA
z3Yfzp&Swq_B`@vFYRqL0BhN{M4+>X_Ymu{;(=KUs>X>?3U5%=ger2Vz7wY(ev-Loc
zB8Je?3Q5|`Nn*OXxDS_x#_zUI^xT*_c?L>v^8ES9_;nCXVc1hgEKDs5sq^{*Arb-@
zU|=`1;7(pire|zr?20~DpTNZ(k_uZDu>utUdzi7$cIg~;d-=oC)Y+SGB#e1N2r;}S
z4#I`ln+A5;qhN>smezXXj~LaH%0ww>*~zrb{v^f+yC$v;vdD?)O^;Lu*+w)xM~i7u
zzhRnwlTee11=Ul@<UCuHo?;nh_K%|G0wk_L2oxP|ioX~Xyu2J&l0sny^zgsG1XxYb
Ir0|sg1+Kr!HUIzs

delta 272
zcmZo@;BRQ)pCHY+Yod%Z<F1VfOZGFX@+nMaKj6JtP~aTz^!oFRteaKO-B;8T<+fzt
zzs0|VKZswOpM~!{-z>gDJ{R7fyoY%1@_KMD;O*s^!xP4%z<r)OkJ}Qco1J^I<?n|~
zyi${8{v2en=H+CY{P2%FqrznUzmn{{Z47!Gy26u}|CZnE@b?H4k0{><2L3NV3(oRC
zpDb`d324ARKCt!eU-=k;m}&c0K4$(vW(DR2)7cZ49f1lWn71!TW=`Q@R^UqnIvFG+
z3DL7Xt&Vw~p#U52SqA<Y{62hl`TF>*dCvkB?BwOnQRQLN<mGkd;E0|cyqDQz`n|o(
M>f4R?F`s1w0J5=H*Z=?k