From d8b4c7d37d4250ff38ba77da3e9e1a68795a6a9b Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Mon, 2 Jan 2023 18:36:07 +0800
Subject: [PATCH] feat: roles

---
 modules/Permissions/Http/Controllers/RolesController.php | 2 ++
 modules/Permissions/Models/Roles.php                     | 2 +-
 modules/Permissions/views/roles/form/create.vue          | 8 +++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/Permissions/Http/Controllers/RolesController.php b/modules/Permissions/Http/Controllers/RolesController.php
index e99149b..d462d17 100644
--- a/modules/Permissions/Http/Controllers/RolesController.php
+++ b/modules/Permissions/Http/Controllers/RolesController.php
@@ -39,6 +39,8 @@ class RolesController extends Controller
 
         $role->setAttribute('permissions', $role->permissions()->get()->toTree());
 
+        $role->setAttribute('departments', $role->departments()->get()->toTree());
+
         return $role;
     }
 
diff --git a/modules/Permissions/Models/Roles.php b/modules/Permissions/Models/Roles.php
index d060f10..6fee421 100644
--- a/modules/Permissions/Models/Roles.php
+++ b/modules/Permissions/Models/Roles.php
@@ -37,7 +37,7 @@ class Roles extends Model
      */
     protected array $form = ['role_name','identify','parent_id','description','data_range'];
 
-    protected array $formRelations = ['permissions'];
+    protected array $formRelations = ['permissions', 'departments'];
 
     /**
      * @var bool
diff --git a/modules/Permissions/views/roles/form/create.vue b/modules/Permissions/views/roles/form/create.vue
index bccdf9d..0680101 100644
--- a/modules/Permissions/views/roles/form/create.vue
+++ b/modules/Permissions/views/roles/form/create.vue
@@ -44,15 +44,16 @@
       <Select v-model="formData.data_range" name="data_range" clearable api="dataRange" class="w-full" />
     </el-form-item>
     <el-form-item label="自定义权限" prop="department_ids" v-if="showDepartments">
+      <!--
       <el-cascader
         :options="departments"
-        name="parent_id"
         v-model="formData.departmetn_ids"
         :show-all-levels="false"
         clearable
-        :props="{ value: 'id', label: 'department_name', checkStrictly: true, multiple: true }"
+        :props="{ value: 'id', label: 'department_name', emitPath: false, multiple: true }"
         class="w-full"
-      />
+      />-->
+      <el-tree-select v-model="formData.departmetn_ids" value-key="id" :data="departments" :render-after-expand="false" show-checkbox multiple :props="{ value: 'id', label: 'department_name' }" />
     </el-form-item>
     <el-form-item label="角色权限" prop="permissions">
       <el-tree
@@ -158,6 +159,7 @@ onMounted(() => {
   watch(
     formData,
     function (value) {
+      // 如果数据权限是自定义数据
       showDepartments.value = value.data_range === 2
     },
     { deep: true },