From e72f82d4eea38330b9f689711f307d5e6586516a Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Mon, 6 Jan 2025 14:46:29 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/system/role/role-drawer.vue  | 12 +++++-------
 .../system/tenantPackage/tenant-package-drawer.vue   |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/apps/web-antd/src/views/system/role/role-drawer.vue b/apps/web-antd/src/views/system/role/role-drawer.vue
index 8e31b7d5..5b583d8e 100644
--- a/apps/web-antd/src/views/system/role/role-drawer.vue
+++ b/apps/web-antd/src/views/system/role/role-drawer.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import type { MenuOption } from '#/api/system/menu/model';
+
 import { computed, nextTick, ref } from 'vue';
 
 import { useVbenDrawer } from '@vben/common-ui';
@@ -32,7 +34,7 @@ const [BasicForm, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-2 gap-x-4',
 });
 
-const menuTree = ref<any[]>([]);
+const menuTree = ref<MenuOption[]>([]);
 async function setupMenuTree(id?: number | string) {
   if (id) {
     const resp = await roleMenuTreeSelect(id);
@@ -82,11 +84,7 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
   },
 });
 
-/**
- * 这里拿到的是一个数组ref
- */
 const menuSelectRef = ref<InstanceType<typeof MenuSelectTable>>();
-
 async function handleConfirm() {
   try {
     drawerApi.drawerLoading(true);
@@ -95,7 +93,7 @@ async function handleConfirm() {
       return;
     }
     // 这个用于提交
-    const menuIds = menuSelectRef.value?.getCheckedKeys() ?? [];
+    const menuIds = menuSelectRef.value?.getCheckedKeys?.() ?? [];
     // formApi.getValues拿到的是一个readonly对象，不能直接修改，需要cloneDeep
     const data = cloneDeep(await formApi.getValues());
     data.menuIds = menuIds;
@@ -128,7 +126,7 @@ function handleMenuCheckStrictlyChange(value: boolean) {
     <BasicForm>
       <template #menuIds="slotProps">
         <div class="h-[600px] w-full">
-          <!-- check-strictly为readonly 不能通过v-model绑定 -->
+          <!-- association为readonly 不能通过v-model绑定 -->
           <MenuSelectTable
             ref="menuSelectRef"
             :checked-keys="slotProps.value"
diff --git a/apps/web-antd/src/views/system/tenantPackage/tenant-package-drawer.vue b/apps/web-antd/src/views/system/tenantPackage/tenant-package-drawer.vue
index 06703a1a..839dbaa3 100644
--- a/apps/web-antd/src/views/system/tenantPackage/tenant-package-drawer.vue
+++ b/apps/web-antd/src/views/system/tenantPackage/tenant-package-drawer.vue
@@ -131,7 +131,7 @@ function handleMenuCheckStrictlyChange(value: boolean) {
     <BasicForm>
       <template #menuIds="slotProps">
         <div class="h-[600px] w-full">
-          <!-- check-strictly为readonly 不能通过v-model绑定 -->
+          <!-- association为readonly 不能通过v-model绑定 -->
           <MenuSelectTable
             ref="menuSelectRef"
             :checked-keys="slotProps.value"