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

feat(mqtt): 实现MQTT别名批量修改功能

Browse Source 
主要改动：
  - 在 MqttServerDetailView 中，允许用户在关联变量列表中进行多项选择。
  - 修改了 ModifyAlias 命令，使其能够处理多个选中项，并调用批量编辑对话框。
  - 新增了 MqttAliasBatchEditDialogViewModel 的构造函数，使其可以接收并编辑已存在的别名列表。
  - 通过 SelectedItemsBehavior 辅助类，实现了 DataGrid 中 SelectedItems 的双向绑定。
  - 更新了相关视图和视图模型，以支持新的批量操作流程。
This commit is contained in:
David P.G
2025-10-07 19:04:30 +08:00
parent b753e5ea73
commit 6daca3eaf6
4 changed files with 441 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
DMS.WPF/ViewModels/Dialogs/MqttAliasBatchEditDialogViewModel.cs
View File

@@ -16,25 +16,41 @@ namespace DMS.WPF.ViewModels.Dialogs
public partial class MqttAliasBatchEditDialogViewModel : DialogViewModelBase<List<MqttAliasItem>>
{
[ObservableProperty]
private ObservableCollection<MqttAliasItem> _variableMqttAliases = new();
private ObservableCollection<MqttAliasItem> _currentMqttAliases = new();
[ObservableProperty]
private MqttServerItem _selectedMqttServer;
public MqttAliasBatchEditDialogViewModel(
List<VariableItem> variables,
List<VariableItem> variables,
MqttServerItem mqttServer)
{
_selectedMqttServer = mqttServer;
InitializeVariableMqttAliases(variables);
InitializeCurrentMqttAliases(variables);
}
public MqttAliasBatchEditDialogViewModel(List<MqttAliasItem> mqttAliasItems)
{
foreach (var item in mqttAliasItems)
{
MqttAliasItem aliasItem = new MqttAliasItem();
aliasItem.Id = item.Id;
aliasItem.Alias = item.Alias;
aliasItem.VariableId = item.VariableId;
aliasItem.MqttServerId = item.MqttServerId;
aliasItem.Variable = item.Variable;
aliasItem.MqttServerName = item.MqttServerName;
aliasItem.MqttServer = item.MqttServer;
CurrentMqttAliases.Add(aliasItem);
}
}
/// <summary>
/// 初始化变量MQTT别名列表
/// </summary>
private void InitializeVariableMqttAliases(List<VariableItem> variables)
private void InitializeCurrentMqttAliases(List<VariableItem> variables)
{
VariableMqttAliases.Clear();
CurrentMqttAliases.Clear();
foreach (var variable in variables)
{
@@ -51,7 +67,7 @@ namespace DMS.WPF.ViewModels.Dialogs
Alias = existingAlias?.Alias ?? GenerateDefaultAlias(variable)
};
VariableMqttAliases.Add(variableMqttAlias);
CurrentMqttAliases.Add(variableMqttAlias);
}
}
@@ -70,7 +86,7 @@ namespace DMS.WPF.ViewModels.Dialogs
[RelayCommand]
private void Confirm()
{
var result = VariableMqttAliases.ToList();
var result = CurrentMqttAliases.ToList();
Close(result);
}
@@ -92,7 +108,7 @@ namespace DMS.WPF.ViewModels.Dialogs
if (string.IsNullOrWhiteSpace(prefix))
return;
foreach (var alias in VariableMqttAliases)
foreach (var alias in CurrentMqttAliases)
{
alias.Alias = $"{prefix}_{alias.Variable.Name}";
}

76
DMS.WPF/ViewModels/MqttServerDetailViewModel.cs
View File

@@ -5,9 +5,10 @@ using DMS.Application.Interfaces;
using DMS.Application.Interfaces.Management;
using DMS.Core.Models;
using DMS.WPF.Interfaces;
using DMS.WPF.ViewModels.Dialogs;
using DMS.WPF.ItemViewModel;
using DMS.WPF.ViewModels.Dialogs;
using Microsoft.Extensions.Logging;
using System.Collections;
using System.Collections.ObjectModel;
namespace DMS.WPF.ViewModels
@@ -39,6 +40,9 @@ namespace DMS.WPF.ViewModels
[ObservableProperty]
private ObservableCollection<MqttAlias> _associatedVariables;
[ObservableProperty]
private IList _selectedMqttAliaes = new ArrayList();
/// <summary>
/// 构造函数。
@@ -198,9 +202,9 @@ namespace DMS.WPF.ViewModels
/// 修改变量的MQTT发送名称
/// </summary>
[RelayCommand]
private async Task ModifyAlias(MqttAlias variableAlias)
private async Task ModifyAlias()
{
if (variableAlias == null)
if (SelectedMqttAliaes.Count == 0)
{
_notificationService.ShowError("请选择要修改的变量项。");
return;
@@ -208,38 +212,52 @@ namespace DMS.WPF.ViewModels
try
{
List<MqttAliasItem> selectedMqttAliaes = SelectedMqttAliaes.Cast<MqttAliasItem>().ToList();
// 创建一个用于输入新名称的简单对话框
var oldAlias = variableAlias.Alias;
InputDialogViewModel viewModel = new InputDialogViewModel("修改发送名称", "请输入新的MQTT发送名称:", oldAlias);
var dialogResult = await _dialogService.ShowDialogAsync(viewModel);
if (dialogResult != null) // 用户没有取消操作
MqttAliasBatchEditDialogViewModel viewModel = new MqttAliasBatchEditDialogViewModel(selectedMqttAliaes);
var resMqttAliaes = await _dialogService.ShowDialogAsync(viewModel);
if (resMqttAliaes is null) // 用户没有取消操作
{
var newAlias = dialogResult.Trim();
if (string.IsNullOrEmpty(newAlias))
return;
}
foreach (var item in resMqttAliaes)
{
foreach (var selectItem in selectedMqttAliaes)
{
_notificationService.ShowWarn("发送名称不能为空。");
return;
if (item.Id == selectItem.Id)
{
selectItem.Alias = item.Alias;
}
}
// 更新变量的发送名称
variableAlias.Alias = newAlias;
// 保存更改到数据服务
// var result = await _wpfDataService.UpdateMqttServer(CurrentMqtt);
//
// if (result)
// {
// _notificationService.ShowSuccess($"变量 '{variableAlias.Variable.Name}' 的发送名称已更新为 '{newAlias}'");
// }
// else
// {
// _notificationService.ShowError("更新发送名称失败。");
// // 如果更新失败，恢复原来的值
// variableAlias.Alias = oldAlias;
// }
}
//var newAlias = dialogResult.Trim();
//if (string.IsNullOrEmpty(newAlias))
//{
// _notificationService.ShowWarn("发送名称不能为空。");
// return;
//}
//// 更新变量的发送名称
//variableAlias.Alias = newAlias;
// 保存更改到数据服务
// var result = await _wpfDataService.UpdateMqttServer(CurrentMqtt);
//
// if (result)
// {
// _notificationService.ShowSuccess($"变量 '{variableAlias.Variable.Name}' 的发送名称已更新为 '{newAlias}'");
// }
// else
// {
// _notificationService.ShowError("更新发送名称失败。");
// // 如果更新失败，恢复原来的值
// variableAlias.Alias = oldAlias;
// }
}
catch (Exception e)
{