Pre Merge pull request !211 from Lex/dev

pull/211/MERGE
Lex 2025-09-12 02:25:21 +00:00 committed by Gitee
commit 48d70a2449
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 6 additions and 6 deletions

View File

@ -13,7 +13,7 @@ import { handleTree } from '@vben/utils';
import { Checkbox, message } from 'ant-design-vue'; import { Checkbox, message } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form'; import { useVbenForm } from '#/adapter/form';
import { getMenuList } from '#/api/system/menu'; import { getSimpleMenusList } from '#/api/system/menu';
import { assignRoleMenu, getRoleMenuList } from '#/api/system/permission'; import { assignRoleMenu, getRoleMenuList } from '#/api/system/permission';
import { $t } from '#/locales'; import { $t } from '#/locales';
@ -90,7 +90,7 @@ const [Modal, modalApi] = useVbenModal({
async function loadMenuTree() { async function loadMenuTree() {
menuLoading.value = true; menuLoading.value = true;
try { try {
const data = await getMenuList(); const data = await getSimpleMenusList();
menuTree.value = handleTree(data) as SystemMenuApi.Menu[]; menuTree.value = handleTree(data) as SystemMenuApi.Menu[];
} finally { } finally {
menuLoading.value = false; menuLoading.value = false;

View File

@ -13,7 +13,7 @@ import { handleTree } from '@vben/utils';
import { ElCheckbox, ElMessage } from 'element-plus'; import { ElCheckbox, ElMessage } from 'element-plus';
import { useVbenForm } from '#/adapter/form'; import { useVbenForm } from '#/adapter/form';
import { getMenuList } from '#/api/system/menu'; import { getSimpleMenusList } from '#/api/system/menu';
import { assignRoleMenu, getRoleMenuList } from '#/api/system/permission'; import { assignRoleMenu, getRoleMenuList } from '#/api/system/permission';
import { $t } from '#/locales'; import { $t } from '#/locales';
@ -90,7 +90,7 @@ const [Modal, modalApi] = useVbenModal({
async function loadMenuTree() { async function loadMenuTree() {
menuLoading.value = true; menuLoading.value = true;
try { try {
const data = await getMenuList(); const data = await getSimpleMenusList();
menuTree.value = handleTree(data) as SystemMenuApi.Menu[]; menuTree.value = handleTree(data) as SystemMenuApi.Menu[];
} finally { } finally {
menuLoading.value = false; menuLoading.value = false;

View File

@ -10,7 +10,7 @@ import { handleTree } from '@vben/utils';
import { NCheckbox } from 'naive-ui'; import { NCheckbox } from 'naive-ui';
import { useVbenForm } from '#/adapter/form'; import { useVbenForm } from '#/adapter/form';
import { getMenuList } from '#/api/system/menu'; import { getSimpleMenusList } from '#/api/system/menu';
import { assignRoleMenu, getRoleMenuList } from '#/api/system/permission'; import { assignRoleMenu, getRoleMenuList } from '#/api/system/permission';
import { $t } from '#/locales'; import { $t } from '#/locales';
@ -86,7 +86,7 @@ const [Modal, modalApi] = useVbenModal({
async function loadMenuTree() { async function loadMenuTree() {
menuLoading.value = true; menuLoading.value = true;
try { try {
const data = await getMenuList(); const data = await getSimpleMenusList();
menuTree.value = handleTree(data) as SystemDeptApi.Dept[]; menuTree.value = handleTree(data) as SystemDeptApi.Dept[];
} finally { } finally {
menuLoading.value = false; menuLoading.value = false;