Bladeren bron

fix(ui): 优化网关配置UI对齐及显隐逻辑

统一标签宽度并右对齐;禁用时隐藏输入框而非仅禁用。
yangkaixiang 1 maand geleden
bovenliggende
commit
4228018bfc
2 gewijzigde bestanden met toevoegingen van 18 en 16 verwijderingen
  1. 17 15
      windows/NetTool.Client/DeviceDetailsWindow.xaml
  2. 1 1
      windows/NetTool.Client/NetTool.Client.csproj

+ 17 - 15
windows/NetTool.Client/DeviceDetailsWindow.xaml

@@ -236,7 +236,7 @@
                                                     <StackPanel>
                                                           <TextBlock Style="{StaticResource SectionTitleStyle}" Text="网关" />
                                                         <StackPanel Margin="18,8,0,12" Orientation="Horizontal">
-                                                            <TextBlock VerticalAlignment="Center" FontSize="12" Foreground="#6B7280" Text="默认网关:" />
+                                                            <TextBlock Width="72" VerticalAlignment="Center" FontSize="12" Foreground="#6B7280" Text="默认网关:" TextAlignment="Right" />
                                                             <CheckBox Margin="8,0,0,0" VerticalContentAlignment="Center" IsChecked="{Binding DefaultGatewayEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Checked="GatewayOrRouteModeChanged_OnChanged" Unchecked="GatewayOrRouteModeChanged_OnChanged" Content="启用">
                                                                 <CheckBox.Style>
                                                                     <Style TargetType="CheckBox">
@@ -251,23 +251,25 @@
                                                             </CheckBox>
                                                             <TextBox Margin="12,0,0,0" MinWidth="220" MinHeight="30" VerticalContentAlignment="Center" Text="{Binding DefaultGateway, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" TextChanged="ConfigInputChanged_OnChanged">
                                                                 <TextBox.Style>
-                                                                    <Style TargetType="TextBox">
-                                                                        <Setter Property="IsEnabled" Value="True" />
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding Dhcp4}" Value="True">
-                                                                                <Setter Property="IsEnabled" Value="False" />
-                                                                            </DataTrigger>
-                                                                            <DataTrigger Binding="{Binding DefaultGatewayEnabled}" Value="False">
-                                                                                <Setter Property="IsEnabled" Value="False" />
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </TextBox.Style>
-                                                            </TextBox>
+                                                                     <Style TargetType="TextBox">
+                                                                         <Setter Property="IsEnabled" Value="True" />
+                                                                         <Setter Property="Visibility" Value="Visible" />
+                                                                         <Style.Triggers>
+                                                                             <DataTrigger Binding="{Binding Dhcp4}" Value="True">
+                                                                                 <Setter Property="IsEnabled" Value="False" />
+                                                                             </DataTrigger>
+                                                                             <DataTrigger Binding="{Binding DefaultGatewayEnabled}" Value="False">
+                                                                                 <Setter Property="IsEnabled" Value="False" />
+                                                                                 <Setter Property="Visibility" Value="Collapsed" />
+                                                                             </DataTrigger>
+                                                                         </Style.Triggers>
+                                                                     </Style>
+                                                                 </TextBox.Style>
+                                                             </TextBox>
                                                         </StackPanel>
                                                     </StackPanel>
                                                     <StackPanel Grid.Row="1" Margin="18,0,0,8" Orientation="Horizontal">
-                                                        <TextBlock VerticalAlignment="Center" FontSize="12" Foreground="#6B7280" Text="自定义路由:" />
+                                                        <TextBlock Width="72" VerticalAlignment="Center" FontSize="12" Foreground="#6B7280" Text="自定义路由:" TextAlignment="Right" />
                                                         <CheckBox Margin="8,0,0,0" VerticalContentAlignment="Center" IsChecked="{Binding CustomRoutesEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Checked="GatewayOrRouteModeChanged_OnChanged" Unchecked="GatewayOrRouteModeChanged_OnChanged" Content="启用">
                                                             <CheckBox.Style>
                                                                 <Style TargetType="CheckBox">

+ 1 - 1
windows/NetTool.Client/NetTool.Client.csproj

@@ -8,7 +8,7 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>NetTool.Client</AssemblyName>
     <RootNamespace>NetTool.Client</RootNamespace>
-    <InformationalVersion>2026.05.15.1713</InformationalVersion>
+    <InformationalVersion>2026.05.15.1723</InformationalVersion>
   </PropertyGroup>
 
 </Project>