From 3357b5f0f0919f7a52cd32a6d6de0acb14e0daaf Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 17 十二月 2024 17:29:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/utils/routerHelper.ts | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/utils/routerHelper.ts b/src/utils/routerHelper.ts
index e9c8c64..b65f93a 100644
--- a/src/utils/routerHelper.ts
+++ b/src/utils/routerHelper.ts
@@ -21,7 +21,6 @@
/* Layout */
export const Layout = () => import('@/layout/Layout.vue')
-
export const getParentLayout = () => {
return () =>
new Promise((resolve) => {
@@ -89,7 +88,8 @@
// 2. 生成 data（AppRouteRecordRaw）
// 路由地址转首字母大写驼峰，作为路由名称，适配keepAlive
let data: AppRouteRecordRaw = {
- path: route.path.indexOf('?') > -1 ? route.path.split('?')[0] : route.path,
+ path:
+ route.path.indexOf('?') > -1 && !isUrl(route.path) ? route.path.split('?')[0] : route.path, // 注意，需要排除 http 这种 url，避免它带 ? 参数被截取掉
name:
route.componentName && route.componentName.length > 0
? route.componentName
@@ -120,7 +120,7 @@
data.children = [childrenData]
} else {
// 目录
- if (route.children) {
+ if (route.children?.length) {
data.component = Layout
data.redirect = getRedirect(route.path, route.children)
// 外链
--
Gitblit v1.9.3