From a64df5cf0ca62fec2a53a2fb48defc87a89ee608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=96=E5=BD=A6=E6=A3=8B?= <liaoyq@pvc123.com>
Date: Thu, 14 Mar 2024 15:25:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E8=A7=92=E8=89=B2=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/src/views/SysRole/SysRoleContainer.vue |  1 +
 .../admin/src/views/SysRole/SysRoleForm.vue      | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

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 @@
     >
       <a-input v-model="formData.description" />
     </a-formItem>
-    <a-formItem
-      label="平台权限"
-      field="permissions"
-      :rules="[{ required: true, message: '请选择平台权限' }]"
-    >
+    <a-formItem label="平台权限" field="permissions">
       <a-tree
         v-model:checked-keys="formData.permissions"
+        :half-checked-keys="[]"
         :data="options"
+        :loading="loading"
         :field-names="{ key: 'id', title: 'name' }"
+        multiple
+        checkable
+        only-check-leaf
       />
     </a-formItem>
   </a-form>
@@ -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 });
 </script>