fix: 优化角色菜单表单加载逻辑,移除重复的菜单列表加载调用,确保在打开模态框时正确加载菜单数据。
							parent
							
								
									990ae4463a
								
							
						
					
					
						commit
						9a305e6cbd
					
				|  | @ -66,6 +66,8 @@ const [Modal, modalApi] = useVbenModal({ | ||||||
|     if (!isOpen) { |     if (!isOpen) { | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|  |     // 加载菜单列表 | ||||||
|  |     await loadMenuTree(); | ||||||
|     const data = modalApi.getData<SystemRoleApi.Role>(); |     const data = modalApi.getData<SystemRoleApi.Role>(); | ||||||
|     if (!data || !data.id) { |     if (!data || !data.id) { | ||||||
|       return; |       return; | ||||||
|  | @ -75,8 +77,6 @@ const [Modal, modalApi] = useVbenModal({ | ||||||
|       // 加载角色菜单 |       // 加载角色菜单 | ||||||
|       const menuIds = await getRoleMenuList(data.id as number); |       const menuIds = await getRoleMenuList(data.id as number); | ||||||
|       await formApi.setFieldValue('menuIds', menuIds); |       await formApi.setFieldValue('menuIds', menuIds); | ||||||
|       // 加载菜单列表 |  | ||||||
|       await loadMenuTree(); |  | ||||||
| 
 | 
 | ||||||
|       await formApi.setValues(data); |       await formApi.setValues(data); | ||||||
|     } finally { |     } finally { | ||||||
|  |  | ||||||
|  | @ -63,6 +63,8 @@ const [Modal, modalApi] = useVbenModal({ | ||||||
|     if (!isOpen) { |     if (!isOpen) { | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|  |     // 加载菜单列表 | ||||||
|  |     await loadMenuTree(); | ||||||
|     const data = modalApi.getData<SystemRoleApi.Role>(); |     const data = modalApi.getData<SystemRoleApi.Role>(); | ||||||
|     if (!data || !data.id) { |     if (!data || !data.id) { | ||||||
|       return; |       return; | ||||||
|  | @ -72,8 +74,6 @@ const [Modal, modalApi] = useVbenModal({ | ||||||
|       // 加载角色菜单 |       // 加载角色菜单 | ||||||
|       const menuIds = await getRoleMenuList(data.id as number); |       const menuIds = await getRoleMenuList(data.id as number); | ||||||
|       await formApi.setFieldValue('menuIds', menuIds); |       await formApi.setFieldValue('menuIds', menuIds); | ||||||
|       // 加载菜单列表 |  | ||||||
|       await loadMenuTree(); |  | ||||||
| 
 | 
 | ||||||
|       await formApi.setValues(data); |       await formApi.setValues(data); | ||||||
|     } finally { |     } finally { | ||||||
|  |  | ||||||
|  | @ -63,6 +63,8 @@ const [Modal, modalApi] = useVbenModal({ | ||||||
|     if (!isOpen) { |     if (!isOpen) { | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|  |     // 加载菜单列表 | ||||||
|  |     await loadMenuTree(); | ||||||
|     const data = modalApi.getData<SystemRoleApi.Role>(); |     const data = modalApi.getData<SystemRoleApi.Role>(); | ||||||
|     if (!data || !data.id) { |     if (!data || !data.id) { | ||||||
|       return; |       return; | ||||||
|  | @ -72,8 +74,6 @@ const [Modal, modalApi] = useVbenModal({ | ||||||
|       // 加载角色菜单 |       // 加载角色菜单 | ||||||
|       const menuIds = await getRoleMenuList(data.id as number); |       const menuIds = await getRoleMenuList(data.id as number); | ||||||
|       await formApi.setFieldValue('menuIds', menuIds); |       await formApi.setFieldValue('menuIds', menuIds); | ||||||
|       // 加载菜单列表 |  | ||||||
|       await loadMenuTree(); |  | ||||||
| 
 | 
 | ||||||
|       await formApi.setValues(data); |       await formApi.setValues(data); | ||||||
|     } finally { |     } finally { | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 xingyu4j
						xingyu4j