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 16:01:30 +08:00
parent 1e0c154884
commit eb81cecec1
20 changed files with 406 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DMS.WPF/Views/Dialogs/ConfirmDialog.xaml
View File

@@ -12,7 +12,7 @@
Title="{Binding Title}"
CloseButtonText="取消"
DefaultButton="Primary"
PrimaryButtonText="{Binding PrimaryButContent}"
PrimaryButtonText="{Binding PrimaryButText}"
Background="#fff"
d:DataContext="{d:DesignInstance vmd:ConfrimDialogViewModel}"
mc:Ignorable="d">

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

@@ -13,7 +13,7 @@
Title="{Binding Title}"
CloseButtonText="取消"
DefaultButton="Primary"
PrimaryButtonText="{Binding PrimaryButContent}"
PrimaryButtonText="{Binding PrimaryButText}"
d:DataContext="{d:DesignInstance vmd:DeviceDialogViewModel}"
mc:Ignorable="d">

2
DMS.WPF/Views/Dialogs/MqttDialog.xaml
View File

@@ -13,7 +13,7 @@
Title="{Binding Title}"
CloseButtonText="取消"
DefaultButton="Primary"
PrimaryButtonText="{Binding PrimaryButContent}"
PrimaryButtonText="{Binding PrimaryButText}"
Background="#fff"
d:DataContext="{d:DesignInstance vmd:MqttDialogViewModel}"
mc:Ignorable="d">

16
DMS.WPF/Views/Dialogs/VarDataDialog.xaml.cs
View File

@@ -1,16 +0,0 @@
using DMS.WPF.ViewModels.Dialogs;
namespace DMS.WPF.Views.Dialogs;
public partial class VarDataDialog
{
public VarDataDialog()
{
InitializeComponent();
}
public VarDataDialog(VarDataDialogViewModel viewModel) : this()
{
DataContext = viewModel;
}
}

52
DMS.WPF/Views/Dialogs/VarDataDialog.xaml → DMS.WPF/Views/Dialogs/VariableDialog.xaml
View File

@@ -1,4 +1,4 @@
<ui:ContentDialog x:Class="DMS.WPF.Views.Dialogs.VarDataDialog"
<ui:ContentDialog x:Class="DMS.WPF.Views.Dialogs.VariableDialog"
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"
@@ -11,34 +11,42 @@
xmlns:sockets="clr-namespace:System.Net.Sockets;assembly=System.Net.Sockets"
xmlns:enums="clr-namespace:DMS.Core.Enums;assembly=DMS.Core"
xmlns:valueConverts="clr-namespace:DMS.WPF.ValueConverts"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
Title="{Binding Title}"
CloseButtonText="取消"
DefaultButton="Primary"
PrimaryButtonText="{Binding PrimaryButtonText}"
PrimaryButtonText="{Binding PrimaryButText}"
Background="#fff"
d:DataContext="{d:DesignInstance vmd:VarDataDialogViewModel}"
d:DataContext="{d:DesignInstance vmd:VariableDialogViewModel}"
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>
<valueConverts:EnumDescriptionConverter x:Key="EnumDescriptionConverter" />
</ui:ContentDialog.Resources>
<Grid Margin="10" Width="480">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<!-- <Grid.RowDefinitions> -->
<!-- <RowDefinition Height="Auto" /> -->
<!-- <RowDefinition Height="Auto" /> -->
<!-- </Grid.RowDefinitions> -->
<!-- 基本信息 -->
<GroupBox Header="基本信息" Grid.Row="0" Grid.Column="0" Margin="0 0 10 10">
<ikw:SimpleStackPanel Margin="10" Spacing="12">
<TextBlock Text="变量名称"
Style="{StaticResource TextBlockSubTitle}" />
<TextBox Text="{Binding Variable.Name, UpdateSourceTrigger=PropertyChanged}" />
<TextBox Width="200" Text="{Binding Variable.Name, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock Text="变量描述"
Style="{StaticResource TextBlockSubTitle}" />
@@ -47,11 +55,11 @@
<TextBlock Text="节点ID"
Style="{StaticResource TextBlockSubTitle}" />
<TextBox Text="{Binding Variable.NodeId, UpdateSourceTrigger=PropertyChanged}" />
<TextBox Text="{Binding Variable.OpcUaNodeId, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock Text="协议类型"
Style="{StaticResource TextBlockSubTitle}" />
<ComboBox SelectedValue="{Binding Variable.ProtocolType, UpdateSourceTrigger=PropertyChanged}"
<ComboBox SelectedValue="{Binding Variable.Protocol, UpdateSourceTrigger=PropertyChanged}"
SelectedValuePath="Tag"
ItemsSource="{ex:EnumBindingSource {x:Type sockets:ProtocolType}}">
<ComboBox.ItemTemplate>
@@ -63,7 +71,7 @@
<TextBlock Text="数据类型"
Style="{StaticResource TextBlockSubTitle}" />
<TextBox Text="{Binding Variable.DataType, UpdateSourceTrigger=PropertyChanged}" />
<TextBox Text="{Binding Variable.CSharpDataType, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock Text="信号类型"
Style="{StaticResource TextBlockSubTitle}" />
@@ -79,7 +87,7 @@
<TextBlock Text="轮询级别"
Style="{StaticResource TextBlockSubTitle}" />
<ComboBox SelectedValue="{Binding Variable.PollLevelType, UpdateSourceTrigger=PropertyChanged}"
<ComboBox SelectedValue="{Binding Variable.PollLevel, UpdateSourceTrigger=PropertyChanged}"
SelectedValuePath="Tag"
ItemsSource="{ex:EnumBindingSource {x:Type enums:PollLevelType}}">
<ComboBox.ItemTemplate>
@@ -91,13 +99,13 @@
</ikw:SimpleStackPanel>
</GroupBox>
<ikw:SimpleStackPanel Grid.Row="0" Grid.Column="1">
<ikw:SimpleStackPanel Grid.Row="0" Grid.Column="1" >
<!-- 保存设置 -->
<GroupBox Header="保存设置" Margin="10 0 0 10">
<ikw:SimpleStackPanel Spacing="12" Margin="10">
<TextBlock Text="保存范围"
Style="{StaticResource TextBlockSubTitle}" />
<TextBox Text="{Binding Variable.SaveRange, UpdateSourceTrigger=PropertyChanged}" />
<TextBox Width="200" Text="{Binding Variable.HistoryDeadband, UpdateSourceTrigger=PropertyChanged}" />
<CheckBox Content="是否激活"
FontSize="16"
Margin="0 10 0 0 "
@@ -105,7 +113,7 @@
<CheckBox Content="是否保存"
FontSize="16"
Margin="0 10 0 0 "
IsChecked="{Binding Variable.IsSave, UpdateSourceTrigger=PropertyChanged}" />
IsChecked="{Binding Variable.IsHistoryEnabled, UpdateSourceTrigger=PropertyChanged}" />
</ikw:SimpleStackPanel>
</GroupBox>
@@ -116,18 +124,22 @@
<TextBlock Text="报警最小值"
Style="{StaticResource TextBlockSubTitle}" />
<TextBox Text="{Binding Variable.AlarmMin, UpdateSourceTrigger=PropertyChanged}" />
<TextBox Text="{Binding Variable.AlarmMinValue, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock Text="报警最大值"
Style="{StaticResource TextBlockSubTitle}" />
<TextBox Text="{Binding Variable.AlarmMax, UpdateSourceTrigger=PropertyChanged}" />
<TextBox Text="{Binding Variable.AlarmMaxValue, UpdateSourceTrigger=PropertyChanged}" />
<CheckBox Content="是否报警"
FontSize="16"
Margin="0 5"
IsChecked="{Binding Variable.IsAlarm, UpdateSourceTrigger=PropertyChanged}" />
IsChecked="{Binding Variable.IsAlarmEnabled, UpdateSourceTrigger=PropertyChanged}" />
</ikw:SimpleStackPanel>
</GroupBox>
</ikw:SimpleStackPanel>
<ikw:SimpleStackPanel Grid.Row="0" Grid.Column="2" Width="100">
</ikw:SimpleStackPanel>
</Grid>
</ui:ContentDialog>

14
DMS.WPF/Views/Dialogs/VariableDialog.xaml.cs Normal file
View File

@@ -0,0 +1,14 @@
using DMS.WPF.ViewModels.Dialogs;
namespace DMS.WPF.Views.Dialogs;
public partial class VariableDialog
{
public VariableDialog()
{
InitializeComponent();
}
}

2
DMS.WPF/Views/Dialogs/VariableTableDialog.xaml
View File

@@ -10,7 +10,7 @@
Title="{Binding Title}"
CloseButtonText="取消"
DefaultButton="Primary"
PrimaryButtonText="{Binding PrimaryButContent}"
PrimaryButtonText="{Binding PrimaryButText}"
Background="#fff"
d:DataContext="{d:DesignInstance vmd:VariableTableDialogViewModel}"
mc:Ignorable="d">