From 4716d0f5db36ff0494a0282fd667609726924209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Tue, 15 Mar 2022 18:09:49 +0800
Subject: [PATCH] TT

---
 HBLConsole/View/AlarmView.xaml      |  2 +-
 HBLConsole/View/VariableConfig.xaml | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/HBLConsole/View/AlarmView.xaml b/HBLConsole/View/AlarmView.xaml
index 0db339d..6084134 100644
--- a/HBLConsole/View/AlarmView.xaml
+++ b/HBLConsole/View/AlarmView.xaml
@@ -13,7 +13,7 @@
     mc:Ignorable="d">
 
     <UserControl.DataContext>
-        <vm:AlarmViewModel/>
+        <vm:AlarmViewModel />
     </UserControl.DataContext>
 
     <UserControl.Resources>
diff --git a/HBLConsole/View/VariableConfig.xaml b/HBLConsole/View/VariableConfig.xaml
index 8ed25dd..d914a04 100644
--- a/HBLConsole/View/VariableConfig.xaml
+++ b/HBLConsole/View/VariableConfig.xaml
@@ -104,7 +104,10 @@
                     FontSize="16"
                     Foreground="{StaticResource TitleFontColor}"
                     Text="名称" />
-                <Border Cursor="SizeWE" BorderBrush="{StaticResource TitleBorderColor}" BorderThickness="1,0,1,0" />
+                <Border
+                    BorderBrush="{StaticResource TitleBorderColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
             </Grid>
 
             <TextBlock
@@ -122,7 +125,10 @@
                     FontSize="16"
                     Foreground="{StaticResource TitleFontColor}"
                     Text="数据类型" />
-                <Border Cursor="SizeWE" BorderBrush="{StaticResource TitleBorderColor}" BorderThickness="1,0,1,0" />
+                <Border
+                    BorderBrush="{StaticResource TitleBorderColor}"
+                    BorderThickness="1,0,1,0"
+                    Cursor="SizeWE" />
             </Grid>
 
             <TextBlock
@@ -140,7 +146,10 @@
                     FontSize="16"
                     Foreground="{StaticResource TitleFontColor}"
                     Text="是否启用报警" />
-                <Border Cursor="SizeWE" BorderBrush="{StaticResource TitleBorderColor}" BorderThickness="0,0,1,0" />
+                <Border
+                    BorderBrush="{StaticResource TitleBorderColor}"
+                    BorderThickness="0,0,1,0"
+                    Cursor="SizeWE" />
             </Grid>
 
             <TextBlock
@@ -189,25 +198,24 @@
                                 Foreground="{StaticResource FontColor}"
                                 Text="{Binding ID}" />
 
-                            <Grid KeyDown="Grid_KeyDown" Grid.Column="1">
+                            <Grid Grid.Column="1" KeyDown="Grid_KeyDown">
                                 <TextBox
                                     Background="Transparent"
                                     CaretBrush="{StaticResource CursorColor}"
                                     Foreground="{StaticResource FontColor}"
                                     Style="{StaticResource InputTextboxStyle}"
                                     TabIndex="{Binding ID}"
-                                    Text="{Binding VarName}" >
-                                </TextBox>
+                                    Text="{Binding VarName}" />
                                 <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
                             </Grid>
 
 
                             <TextBox
-                                KeyDown="Grid_KeyDown"
                                 Grid.Column="2"
                                 Background="Transparent"
                                 CaretBrush="{StaticResource CursorColor}"
                                 Foreground="{StaticResource FontColor}"
+                                KeyDown="Grid_KeyDown"
                                 Style="{StaticResource InputTextboxStyle}"
                                 TabIndex="{Binding ID}"
                                 Text="{Binding Address}" />
@@ -463,7 +471,7 @@
 
                         <DataTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="true">
-                                <Setter Property="Background" Value="#112AB2E7" TargetName="gr"/>
+                                <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
                             </Trigger>
                         </DataTemplate.Triggers>