From 5589c7fa4f6e3a31cf0c96bb2ded4f5ca783ff7c Mon Sep 17 00:00:00 2001
From: hbzgyjh <yjh19930815>
Date: Mon, 20 Dec 2021 19:43:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/security/menu/MenuForm.vue | 1 +
 src/views/security/menu/MenuList.vue | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/security/menu/MenuForm.vue b/src/views/security/menu/MenuForm.vue
index 7cbf0c5..305cb92 100644
--- a/src/views/security/menu/MenuForm.vue
+++ b/src/views/security/menu/MenuForm.vue
@@ -175,6 +175,7 @@ export default {
         this.visibleDef = true
       }
       this.form.getFieldDecorator('visible', { valuePropName: 'checked', initialValue: this.visibleDef })
+      this.treeSelDefaultValue = record.id;
 
       setTimeout(() => {
         this.setMenuItem(record)
diff --git a/src/views/security/menu/MenuList.vue b/src/views/security/menu/MenuList.vue
index 1bdf9b6..3568592 100644
--- a/src/views/security/menu/MenuList.vue
+++ b/src/views/security/menu/MenuList.vue
@@ -44,9 +44,9 @@
         <span slot="action" slot-scope="text, record" >
           <template>
             <a v-if="hasPerm('sys:menu:add') && record.type !== 2" @click="$refs.menuForm.add(record.id)">新增下级</a>
-            <a-divider type="vertical" v-if="hasPerm('sys:menu:add')" />
+            <a-divider type="vertical" v-if="hasPerm('sys:menu:add') && record.type !== 2 && hasPerm('sys:menu:edit')" />
             <a v-if="hasPerm('sys:menu:edit')" @click="$refs.menuForm.edit(record)">编辑</a>
-            <a-divider type="vertical" v-if="hasPerm('sys:menu:edit')" />
+            <a-divider type="vertical" v-if="hasPerm('sys:menu:edit') && hasPerm('sys:menu:delete') " />
             <a-popconfirm v-if="hasPerm('sys:menu:delete')" placement="topRight" title="删除本菜单与下级？" @confirm="() => handleDel(record)">
               <a>删除</a>
             </a-popconfirm>