fix(breadcrumb): ensure that the single-level breadcrumbs jump correc…

…tly close #321
vbenjs · Mar 7, 2021 · e0dc5cf · e0dc5cf
1 parent d5d4c4b
commit e0dc5cf
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 16 deletions.
diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
@@ -21,6 +21,7 @@
 - 修复树组件 demo 示例样式错误
 - 修复账号管理新增未清空旧数据
 - form 组件应允许 setFieldsValue 方法值为 null 或者 undefined
+- 确保单级面包屑正确跳转
 
 ## 2.0.2 (2021-03-04)
 

diff --git a/src/layouts/default/header/components/Breadcrumb.vue b/src/layouts/default/header/components/Breadcrumb.vue
@@ -72,26 +72,40 @@
         if (currentRoute.value.meta?.currentActiveMenu) {
           filterBreadcrumbList.push((currentRoute.value as unknown) as RouteLocationMatched);
         }
-        // routes.value = filterBreadcrumbList.length === 1 ? [] : filterBreadcrumbList;
-        routes.value = filterBreadcrumbList;
+        routes.value = subRouteExtraction(filterBreadcrumbList);
       });
 
+      function subRouteExtraction(routeList: RouteLocationMatched[]) {
+        const resultRoutes: RouteLocationMatched[] = [];
+        routeList.forEach((route) => {
+          if (route.children?.length === 1) {
+            const subRoute = route.children[0] as RouteLocationMatched;
+            const subRouteName = subRoute.name as string;
+            const routeName = route.name;
+            if (subRouteName && `${subRouteName}Parent` === routeName) {
+              route = subRoute;
+            }
+          }
+          resultRoutes.push(route);
+        });
+        return resultRoutes;
+      }
+
       function filterItem(list: RouteLocationMatched[]) {
         let resultList = filter(list, (item) => {
           const { meta } = item;
 
           if (!meta) {
             return false;
           }
+
           const { title, hideBreadcrumb, hideMenu } = meta;
           if (!title || hideBreadcrumb || hideMenu) {
             return false;
           }
-
           return true;
         }).filter((item) => !item.meta?.hideBreadcrumb || !item.meta?.hideMenu);
 
-        // resultList = resultList.filter((item) => item.path !== PageEnum.BASE_HOME);
         return resultList;
       }
 
@@ -101,7 +115,8 @@
           children,
           redirect,
           meta,
-          //  components
+
+          // components
         } = route;
 
         // const isParent =
@@ -123,23 +138,29 @@
         if (redirect && isString(redirect)) {
           go(redirect);
         } else {
-          const ps = paths.slice(1);
-          const lastPath = ps.pop() || '';
-          const parentPath = ps.pop() || '';
-          let path = `${parentPath}/${lastPath}`;
-          path = /^\//.test(path) ? path : `/${path}`;
-          go(path);
+          let goPath = '';
+          if (paths.length === 1) {
+            goPath = paths[0];
+          } else {
+            const ps = paths.slice(1);
+            const lastPath = ps.pop() || '';
+            const parentPath = ps.pop() || '';
+            goPath = `${parentPath}/${lastPath}`;
+          }
+          goPath = /^\//.test(goPath) ? goPath : `/${goPath}`;
+          go(goPath);
         }
       }
 
       function hasRedirect(routes: RouteLocationMatched[], route: RouteLocationMatched) {
-        if (route?.meta?.isLink) {
-          return true;
-        }
-
         if (routes.indexOf(route) === routes.length - 1) {
           return false;
         }
+
+        // if (route?.meta?.isLink) {
+        //   return true;
+        // }
+
         return true;
       }
 

diff --git a/src/main.ts b/src/main.ts
@@ -51,7 +51,7 @@ import { isDevMode } from '/@/utils/env';
 
   // The development environment takes effect
   if (isDevMode()) {
-    app.config.performance = true;
+    // app.config.performance = true;
     window.__APP__ = app;
   }
 })();