refactor:完成重构设备的添加,删除,更新。
This commit is contained in:
@@ -16,8 +16,8 @@ namespace DMS.WPF.Services;
|
||||
public class MenuViewService : IMenuViewService
|
||||
{
|
||||
private readonly IMapper _mapper;
|
||||
private readonly IWpfDataService _wpfDataService;
|
||||
private readonly IAppStorageService _appStorageService;
|
||||
private readonly IViewDataService _wpfDataService;
|
||||
private readonly IAppDataService _appDataService;
|
||||
private readonly IMenuManagementService _menuManagementService;
|
||||
|
||||
|
||||
@@ -27,17 +27,17 @@ public class MenuViewService : IMenuViewService
|
||||
/// </summary>
|
||||
/// <param name="mapper">AutoMapper 实例。</param>
|
||||
/// <param name="appStorageService">数据服务中心实例。</param>
|
||||
public MenuViewService(IMapper mapper, IWpfDataService dataStorageService, IAppStorageService appStorageService, IMenuManagementService menuManagementService)
|
||||
public MenuViewService(IMapper mapper, IViewDataService dataStorageService, IAppDataService appStorageService, IMenuManagementService menuManagementService)
|
||||
{
|
||||
_mapper = mapper;
|
||||
_wpfDataService = dataStorageService;
|
||||
_appStorageService = appStorageService;
|
||||
_appDataService = appStorageService;
|
||||
_menuManagementService = menuManagementService;
|
||||
}
|
||||
|
||||
public void LoadAllMenus()
|
||||
{
|
||||
_wpfDataService.Menus = _mapper.Map<ObservableCollection<MenuItem>>(_appStorageService.Menus.Values);
|
||||
_wpfDataService.Menus = _mapper.Map<ObservableCollection<MenuItem>>(_appDataService.Menus.Values);
|
||||
BuildMenuTrees();
|
||||
}
|
||||
|
||||
@@ -102,6 +102,11 @@ public class MenuViewService : IMenuViewService
|
||||
{
|
||||
parentMenu.Children.Add(MenuItem);
|
||||
}
|
||||
//将子菜单也添加到列表中
|
||||
foreach (var item in MenuItem.Children)
|
||||
{
|
||||
_wpfDataService.Menus.Add(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,7 +121,7 @@ public class MenuViewService : IMenuViewService
|
||||
if (menu is not null)
|
||||
{
|
||||
|
||||
var res = await _menuManagementService.UpdateMenuAsync(_mapper.Map<MenuBean>(MenuItem));
|
||||
var res = await _menuManagementService.UpdateAsync(_mapper.Map<MenuBean>(MenuItem));
|
||||
if (res > 0)
|
||||
{
|
||||
menu.Header = MenuItem.Header;
|
||||
@@ -129,13 +134,16 @@ public class MenuViewService : IMenuViewService
|
||||
/// <summary>
|
||||
/// 删除菜单项。
|
||||
/// </summary>
|
||||
public async Task DeleteMenuItem(MenuItem? MenuItem)
|
||||
public void DeleteMenuToView(MenuItem? MenuItem)
|
||||
{
|
||||
if (MenuItem is null) return;
|
||||
|
||||
await _menuManagementService.DeleteMenuAsync(MenuItem.Id);
|
||||
|
||||
// 从扁平菜单列表中移除
|
||||
foreach (var children in MenuItem.Children)
|
||||
{
|
||||
_wpfDataService.Menus.Remove(children);
|
||||
}
|
||||
MenuItem.Children.Clear();
|
||||
// 从菜单列表中移除
|
||||
_wpfDataService.Menus.Remove(MenuItem);
|
||||
|
||||
// 从树形结构中移除
|
||||
@@ -151,7 +159,5 @@ public class MenuViewService : IMenuViewService
|
||||
_wpfDataService.MenuTrees.Remove(MenuItem);
|
||||
}
|
||||
|
||||
// 重新构建整个菜单树以确保一致性
|
||||
BuildMenuTrees();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user