diff --git a/.gitignore b/.gitignore index 247d64e7..400cf6c1 100644 --- a/.gitignore +++ b/.gitignore @@ -271,5 +271,6 @@ dist /Yi.Abp.Net8/test/Yi.Abp.Test/appsettings.Production.json database_backup /Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.Staging.json -/Yi.Abp.Net8/src/Yi.Abp.Web/logs/all +/Yi.Abp.Net8/src/Yi.Abp.Web/logs/ /Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db + diff --git a/Yi.Pure.Vue3/src/api/system/menu.ts b/Yi.Pure.Vue3/src/api/system/menu.ts index a808153b..5d164f36 100644 --- a/Yi.Pure.Vue3/src/api/system/menu.ts +++ b/Yi.Pure.Vue3/src/api/system/menu.ts @@ -2,8 +2,8 @@ import type { Result, ResultPage } from "@/api/result"; /** 查询菜单下拉树结构 */ -export const getMenuOption = () => { - return http.request("get", `/menu`, {}); +export const getMenuOption = menusource => { + return http.request("get", `/menu`, { params: menusource }); }; /** 查询菜单列表 */ diff --git a/Yi.Pure.Vue3/src/views/system/role/utils/hook.tsx b/Yi.Pure.Vue3/src/views/system/role/utils/hook.tsx index 6945190a..d94ccc27 100644 --- a/Yi.Pure.Vue3/src/views/system/role/utils/hook.tsx +++ b/Yi.Pure.Vue3/src/views/system/role/utils/hook.tsx @@ -294,7 +294,7 @@ export function useRole(treeRef: Ref) { onMounted(async () => { onSearch(); - const data = (await getMenuOption()).data.items; + const data = (await getMenuOption({ menusource: "pure" })).data.items; treeIds.value = getKeyList(data, "id"); treeData.value = handleTree(data); });