From 9a305e6cbd6f3bb37dd904244a91a0d03740229b Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Mon, 4 Aug 2025 19:12:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=A1=A8=E5=8D=95=E5=8A=A0=E8=BD=BD=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E7=A7=BB=E9=99=A4=E9=87=8D=E5=A4=8D=E7=9A=84?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BD=BD=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=EF=BC=8C=E7=A1=AE=E4=BF=9D=E5=9C=A8=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E6=A8=A1=E6=80=81=E6=A1=86=E6=97=B6=E6=AD=A3=E7=A1=AE=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E8=8F=9C=E5=8D=95=E6=95=B0=E6=8D=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/role/modules/assign-menu-form.vue        | 4 ++--
 .../src/views/system/role/modules/assign-menu-form.vue        | 4 ++--
 .../src/views/system/role/modules/assign-menu-form.vue        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue b/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
index 1d62398c..6227e2b3 100644
--- a/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
+++ b/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
@@ -66,6 +66,8 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       return;
     }
+    // 加载菜单列表
+    await loadMenuTree();
     const data = modalApi.getData<SystemRoleApi.Role>();
     if (!data || !data.id) {
       return;
@@ -75,8 +77,6 @@ const [Modal, modalApi] = useVbenModal({
       // 加载角色菜单
       const menuIds = await getRoleMenuList(data.id as number);
       await formApi.setFieldValue('menuIds', menuIds);
-      // 加载菜单列表
-      await loadMenuTree();
 
       await formApi.setValues(data);
     } finally {
diff --git a/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue b/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue
index b7e11b51..9384403a 100644
--- a/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue
+++ b/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue
@@ -63,6 +63,8 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       return;
     }
+    // 加载菜单列表
+    await loadMenuTree();
     const data = modalApi.getData<SystemRoleApi.Role>();
     if (!data || !data.id) {
       return;
@@ -72,8 +74,6 @@ const [Modal, modalApi] = useVbenModal({
       // 加载角色菜单
       const menuIds = await getRoleMenuList(data.id as number);
       await formApi.setFieldValue('menuIds', menuIds);
-      // 加载菜单列表
-      await loadMenuTree();
 
       await formApi.setValues(data);
     } finally {
diff --git a/apps/web-naive/src/views/system/role/modules/assign-menu-form.vue b/apps/web-naive/src/views/system/role/modules/assign-menu-form.vue
index 30ff77c0..1712494f 100644
--- a/apps/web-naive/src/views/system/role/modules/assign-menu-form.vue
+++ b/apps/web-naive/src/views/system/role/modules/assign-menu-form.vue
@@ -63,6 +63,8 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       return;
     }
+    // 加载菜单列表
+    await loadMenuTree();
     const data = modalApi.getData<SystemRoleApi.Role>();
     if (!data || !data.id) {
       return;
@@ -72,8 +74,6 @@ const [Modal, modalApi] = useVbenModal({
       // 加载角色菜单
       const menuIds = await getRoleMenuList(data.id as number);
       await formApi.setFieldValue('menuIds', menuIds);
-      // 加载菜单列表
-      await loadMenuTree();
 
       await formApi.setValues(data);
     } finally {