From 20459fe59f680031bfc7c1012be860e0727cb016 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 05 八月 2025 17:47:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/hooks/useAccess.ts | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/hooks/useAccess.ts b/src/hooks/useAccess.ts
index 9546d73..0c61411 100644
--- a/src/hooks/useAccess.ts
+++ b/src/hooks/useAccess.ts
@@ -1,13 +1,14 @@
import { Route } from '@/router';
-import type { OperationBtnType, ColumnPropsMap } from '@bole-core/components';
+import type { OperationBtnType, ColumnPropsMap, ModuleColumnDto } from '@bole-core/components';
import {
useAccess as useBoleAccess,
useGroupColumns as useBoleGroupColumns,
useGroupOperationBtns as useBoleGroupOperationBtns,
+ DaPengAccessAdapter,
} from '@bole-core/components';
import type { Ref, ComputedRef } from 'vue';
-import * as baseModuleServices from '@/services/api/BaseModule';
import { myClient } from '@/constants/query';
+import * as menuServices from '@/services/api/menu';
type UseAccessOptions = {
operationBtnMap?: Record<string, OperationBtnType>;
@@ -32,7 +33,13 @@
return useBoleAccess({
queryKey: ['baseModuleServices/getCurrentSubModuleList', { moduleId }],
service: async () => {
- return await baseModuleServices.getCurrentSubModuleList({ moduleId }, { showLoading: false });
+ const res = await menuServices.getMenu(
+ { id: moduleId },
+ {
+ showLoading: false,
+ }
+ );
+ return DaPengAccessAdapter.menuAdapter({ groups: res.groups, moduleId });
},
...options,
});
@@ -49,7 +56,7 @@
/**
* 瀵筩olumns杩涜鍒嗙粍
*/
-export function useGroupColumns(columns: Ref<API.ModuleColumnDto[]>, groups: string[]) {
+export function useGroupColumns(columns: Ref<ModuleColumnDto[]>, groups: string[]) {
//@ts-ignore
return useBoleGroupColumns(columns, groups);
}
--
Gitblit v1.9.1