From ebbd788fbb2c0b45d4473798efc57eec8ba74a25 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 18 六月 2024 14:51:16 +0800
Subject: [PATCH] 版本更新至2.11.5
---
src/router/menus/index.ts | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/router/menus/index.ts b/src/router/menus/index.ts
index 014d757..f9e6b4f 100644
--- a/src/router/menus/index.ts
+++ b/src/router/menus/index.ts
@@ -1,21 +1,21 @@
-import type { Menu, MenuModule } from '/@/router/types';
+import type { Menu, MenuModule } from '@/router/types';
import type { RouteRecordNormalized } from 'vue-router';
-import { useAppStoreWithOut } from '/@/store/modules/app';
-import { usePermissionStore } from '/@/store/modules/permission';
-import { transformMenuModule, getAllParentPath } from '/@/router/helper/menuHelper';
-import { filter } from '/@/utils/helper/treeHelper';
-import { isUrl } from '/@/utils/is';
-import { router } from '/@/router';
-import { PermissionModeEnum } from '/@/enums/appEnum';
+import { useAppStoreWithOut } from '@/store/modules/app';
+import { usePermissionStore } from '@/store/modules/permission';
+import { transformMenuModule, getAllParentPath } from '@/router/helper/menuHelper';
+import { filter } from '@/utils/helper/treeHelper';
+import { isHttpUrl } from '@/utils/is';
+import { router } from '@/router';
+import { PermissionModeEnum } from '@/enums/appEnum';
import { pathToRegexp } from 'path-to-regexp';
-const modules = import.meta.globEager('./modules/**/*.ts');
+const modules = import.meta.glob('../routes/modules/**/*.ts', { eager: true });
const menuModules: MenuModule[] = [];
Object.keys(modules).forEach((key) => {
- const mod = modules[key].default || {};
+ const mod = (modules as Recordable)[key].default || {};
const modList = Array.isArray(mod) ? [...mod] : [mod];
menuModules.push(...modList);
});
@@ -115,7 +115,7 @@
function basicFilter(routes: RouteRecordNormalized[]) {
return (menu: Menu) => {
const matchRoute = routes.find((route) => {
- if (isUrl(menu.path)) return true;
+ if (isHttpUrl(menu.path)) return true;
if (route.meta?.carryParam) {
return pathToRegexp(route.path).test(menu.path);
--
Gitblit v1.9.3