From 25593cc2497b31c71b34fb22cb7e0a53a06f1e0a Mon Sep 17 00:00:00 2001
From: xxqc <xxqcs@qq.com>
Date: Wed, 5 Jul 2023 13:48:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=8B=E5=80=BC?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90=E6=97=B6=EF=BC=8C=E9=80=89?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BA=86=E4=B8=80=E4=B8=AA[1]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Tree/src/BasicTree.vue   | 3 ++-
 src/views/system/role/RoleMenuModal.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/Tree/src/BasicTree.vue b/src/components/Tree/src/BasicTree.vue
index 4a09f8c..03e84e5 100644
--- a/src/components/Tree/src/BasicTree.vue
+++ b/src/components/Tree/src/BasicTree.vue
@@ -85,7 +85,7 @@ export default defineComponent({
 
           const rawVal = toRaw(state.checkedKeys)
           emit('update:value', rawVal)
-          emit('check', rawVal, e)
+          emit('check', state.checkStrictly ? rawVal.checked : rawVal, e)
         },
         onRightClick: handleRightClick
       }
@@ -163,6 +163,7 @@ export default defineComponent({
 
     function checkAll(checkAll: boolean) {
       state.checkedKeys = checkAll ? getEnabledKeys() : ([] as KeyType[])
+      emit('check', state.checkedKeys, [])
     }
 
     function expandAll(expandAll: boolean) {
diff --git a/src/views/system/role/RoleMenuModal.vue b/src/views/system/role/RoleMenuModal.vue
index b0638e8..cd460d9 100644
--- a/src/views/system/role/RoleMenuModal.vue
+++ b/src/views/system/role/RoleMenuModal.vue
@@ -114,7 +114,7 @@ function menuCheck(checkedKeys: CheckKeys, event: CheckedEvent) {
     // 这里是子节点的ID
     menuKeys.value = checkedKeys as number[]
     // 这里是父节点的ID 默认空数组
-    menuHalfKeys.value = event.halfCheckedKeys as number[]
+    menuHalfKeys.value = (event.halfCheckedKeys as number[]) || []
   }
 }
 </script>