diff --git a/src/api/system/menu.ts b/src/api/system/menu.ts index 9f40e78..d095e98 100644 --- a/src/api/system/menu.ts +++ b/src/api/system/menu.ts @@ -45,6 +45,10 @@ export function deleteMenu(id: number) { * 查询菜单树 * GET /menu/selectTree */ -export function getMenuOptions() { - return request.Get>('/menu/options') +export function getMenuOptions(excludePermissions?: boolean) { + return request.Get>('/menu/options', { + params: { + excludePermissions, + }, + }) } diff --git a/src/layouts/components/header/Search.vue b/src/layouts/components/header/Search.vue index 5d5c13b..002451a 100644 --- a/src/layouts/components/header/Search.vue +++ b/src/layouts/components/header/Search.vue @@ -39,13 +39,13 @@ const options = computed(() => { return routeStore.rowRoutes.filter((item) => { const conditions = [ - t(`route.${String(item.name)}`, item.title || item.name)?.includes(searchValue.value), + t(`${String(item.i18nKey)}`, item.title)?.includes(searchValue.value), item.path?.includes(searchValue.value), ] - return conditions.some(condition => !item.hide && condition) + return conditions.some(condition => !item.menuVisible && condition) }).map((item) => { return { - label: t(`route.${String(item.name)}`, item.title || item.name), + label: t(`${String(item.i18nKey)}`, item.title), value: item.path, icon: item.icon, } diff --git a/src/layouts/components/tab/TabBarItem.vue b/src/layouts/components/tab/TabBarItem.vue index 6a3fb4c..ff3b0ec 100644 --- a/src/layouts/components/tab/TabBarItem.vue +++ b/src/layouts/components/tab/TabBarItem.vue @@ -24,7 +24,7 @@ const emit = defineEmits<{ >
- {{ $t(`route.${String(route.name)}`, route.meta.title) }} + {{ $t(`${String(route.meta.i18nKey)}`, route.meta.title) }}