From 7981c8b76ea5708bfb75b59fcd65252e72ed72f3 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期二, 20 十月 2026 14:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_江苏商贸供销社' into dev_江苏商贸供销社
---
src/router/access.ts | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/router/access.ts b/src/router/access.ts
index a014946..2811d94 100644
--- a/src/router/access.ts
+++ b/src/router/access.ts
@@ -2,14 +2,15 @@
AppRouteRecordRaw,
ComponentRecordType,
GenerateMenuAndRoutesOptions,
-} from '../packages/types/src';
+} from '@vben/types';
-import { generateAccessible } from '../packages/effects/access/src';
-import { preferences } from '../packages/preferences/src';
-import { useAccessStore } from '../packages/stores/src';
-import { convertServerMenuToRouteRecordStringComponent } from '../packages/utils/src';
+import { generateAccessible } from '@vben/access';
+import { preferences } from '@vben/preferences';
+import { useAccessStore } from '@vben/stores';
+import { convertServerMenuToRouteRecordStringComponent } from '@vben/utils';
import { BasicLayout, IFrameView } from '#/layouts';
+import { portalSystemMenus } from './portal-system-menus';
const forbiddenComponent = () => import('#/views/_core/fallback/forbidden.vue');
@@ -28,7 +29,10 @@
// 鐢变簬 yudao 閫氳繃 accessStore 璇诲彇锛屾墍浠ヤ笉鍦ㄨ繘琛� message.loading 鎻愮ず
// 琛ュ厖璇存槑锛歛ccessStore.accessMenus 涓�寮�濮嬫槸 AppRouteRecordRaw 绫诲瀷锛堝悗绔姞杞斤級锛屽悗闈㈣璧嬪�兼垚 MenuRecordRaw 绫诲瀷锛堝墠绔浆鎹級
const accessMenus = accessStore.accessMenus as AppRouteRecordRaw[];
- return convertServerMenuToRouteRecordStringComponent(accessMenus);
+ const portalMenus = import.meta.env.VITE_COMPANY === 'JSSM'
+ ? portalSystemMenus(accessMenus, accessStore.accessCodes, options.roles ?? [])
+ : accessMenus;
+ return convertServerMenuToRouteRecordStringComponent(portalMenus);
},
// 鍙互鎸囧畾娌℃湁鏉冮檺璺宠浆403椤甸潰
forbiddenComponent,
--
Gitblit v1.9.3