src/views/pms/resource/components/MenuTree.vue

@@ -112,7 +112,6 @@ function handleDelete(item) {
         await api.deletePermission(item.id)
         $message.success('删除成功', { key: 'deleteMenu' })
         emit('refresh')
-        emit('update:currentMenu', null)
       } catch (error) {
         $message.destroy('deleteMenu')
       }

src/views/pms/resource/components/ResAddOrEdit.vue

@@ -115,7 +115,7 @@
             <template #unchecked>禁用</template>
           </n-switch>
         </n-form-item-gi>
-        <n-form-item-gi v-if="modalForm.type === 'MENU'" :span="12" path="keepAlive">
+        <n-form-item-gi v-if="modalForm.type === 'MENU'" :span="12" path="enable">
           <template #label>
             <QuestionLabel
               label="KeepAlive"
@@ -184,8 +184,8 @@ const required = {
   trigger: ['blur', 'change'],
 }
 
-const defaultForm = { enable: true, show: true, layout: '' }
+const defaultForm = { enable: true, show: true }
-const [modalFormRef, modalForm, validation] = useForm()
+const [modalFormRef, modalForm, validation] = useForm(defaultForm)
 const [modalRef, okLoading] = useModal()
 
 const modalAction = ref('')
@@ -193,8 +193,8 @@ const parentIdDisabled = ref(false)
 function handleOpen(options = {}) {
   const { action, row = {}, ...rest } = options
   modalAction.value = action
-  modalForm.value = { ...defaultForm, ...row }
+  modalForm.value = { ...row }
-  parentIdDisabled.value = !!row.parentId && row.type === 'BUTTON'
+  parentIdDisabled.value = !!row.parentId
   modalRef.value.open({ ...rest, onOk: onSave })
 }