!190 fix: 优化角色菜单表单加载逻辑,移除重复的菜单列表加载调用,确保在打开模态框时正确加载菜单数据。

Merge pull request !190 from xingyu/dev
This commit is contained in:
xingyu
2025-08-04 11:23:08 +00:00
committed by Gitee
6 changed files with 19 additions and 9 deletions

View File

@@ -104,7 +104,10 @@ onMounted(async () => {
</template>
<template #userId="{ row }">
<span>
{{ userList.find((item) => item.id === row.userId)?.nickname }}
{{
userList.find((item: SystemUserApi.User) => item.id === row.userId)
?.nickname
}}
</span>
</template>
<template #publicStatus="{ row }">

View File

@@ -108,7 +108,10 @@ onMounted(async () => {
</template>
<template #userId="{ row }">
<span>
{{ userList.find((item) => item.id === row.userId)?.nickname }}
{{
userList.find((item: SystemUserApi.User) => item.id === row.userId)
?.nickname
}}
</span>
</template>
<template #actions="{ row }">

View File

@@ -112,7 +112,11 @@ onMounted(async () => {
</template>
<template #keyId="{ row }">
<span>
{{ apiKeyList.find((item) => item.id === row.keyId)?.name }}
{{
apiKeyList.find(
(item: AiModelApiKeyApi.ApiKey) => item.id === row.keyId,
)?.name
}}
</span>
</template>
<template #actions="{ row }">

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {