Browse Source

TT

master
pry 2 years ago
parent
commit
4716d0f5db
2 changed files with 17 additions and 9 deletions
  1. +1
    -1
      HBLConsole/View/AlarmView.xaml
  2. +16
    -8
      HBLConsole/View/VariableConfig.xaml

+ 1
- 1
HBLConsole/View/AlarmView.xaml View File

@@ -13,7 +13,7 @@
mc:Ignorable="d"> mc:Ignorable="d">


<UserControl.DataContext> <UserControl.DataContext>
<vm:AlarmViewModel/>
<vm:AlarmViewModel />
</UserControl.DataContext> </UserControl.DataContext>


<UserControl.Resources> <UserControl.Resources>


+ 16
- 8
HBLConsole/View/VariableConfig.xaml View File

@@ -104,7 +104,10 @@
FontSize="16" FontSize="16"
Foreground="{StaticResource TitleFontColor}" Foreground="{StaticResource TitleFontColor}"
Text="名称" /> Text="名称" />
<Border Cursor="SizeWE" BorderBrush="{StaticResource TitleBorderColor}" BorderThickness="1,0,1,0" />
<Border
BorderBrush="{StaticResource TitleBorderColor}"
BorderThickness="1,0,1,0"
Cursor="SizeWE" />
</Grid> </Grid>


<TextBlock <TextBlock
@@ -122,7 +125,10 @@
FontSize="16" FontSize="16"
Foreground="{StaticResource TitleFontColor}" Foreground="{StaticResource TitleFontColor}"
Text="数据类型" /> Text="数据类型" />
<Border Cursor="SizeWE" BorderBrush="{StaticResource TitleBorderColor}" BorderThickness="1,0,1,0" />
<Border
BorderBrush="{StaticResource TitleBorderColor}"
BorderThickness="1,0,1,0"
Cursor="SizeWE" />
</Grid> </Grid>


<TextBlock <TextBlock
@@ -140,7 +146,10 @@
FontSize="16" FontSize="16"
Foreground="{StaticResource TitleFontColor}" Foreground="{StaticResource TitleFontColor}"
Text="是否启用报警" /> Text="是否启用报警" />
<Border Cursor="SizeWE" BorderBrush="{StaticResource TitleBorderColor}" BorderThickness="0,0,1,0" />
<Border
BorderBrush="{StaticResource TitleBorderColor}"
BorderThickness="0,0,1,0"
Cursor="SizeWE" />
</Grid> </Grid>


<TextBlock <TextBlock
@@ -189,25 +198,24 @@
Foreground="{StaticResource FontColor}" Foreground="{StaticResource FontColor}"
Text="{Binding ID}" /> Text="{Binding ID}" />


<Grid KeyDown="Grid_KeyDown" Grid.Column="1">
<Grid Grid.Column="1" KeyDown="Grid_KeyDown">
<TextBox <TextBox
Background="Transparent" Background="Transparent"
CaretBrush="{StaticResource CursorColor}" CaretBrush="{StaticResource CursorColor}"
Foreground="{StaticResource FontColor}" Foreground="{StaticResource FontColor}"
Style="{StaticResource InputTextboxStyle}" Style="{StaticResource InputTextboxStyle}"
TabIndex="{Binding ID}" TabIndex="{Binding ID}"
Text="{Binding VarName}" >
</TextBox>
Text="{Binding VarName}" />
<Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" /> <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
</Grid> </Grid>




<TextBox <TextBox
KeyDown="Grid_KeyDown"
Grid.Column="2" Grid.Column="2"
Background="Transparent" Background="Transparent"
CaretBrush="{StaticResource CursorColor}" CaretBrush="{StaticResource CursorColor}"
Foreground="{StaticResource FontColor}" Foreground="{StaticResource FontColor}"
KeyDown="Grid_KeyDown"
Style="{StaticResource InputTextboxStyle}" Style="{StaticResource InputTextboxStyle}"
TabIndex="{Binding ID}" TabIndex="{Binding ID}"
Text="{Binding Address}" /> Text="{Binding Address}" />
@@ -463,7 +471,7 @@


<DataTemplate.Triggers> <DataTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="true"> <Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" Value="#112AB2E7" TargetName="gr"/>
<Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
</Trigger> </Trigger>
</DataTemplate.Triggers> </DataTemplate.Triggers>




Loading…
Cancel
Save