From 008bed05a97c021ca0c7a077890b999620ab1f9d Mon Sep 17 00:00:00 2001
From: hadeas <980643040@qq.com>
Date: Mon, 1 Apr 2024 12:36:32 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8A=A5=E9=94=99=E5=B9=B6=E4=B8=94=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E6=96=B0=E5=A2=9E=E7=9A=84=E8=8F=9C=E5=8D=95=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pms/resource/components/MenuTree.vue     | 1 +
 src/views/pms/resource/components/ResAddOrEdit.vue | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/pms/resource/components/MenuTree.vue b/src/views/pms/resource/components/MenuTree.vue
index 497dc54..de6110b 100644
--- a/src/views/pms/resource/components/MenuTree.vue
+++ b/src/views/pms/resource/components/MenuTree.vue
@@ -22,6 +22,7 @@
         :show-irrelevant-nodes="false"
         :pattern="pattern"
         :data="treeData"
+        :selected-keys="[currentMenu?.code]"
         :render-prefix="renderPrefix"
         :render-suffix="renderSuffix"
         :on-update:selected-keys="onSelect"
diff --git a/src/views/pms/resource/components/ResAddOrEdit.vue b/src/views/pms/resource/components/ResAddOrEdit.vue
index cbe040a..7f7a8ff 100644
--- a/src/views/pms/resource/components/ResAddOrEdit.vue
+++ b/src/views/pms/resource/components/ResAddOrEdit.vue
@@ -202,15 +202,17 @@ async function onSave() {
   await validation()
   okLoading.value = true
   try {
+    let newFormData
     if (!modalForm.value.parentId) modalForm.value.parentId = null
     if (modalAction.value === 'add') {
-      await api.addPermission(modalForm.value)
+      const res = await api.addPermission(modalForm.value)
+      newFormData = res.data
     } else if (modalAction.value === 'edit') {
       await api.savePermission(modalForm.value.id, modalForm.value)
     }
     okLoading.value = false
     $message.success('保存成功')
-    emit('refresh', modalForm.value)
+    emit('refresh', modalAction.value === 'add' ? newFormData : modalForm.value)
   } catch (error) {
     console.error(error)
     okLoading.value = false