From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001 From: ahaos <8406649+lhailgl@user.noreply.gitee.com> Date: 星期三, 13 十二月 2023 09:01:52 +0800 Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance --- src/components/Breadcrumb/index.vue | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index b96829a..57a30ac 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -2,8 +2,7 @@ <el-breadcrumb class="app-breadcrumb" separator="/"> <transition-group name="breadcrumb"> <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path"> - <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{ - item.meta?.title }}</span> + <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{ item.meta?.title }}</span> <a v-else @click.prevent="handleLink(item)">{{ item.meta?.title }}</a> </el-breadcrumb-item> </transition-group> @@ -11,42 +10,42 @@ </template> <script setup lang="ts"> -import { RouteLocationMatched } from 'vue-router' +import { RouteLocationMatched } from 'vue-router'; const route = useRoute(); const router = useRouter(); -const levelList = ref<RouteLocationMatched[]>([]) +const levelList = ref<RouteLocationMatched[]>([]); const getBreadcrumb = () => { // only show routes with meta.title - let matched = route.matched.filter(item => item.meta && item.meta.title); - const first = matched[0] + let matched = route.matched.filter((item) => item.meta && item.meta.title); + const first = matched[0]; // 鍒ゆ柇鏄惁涓洪椤� if (!isDashboard(first)) { - matched = ([{ path: '/index', meta: { title: '棣栭〉' } }] as any).concat(matched) + matched = ([{ path: '/index', meta: { title: '棣栭〉' } }] as any).concat(matched); } - levelList.value = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false) -} + levelList.value = matched.filter((item) => item.meta && item.meta.title && item.meta.breadcrumb !== false); +}; const isDashboard = (route: RouteLocationMatched) => { - const name = route && route.name as string + const name = route && (route.name as string); if (!name) { - return false + return false; } - return name.trim() === 'Index' -} + return name.trim() === 'Index'; +}; const handleLink = (item: RouteLocationMatched) => { - const { redirect, path } = item - redirect ? router.push(redirect as string) : router.push(path) -} + const { redirect, path } = item; + redirect ? router.push(redirect as string) : router.push(path); +}; watchEffect(() => { // if you go to the redirect page, do not update the breadcrumbs - if (route.path.startsWith('/redirect/')) return - getBreadcrumb() -}) + if (route.path.startsWith('/redirect/')) return; + getBreadcrumb(); +}); onMounted(() => { getBreadcrumb(); -}) +}); </script> <style lang="scss" scoped> -- Gitblit v1.9.3