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 1d62398c3..6227e2b3b 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(); 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 b7e11b513..9384403a2 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(); 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 30ff77c0d..1712494fd 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(); 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 {