From 04fb38757c78e0f6da581ad1d9e18af884c964dc Mon Sep 17 00:00:00 2001
From: Xwen <929716663@qq.com>
Date: Sat, 23 Dec 2023 19:05:51 +0800
Subject: [PATCH] =?UTF-8?q?perf:=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/TreeArticleInfo.vue        | 84 +++++++++++--------
 Yi.Bbs.Vue3/src/utils/auth.js                 |  2 +-
 Yi.Bbs.Vue3/src/views/Article.vue             | 16 +---
 3 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/Yi.Bbs.Vue3/src/components/TreeArticleInfo.vue b/Yi.Bbs.Vue3/src/components/TreeArticleInfo.vue
index c449024a..b14133d9 100644
--- a/Yi.Bbs.Vue3/src/components/TreeArticleInfo.vue
+++ b/Yi.Bbs.Vue3/src/components/TreeArticleInfo.vue
@@ -1,42 +1,52 @@
 <template>
-      <el-tree
-                  :data="props.data==''?[]:props.data"
-                  :props="defaultProps"
-                  @node-click="handleNodeClick"
-                  :expand-on-click-node="false"
-                  node-key="id"
-                  :default-expand-all='true'
-                  :highlight-current="true"
-                  :current-node-key="currentNodeKey"
-                >
-
-                <template #default="{ node, data }">
-        <span class="custom-tree-node">
-          <span>{{data.name}}</span>
-          <span>
-            
-            <a style="color: #409EFF; margin-left: 8px" @click="$emit('create',node, data)" v-hasPer="['bbs:article:add']"
-  
-  > + </a>
-            <a style="color: #409EFF; margin-left: 8px" @click="$emit('update',node, data)" v-hasPer="['bbs:article:edit']"
-  
-  > 编辑 </a>
-            <a style="color: #f56c6c; margin-left: 8px" @click="$emit('remove',node, data)" v-hasPer="['bbs:article:remove']"
-  
-            > 删除 </a>
-          </span>
+  <el-tree
+    :data="props.data == '' ? [] : props.data"
+    :props="defaultProps"
+    @node-click="handleNodeClick"
+    :expand-on-click-node="false"
+    node-key="id"
+    :default-expand-all="true"
+    :highlight-current="true"
+    :current-node-key="currentNodeKey"
+  >
+    <template #default="{ node, data }">
+      <span class="custom-tree-node">
+        <span>{{ data.name }}</span>
+        <span>
+          <a
+            style="color: #409eff; margin-left: 8px"
+            @click="$emit('create', node, data)"
+            v-if="isArticleUser && isAddArticle"
+          >
+            +
+          </a>
+          <a
+            style="color: #409eff; margin-left: 8px"
+            @click="$emit('update', node, data)"
+            v-if="isArticleUser && isEditArticle"
+          >
+            编辑
+          </a>
+          <a
+            style="color: #f56c6c; margin-left: 8px"
+            @click="$emit('remove', node, data)"
+            v-if="isArticleUser && isRemoveArticle"
+          >
+            删除
+          </a>
         </span>
-      </template>
-                </el-tree>
+      </span>
+    </template>
+  </el-tree>
 </template>
 <script setup>
-import { ref } from 'vue';
+import { ref } from "vue";
+import { getPermission } from "@/utils/auth";
 
+const props = defineProps(["data", "currentNodeKey", "isArticleUser"]);
+const emits = defineEmits(["handleNodeClick"]);
 
-const props = defineProps(['data',"currentNodeKey"])
-const emits= defineEmits(["handleNodeClick"])
-
-const currentNodeKey=props.currentNodeKey;
+const currentNodeKey = props.currentNodeKey;
 //数据定义
 //子文章数据
 // const articleData =ref([]);
@@ -52,8 +62,12 @@ const defaultProps = {
 // }
 //点击事件
 const handleNodeClick = (data) => {
-  emits('handleNodeClick',data)
+  emits("handleNodeClick", data);
 };
+const { isHasPermission: isAddArticle } = getPermission("bbs:article:add");
+const { isHasPermission: isEditArticle } = getPermission("bbs:article:edit");
+const { isHasPermission: isRemoveArticle } =
+  getPermission("bbs:article:remove");
 </script>
 <style scoped>
 .custom-tree-node {
@@ -64,4 +78,4 @@ const handleNodeClick = (data) => {
   font-size: 14px;
   padding-right: 8px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/Yi.Bbs.Vue3/src/utils/auth.js b/Yi.Bbs.Vue3/src/utils/auth.js
index 7e259f8d..c573648f 100644
--- a/Yi.Bbs.Vue3/src/utils/auth.js
+++ b/Yi.Bbs.Vue3/src/utils/auth.js
@@ -13,7 +13,7 @@ export function removeToken() {
   return localStorage.removeItem(TokenKey);
 }
 
-export function getPermission(code, isDisabled) {
+export function getPermission(code, isDisabled = false) {
   const all_permission = "*:*:*";
   const isHasPermission = useUserStore().permissions.some((permission) => {
     if (all_permission === permission) {
diff --git a/Yi.Bbs.Vue3/src/views/Article.vue b/Yi.Bbs.Vue3/src/views/Article.vue
index 66a1695a..c23d5e41 100644
--- a/Yi.Bbs.Vue3/src/views/Article.vue
+++ b/Yi.Bbs.Vue3/src/views/Article.vue
@@ -26,6 +26,7 @@
                   @create="addNextArticle"
                   @handleNodeClick="handleNodeClick"
                   :currentNodeKey="currentNodeKey"
+                  :isArticleUser="isArticleUser"
                 />
               </template>
             </InfoCard>
@@ -223,18 +224,9 @@ const loadArticleData = async () => {
 //主题初始化
 const isDisabledCreateComment = ref(false);
 const isArticleUser = 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 { isHasPermission: isAddArticle } = getPermission("bbs:article:add");
+const { isHasPermission: isEditTheme } = getPermission("bbs:discuss:edit");
+const { isHasPermission: isRemoveTheme } = getPermission("bbs:discuss:remove");
 const loadDiscuss = async (isRewrite) => {
   if (isRewrite) {
     //跳转路由