P膩rl奴kot izejas kodu

淇閲嶅x:Name鎶ラ敊 - 娓呯悊鎵鏈夎鍥剧殑鍛藉悕鍐茬獊

纾 鏇 6 dienas atpaka募
vec膩ks
rev墨zija
84f4c11705

+ 6 - 6
src/YZWater.Avalonia/Views/ViewAView.axaml

@@ -9,7 +9,7 @@
         <vm:ViewAViewModel/>
     </UserControl.DataContext>
 
-    <Border Background="{DynamicResource AppBgBrush}">
+    <Border x:Name="RootBorder" Background="{DynamicResource AppBgBrush}">
         <Grid RowDefinitions="48,*,32">
 
             <!-- 鈺愨晲鈺 椤堕儴鏍囬鏍 鈺愨晲鈺 -->
@@ -193,7 +193,7 @@
                                 <!-- 鍙充晶锛氭暟鎹潰鏉 -->
                                 <Grid Grid.Row="0" Grid.RowSpan="4" Grid.Column="4" RowDefinitions="Auto,Auto,Auto" Margin="8,0,0,0">
                                     <!-- 妯″紡 -->
-                                    <Border x:Name="TitleBar" Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
+                                    <Border Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
                                             CornerRadius="2" Padding="8" Margin="0,0,0,6">
                                         <StackPanel HorizontalAlignment="Center" Spacing="4">
                                             <TextBlock Text="{Binding ModeText}" FontFamily="Consolas, monospace"
@@ -237,7 +237,7 @@
                                     </Border>
 
                                     <!-- 缁熻 -->
-                                    <Border x:Name="StatusBar" Grid.Row="2" Background="{DynamicResource SurfaceBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
+                                    <Border Grid.Row="2" Background="{DynamicResource SurfaceBgBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
                                             CornerRadius="2" Padding="8">
                                         <StackPanel Spacing="5">
                                             <TextBlock Text="{Binding StatisticsText}" FontFamily="Consolas, monospace"
@@ -267,7 +267,7 @@
                         </Border>
 
                         <!-- 搴曢儴璁惧鐘舵佹潯 -->
-                        <Border x:Name="StatusBar" Grid.Row="2" Background="{DynamicResource SurfaceBgBrush}" CornerRadius="2" Margin="0,4,0,0" Padding="8,6">
+                        <Border Grid.Row="2" Background="{DynamicResource SurfaceBgBrush}" CornerRadius="2" Margin="0,4,0,0" Padding="8,6">
                             <StackPanel Orientation="Horizontal" Spacing="12">
                                 <StackPanel Orientation="Horizontal" Spacing="4">
                                     <Border Width="8" Height="8" CornerRadius="4" Background="{Binding Pump1StatusColor}"/>
@@ -323,7 +323,7 @@
                 <!-- 鍙充晶闈㈡澘 -->
                 <Grid Grid.Column="1" RowDefinitions="Auto,Auto,*,Auto">
 
-                    <Border x:Name="TitleBar" Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" CornerRadius="2" Padding="10,8" Margin="0,0,0,4"
+                    <Border Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" CornerRadius="2" Padding="10,8" Margin="0,0,0,4"
                             BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1">
                         <StackPanel>
                             <StackPanel Orientation="Horizontal" Spacing="6" Margin="0,0,0,8">
@@ -358,7 +358,7 @@
                         </StackPanel>
                     </Border>
 
-                    <Border x:Name="StatusBar" Grid.Row="2" Background="{DynamicResource SurfaceBgBrush}" CornerRadius="2" Padding="10,8" Margin="0,0,0,4"
+                    <Border Grid.Row="2" Background="{DynamicResource SurfaceBgBrush}" CornerRadius="2" Padding="10,8" Margin="0,0,0,4"
                             BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" IsVisible="{Binding HasAlarm}">
                         <StackPanel>
                             <StackPanel Orientation="Horizontal" Spacing="6" Margin="0,0,0,8">

+ 1 - 1
src/YZWater.Avalonia/Views/ViewBView.axaml

