zuaa
/
vue-vben-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(breadcrumb): `redirect` not worked 

修复面包屑组件的重定向菜单不能工作以及eslint警告
This commit is contained in:
无木 2021-07-13 11:09:00 +08:00
parent 6f830703a2
commit f5e31febbd
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/layouts/default/header/components/Breadcrumb.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<div :class="[prefixCls, `${prefixCls}--${theme}`]"> <div :class="[prefixCls, `${prefixCls}--${theme}`]">
<a-breadcrumb :routes="routes"> <a-breadcrumb :routes="routes">
<template #itemRender="{ route, routes, paths }"> <template #itemRender="{ route, routes: routesMatched, paths }">
<Icon :icon="getIcon(route)" v-if="getShowBreadCrumbIcon && getIcon(route)" /> <Icon :icon="getIcon(route)" v-if="getShowBreadCrumbIcon && getIcon(route)" />
<span v-if="!hasRedirect(routes, route)"> <span v-if="!hasRedirect(routesMatched, route)">
{{ t(route.name || route.meta.title) }} {{ t(route.name || route.meta.title) }}
</span> </span>
<router-link v-else to="" @click="handleClick(route, paths, $event)"> <router-link v-else to="" @click="handleClick(route, paths, $event)">
@ -15,6 +15,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import type { RouteLocationMatched } from 'vue-router'; import type { RouteLocationMatched } from 'vue-router';
import { useRouter } from 'vue-router';
import type { Menu } from '/@/router/types'; import type { Menu } from '/@/router/types';
import { defineComponent, ref, watchEffect } from 'vue'; import { defineComponent, ref, watchEffect } from 'vue';
@ -26,7 +27,6 @@
import { useRootSetting } from '/@/hooks/setting/useRootSetting'; import { useRootSetting } from '/@/hooks/setting/useRootSetting';
import { useGo } from '/@/hooks/web/usePage'; import { useGo } from '/@/hooks/web/usePage';
import { useI18n } from '/@/hooks/web/useI18n'; import { useI18n } from '/@/hooks/web/useI18n';
import { useRouter } from 'vue-router';
import { propTypes } from '/@/utils/propTypes'; import { propTypes } from '/@/utils/propTypes';
import { isString } from '/@/utils/is'; import { isString } from '/@/utils/is';
@ -96,7 +96,7 @@
} }
function filterItem(list: RouteLocationMatched[]) { function filterItem(list: RouteLocationMatched[]) {
let resultList = filter(list, (item) => { return filter(list, (item) => {
const { meta, name } = item; const { meta, name } = item;
if (!meta) { if (!meta) {
return !!name; return !!name;
@ -107,8 +107,6 @@
} }
return true; return true;
}).filter((item) => !item.meta?.hideBreadcrumb || !item.meta?.hideMenu); }).filter((item) => !item.meta?.hideBreadcrumb || !item.meta?.hideMenu);
return resultList;
} }
function handleClick(route: RouteLocationMatched, paths: string[], e: Event) { function handleClick(route: RouteLocationMatched, paths: string[], e: Event) {
@ -140,10 +138,7 @@
} }
function hasRedirect(routes: RouteLocationMatched[], route: RouteLocationMatched) { function hasRedirect(routes: RouteLocationMatched[], route: RouteLocationMatched) {
if (routes.indexOf(route) === routes.length - 1) { return routes.indexOf(route) !== routes.length - 1;
return false;
}
return true;
} }
function getIcon(route) { function getIcon(route) {

1
src/router/helper/menuHelper.ts
View File

@ -62,6 +62,7 @@ export function transformRouteToMenu(routeModList: AppRouteModule[], routerMappi
name: title, name: title,
hideMenu, hideMenu,
path: node.path, path: node.path,
...(node.redirect ? { redirect: node.redirect } : {}),
}; };
}, },
}); });