feat: 菜单管理重构及MQTT服务器功能增强

This commit is contained in:
2025-10-05 17:07:17 +08:00
parent 80ea47e627
commit 6b55211dbf
23 changed files with 287 additions and 184 deletions

View File

@@ -127,10 +127,10 @@
<DataTemplate DataType="{x:Type vm:VariableHistoryViewModel}">
<local:VariableHistoryView DataContext="{Binding}" />
</DataTemplate>
<!-- Mqtt服务器详情页 -->
<!-- <DataTemplate DataType="{x:Type vm:MqttServerDetailViewModel}"> -->
<!-- <local:MqttServerDetailView DataContext="{Binding }"/> -->
<!-- </DataTemplate> -->
<!--Mqtt服务器详情页-->
<DataTemplate DataType="{x:Type vm:MqttServerDetailViewModel}">
<local:MqttServerDetailView DataContext="{Binding }"/>
</DataTemplate>
</ContentControl.Resources>
</ContentControl>

View File

@@ -3,11 +3,6 @@
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:viewmodels="clr-namespace:DMS.WPF.ViewModels"
xmlns:models="clr-namespace:DMS.Core.Models;assembly=DMS.Core"
xmlns:iNKORE="clr-namespace:iNKORE.UI.WPF.Modern.Controls;assembly=iNKORE.UI.WPF.Modern"
xmlns:extensions="clr-namespace:DMS.Extensions"
xmlns:enums="clr-namespace:DMS.Core.Enums"
xmlns:valueConverts="clr-namespace:DMS.WPF.ValueConverts"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">

View File

@@ -3,6 +3,7 @@
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:hc="https://handyorg.github.io/handycontrol"
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
@@ -213,7 +214,13 @@
ItemTemplate="{StaticResource MqttItemTemplate}"
ItemsSource="{Binding MqttServeise}"
SelectedItem="{Binding SelectedMqtt}"
SelectionMode="Single" />
SelectionMode="Single">
<hc:Interaction.Triggers>
<hc:EventTrigger EventName="MouseDoubleClick">
<hc:InvokeCommandAction Command="{Binding NavigateToMqttDetailCommand}" />
</hc:EventTrigger>
</hc:Interaction.Triggers>
</ui:GridView>
</StackPanel>
</UserControl>