From 1d5133b6957d95c0c2b1e9641f21a03d9a1c85bb Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期四, 14 十二月 2023 16:17:12 +0800
Subject: [PATCH] !69 修复升级依赖带来的类型问题 * fix 修复变量问题 * Merge remote-tracking branch 'origin/dev' into dev * update 依赖升级 * update 依赖升级 * Merge remote-tracking branch 'origin/dev' into dev * 升级依赖 * Merge remote-tracking branch 'origin/ts' into ts * 升级依赖 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/components/Breadcrumb/index.vue | 63 +++++++++++++++----------------
1 files changed, 30 insertions(+), 33 deletions(-)
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 489cba1..9502e60 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,57 +1,54 @@
<template>
<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>
- <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
+ <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>
+ <a v-else @click.prevent="handleLink(item)">{{ item.meta?.title }}</a>
</el-breadcrumb-item>
</transition-group>
</el-breadcrumb>
</template>
-<script setup>
+<script setup lang="ts">
+import { RouteLocationMatched } from 'vue-router';
+
const route = useRoute();
const router = useRouter();
-const levelList = ref([])
+const levelList = ref<RouteLocationMatched[]>([]);
-function getBreadcrumb() {
+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: '棣栭〉' } }].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)
-}
-function isDashboard(route) {
- const name = route && route.name
+ 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);
if (!name) {
- return false
+ return false;
}
- return name.trim() === 'Index'
-}
-function handleLink(item) {
- const { redirect, path } = item
- if (redirect) {
- router.push(redirect)
- return
- }
- router.push(path)
-}
+ return name.trim() === 'Index';
+};
+const handleLink = (item) => {
+ const { redirect, path } = item;
+ redirect ? router.push(redirect) : router.push(path);
+};
watchEffect(() => {
// if you go to the redirect page, do not update the breadcrumbs
- if (route.path.startsWith('/redirect/')) {
- return
- }
- getBreadcrumb()
-})
-getBreadcrumb();
+ if (route.path.startsWith('/redirect/')) return;
+ getBreadcrumb();
+});
+onMounted(() => {
+ getBreadcrumb();
+});
</script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
.app-breadcrumb.el-breadcrumb {
display: inline-block;
font-size: 14px;
@@ -63,4 +60,4 @@
cursor: text;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3