新功能:

1.菜单新增框架外显示字段

web/src/router/backEnd.ts

@@ -18,8 +18,6 @@ const menuApi = useMenuApi();
 const layouModules: any = import.meta.glob('../layout/routerView/*.{vue,tsx}');
 const viewsModules: any = import.meta.glob('../views/**/*.{vue,tsx}');
 
-// 后端控制路由
-
 /**
  * 获取目录下的 .vue、.tsx 全部文件
  * @method import.meta.glob
@@ -45,9 +43,12 @@ export async function initBackEndControlRoutes() {
 	await useUserInfo().setUserInfos();
 	// 获取路由菜单数据
 	const res = await getBackEndControlRoutes();
-
+	// 无登录权限时，添加判断
+	// https://gitee.com/lyt-top/vue-next-admin/issues/I64HVO
+	if (res.data.length <= 0) return Promise.resolve(true);
 	// 处理路由（component），替换 dynamicRoutes（/@/router/route）第一个顶级 children 的路由
-	dynamicRoutes[0].children = await backEndComponent(handleMenu(res.data));
+	const {frameIn,frameOut} = handleMenu(res.data)
+	dynamicRoutes[0].children = await backEndComponent(frameIn);
 	// 添加动态路由
 	await setAddRoute();
 	// 设置路由到 vuex routesList 中（已处理成多级嵌套路由）及缓存多级嵌套数组处理后的一维数组
@@ -80,7 +81,10 @@ export function setCacheTagsViewRoutes() {
  * @returns 返回替换后的路由数组
  */
 export function setFilterRouteEnd() {
+	console.log(dynamicRoutes)
 	let filterRouteEnd: any = formatTwoStageRoutes(formatFlatteningRoutes(dynamicRoutes));
+	// notFoundAndNoPower 防止 404、401 不在 layout 布局中，不设置的话，404、401 界面将全屏显示
+	// 关联问题 No match found for location with path 'xxx'
 	filterRouteEnd[0].children = [...filterRouteEnd[0].children, ...notFoundAndNoPower];
 	return filterRouteEnd;
 }
@@ -92,9 +96,11 @@ export function setFilterRouteEnd() {
  * @link 参考：https://next.router.vuejs.org/zh/api/#addroute
  */
 export async function setAddRoute() {
+	console.log("默认路由",router.getRoutes())
 	await setFilterRouteEnd().forEach((route: RouteRecordRaw) => {
 		router.addRoute(route);
 	});
+	console.log("全部路由",router.getRoutes())
 }
 
 /**
@@ -126,6 +132,34 @@ export function backEndComponent(routes: any) {
 	if (!routes) return;
 	return routes.map((item: any) => {
 		if (item.component) item.component = dynamicImport(dynamicViewsModules, item.component as string);
+		if(item.is_catalog){
+			// 对目录的处理
+			item.component = dynamicImport(dynamicViewsModules, 'layout/routerView/parent')
+		}
+		if(item.is_link){
+			// 对外链接的处理
+			item.meta.isIframe = !item.is_iframe
+			if(item.is_iframe){
+				item.component = dynamicImport(dynamicViewsModules, 'layout/routerView/link')
+			}else {
+				item.component = dynamicImport(dynamicViewsModules, 'layout/routerView/iframes')
+			}
+		}else{
+			console.log(item.is_iframe,item.web_path)
+			if(item.is_iframe){
+				const iframeRoute:RouteRecordRaw = {
+					...item
+				}
+				item.meta.isLink = item.path
+				item.path = `${item.path}Link`
+				item.name = `${item.name}Link`
+				item.component = dynamicImport(dynamicViewsModules, 'layout/routerView/link.vue')
+				item.meta.isIframe = !item.is_iframe
+				item.meta.isKeepAlive = false
+				item.meta.isIframeOpen = true
+
+			}
+		}
 		item.children && backEndComponent(item.children);
 		return item;
 	});

web/src/router/index.ts

@@ -7,7 +7,7 @@ import {useKeepALiveNames} from '/@/stores/keepAliveNames';
 import {useRoutesList} from '/@/stores/routesList';
 import {useThemeConfig} from '/@/stores/themeConfig';
 import {Session} from '/@/utils/storage';
-import {staticRoutes} from '/@/router/route';
+import {notFoundAndNoPower,staticRoutes} from '/@/router/route';
 import {initFrontEndControlRoutes} from '/@/router/frontEnd';
 import {initBackEndControlRoutes} from '/@/router/backEnd';
 
@@ -32,7 +32,13 @@ const {isRequestRoutes} = themeConfig.value;
  */
 export const router = createRouter({
     history: createWebHashHistory(),
-    routes: staticRoutes,
+    /**
+     * 说明：
+     * 1、notFoundAndNoPower 默认添加 404、401 界面，防止一直提示 No match found for location with path 'xxx'
+     * 2、backEnd.ts(后端控制路由)、frontEnd.ts(前端控制路由) 中也需要加 notFoundAndNoPower 404、401 界面。
+     *    防止 404、401 不在 layout 布局中，不设置的话，404、401 界面将全屏显示
+     */
+    routes: [...notFoundAndNoPower, ...staticRoutes]
 });
 
 /**
@@ -63,14 +69,7 @@ export function formatTwoStageRoutes(arr: any) {
     const cacheList: Array<string> = [];
     arr.forEach((v: any) => {
         if (v.path === '/') {
-            newArr.push({
-                component: v.component,
-                name: v.name,
-                path: v.path,
-                redirect: v.redirect,
-                meta: v.meta,
-                children: []
-            });
+            newArr.push({component: v.component,name: v.name,path: v.path,redirect: v.redirect,meta: v.meta,children: []});
         } else {
             // 判断是否是动态路由（xx/:id/:name），用于 tagsView 等中使用
             // 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G
@@ -114,13 +113,13 @@ router.beforeEach(async (to, from, next) => {
                 if (isRequestRoutes) {
                     // 后端控制路由：路由数据初始化，防止刷新时丢失
                     await initBackEndControlRoutes();
-                    // 动态添加路由：防止非首页刷新时跳转回首页的问题
-                    // 确保 addRoute() 时动态添加的路由已经被完全加载上去
-                    next({...to, replace: true});
+                    // 解决刷新时，一直跳 404 页面问题，关联问题 No match found for location with path 'xxx'
+                    // to.query 防止页面刷新时，普通路由带参数时，参数丢失。动态路由（xxx/:id/:name"）isDynamic 无需处理
+                    next({ path: to.path, query: to.query });
                 } else {
                     // https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP
                     await initFrontEndControlRoutes();
-                    next({...to, replace: true});
+                    next({ path: to.path, query: to.query });
                 }
             } else {
                 next();

web/src/router/route.ts

@@ -88,4 +88,20 @@ export const staticRoutes: Array<RouteRecordRaw> = [
 			title: '登录',
 		},
 	},
+	{
+		path: '/operationLog',
+		name: 'operationLog',
+		component: () => import('/@/views/system/personal/index.vue'),
+		meta: {
+			title: 'message.router.personal'
+		},
+	},
+	// {
+	// 	path: '/demo',
+	// 	name: 'demo',
+	// 	component: () => import('/@/views/system/demo/index.vue'),
+	// 	meta: {
+	// 		title: 'message.router.personal'
+	// 	},
+	// }
 ];