xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor:

Browse Source 
- 重构了 VariableTableDataService 中的 AddVariableTable 方法，使其返回值从 bool 变为新表的 ID
  (int)。这使得服务层更加健壮，并能向调用方提供新创建实体的确切ID。

  Fix:
  - 修复了 DeviceDetailViewModel 在创建变量表后UI不自动更新的Bug。现在视图模型会正确地将新表添加到UI集合中，确保了界面的即时刷新。

  Feat:
  - 为 DeviceDetailViewModel 添加了 IsBusy
  状态。现在“添加”、“编辑”和“删除”等异步操作会更新此状态，防止了用户重复点击，并允许UI在处理期间显示加载指示，提升了用户体验。
This commit is contained in:
David P.G
2025-10-02 13:19:55 +08:00
parent 1a666b79c8
commit 2a98b40bfe
3 changed files with 66 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DMS.WPF/Interfaces/IVariableTableDataService.cs
View File

@@ -9,7 +9,7 @@ public interface IVariableTableDataService
void LoadAllVariableTables();
Task<bool> AddVariableTable(VariableTableDto variableTableDto,
Task<int> AddVariableTable(VariableTableDto variableTableDto,
MenuBeanDto menuDto = null, bool isAddDb = false);
Task<bool> UpdateVariableTable(VariableTableItemViewModel variableTable);

20
DMS.WPF/Services/VariableTableDataService.cs
View File

@@ -14,8 +14,6 @@ public class VariableTableDataService : IVariableTableDataService
private readonly IDataStorageService _dataStorageService;
private readonly IAppDataCenterService _appDataCenterService;
private readonly IMenuDataService _menuDataService;
// Removed circular dependency by not injecting IDeviceDataService
// private readonly IDeviceDataService _deviceDataService;
@@ -40,11 +38,11 @@ public class VariableTableDataService : IVariableTableDataService
}
}
public async Task<bool> AddVariableTable(VariableTableDto variableTableDto,
public async Task<int> AddVariableTable(VariableTableDto variableTableDto,
MenuBeanDto menuDto = null, bool isAddDb = false)
{
if (variableTableDto == null)
return false;
return 0;
if (isAddDb && menuDto != null)
{
@@ -53,22 +51,14 @@ public class VariableTableDataService : IVariableTableDataService
createDto.DeviceId = variableTableDto.DeviceId;
createDto.Menu = menuDto;
var resDto = await _appDataCenterService.VariableTableManagementService.CreateVariableTableAsync(createDto);
_mapper.Map(resDto.VariableTable, variableTableDto);
_menuDataService.AddMenuItem(_mapper.Map<MenuItemViewModel>(resDto.Menu));
return resDto.VariableTable.Id;
}
// 添加变量表到内存的操作现在在服务内部完成，无需额外调用
// var device = _deviceDataService.Devices.FirstOrDefault(d => d.Id == variableTableDto.DeviceId);
// if (device != null)
// {
// var variableTableItemViewModel = _mapper.Map<VariableTableItemViewModel>(variableTableDto);
// variableTableItemViewModel.Device = device;
// device.VariableTables.Add(variableTableItemViewModel);
// VariableTables.Add(variableTableItemViewModel);
// }
return true;
return 0;
}

46
DMS.WPF/ViewModels/DeviceDetailViewModel.cs
View File

@@ -28,11 +28,14 @@ public partial class DeviceDetailViewModel : ViewModelBase, INavigatable
[ObservableProperty]
private VariableTableItemViewModel _selectedVariableTable;
[ObservableProperty]
private bool _isBusy;
private readonly INotificationService _notificationService;
public DeviceDetailViewModel(IMapper mapper, IDialogService dialogService,IDataStorageService dataStorageService ,INavigationService navigationService,
public DeviceDetailViewModel(IMapper mapper, IDialogService dialogService, IDataStorageService dataStorageService,
INavigationService navigationService,
IWPFDataService wpfDataService, INotificationService notificationService)
{
_mapper = mapper;
@@ -46,6 +49,8 @@ public partial class DeviceDetailViewModel : ViewModelBase, INavigatable
[RelayCommand]
private async Task AddVariableTable()
{
if (IsBusy) return;
IsBusy = true;
try
{
VariableTableDialogViewModel variableTableDialogViewModel = new VariableTableDialogViewModel()
@@ -67,27 +72,41 @@ public partial class DeviceDetailViewModel : ViewModelBase, INavigatable
Icon = SegoeFluentIcons.DataSense.Glyph,
TargetViewKey = "VariableTableView"
};
int addVarTableId = await _wpfDataService.VariableTableDataService.AddVariableTable(
_mapper.Map<VariableTableDto>(variableTableItemViewModel),
tableMenu, true);
if (await _wpfDataService.VariableTableDataService.AddVariableTable(_mapper.Map<VariableTableDto>(variableTableItemViewModel),
tableMenu, true))
if (addVarTableId > 0)
{
variableTableItemViewModel.Id = addVarTableId;
if (_dataStorageService.Devices.TryGetValue(variableTableItemViewModel.DeviceId, out var device))
{
variableTableItemViewModel.Device = device;
}
_notificationService.ShowSuccess($"添加变量表成功：{variableTableItemViewModel.Name}");
CurrentDevice.VariableTables.Add(variableTableItemViewModel);
}
else
{
_notificationService.ShowError($"添加变量表失败：{variableTableItemViewModel.Name}！！");
}
}
catch (Exception ex)
{
_notificationService.ShowError($"添加变量表时发生错误: {ex.Message}", ex);
}
finally
{
IsBusy = false;
}
}
[RelayCommand]
private async Task EditVariableTable()
{
if (IsBusy) return;
IsBusy = true;
try
{
if (SelectedVariableTable == null)
@@ -96,12 +115,14 @@ public partial class DeviceDetailViewModel : ViewModelBase, INavigatable
return;
}
VariableTableDialogViewModel variableTableDialogViewModel = new VariableTableDialogViewModel(SelectedVariableTable)
VariableTableDialogViewModel variableTableDialogViewModel
= new VariableTableDialogViewModel(SelectedVariableTable)
{
PrimaryButText = "编辑变量表"
};
// 1. 显示变量表对话框
VariableTableItemViewModel variableTable = await _dialogService.ShowDialogAsync(variableTableDialogViewModel);
VariableTableItemViewModel variableTable
= await _dialogService.ShowDialogAsync(variableTableDialogViewModel);
// 如果用户取消或对话框未返回变量表，则直接返回
if (variableTable == null)
{
@@ -121,11 +142,17 @@ public partial class DeviceDetailViewModel : ViewModelBase, INavigatable
{
_notificationService.ShowError($"编辑变量表的过程中发生错误：{e.Message}", e);
}
finally
{
IsBusy = false;
}
}
[RelayCommand]
private async Task DeleteVariableTable()
{
if (IsBusy) return;
IsBusy = true;
try
{
if (SelectedVariableTable == null)
@@ -153,8 +180,11 @@ public partial class DeviceDetailViewModel : ViewModelBase, INavigatable
{
_notificationService.ShowError($"删除变量表的过程中发生错误：{e.Message}", e);
}
finally
{
IsBusy = false;
}
}
public async Task OnNavigatedToAsync(MenuItemViewModel menu)