diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/MenuServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/MenuServiceImpl.java index ef62eaed..6dfd7eb7 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/MenuServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/MenuServiceImpl.java @@ -43,6 +43,7 @@ public class MenuServiceImpl extends ServiceImpl implements Me List menuVoList = menus.stream().map(menu -> { MenuVo menuVo = new MenuVo(); menuVo.setName(menu.getName()); + menuVo.setComponent(menu.getComponent()); // 检测是否是根节点,0:代表根节点 if (MenuEnum.MENU_0.getValue().equals(menu.getParentId()) && !ReUtil.isMatch(RegexConstants.MATCHER_URL, menu.getPath())) { menuVo.setPath("/" + menu.getPath()); @@ -55,7 +56,6 @@ public class MenuServiceImpl extends ServiceImpl implements Me .setIcon(menu.getIcon()) .setHideMenu(MenuEnum.MENU_1.getValue().equals(menu.getHideMenu())) .setKeepAlive(menu.getKeepAlive().equals(MenuEnum.MENU_1.getValue()))); - List childrenMenus = menu.getChildren(); if (childrenMenus != null && childrenMenus.size() > 0 && MenuEnum.MENU_M.getValue().equals(menu.getType())) { menuVo.setChildren(buildMenuRoute(childrenMenus)); diff --git a/kicc-ui/src/api/system/menu.ts b/kicc-ui/src/api/system/menu.ts index fdec7b5c..a5257887 100644 --- a/kicc-ui/src/api/system/menu.ts +++ b/kicc-ui/src/api/system/menu.ts @@ -2,21 +2,24 @@ import { MenuVO, Menu } from './model/menuModel'; import { defHttp } from '/@/utils/http/axios'; enum Api { - List = 'system_proxy/system/menu/list', + list = 'system_proxy/system/menu/list', add = 'system_proxy/system/menu/save', - update = 'system_proxy/system/menu/update', + get = 'system_proxy/system/menu', + edit = 'system_proxy/system/menu/update', del = 'system_proxy/system/menu/remove' } -// 菜单树 -export const menuList = (params?: MenuVO) => defHttp.get({ url: Api.List, params }); +// 查询菜单列表 +export const listMenu = (params?: MenuVO) => defHttp.get({ url: Api.list, params }); -//新增 -export const menuAdd = (params?: Menu) => defHttp.post({ url: Api.add, params }); +// 新增菜单 +export const addMenu = (params: Menu) => defHttp.post({ url: Api.add, data: params }); -// 修改 -export const menuUpdate = (params: Menu) => defHttp.put({ url: Api.update, params }); +// 修改菜单 +export const editMenu = (params: Menu ) => defHttp.put({ url: Api.edit, data: params }); -// 删除 -export const menuDel = (params: { id: String }) => - defHttp.delete({ url: Api.del + `/${params.id}` }); +// 查询菜单详细 +export const getMenu = (params: { id: String }) => defHttp.get({ url: `${Api.get}/${params.id}` }); + +// 删除菜单 +export const delMenu = (params: { id: String }) => defHttp.delete({ url: `${Api.del}/${params.id}` }); diff --git a/kicc-ui/src/router/helper/routeHelper.ts b/kicc-ui/src/router/helper/routeHelper.ts index 705ed760..164b7ee1 100644 --- a/kicc-ui/src/router/helper/routeHelper.ts +++ b/kicc-ui/src/router/helper/routeHelper.ts @@ -23,7 +23,7 @@ function findImportComponent(dynamicViewsModules: Record Promise { - let k = key.replace('../../views', ''); + let k = key.replace('../../views/', ''); const lastIndex = k.lastIndexOf('.'); k = k.substring(0, lastIndex); return k === component; diff --git a/kicc-ui/src/store/modules/permission.ts b/kicc-ui/src/store/modules/permission.ts index b8ce7aef..4cb08776 100644 --- a/kicc-ui/src/store/modules/permission.ts +++ b/kicc-ui/src/store/modules/permission.ts @@ -75,7 +75,6 @@ export const usePermissionStore = defineStore({ /** 根据设置的首页path,修正routes中的affix标记(固定首页) */ const patchHomeAffix = (routes: AppRouteRecordRaw[]) => { - debugger if (!routes || routes.length === 0) return; let homePath: string = userStore.getUserInfo.homePath || PageEnum.BASE_HOME; function patcher(routes: AppRouteRecordRaw[], parentPath = '') { @@ -119,7 +118,6 @@ export const usePermissionStore = defineStore({ // 过滤忽略路由配置项,只构建菜单不构建路由 routeList = filter(routeList, routeRemoveIgnoreFilter); patchHomeAffix(routeList); - console.log(routeList); } catch (error) { console.error(error); } return routeList; } diff --git a/kicc-ui/src/views/system/menu/MenuModal.vue b/kicc-ui/src/views/system/menu/MenuModal.vue index ac0e6572..f253ba84 100644 --- a/kicc-ui/src/views/system/menu/MenuModal.vue +++ b/kicc-ui/src/views/system/menu/MenuModal.vue @@ -15,7 +15,7 @@ import { BasicForm, useForm } from '/@/components/Form/index'; import { formSchema } from './menu.data'; import { BasicModal, useModalInner } from '/@/components/Modal'; - import { menuList, menuAdd, menuUpdate } from '/@/api/system/menu'; + import { listMenu, addMenu, editMenu } from '/@/api/system/menu'; // 定义emit const emit = defineEmits(['success', 'register']); diff --git a/kicc-ui/src/views/system/menu/index.vue b/kicc-ui/src/views/system/menu/index.vue index 568c0043..9a000679 100644 --- a/kicc-ui/src/views/system/menu/index.vue +++ b/kicc-ui/src/views/system/menu/index.vue @@ -31,7 +31,7 @@