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-08-23 20:58:48 +08:00
parent 6d2bc57923
commit c618d967df
3 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DMS.WPF/ViewModels/Dialogs/DeviceDialogViewModel.cs
View File

@@ -29,14 +29,13 @@ public partial class DeviceDialogViewModel : DialogViewModelBase<DeviceItemViewM
} }
[RelayCommand] [RelayCommand]
private async Task Save() private async Task PrimaryButton()
{ {
// Here you can add validation logic before closing.
await Close(Device); await Close(Device);
} }
[RelayCommand] [RelayCommand]
private async Task Cancel() private async Task CancleButton()
{ {
await Close(null); await Close(null);
} }

20
DMS.WPF/Views/Dialogs/DeviceDialog.xaml
View File

@@ -8,24 +8,16 @@
xmlns:vmd="clr-namespace:DMS.WPF.ViewModels.Dialogs" xmlns:vmd="clr-namespace:DMS.WPF.ViewModels.Dialogs"
xmlns:ex="clr-namespace:DMS.Extensions" xmlns:ex="clr-namespace:DMS.Extensions"
xmlns:enums="clr-namespace:DMS.Core.Enums;assembly=DMS.Core" xmlns:enums="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
xmlns:vc="clr-namespace:DMS.WPF.ValueConverts" xmlns:vc="clr-namespace:DMS.WPF.ValueConverts"
Title="{Binding Title}" Title="{Binding Title}"
CloseButtonText="取消" CloseButtonText="取消"
DefaultButton="Primary" DefaultButton="Primary"
PrimaryButtonText="{Binding PrimaryButText}" PrimaryButtonText="{Binding PrimaryButText}"
PrimaryButtonCommand="{Binding PrimaryButtonCommand}"
CloseButtonCommand="{Binding CancleButtonCommand}"
d:DataContext="{d:DesignInstance vmd:DeviceDialogViewModel}" d:DataContext="{d:DesignInstance vmd:DeviceDialogViewModel}"
mc:Ignorable="d"> mc:Ignorable="d">
<i:Interaction.Triggers>
<i:EventTrigger EventName="PrimaryButtonClick">
<i:InvokeCommandAction Command="{Binding SaveCommand}" />
</i:EventTrigger>
<i:EventTrigger EventName="CloseButtonClick">
<i:InvokeCommandAction Command="{Binding CancelCommand}" />
</i:EventTrigger>
</i:Interaction.Triggers>
<ui:ContentDialog.Resources> <ui:ContentDialog.Resources>
<ex:EnumBindingSource x:Key="DeviceType" <ex:EnumBindingSource x:Key="DeviceType"
EnumType="{x:Type enums:DeviceType}" /> EnumType="{x:Type enums:DeviceType}" />
@@ -114,7 +106,7 @@
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<StackPanel Background="LightGray"> <StackPanel Background="LightGray">
<StackPanel.Style> <StackPanel.Style>
<Style TargetType="StackPanel"> <Style TargetType="StackPanel">
@@ -131,9 +123,9 @@
HorizontalAlignment="Left" HorizontalAlignment="Left"
Style="{StaticResource TextBlockSubTitle}" /> Style="{StaticResource TextBlockSubTitle}" />
<TextBox Text="{Binding Device.OpcUaServerUrl}"/> <TextBox Text="{Binding Device.OpcUaServerUrl}"/>
</StackPanel> </StackPanel>
<!-- S7 Specific Properties --> <!-- S7 Specific Properties -->
<StackPanel x:Name="S7PropertiesPanel" Background="LightGray"> <StackPanel x:Name="S7PropertiesPanel" Background="LightGray">
<StackPanel.Style> <StackPanel.Style>

11
DMS.WPF/Views/Dialogs/VariableDialog.xaml
View File

@@ -10,23 +10,16 @@
xmlns:en="clr-namespace:DMS.Core.Enums;assembly=DMS.Core" xmlns:en="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
xmlns:enums="clr-namespace:DMS.Core.Enums;assembly=DMS.Core" xmlns:enums="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
xmlns:valueConverts="clr-namespace:DMS.WPF.ValueConverts" xmlns:valueConverts="clr-namespace:DMS.WPF.ValueConverts"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
Title="{Binding Title}" Title="{Binding Title}"
CloseButtonText="取消" CloseButtonText="取消"
DefaultButton="Primary" DefaultButton="Primary"
PrimaryButtonText="{Binding PrimaryButText}" PrimaryButtonText="{Binding PrimaryButText}"
PrimaryButtonCommand="{Binding PrimaryButtonCommand}"
CloseButtonCommand="{Binding CancleButtonCommand}"
Background="#fff" Background="#fff"
d:DataContext="{d:DesignInstance vmd:VariableDialogViewModel}" d:DataContext="{d:DesignInstance vmd:VariableDialogViewModel}"
mc:Ignorable="d"> mc:Ignorable="d">
<i:Interaction.Triggers>
<i:EventTrigger EventName="PrimaryButtonClick">
<i:InvokeCommandAction Command="{Binding PrimaryButtonCommand}" />
</i:EventTrigger>
<i:EventTrigger EventName="CloseButtonClick">
<i:InvokeCommandAction Command="{Binding CancleButtonCommand}" />
</i:EventTrigger>
</i:Interaction.Triggers>
<ui:ContentDialog.Resources> <ui:ContentDialog.Resources>
<valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter" /> <valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
</ui:ContentDialog.Resources> </ui:ContentDialog.Resources>