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

完成设备详情页的变量表的编辑和删除

Browse Source
This commit is contained in:
David P.G
2025-07-30 13:21:03 +08:00
parent a62ee03933
commit d4fb542770
2 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
DMS.WPF/Services/DataServices.cs
View File

@@ -177,7 +177,6 @@ public partial class DataServices : ObservableRecipient, IRecipient<LoadMessage>
// 注意：MenuItemViewModel 的属性是 ObservableProperty，直接赋值会触发通知 // 注意：MenuItemViewModel 的属性是 ObservableProperty，直接赋值会触发通知
if (existingItem.Header != newDto.Header) existingItem.Header = newDto.Header; if (existingItem.Header != newDto.Header) existingItem.Header = newDto.Header;
if (existingItem.Icon != newDto.Icon) existingItem.Icon = newDto.Icon; if (existingItem.Icon != newDto.Icon) existingItem.Icon = newDto.Icon;
} }
else else
{ {
@@ -523,11 +522,13 @@ public partial class DataServices : ObservableRecipient, IRecipient<LoadMessage>
if (device != null) if (device != null)
{ {
// 1. 删除与设备关联的所有变量表及其变量 // 1. 删除与设备关联的所有变量表及其变量
var variableTablesToDelete = VariableTables.Where(vt => vt.DeviceId == device.Id).ToList(); var variableTablesToDelete = VariableTables.Where(vt => vt.DeviceId == device.Id)
.ToList();
foreach (var vt in variableTablesToDelete) foreach (var vt in variableTablesToDelete)
{ {
// 删除与当前变量表关联的所有变量 // 删除与当前变量表关联的所有变量
var variablesToDelete = Variables.Where(v => v.VariableTableId == vt.Id).ToList(); var variablesToDelete = Variables.Where(v => v.VariableTableId == vt.Id)
.ToList();
foreach (var variable in variablesToDelete) foreach (var variable in variablesToDelete)
{ {
Variables.Remove(variable); Variables.Remove(variable);
@@ -537,7 +538,8 @@ public partial class DataServices : ObservableRecipient, IRecipient<LoadMessage>
VariableTables.Remove(vt); VariableTables.Remove(vt);
// 删除与变量表关联的菜单项 // 删除与变量表关联的菜单项
var variableTableMenu = Menus.FirstOrDefault(m => m.TargetViewKey == "VariableTableView" && m.Header == vt.Name); var variableTableMenu
= Menus.FirstOrDefault(m => m.TargetViewKey == "VariableTableView" && m.Header == vt.Name);
if (variableTableMenu != null) if (variableTableMenu != null)
{ {
DeleteMenuItem(variableTableMenu); DeleteMenuItem(variableTableMenu);
@@ -558,4 +560,34 @@ public partial class DataServices : ObservableRecipient, IRecipient<LoadMessage>
// BuildMenuTree(); // BuildMenuTree();
} }
} }
public void DeleteVariableTableById(int id)
{
var variableTable = VariableTables.FirstOrDefault(vt => vt.Id == id);
if (variableTable != null)
{
// 删除与当前变量表关联的所有变量
var variablesToDelete = Variables.Where(v => v.VariableTableId == variableTable.Id)
.ToList();
foreach (var variable in variablesToDelete)
{
Variables.Remove(variable);
}
var device = Devices.FirstOrDefault(d => d.Id == variableTable.DeviceId);
if (device != null)
device.VariableTables.Remove(variableTable);
// 删除变量表
VariableTables.Remove(variableTable);
// 删除与变量表关联的菜单项
var variableTableMenu
= Menus.FirstOrDefault(m => m.MenuType == MenuType.VariableTableMenu && m.TargetId == variableTable.Id);
if (variableTableMenu != null)
{
DeleteMenuItem(variableTableMenu);
}
}
}
} }

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

@@ -25,7 +25,7 @@ public partial class DeviceDetailViewModel : ViewModelBase, INavigatable
private DeviceItemViewModel _currentDevice; private DeviceItemViewModel _currentDevice;
[ObservableProperty] [ObservableProperty]
private VariableItemViewModel _selectedVariableTable; private VariableTableItemViewModel _selectedVariableTable;
public DeviceDetailViewModel(IMapper mapper, IDialogService dialogService, INavigationService navigationService, public DeviceDetailViewModel(IMapper mapper, IDialogService dialogService, INavigationService navigationService,
DataServices dataServices, IVariableTableAppService variableTableAppService) DataServices dataServices, IVariableTableAppService variableTableAppService)
@@ -75,111 +75,79 @@ public partial class DeviceDetailViewModel : ViewModelBase, INavigatable
[RelayCommand] [RelayCommand]
private async Task EditVariableTable() private async Task EditVariableTable()
{
try
{ {
if (SelectedVariableTable == null) if (SelectedVariableTable == null)
{ {
// NotificationHelper.ShowInfo("请选择要编辑的变量表。"); NotificationHelper.ShowError("你没有选择任何变量表，请选择变量表后再点击编辑变量表");
return; return;
} }
//
// using var db = DbContext.GetInstance(); VariableTableDialogViewModel variableTableDialogViewModel = new VariableTableDialogViewModel(SelectedVariableTable)
// try {
// { PrimaryButContent = "编辑变量表"
// var originalName = SelectedVariableTable.Name; // Store original name for comparison };
// var editedVarTable = await _dialogService.ShowEditVarTableDialog(SelectedVariableTable); // 1. 显示变量表对话框
// if (editedVarTable == null) return; VariableTableItemViewModel variableTable = await _dialogService.ShowDialogAsync(variableTableDialogViewModel);
// // 如果用户取消或对话框未返回变量表，则直接返回
// await db.BeginTranAsync(); if (variableTable == null)
// {
// // Update variable table in DB return;
// var result = await _varTableRepository.UpdateAsync(SelectedVariableTable, db); }
//
// if (result > 0) int res = await _variableTableAppService.UpdateVariableTableAsync(_mapper.Map<VariableTableDto>(variableTable));
// { if (res > 0)
// // Update corresponding menu item if name changed {
// if (originalName != SelectedVariableTable.Name) var menu = DataServices.Menus.FirstOrDefault(m =>
// { m.MenuType == MenuType.VariableTableMenu &&
// var menu = DataServicesHelper.FindVarTableMenu(SelectedVariableTable.Id, _dataServices.MenuTrees); m.TargetId == variableTable.Id);
// if (menu != null) if (menu != null)
// { {
// menu.Name = SelectedVariableTable.Name; menu.Header = variableTable.Name;
// await _menuRepository.UpdateAsync(menu, db); }
// } }
// } }
// catch (Exception e)
// await db.CommitTranAsync(); {
// //NotificationHelper.ShowSuccess($"变量表 {SelectedVariableTable.Name} 编辑成功。"); NotificationHelper.ShowError($"编辑变量表的过程中发生错误：{e.Message}", e);
// MessageHelper.SendLoadMessage(Enums.LoadTypes.Menu); // Refresh the main navigation menu }
// }
// else
// {
// await db.RollbackTranAsync();
// //NotificationHelper.ShowError($"变量表 {SelectedVariableTable.Name} 编辑失败。");
// }
// }
// catch (Exception ex)
// {
// await db.RollbackTranAsync();
// //NotificationHelper.ShowError($"编辑变量表时发生错误: {ex.Message}", ex);
// }
} }
[RelayCommand] [RelayCommand]
private async Task DeleteVariableTable() private async Task DeleteVariableTable()
{ {
// if (SelectedVariableTable == null) try
// { {
// //NotificationHelper.ShowInfo("请选择要删除的变量表。"); if (SelectedVariableTable == null)
// return; {
// } NotificationHelper.ShowError("你没有选择任何变量表，请选择变量表后再点击删除变量表");
// return;
// var confirm = await _dialogService.ShowConfrimeDialog( }
// "删除确认",
// $"确定要删除变量表 \"{SelectedVariableTable.Name}\" 吗?\n\n此操作将同时删除该变量表下的所有变量数据，且无法恢复！", ConfrimDialogViewModel viewModel = new ConfrimDialogViewModel();
// "删除"); viewModel.Message = $"确认要删除变量表名为:{SelectedVariableTable.Name} \n\n此操作将同时删除该变量表下的所有变量数据，且无法恢复！";
// viewModel.Title = "删除变量表";
// if (!confirm) return; viewModel.PrimaryButContent = "删除";
//
// using var db = DbContext.GetInstance(); var resViewModel = await _dialogService.ShowDialogAsync(viewModel);
// try if (resViewModel.IsPrimaryButton)
// { {
// await db.BeginTranAsync(); var isDel = await _variableTableAppService.DeleteVariableTableAsync(SelectedVariableTable.Id);
// if (isDel)
// // Find the corresponding menu item {
// MenuBean menuToDelete = null; var delName = SelectedVariableTable.Name;
// if (_dataServices.MenuTrees != null) // 更新界面
// { DataServices.DeleteVariableTableById(SelectedVariableTable.Id);
// menuToDelete = DataServicesHelper.FindVarTableMenu( SelectedVariableTable.Id,_dataServices.MenuTrees);
// } NotificationHelper.ShowSuccess($"删除变量表成功,变量表名：{delName}");
// }
// // Delete variable table from DB }
// var result = await _varTableRepository.DeleteAsync(SelectedVariableTable, db); }
// catch (Exception e)
// if (result > 0) {
// { NotificationHelper.ShowError($"删除变量表的过程中发生错误：{e.Message}", e);
// // Delete corresponding menu item }
// if (menuToDelete != null)
// {
// await _menuRepository.DeleteAsync(menuToDelete, db);
// }
//
// await db.CommitTranAsync();
// var delVarTableName = SelectedVariableTable.Name;
// CurrentDevice?.VariableTables?.Remove(SelectedVariableTable);
// //NotificationHelper.ShowSuccess($"变量表 {delVarTableName} 删除成功。");
// MessageHelper.SendLoadMessage(Enums.LoadTypes.Menu); // Refresh the main navigation menu
// }
// else
// {
// await db.RollbackTranAsync();
// //NotificationHelper.ShowError($"变量表 {SelectedVariableTable.Name} 删除失败。");
// }
// }
// catch (Exception ex)
// {
// await db.RollbackTranAsync();
// //NotificationHelper.ShowError($"删除变量表时发生错误: {ex.Message}", ex);
// }
} }
// Placeholder for EditDeviceCommand and DeleteDeviceCommand if they are needed here // Placeholder for EditDeviceCommand and DeleteDeviceCommand if they are needed here