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

1 feat: 实现触发器-菜单联动功能和事件系统

Browse Source 
2
    3 - 实现触发器与菜单联动功能，现在可以同时创建触发器及其关联的菜单项
    4 - 添加触发器更改事件系统，用于通知UI和其他组件触发器状态的变化
    5 - 优化触发器管理服务，改进了添加、修改和删除触发器的逻辑
    6 - 将CreateTriggerAsync方法重命名为AddTriggerAsync，使其语义更准确
    7 - 修改UpdateTriggerAsync方法的参数和返回值类型，提高一致性
    8 - 添加CreateTriggerWithMenuAsync方法用于同时创建触发器和菜单
    9 - 在应用层重构触发器管理逻辑，增加事务支持确保数据一致性
   10 - 更新菜单管理服务，改进并发安全处理
   11 - 调整数据存储服务，使其同步触发器和菜单更新
   12 - 更新触发器对话框和列表视图模型，提升用户体验
   13 - 在依赖注入容器中注册触发器服务
   14 - 修复设备数据服务中的异步调用问题，确保菜单项的正确处理
   15 - 添加缺失的触发器项映射配置
   16 - 创建TriggerChangedEventArgs类处理触发器更改事件
This commit is contained in:
David P.G
2025-10-19 20:34:20 +08:00
parent 0007235171
commit 958593b35d
17 changed files with 362 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DMS.WPF/ViewModels/Dialogs/TriggerDialogViewModel.cs
View File

@@ -145,10 +145,10 @@ namespace DMS.WPF.ViewModels.Dialogs
}
// Set timestamps
Trigger.UpdatedAt = DateTime.UtcNow;
Trigger.UpdatedAt = DateTime.Now;
if (Trigger.Id == default(int))
{
Trigger.CreatedAt = DateTime.UtcNow;
Trigger.CreatedAt = DateTime.Now;
Trigger.Id = 0; // 对于自增ID，设置为0让数据库自动生成
}

86
DMS.WPF/ViewModels/TriggersViewModel.cs
View File

@@ -30,7 +30,7 @@ namespace DMS.WPF.ViewModels
public NotifyCollectionChangedSynchronizedViewList<TriggerItem> TriggerItemListView { get; }
[ObservableProperty]
private ObservableDictionary<int, TriggerItem> _triggers ;
private ObservableDictionary<int, TriggerItem> _triggers;
[ObservableProperty]
private TriggerItem? _selectedTrigger;
@@ -51,14 +51,14 @@ namespace DMS.WPF.ViewModels
_navigationService = navigationService ?? throw new ArgumentNullException(nameof(navigationService));
// 初始化时加载触发器数据
_synchronizedView = _dataStorageService.Triggers.CreateView(v=>v.Value);
TriggerItemListView= _synchronizedView.ToNotifyCollectionChanged();
_synchronizedView = _dataStorageService.Triggers.CreateView(v => v.Value);
TriggerItemListView = _synchronizedView.ToNotifyCollectionChanged();
}
/// <summary>
/// 添加新触发器
@@ -67,59 +67,40 @@ namespace DMS.WPF.ViewModels
private async Task AddTriggerAsync()
{
var newTrigger = new TriggerItem()
{
IsActive = true,
Action = Core.Models.Triggers.ActionType.SendEmail,
Description = "新建触发器",
CreatedAt = DateTime.Now,
UpdatedAt = DateTime.Now
{
IsActive = true,
Action = Core.Models.Triggers.ActionType.SendEmail,
Name = "新建触发器",
Description = "新建触发器",
CreatedAt = DateTime.Now,
UpdatedAt = DateTime.Now
};
TriggerDialogViewModel viewModel = App.Current.Services.GetRequiredService<TriggerDialogViewModel>();
await viewModel.OnInitializedAsync(newTrigger);
var result = await _dialogService.ShowDialogAsync(viewModel);
if (result != null)
if (result is null) return;
try
{
try
{
// 创建包含菜单信息的 DTO
CreateTriggerWithMenuDto dto = new CreateTriggerWithMenuDto();
if (_mapper != null)
{
dto.Trigger = _mapper.Map<Trigger>(result);
}
else
{
_notificationService?.ShowError("映射服务未初始化");
return;
}
// 创建菜单项
dto.TriggerMenu = new MenuBean()
{
Header = result.Name ?? result.Description,
Icon = "\uE945", // 使用触发器图标
TargetViewKey = nameof(TriggerDetailViewModel),
};
// 使用TriggerDataService添加触发器和菜单
var resTriggerItem = await _triggerDataService.AddTrigger(result);
// 使用TriggerDataService添加触发器和菜单
var createdTriggerDto = await _triggerDataService.AddTriggerWithMenu(dto);
if (createdTriggerDto != null && createdTriggerDto.Trigger != null)
{
// 更新UI显示
_notificationService.ShowSuccess($"触发器创建成功：{createdTriggerDto.Trigger.Name ?? createdTriggerDto.Trigger.Description}");
}
else
{
_notificationService.ShowError("触发器创建失败");
}
}
catch (Exception ex)
if (resTriggerItem is not null)
{
_notificationService.ShowError($"创建触发器失败: {ex.Message}");
// 更新UI显示
_notificationService.ShowSuccess($"触发器创建成功：{resTriggerItem.Name}");
}
else
{
_notificationService.ShowError("触发器创建失败");
}
}
catch (Exception ex)
{
_notificationService.ShowError($"创建触发器失败: {ex.Message},");
}
}
@@ -136,10 +117,11 @@ namespace DMS.WPF.ViewModels
}
// 传递副本以避免直接修改原始对象
var triggerToEdit = _mapper.Map<Trigger>(SelectedTrigger);
TriggerItem triggerItemToEdit = new TriggerItem();
_mapper.Map(SelectedTrigger, triggerItemToEdit);
TriggerDialogViewModel viewModel = App.Current.Services.GetRequiredService<TriggerDialogViewModel>();
await viewModel.OnInitializedAsync(triggerToEdit);
await viewModel.OnInitializedAsync(triggerItemToEdit);
var result = await _dialogService.ShowDialogAsync(viewModel);
if (result != null)
@@ -147,7 +129,7 @@ namespace DMS.WPF.ViewModels
try
{
// 使用TriggerDataService更新触发器
var updatedTrigger = await _triggerDataService.UpdateTrigger(SelectedTrigger);
var updatedTrigger = await _triggerDataService.UpdateTrigger(result);
if (updatedTrigger)
{
_notificationService.ShowSuccess("触发器更新成功");
@@ -176,7 +158,7 @@ namespace DMS.WPF.ViewModels
return;
}
var confirm = await _dialogService.ShowDialogAsync(new ConfirmDialogViewModel("确认删除", $"确定要删除触发器 '{SelectedTrigger.Description}' 吗？","删除"));
var confirm = await _dialogService.ShowDialogAsync(new ConfirmDialogViewModel("确认删除", $"确定要删除触发器 '{SelectedTrigger.Description}' 吗？", "删除"));
if (confirm)
{
try