diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/api/system/menu/model.d.ts b/Yi.Vben5.Vue3/apps/web-antd/src/api/system/menu/model.d.ts index 5ee550b7..14baf918 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/api/system/menu/model.d.ts +++ b/Yi.Vben5.Vue3/apps/web-antd/src/api/system/menu/model.d.ts @@ -54,4 +54,5 @@ export interface MenuQuery { menuName?: string; isShow?: boolean; state?: boolean; + menuSource: number; } diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/index.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/index.vue index 9be5ad58..c90d0934 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/index.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/index.vue @@ -50,6 +50,7 @@ const gridOptions: VxeGridProps> = { query: async (_, formValues = {}) => { const resp = await menuList({ ...formValues, + menuSource: 2 // 不传后端会默认为ruoyi的菜单 }); // 统一处理数据:确保 menuId 和 parentId 存在,并将根节点的 parentId 置为 null const items = (resp || []).map((item) => { diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/menu-drawer.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/menu-drawer.vue index d4fb231c..d693b303 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/menu-drawer.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/menu-drawer.vue @@ -46,7 +46,7 @@ const [BasicForm, formApi] = useVbenForm({ async function setupMenuSelect() { // menu - const menuArray = await menuList(); + const menuArray = await menuList({ menuSource: 2 }); // 不传后端会默认为ruoyi的菜单 // support i18n menuArray.forEach((item) => { item.menuName = $t(item.menuName); diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue index 0ffe258d..57f2a721 100644 --- a/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue +++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue @@ -67,7 +67,7 @@ async function initTreeSelect(columns: Column[]) { * 加载菜单选择 */ async function initMenuSelect() { - const list = await menuList(); + const list = await menuList({ menuSource: 2 }); // 不传后端会默认为ruoyi的菜单 // support i18n list.forEach((item) => { item.menuName = $t(item.menuName);