From 5cfb0d795a000393514109fdf057ce0c654dc0a9 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Tue, 3 Sep 2024 00:30:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=A1=94=E6=8E=A5=E6=96=B0=E5=A2=9E=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=97=B6=E7=9A=84=E7=88=B6=E5=AD=90=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/system/type.ts                    |  2 ++
 src/views/system/role/RoleAddModal.vue     | 20 ++++++--------
 src/views/system/role/RoleUpdateDrawer.vue | 32 ++++++++++++----------
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/apis/system/type.ts b/src/apis/system/type.ts
index 2de3400..fb40135 100644
--- a/src/apis/system/type.ts
+++ b/src/apis/system/type.ts
@@ -70,6 +70,8 @@ export interface RoleDetailResp {
   dataScope: number
   deptIds: Array<number>
   isSystem: boolean
+  menuCheckStrictly: boolean
+  deptCheckStrictly: boolean
   createUserString: string
   createTime: string
   updateUserString: string
diff --git a/src/views/system/role/RoleAddModal.vue b/src/views/system/role/RoleAddModal.vue
index 0447666..5181c33 100644
--- a/src/views/system/role/RoleAddModal.vue
+++ b/src/views/system/role/RoleAddModal.vue
@@ -39,7 +39,7 @@
           <a-space>
             <a-checkbox v-model="isMenuExpanded" @change="onExpanded('menu')">展开/折叠</a-checkbox>
             <a-checkbox v-model="isMenuCheckAll" @change="onCheckAll('menu')">全选/全不选</a-checkbox>
-            <a-checkbox v-model="isMenuCheckStrictly">父子联动</a-checkbox>
+            <a-checkbox v-model="form.menuCheckStrictly">父子联动</a-checkbox>
           </a-space>
           <template #extra>
             <a-tree
@@ -48,7 +48,7 @@
                 class="w-full"
                 :data="menuList"
                 :default-expand-all="isMenuExpanded"
-                :check-strictly="!isMenuCheckStrictly"
+                :check-strictly="!form.menuCheckStrictly"
                 :virtual-list-props="{ height: 400 }"
                 checkable
             />
@@ -68,7 +68,7 @@
           <a-space>
             <a-checkbox v-model="isDeptExpanded" @change="onExpanded('dept')">展开/折叠</a-checkbox>
             <a-checkbox v-model="isDeptCheckAll" @change="onCheckAll('dept')">全选/全不选</a-checkbox>
-            <a-checkbox v-model="isDeptCheckStrictly">父子联动</a-checkbox>
+            <a-checkbox v-model="form.deptCheckStrictly">父子联动</a-checkbox>
           </a-space>
           <template #extra>
             <a-tree
@@ -77,7 +77,7 @@
                 class="w-full"
                 :data="deptList"
                 :default-expand-all="isDeptExpanded"
-                :check-strictly="!isDeptCheckStrictly"
+                :check-strictly="!form.deptCheckStrictly"
                 :virtual-list-props="{ height: 350 }"
                 checkable
             />
@@ -128,6 +128,8 @@ const rules: FormInstance['rules'] = {
 }
 
 const { form, resetForm } = useForm({
+  menuCheckStrictly: true,
+  deptCheckStrictly: true,
   sort: 999,
   dataScope: 4
 })
@@ -138,8 +140,6 @@ const isMenuExpanded = ref(false)
 const isDeptExpanded = ref(true)
 const isMenuCheckAll = ref(false)
 const isDeptCheckAll = ref(false)
-const isMenuCheckStrictly = ref(true)
-const isDeptCheckStrictly = ref(true)
 // 重置
 const reset = () => {
   isMenuExpanded.value = false
@@ -160,8 +160,6 @@ const onAdd = () => {
     getMenuList()
   }
   reset()
-  isMenuCheckStrictly.value = true
-  isDeptCheckStrictly.value = true
   dataId.value = ''
   visible.value = true
   if (!deptList.value.length) {
@@ -197,8 +195,6 @@ const onUpdate = async (id: string) => {
     await getDeptList()
   }
   reset()
-  isMenuCheckStrictly.value = false
-  isDeptCheckStrictly.value = false
   dataId.value = id
   const res = await getRole(id)
   Object.assign(form, res.data)
@@ -274,8 +270,8 @@ const onCheckAll = (type) => handleTreeAction(type, 'check')
 // 确认时
 const onClickOk = () => {
   if (unref(current) === 3) {
-    const isSaved = save()
-    if (isSaved) visible.value = false
+    save()
+    visible.value = false
   }
 }
 defineExpose({ onAdd, onUpdate })
diff --git a/src/views/system/role/RoleUpdateDrawer.vue b/src/views/system/role/RoleUpdateDrawer.vue
index 5b51182..077bad0 100644
--- a/src/views/system/role/RoleUpdateDrawer.vue
+++ b/src/views/system/role/RoleUpdateDrawer.vue
@@ -36,15 +36,14 @@
           <a-space>
             <a-checkbox v-model="isMenuExpanded" @change="onExpanded('menu')">展开/折叠</a-checkbox>
             <a-checkbox v-model="isMenuCheckAll" @change="onCheckAll('menu')">全选/全不选</a-checkbox>
-            <a-checkbox v-model="isMenuCheckStrictly">父子联动</a-checkbox>
+            <a-checkbox v-model="form.menuCheckStrictly">父子联动</a-checkbox>
           </a-space>
           <template #extra>
             <a-tree
               ref="menuTreeRef"
-              v-model:checked-keys="form.menuIds"
               :data="menuList"
               :default-expand-all="isMenuExpanded"
-              :check-strictly="!isMenuCheckStrictly"
+              :check-strictly="!form.menuCheckStrictly"
               checkable
             />
           </template>
@@ -64,15 +63,14 @@
           <a-space>
             <a-checkbox v-model="isDeptExpanded" @change="onExpanded('dept')">展开/折叠</a-checkbox>
             <a-checkbox v-model="isDeptCheckAll" @change="onCheckAll('dept')">全选/全不选</a-checkbox>
-            <a-checkbox v-model="isDeptCheckStrictly">父子联动</a-checkbox>
+            <a-checkbox v-model="form.deptCheckStrictly">父子联动</a-checkbox>
           </a-space>
           <template #extra>
             <a-tree
               ref="deptTreeRef"
-              v-model:checked-keys="form.deptIds"
               :data="deptList"
               :default-expand-all="isDeptExpanded"
-              :check-strictly="!isDeptCheckStrictly"
+              :check-strictly="!form.deptCheckStrictly"
               checkable
             />
           </template>
@@ -109,6 +107,8 @@ const rules: FormInstance['rules'] = {
 }
 
 const { form, resetForm } = useForm({
+  menuCheckStrictly: true,
+  deptCheckStrictly: true,
   sort: 999,
   dataScope: 4
 })
@@ -119,8 +119,6 @@ const isMenuExpanded = ref(false)
 const isDeptExpanded = ref(true)
 const isMenuCheckAll = ref(false)
 const isDeptCheckAll = ref(false)
-const isMenuCheckStrictly = ref(true)
-const isDeptCheckStrictly = ref(true)
 // 重置
 const reset = () => {
   isMenuExpanded.value = false
@@ -140,8 +138,6 @@ const onAdd = () => {
     getMenuList()
   }
   reset()
-  isMenuCheckStrictly.value = true
-  isDeptCheckStrictly.value = true
   dataId.value = ''
   visible.value = true
   if (!deptList.value.length) {
@@ -158,11 +154,19 @@ const onUpdate = async (id: string) => {
     await getDeptList()
   }
   reset()
-  isMenuCheckStrictly.value = false
-  isDeptCheckStrictly.value = false
   dataId.value = id
-  const res = await getRole(id)
-  Object.assign(form, res.data)
+  const { data } = await getRole(id)
+  Object.assign(form, data)
+  data.menuIds?.forEach((node) => {
+    nextTick(() => {
+      menuTreeRef.value?.checkNode(node, true, true)
+    })
+  })
+  data.deptIds?.forEach((node) => {
+    nextTick(() => {
+      deptTreeRef.value?.checkNode(node, true, true)
+    })
+  })
   visible.value = true
 }