Преглед изворни кода

修复重复x:Name报错 - 清理所有视图的命名冲突

磊 曹 пре 6 дана
родитељ
комит
84f4c11705

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

@@ -9,7 +9,7 @@
         <vm:ViewAViewModel/>
         <vm:ViewAViewModel/>
     </UserControl.DataContext>
     </UserControl.DataContext>
 
 
-    <Border Background="{DynamicResource AppBgBrush}">
+    <Border x:Name="RootBorder" Background="{DynamicResource AppBgBrush}">
         <Grid RowDefinitions="48,*,32">
         <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">
                                 <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">
                                             CornerRadius="2" Padding="8" Margin="0,0,0,6">
                                         <StackPanel HorizontalAlignment="Center" Spacing="4">
                                         <StackPanel HorizontalAlignment="Center" Spacing="4">
                                             <TextBlock Text="{Binding ModeText}" FontFamily="Consolas, monospace"
                                             <TextBlock Text="{Binding ModeText}" FontFamily="Consolas, monospace"
@@ -237,7 +237,7 @@
                                     </Border>
                                     </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">
                                             CornerRadius="2" Padding="8">
                                         <StackPanel Spacing="5">
                                         <StackPanel Spacing="5">
                                             <TextBlock Text="{Binding StatisticsText}" FontFamily="Consolas, monospace"
                                             <TextBlock Text="{Binding StatisticsText}" FontFamily="Consolas, monospace"
@@ -267,7 +267,7 @@
                         </Border>
                         </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="12">
                                 <StackPanel Orientation="Horizontal" Spacing="4">
                                 <StackPanel Orientation="Horizontal" Spacing="4">
                                     <Border Width="8" Height="8" CornerRadius="4" Background="{Binding Pump1StatusColor}"/>
                                     <Border Width="8" Height="8" CornerRadius="4" Background="{Binding Pump1StatusColor}"/>
@@ -323,7 +323,7 @@
                 <!-- 右侧面板 -->
                 <!-- 右侧面板 -->
                 <Grid Grid.Column="1" RowDefinitions="Auto,Auto,*,Auto">
                 <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">
                             BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1">
                         <StackPanel>
                         <StackPanel>
                             <StackPanel Orientation="Horizontal" Spacing="6" Margin="0,0,0,8">
                             <StackPanel Orientation="Horizontal" Spacing="6" Margin="0,0,0,8">
@@ -358,7 +358,7 @@
                         </StackPanel>
                         </StackPanel>
                     </Border>
                     </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}">
                             BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" IsVisible="{Binding HasAlarm}">
                         <StackPanel>
                         <StackPanel>
                             <StackPanel Orientation="Horizontal" Spacing="6" Margin="0,0,0,8">
                             <StackPanel Orientation="Horizontal" Spacing="6" Margin="0,0,0,8">

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

@@ -8,7 +8,7 @@
         <vm:ViewBViewModel/>
         <vm:ViewBViewModel/>
     </UserControl.DataContext>
     </UserControl.DataContext>
 
 
-    <Border Background="{DynamicResource AppBgBrush}">
+    <Border x:Name="RootBorder" Background="{DynamicResource AppBgBrush}">
         <Grid RowDefinitions="48,*,32">
         <Grid RowDefinitions="48,*,32">
             <!-- 顶部 -->
             <!-- 顶部 -->
             <Border x:Name="TitleBar" Grid.Row="0" Background="#111820" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
             <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/>
         <vm:ViewCViewModel/>
     </UserControl.DataContext>
     </UserControl.DataContext>
 
 
-    <Border Background="{DynamicResource AppBgBrush}">
+    <Border x:Name="RootBorder" Background="{DynamicResource AppBgBrush}">
         <Grid RowDefinitions="48,*,32">
         <Grid RowDefinitions="48,*,32">
             <!-- 顶部 -->
             <!-- 顶部 -->
             <Border x:Name="TitleBar" Grid.Row="0" Background="#111820" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
             <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">
             <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">
                         BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Padding="12" Margin="0,0,0,4">
                     <StackPanel Orientation="Horizontal" Spacing="16">
                     <StackPanel Orientation="Horizontal" Spacing="16">
                         <StackPanel Orientation="Horizontal" Spacing="6">
                         <StackPanel Orientation="Horizontal" Spacing="6">
@@ -45,7 +45,7 @@
                 </Border>
                 </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">
                         BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Padding="12" Margin="0,0,0,4">
                     <ScrollViewer>
                     <ScrollViewer>
                         <StackPanel>
                         <StackPanel>

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

@@ -8,7 +8,7 @@
         <vm:ViewDViewModel/>
         <vm:ViewDViewModel/>
     </UserControl.DataContext>
     </UserControl.DataContext>
 
 
-    <Border Background="{DynamicResource AppBgBrush}">
+    <Border x:Name="RootBorder" Background="{DynamicResource AppBgBrush}">
         <Grid RowDefinitions="48,*,32">
         <Grid RowDefinitions="48,*,32">
             <!-- 顶部 -->
             <!-- 顶部 -->
             <Border x:Name="TitleBar" Grid.Row="0" Background="#111820" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
             <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">
             <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">
                         BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Padding="12" Margin="0,0,0,4">
                     <StackPanel Orientation="Horizontal" Spacing="16">
                     <StackPanel Orientation="Horizontal" Spacing="16">
                         <StackPanel Orientation="Horizontal" Spacing="6">
                         <StackPanel Orientation="Horizontal" Spacing="6">
@@ -49,7 +49,7 @@
                 </Border>
                 </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">
                         BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Padding="8" Margin="0,0,0,4">
                     <DataGrid ItemsSource="{Binding AlarmRecords}" AutoGenerateColumns="False" IsReadOnly="True"
                     <DataGrid ItemsSource="{Binding AlarmRecords}" AutoGenerateColumns="False" IsReadOnly="True"
                               SelectedItem="{Binding SelectedRecord}">
                               SelectedItem="{Binding SelectedRecord}">

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

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