@@ -8,7 +8,7 @@
         <vm:ViewBViewModel/>
     </UserControl.DataContext>
 
-    <Border Background="{DynamicResource AppBgBrush}">
+    <Border x:Name="RootBorder" Background="{DynamicResource AppBgBrush}">
         <Grid RowDefinitions="48,*,32">
             <!-- 椤堕儴 -->
             <Border x:Name="TitleBar" Grid.Row="0" Background="#111820" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">

+ 3 - 3
src/YZWater.Avalonia/Views/ViewCView.axaml

@@ -9,7 +9,7 @@
         <vm:ViewCViewModel/>
     </UserControl.DataContext>
 
-    <Border Background="{DynamicResource AppBgBrush}">
+    <Border x:Name="RootBorder" Background="{DynamicResource AppBgBrush}">
         <Grid RowDefinitions="48,*,32">
             <!-- 椤堕儴 -->
             <Border x:Name="TitleBar" Grid.Row="0" Background="#111820" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
@@ -27,7 +27,7 @@
             <Grid Grid.Row="1" RowDefinitions="Auto,*,Auto" Margin="8,4">
 
                 <!-- 鏌ヨ鏉′欢 -->
-                <Border x:Name="TitleBar" Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" CornerRadius="2"
+                <Border Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" CornerRadius="2"
                         BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Padding="12" Margin="0,0,0,4">
                     <StackPanel Orientation="Horizontal" Spacing="16">
                         <StackPanel Orientation="Horizontal" Spacing="6">
@@ -45,7 +45,7 @@
                 </Border>
 
                 <!-- 鍥捐〃 -->
-                <Border x:Name="TitleBar" Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" CornerRadius="2"
+                <Border Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" CornerRadius="2"
                         BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Padding="12" Margin="0,0,0,4">
                     <ScrollViewer>
                         <StackPanel>

+ 3 - 3
src/YZWater.Avalonia/Views/ViewDView.axaml

@@ -8,7 +8,7 @@
         <vm:ViewDViewModel/>
     </UserControl.DataContext>
 
-    <Border Background="{DynamicResource AppBgBrush}">
+    <Border x:Name="RootBorder" Background="{DynamicResource AppBgBrush}">
         <Grid RowDefinitions="48,*,32">
             <!-- 椤堕儴 -->
             <Border x:Name="TitleBar" Grid.Row="0" Background="#111820" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
@@ -30,7 +30,7 @@
             <Grid Grid.Row="1" RowDefinitions="Auto,*,Auto" Margin="8,4">
 
                 <!-- 鏌ヨ鏉′欢 -->
-                <Border x:Name="TitleBar" Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" CornerRadius="2"
+                <Border Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" CornerRadius="2"
                         BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Padding="12" Margin="0,0,0,4">
                     <StackPanel Orientation="Horizontal" Spacing="16">
                         <StackPanel Orientation="Horizontal" Spacing="6">
@@ -49,7 +49,7 @@
                 </Border>
 
                 <!-- 鎶ヨ鍒楄〃 -->
-                <Border x:Name="TitleBar" Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" CornerRadius="2"
+                <Border Grid.Row="0" Background="{DynamicResource SurfaceBgBrush}" CornerRadius="2"
                         BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Padding="8" Margin="0,0,0,4">
                     <DataGrid ItemsSource="{Binding AlarmRecords}" AutoGenerateColumns="False" IsReadOnly="True"
                               SelectedItem="{Binding SelectedRecord}">

+ 1 - 1
src/YZWater.Avalonia/Views/ViewEView.axaml

@@ -8,7 +8,7 @@
         <vm:ViewEViewModel/>
     </UserControl.DataContext>
 
-    <Border Background="{DynamicResource AppBgBrush}">
+    <Border x:Name="RootBorder" Background="{DynamicResource AppBgBrush}">
         <Grid RowDefinitions="48,*,32">
             <!-- 椤堕儴 -->
             <Border x:Name="TitleBar" Grid.Row="0" Background="#111820" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">