From 522b18ff7d7220b6150da4e87a30eba2b5e2d871 Mon Sep 17 00:00:00 2001
From: Xwen <929716663@qq.com>
Date: Thu, 21 Dec 2023 23:59:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=9D=83=E9=99=90=E3=80=81=E6=8A=BD=E5=8F=96?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E9=80=BB=E8=BE=91=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=B6=85=E7=AE=A1=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Bbs.Vue3/src/utils/auth.js     |  8 ++++++--
 Yi.Bbs.Vue3/src/views/Article.vue | 23 +++++++++++++++++++----
 Yi.Bbs.Vue3/src/views/Discuss.vue |  7 ++++---
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/Yi.Bbs.Vue3/src/utils/auth.js b/Yi.Bbs.Vue3/src/utils/auth.js
index 691f4923..7e259f8d 100644
--- a/Yi.Bbs.Vue3/src/utils/auth.js
+++ b/Yi.Bbs.Vue3/src/utils/auth.js
@@ -13,10 +13,14 @@ export function removeToken() {
   return localStorage.removeItem(TokenKey);
 }
 
-export function getPermission(code) {
+export function getPermission(code, isDisabled) {
   const all_permission = "*:*:*";
   const isHasPermission = useUserStore().permissions.some((permission) => {
-    return all_permission === permission || code.includes(permission);
+    if (all_permission === permission) {
+      return true;
+    } else {
+      return code.includes(permission) && !isDisabled;
+    }
   });
   return {
     isHasPermission,
diff --git a/Yi.Bbs.Vue3/src/views/Article.vue b/Yi.Bbs.Vue3/src/views/Article.vue
index b286d515..e03d14fd 100644
--- a/Yi.Bbs.Vue3/src/views/Article.vue
+++ b/Yi.Bbs.Vue3/src/views/Article.vue
@@ -12,7 +12,7 @@
                   >主题封面</el-button
                 >
                 <el-button
-                  v-hasPer="['bbs:article:add']"
+                  v-if="isAddArticle"
                   @click="addArticle('00000000-0000-0000-0000-000000000000')"
                   type="primary"
                   style="width: 100%; margin-bottom: 0.8rem; margin-left: 0"
@@ -105,14 +105,14 @@
                       <el-button
                         type="primary"
                         size="default"
-                        v-hasPer="['bbs:discuss:edit']"
+                        v-if="isEditTheme"
                         @click="updateHander(route.params.discussId)"
                         >编辑</el-button
                       >
                       <el-button
                         style="margin-left: 1rem"
                         type="danger"
-                        v-hasPer="['bbs:discuss:remove']"
+                        v-if="isRemoveTheme"
                         @click="delHander(route.params.discussId)"
                         >删除</el-button
                       >
@@ -170,7 +170,7 @@
   </div>
 </template>
 <script setup>
-import { h, ref, onMounted, watch } from "vue";
+import { h, ref, onMounted, watch, computed } from "vue";
 import AvatarInfo from "@/components/AvatarInfo.vue";
 import InfoCard from "@/components/InfoCard.vue";
 import ArticleContentInfo from "@/components/ArticleContentInfo.vue";
@@ -186,6 +186,7 @@ import {
   get as articleGet,
 } from "@/apis/articleApi.js";
 import Breadcrumb from "@/components/Breadcrumb/index.vue";
+import { getPermission } from "@/utils/auth";
 
 //数据定义
 const route = useRoute();
@@ -219,12 +220,26 @@ const loadArticleData = async () => {
 };
 
 //主题初始化
+const isDisabledCreateComment = ref(false);
+const { isHasPermission: isAddArticle } = getPermission(
+  "bbs:article:add",
+  isDisabledCreateComment.value
+);
+const { isHasPermission: isEditTheme } = getPermission(
+  "bbs:discuss:edit",
+  isDisabledCreateComment.value
+);
+const { isHasPermission: isRemoveTheme } = getPermission(
+  "bbs:discuss:remove",
+  isDisabledCreateComment.value
+);
 const loadDiscuss = async (isRewrite) => {
   if (isRewrite) {
     //跳转路由
     router.push(`/article/${route.params.discussId}`);
   }
   discuss.value = (await discussGet(route.params.discussId)).data;
+  isDisabledCreateComment.value = discuss.value.isDisabledCreateComment;
   if (route.params.articleId != "") {
     const response = await articleGet(route.params.articleId);
     discuss.value.content = response.data.content;
diff --git a/Yi.Bbs.Vue3/src/views/Discuss.vue b/Yi.Bbs.Vue3/src/views/Discuss.vue
index 413d2e99..5e95a96e 100644
--- a/Yi.Bbs.Vue3/src/views/Discuss.vue
+++ b/Yi.Bbs.Vue3/src/views/Discuss.vue
@@ -160,10 +160,11 @@ const loadDiscussList = async () => {
 };
 
 //进入添加主题页面
-const { isHasPermission } = getPermission("bbs:discuss:add");
-const isEditArticle = computed(
-  () => isHasPermission && !(route.params.isPublish === "false" ? false : true)
+const { isHasPermission: isEditArticle } = getPermission(
+  "bbs:discuss:add",
+  route.params.isPublish === "false" ? false : true
 );
+
 const enterEditArticle = () => {
   if (isEditArticle.value) {
     //跳转路由