diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 5b50eb18..273757fa 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -346,7 +346,9 @@ const { queryParams, form, rules } = toRefs>(data) /** 获取子菜单列表 */ const getChildrenList = async (row: any, treeNode: unknown, resolve: (data: any[]) => void) => { + loading.value = true; resolve(menuChildrenListMap.value[row.menuId] || []); + loading.value = false; }; /** 查询菜单列表 */ @@ -414,14 +416,7 @@ const handleToggleExpandAll = () => { }; /** 展开/折叠所有 */ const toggleExpandAll = (data: MenuVO[], status: boolean) => { - data.forEach(async (item: MenuVO) => { - const menuChildrenList = menuChildrenListMap.value[item.menuId]; - // 从menuChildrenListMap中获取子菜单列表 - if (menuChildrenList && (!item.children || item.children.length === 0)) { - item.children = menuChildrenList || []; - // 等待子菜单列表加载完成 - await nextTick(); - } + data.forEach((item: MenuVO) => { menuTableRef.value?.toggleRowExpansion(item, status); if (item.children && item.children.length > 0) toggleExpandAll(item.children, status); });