diff --git a/new-ui/projects/admin/src/views/SysRole/SysRoleContainer.vue b/new-ui/projects/admin/src/views/SysRole/SysRoleContainer.vue
index d6297643..0a459ed4 100644
--- a/new-ui/projects/admin/src/views/SysRole/SysRoleContainer.vue
+++ b/new-ui/projects/admin/src/views/SysRole/SysRoleContainer.vue
@@ -30,6 +30,7 @@ const columns: SearchTableColumns[] = [
];
const openFormModal = usePopup(SysRoleForm, {
+ type: "drawer",
nodeProps: ([record]) => ({ record }),
popupProps: ([record, reload], exposed) => ({
title: `${record?.id ? "编辑" : "新增"}角色`,
diff --git a/new-ui/projects/admin/src/views/SysRole/SysRoleForm.vue b/new-ui/projects/admin/src/views/SysRole/SysRoleForm.vue
index 822ffb12..4068c6e7 100644
--- a/new-ui/projects/admin/src/views/SysRole/SysRoleForm.vue
+++ b/new-ui/projects/admin/src/views/SysRole/SysRoleForm.vue
@@ -14,15 +14,16 @@
>
-
+
@@ -45,7 +46,10 @@ const { formRef, formData, handleSubmit } = useSubmit({
permissions: [],
});
-Object.assign(formData, props.record);
+Object.assign(formData, {
+ ...props.record,
+ permissions: props.record?.permissions?.map((item) => item.id) ?? [],
+});
getOptions();
defineExpose({ handleSubmit });