feat(mqtt): 实现MQTT别名批量修改功能
主要改动： - 在 MqttServerDetailView 中，允许用户在关联变量列表中进行多项选择。 - 修改了 ModifyAlias 命令，使其能够处理多个选中项，并调用批量编辑对话框。 - 新增了 MqttAliasBatchEditDialogViewModel 的构造函数，使其可以接收并编辑已存在的别名列表。 - 通过 SelectedItemsBehavior 辅助类，实现了 DataGrid 中 SelectedItems 的双向绑定。 - 更新了相关视图和视图模型，以支持新的批量操作流程。
This commit is contained in:
@@ -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}";
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
</StackPanel>
|
||||
|
||||
<DataGrid Grid.Row="2"
|
||||
ItemsSource="{Binding VariableMqttAliases}"
|
||||
ItemsSource="{Binding CurrentMqttAliases}"
|
||||
AutoGenerateColumns="False"
|
||||
CanUserAddRows="False"
|
||||
CanUserDeleteRows="False"
|
||||
|
||||
@@ -1,56 +1,68 @@
|
||||
<UserControl x:Class="DMS.WPF.Views.MqttServerDetailView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
|
||||
xmlns:valueConverts="clr-namespace:DMS.WPF.ValueConverts"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="450" d:DesignWidth="800">
|
||||
<UserControl
|
||||
x:Class="DMS.WPF.Views.MqttServerDetailView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:helper="clr-namespace:DMS.WPF.Helper"
|
||||
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
|
||||
xmlns:valueConverts="clr-namespace:DMS.WPF.ValueConverts"
|
||||
d:DesignHeight="450"
|
||||
d:DesignWidth="800"
|
||||
mc:Ignorable="d">
|
||||
<UserControl.Resources>
|
||||
<valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter"/>
|
||||
<valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
|
||||
</UserControl.Resources>
|
||||
|
||||
|
||||
<DockPanel>
|
||||
<!-- 顶部导航栏 -->
|
||||
<Border DockPanel.Dock="Top" Margin="20,10" Padding="15">
|
||||
<!-- 顶部导航栏 -->
|
||||
<Border
|
||||
Margin="20,10"
|
||||
Padding="15"
|
||||
DockPanel.Dock="Top">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<!-- 返回MQTT列表按钮 -->
|
||||
<Button Grid.Column="0"
|
||||
Command="{Binding NavigateToMqttsCommand}"
|
||||
Style="{StaticResource ButtonDefault}"
|
||||
ToolTip="返回MQTT服务器列表"
|
||||
Margin="0,0,10,0">
|
||||
|
||||
<!-- 返回MQTT列表按钮 -->
|
||||
<Button
|
||||
Grid.Column="0"
|
||||
Margin="0,0,10,0"
|
||||
Command="{Binding NavigateToMqttsCommand}"
|
||||
Style="{StaticResource ButtonDefault}"
|
||||
ToolTip="返回MQTT服务器列表">
|
||||
<Button.Content>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.ArrowLeft8}" />
|
||||
</StackPanel>
|
||||
</Button.Content>
|
||||
</Button>
|
||||
|
||||
<!-- 操作菜单栏 -->
|
||||
<ui:CommandBar Grid.Column="1"
|
||||
DefaultLabelPosition="Right"
|
||||
IsOpen="False"
|
||||
HorizontalAlignment="Right">
|
||||
|
||||
<ui:AppBarButton x:Name="EditButton" Label="编辑" Command="{Binding EditMqttCommand}">
|
||||
|
||||
<!-- 操作菜单栏 -->
|
||||
<ui:CommandBar
|
||||
Grid.Column="1"
|
||||
HorizontalAlignment="Right"
|
||||
DefaultLabelPosition="Right"
|
||||
IsOpen="False">
|
||||
|
||||
<ui:AppBarButton
|
||||
x:Name="EditButton"
|
||||
Command="{Binding EditMqttCommand}"
|
||||
Label="编辑">
|
||||
<ui:AppBarButton.Icon>
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Edit}" />
|
||||
</ui:AppBarButton.Icon>
|
||||
</ui:AppBarButton>
|
||||
|
||||
|
||||
<ui:AppBarButton x:Name="ShareButton" Label="分享">
|
||||
<ui:AppBarButton.Icon>
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Share}" />
|
||||
</ui:AppBarButton.Icon>
|
||||
</ui:AppBarButton>
|
||||
|
||||
|
||||
<ui:CommandBar.SecondaryCommands>
|
||||
<ui:AppBarButton
|
||||
x:Name="SettingsButton"
|
||||
@@ -61,231 +73,383 @@
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 主内容区域 -->
|
||||
<!-- 主内容区域 -->
|
||||
<ScrollViewer DockPanel.Dock="Top" VerticalScrollBarVisibility="Auto">
|
||||
<StackPanel Margin="20">
|
||||
<!-- MQTT Server Details -->
|
||||
<Border Background="White" BorderBrush="#E0E0E0" BorderThickness="1" CornerRadius="8" Margin="0,0,0,10" Padding="15">
|
||||
<!-- MQTT Server Details -->
|
||||
<Border
|
||||
Margin="0,0,0,10"
|
||||
Padding="15"
|
||||
Background="White"
|
||||
BorderBrush="#E0E0E0"
|
||||
BorderThickness="1"
|
||||
CornerRadius="8">
|
||||
<Border.Effect>
|
||||
<DropShadowEffect ShadowDepth="2" BlurRadius="5" Opacity="0.1" Color="#888888"/>
|
||||
<DropShadowEffect
|
||||
BlurRadius="5"
|
||||
Opacity="0.1"
|
||||
ShadowDepth="2"
|
||||
Color="#888888" />
|
||||
</Border.Effect>
|
||||
|
||||
|
||||
<StackPanel>
|
||||
<Grid Margin="0,0,0,10">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<StackPanel Grid.Column="0" Orientation="Horizontal">
|
||||
<ui:FontIcon FontFamily="{StaticResource MdFontIcons}"
|
||||
Glyph="󰒋"
|
||||
FontSize="24"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,10,0"
|
||||
Foreground="#2196F3"/>
|
||||
<TextBlock Text="MQTT 服务器详情"
|
||||
Style="{StaticResource SubtitleTextBlockStyle}"
|
||||
VerticalAlignment="Center"/>
|
||||
<ui:FontIcon
|
||||
Margin="0,0,10,0"
|
||||
VerticalAlignment="Center"
|
||||
FontFamily="{StaticResource MdFontIcons}"
|
||||
FontSize="24"
|
||||
Foreground="#2196F3"
|
||||
Glyph="󰒋" />
|
||||
<TextBlock
|
||||
VerticalAlignment="Center"
|
||||
Style="{StaticResource SubtitleTextBlockStyle}"
|
||||
Text="MQTT 服务器详情" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
|
||||
|
||||
<Grid Margin="0,8,0,8">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" Margin="0,0,5,12">
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Tag}"
|
||||
FontSize="16"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,5,0"
|
||||
Foreground="#666666"/>
|
||||
<TextBlock Text="名称:" VerticalAlignment="Center"/>
|
||||
<StackPanel
|
||||
Grid.Row="0"
|
||||
Grid.Column="0"
|
||||
Margin="0,0,5,12"
|
||||
Orientation="Horizontal">
|
||||
<ui:FontIcon
|
||||
Margin="0,0,5,0"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16"
|
||||
Foreground="#666666"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.Tag}" />
|
||||
<TextBlock VerticalAlignment="Center" Text="名称:" />
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CurrentMqtt.ServerName}"
|
||||
Margin="0,0,10,12" VerticalAlignment="Center"
|
||||
FontWeight="SemiBold" Foreground="#333333"/>
|
||||
<TextBlock
|
||||
Grid.Row="0"
|
||||
Grid.Column="1"
|
||||
Margin="0,0,10,12"
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="SemiBold"
|
||||
Foreground="#333333"
|
||||
Text="{Binding CurrentMqtt.ServerName}" />
|
||||
|
||||
<StackPanel Grid.Row="0" Grid.Column="2" Orientation="Horizontal" Margin="0,0,5,12">
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.World}"
|
||||
FontSize="16"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,5,0"
|
||||
Foreground="#666666"/>
|
||||
<TextBlock Text="主机:" VerticalAlignment="Center"/>
|
||||
<StackPanel
|
||||
Grid.Row="0"
|
||||
Grid.Column="2"
|
||||
Margin="0,0,5,12"
|
||||
Orientation="Horizontal">
|
||||
<ui:FontIcon
|
||||
Margin="0,0,5,0"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16"
|
||||
Foreground="#666666"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.World}" />
|
||||
<TextBlock VerticalAlignment="Center" Text="主机:" />
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Row="0" Grid.Column="3" Text="{Binding CurrentMqtt.ServerUrl}"
|
||||
Margin="0,0,0,12" VerticalAlignment="Center"
|
||||
FontWeight="SemiBold" Foreground="#333333"/>
|
||||
<TextBlock
|
||||
Grid.Row="0"
|
||||
Grid.Column="3"
|
||||
Margin="0,0,0,12"
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="SemiBold"
|
||||
Foreground="#333333"
|
||||
Text="{Binding CurrentMqtt.ServerUrl}" />
|
||||
|
||||
<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" Margin="0,0,5,12">
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.ConnectApp}"
|
||||
FontSize="16"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,5,0"
|
||||
Foreground="#666666"/>
|
||||
<TextBlock Text="端口:" VerticalAlignment="Center"/>
|
||||
<StackPanel
|
||||
Grid.Row="1"
|
||||
Grid.Column="0"
|
||||
Margin="0,0,5,12"
|
||||
Orientation="Horizontal">
|
||||
<ui:FontIcon
|
||||
Margin="0,0,5,0"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16"
|
||||
Foreground="#666666"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.ConnectApp}" />
|
||||
<TextBlock VerticalAlignment="Center" Text="端口:" />
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding CurrentMqtt.Port}"
|
||||
Margin="0,0,10,12" VerticalAlignment="Center"
|
||||
FontWeight="SemiBold" Foreground="#333333"/>
|
||||
<TextBlock
|
||||
Grid.Row="1"
|
||||
Grid.Column="1"
|
||||
Margin="0,0,10,12"
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="SemiBold"
|
||||
Foreground="#333333"
|
||||
Text="{Binding CurrentMqtt.Port}" />
|
||||
|
||||
<StackPanel Grid.Row="1" Grid.Column="2" Orientation="Horizontal" Margin="0,0,5,12">
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.ContactInfo}"
|
||||
FontSize="16"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,5,0"
|
||||
Foreground="#666666"/>
|
||||
<TextBlock Text="客户端ID:" VerticalAlignment="Center"/>
|
||||
<StackPanel
|
||||
Grid.Row="1"
|
||||
Grid.Column="2"
|
||||
Margin="0,0,5,12"
|
||||
Orientation="Horizontal">
|
||||
<ui:FontIcon
|
||||
Margin="0,0,5,0"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16"
|
||||
Foreground="#666666"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.ContactInfo}" />
|
||||
<TextBlock VerticalAlignment="Center" Text="客户端ID:" />
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Row="1" Grid.Column="3" Text="{Binding CurrentMqtt.ClientId}"
|
||||
Margin="0,0,0,12" VerticalAlignment="Center"
|
||||
FontWeight="SemiBold" Foreground="#333333"/>
|
||||
<TextBlock
|
||||
Grid.Row="1"
|
||||
Grid.Column="3"
|
||||
Margin="0,0,0,12"
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="SemiBold"
|
||||
Foreground="#333333"
|
||||
Text="{Binding CurrentMqtt.ClientId}" />
|
||||
|
||||
<StackPanel Grid.Row="2" Grid.Column="0" Orientation="Horizontal" Margin="0,0,5,12">
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.People}"
|
||||
FontSize="16"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,5,0"
|
||||
Foreground="#666666"/>
|
||||
<TextBlock Text="用户名:" VerticalAlignment="Center"/>
|
||||
<StackPanel
|
||||
Grid.Row="2"
|
||||
Grid.Column="0"
|
||||
Margin="0,0,5,12"
|
||||
Orientation="Horizontal">
|
||||
<ui:FontIcon
|
||||
Margin="0,0,5,0"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16"
|
||||
Foreground="#666666"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.People}" />
|
||||
<TextBlock VerticalAlignment="Center" Text="用户名:" />
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding CurrentMqtt.Username}"
|
||||
Margin="0,0,10,12" VerticalAlignment="Center"
|
||||
FontWeight="SemiBold" Foreground="#333333"/>
|
||||
<TextBlock
|
||||
Grid.Row="2"
|
||||
Grid.Column="1"
|
||||
Margin="0,0,10,12"
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="SemiBold"
|
||||
Foreground="#333333"
|
||||
Text="{Binding CurrentMqtt.Username}" />
|
||||
|
||||
<StackPanel Grid.Row="2" Grid.Column="2" Orientation="Horizontal" Margin="0,0,5,12">
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Lock}"
|
||||
FontSize="16"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,5,0"
|
||||
Foreground="#666666"/>
|
||||
<TextBlock Text="密码:" VerticalAlignment="Center"/>
|
||||
<StackPanel
|
||||
Grid.Row="2"
|
||||
Grid.Column="2"
|
||||
Margin="0,0,5,12"
|
||||
Orientation="Horizontal">
|
||||
<ui:FontIcon
|
||||
Margin="0,0,5,0"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16"
|
||||
Foreground="#666666"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.Lock}" />
|
||||
<TextBlock VerticalAlignment="Center" Text="密码:" />
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Row="2" Grid.Column="3" Text="{Binding CurrentMqtt.Password}"
|
||||
Margin="0,0,0,12" VerticalAlignment="Center"
|
||||
FontWeight="SemiBold" Foreground="#333333"/>
|
||||
<TextBlock
|
||||
Grid.Row="2"
|
||||
Grid.Column="3"
|
||||
Margin="0,0,0,12"
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="SemiBold"
|
||||
Foreground="#333333"
|
||||
Text="{Binding CurrentMqtt.Password}" />
|
||||
|
||||
<StackPanel Grid.Row="3" Grid.Column="0" Orientation="Horizontal" Margin="0,0,5,12">
|
||||
<ui:FontIcon FontFamily="{StaticResource MdFontIcons}"
|
||||
Glyph="󰚧"
|
||||
FontSize="16"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,5,0"
|
||||
Foreground="#666666"/>
|
||||
<TextBlock Text="发布主题:" VerticalAlignment="Center"/>
|
||||
<StackPanel
|
||||
Grid.Row="3"
|
||||
Grid.Column="0"
|
||||
Margin="0,0,5,12"
|
||||
Orientation="Horizontal">
|
||||
<ui:FontIcon
|
||||
Margin="0,0,5,0"
|
||||
VerticalAlignment="Center"
|
||||
FontFamily="{StaticResource MdFontIcons}"
|
||||
FontSize="16"
|
||||
Foreground="#666666"
|
||||
Glyph="󰚧" />
|
||||
<TextBlock VerticalAlignment="Center" Text="发布主题:" />
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding CurrentMqtt.PublishTopic}"
|
||||
Margin="0,0,10,12" VerticalAlignment="Center"
|
||||
FontWeight="SemiBold" Foreground="#333333"/>
|
||||
<TextBlock
|
||||
Grid.Row="3"
|
||||
Grid.Column="1"
|
||||
Margin="0,0,10,12"
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="SemiBold"
|
||||
Foreground="#333333"
|
||||
Text="{Binding CurrentMqtt.PublishTopic}" />
|
||||
|
||||
<StackPanel Grid.Row="3" Grid.Column="2" Orientation="Horizontal" Margin="0,0,5,12">
|
||||
<ui:FontIcon FontFamily="{StaticResource MdFontIcons}"
|
||||
Glyph="󰂞"
|
||||
FontSize="16"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,5,0"
|
||||
Foreground="#666666"/>
|
||||
<TextBlock Text="订阅主题:" VerticalAlignment="Center"/>
|
||||
<StackPanel
|
||||
Grid.Row="3"
|
||||
Grid.Column="2"
|
||||
Margin="0,0,5,12"
|
||||
Orientation="Horizontal">
|
||||
<ui:FontIcon
|
||||
Margin="0,0,5,0"
|
||||
VerticalAlignment="Center"
|
||||
FontFamily="{StaticResource MdFontIcons}"
|
||||
FontSize="16"
|
||||
Foreground="#666666"
|
||||
Glyph="󰂞" />
|
||||
<TextBlock VerticalAlignment="Center" Text="订阅主题:" />
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Row="3" Grid.Column="3" Text="{Binding CurrentMqtt.SubscribeTopic}"
|
||||
Margin="0,0,0,12" VerticalAlignment="Center"
|
||||
FontWeight="SemiBold" Foreground="#333333"/>
|
||||
<TextBlock
|
||||
Grid.Row="3"
|
||||
Grid.Column="3"
|
||||
Margin="0,0,0,12"
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="SemiBold"
|
||||
Foreground="#333333"
|
||||
Text="{Binding CurrentMqtt.SubscribeTopic}" />
|
||||
|
||||
<StackPanel Grid.Row="4" Grid.Column="0" Orientation="Horizontal" Margin="0,0,5,12">
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.PC1}"
|
||||
FontSize="16"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,5,0"
|
||||
Foreground="#666666"/>
|
||||
<TextBlock Text="平台:" VerticalAlignment="Center"/>
|
||||
<StackPanel
|
||||
Grid.Row="4"
|
||||
Grid.Column="0"
|
||||
Margin="0,0,5,12"
|
||||
Orientation="Horizontal">
|
||||
<ui:FontIcon
|
||||
Margin="0,0,5,0"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16"
|
||||
Foreground="#666666"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.PC1}" />
|
||||
<TextBlock VerticalAlignment="Center" Text="平台:" />
|
||||
</StackPanel>
|
||||
<!-- <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding CurrentMqtt.MqttPlatform, Converter={StaticResource EnumDescriptionConverter}}" Margin="0,0,10,12" VerticalAlignment="Center" FontWeight="SemiBold" Foreground="#333333"/> -->
|
||||
|
||||
<StackPanel Grid.Row="5" Grid.Column="0" Orientation="Horizontal" Margin="0,0,5,12">
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Mail}"
|
||||
FontSize="16"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,5,0"
|
||||
Foreground="#666666"/>
|
||||
<TextBlock Text="消息头:" VerticalAlignment="Center"/>
|
||||
|
||||
<StackPanel
|
||||
Grid.Row="5"
|
||||
Grid.Column="0"
|
||||
Margin="0,0,5,12"
|
||||
Orientation="Horizontal">
|
||||
<ui:FontIcon
|
||||
Margin="0,0,5,0"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16"
|
||||
Foreground="#666666"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.Mail}" />
|
||||
<TextBlock VerticalAlignment="Center" Text="消息头:" />
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding CurrentMqtt.MessageHeader}"
|
||||
Margin="0,0,10,12" VerticalAlignment="Center"
|
||||
FontWeight="SemiBold" Foreground="#333333"/>
|
||||
|
||||
<StackPanel Grid.Row="5" Grid.Column="2" Orientation="Horizontal" Margin="0,0,5,12">
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Mail}"
|
||||
FontSize="16"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,5,0"
|
||||
Foreground="#666666"/>
|
||||
<TextBlock Text="消息内容:" VerticalAlignment="Center"/>
|
||||
<TextBlock
|
||||
Grid.Row="5"
|
||||
Grid.Column="1"
|
||||
Margin="0,0,10,12"
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="SemiBold"
|
||||
Foreground="#333333"
|
||||
Text="{Binding CurrentMqtt.MessageHeader}" />
|
||||
|
||||
<StackPanel
|
||||
Grid.Row="5"
|
||||
Grid.Column="2"
|
||||
Margin="0,0,5,12"
|
||||
Orientation="Horizontal">
|
||||
<ui:FontIcon
|
||||
Margin="0,0,5,0"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16"
|
||||
Foreground="#666666"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.Mail}" />
|
||||
<TextBlock VerticalAlignment="Center" Text="消息内容:" />
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Row="5" Grid.Column="3" Text="{Binding CurrentMqtt.MessageContent}"
|
||||
Margin="0,0,0,12" VerticalAlignment="Center"
|
||||
FontWeight="SemiBold" Foreground="#333333"/>
|
||||
|
||||
<StackPanel Grid.Row="6" Grid.Column="0" Orientation="Horizontal" Margin="0,0,5,0">
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Mail}"
|
||||
FontSize="16"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,5,0"
|
||||
Foreground="#666666"/>
|
||||
<TextBlock Text="消息尾:" VerticalAlignment="Center"/>
|
||||
<TextBlock
|
||||
Grid.Row="5"
|
||||
Grid.Column="3"
|
||||
Margin="0,0,0,12"
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="SemiBold"
|
||||
Foreground="#333333"
|
||||
Text="{Binding CurrentMqtt.MessageContent}" />
|
||||
|
||||
<StackPanel
|
||||
Grid.Row="6"
|
||||
Grid.Column="0"
|
||||
Margin="0,0,5,0"
|
||||
Orientation="Horizontal">
|
||||
<ui:FontIcon
|
||||
Margin="0,0,5,0"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16"
|
||||
Foreground="#666666"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.Mail}" />
|
||||
<TextBlock VerticalAlignment="Center" Text="消息尾:" />
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Row="6" Grid.Column="1" Text="{Binding CurrentMqtt.MessageFooter}"
|
||||
Margin="0,0,10,0" VerticalAlignment="Center"
|
||||
FontWeight="SemiBold" Foreground="#333333"/>
|
||||
<TextBlock
|
||||
Grid.Row="6"
|
||||
Grid.Column="1"
|
||||
Margin="0,0,10,0"
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="SemiBold"
|
||||
Foreground="#333333"
|
||||
Text="{Binding CurrentMqtt.MessageFooter}" />
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<!-- Associated Variables -->
|
||||
<Border Background="White" BorderBrush="#E0E0E0" BorderThickness="1" CornerRadius="8" Margin="0,0,0,10" Padding="15">
|
||||
<!-- Associated Variables -->
|
||||
<Border
|
||||
Margin="0,0,0,10"
|
||||
Padding="15"
|
||||
Background="White"
|
||||
BorderBrush="#E0E0E0"
|
||||
BorderThickness="1"
|
||||
CornerRadius="8">
|
||||
<Border.Effect>
|
||||
<DropShadowEffect ShadowDepth="2" BlurRadius="5" Opacity="0.1" Color="#888888"/>
|
||||
<DropShadowEffect
|
||||
BlurRadius="5"
|
||||
Opacity="0.1"
|
||||
ShadowDepth="2"
|
||||
Color="#888888" />
|
||||
</Border.Effect>
|
||||
|
||||
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock Grid.Row="0" Text="关联变量" Style="{StaticResource SubtitleTextBlockStyle}" Margin="0,0,0,10"/>
|
||||
<DataGrid Grid.Row="1" x:Name="AssociatedVariablesDataGrid"
|
||||
ItemsSource="{Binding CurrentMqtt.VariableAliases}"
|
||||
AutoGenerateColumns="False"
|
||||
CanUserAddRows="False"
|
||||
CanUserDeleteRows="False"
|
||||
IsReadOnly="True"
|
||||
SelectionMode="Extended">
|
||||
<TextBlock
|
||||
Grid.Row="0"
|
||||
Margin="0,0,0,10"
|
||||
Style="{StaticResource SubtitleTextBlockStyle}"
|
||||
Text="关联变量" />
|
||||
<DataGrid
|
||||
x:Name="AssociatedVariablesDataGrid"
|
||||
Grid.Row="1"
|
||||
AutoGenerateColumns="False"
|
||||
CanUserAddRows="False"
|
||||
CanUserDeleteRows="False"
|
||||
IsReadOnly="True"
|
||||
ItemsSource="{Binding CurrentMqtt.VariableAliases}"
|
||||
SelectionMode="Extended">
|
||||
|
||||
<i:Interaction.Behaviors>
|
||||
<helper:SelectedItemsBehavior SelectedItems="{Binding SelectedMqttAliaes}" />
|
||||
</i:Interaction.Behaviors>
|
||||
|
||||
|
||||
<DataGrid.ContextMenu>
|
||||
<ContextMenu>
|
||||
<MenuItem Header="修改发送名称" Command="{Binding ModifyAliasCommand}" CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=DataGrid}, Path=SelectedItems[0]}"/>
|
||||
<MenuItem
|
||||
Command="{Binding ModifyAliasCommand}"
|
||||
CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=DataGrid}, Path=SelectedItems[0]}"
|
||||
Header="修改发送名称" />
|
||||
</ContextMenu>
|
||||
</DataGrid.ContextMenu>
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="设备名称" Binding="{Binding Variable.VariableTable.Device.Name}"/>
|
||||
<DataGridTextColumn Header="变量表名称" Binding="{Binding Variable.VariableTable.Name}"/>
|
||||
<DataGridTextColumn Header="变量名称" Binding="{Binding Variable.Name}"/>
|
||||
<DataGridTextColumn Header="MQTT发送名称" Binding="{Binding Alias}"/>
|
||||
<DataGridTextColumn Header="地址" Binding="{Binding Variable.S7Address}"/>
|
||||
<DataGridTextColumn Header="数据类型" Binding="{Binding Variable.DataType}"/>
|
||||
<DataGridTextColumn Header="显示值" Binding="{Binding Variable.DisplayValue}"/>
|
||||
<DataGridTextColumn Header="更新时间" Binding="{Binding Variable.UpdatedAt, StringFormat='yyyy-MM-dd HH:mm:ss'}"/>
|
||||
<DataGridTextColumn Binding="{Binding Variable.VariableTable.Device.Name}" Header="设备名称" />
|
||||
<DataGridTextColumn Binding="{Binding Variable.VariableTable.Name}" Header="变量表名称" />
|
||||
<DataGridTextColumn Binding="{Binding Variable.Name}" Header="变量名称" />
|
||||
<DataGridTextColumn Binding="{Binding Alias}" Header="MQTT发送名称" />
|
||||
<DataGridTextColumn Binding="{Binding Variable.S7Address}" Header="地址" />
|
||||
<DataGridTextColumn Binding="{Binding Variable.DataType}" Header="数据类型" />
|
||||
<DataGridTextColumn Binding="{Binding Variable.DisplayValue}" Header="显示值" />
|
||||
<DataGridTextColumn Binding="{Binding Variable.UpdatedAt, StringFormat='yyyy-MM-dd HH:mm:ss'}" Header="更新时间" />
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
</Grid>
|
||||
|
||||
Reference in New Issue
Block a user