From 818c42e643db98e34dbbdb2dea61b7893022cf6f Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Wed, 16 Jul 2025 15:16:13 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wpf):=20=E5=9F=BA=E5=BB=BA=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=9E=9A=E4=B8=BE=E5=BC=95=E7=94=A8=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80,=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TaskQueue/InfrastSettingsUserControl.xaml | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml
index 224d8912f4..f42967934a 100644
--- a/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml
@@ -29,7 +29,7 @@
                 ItemsSource="{Binding InfrastModeList}"
                 SelectedValue="{Binding InfrastMode}"
                 SelectedValuePath="Value" />
-            <StackPanel Visibility="{c:Binding 'InfrastMode == task:InfrastMode.Custom', Source={x:Static task:InfrastSettingsUserControlModel.Instance}}">
+            <StackPanel d:Visibility="Visible" Visibility="{c:Binding 'InfrastMode == task:InfrastMode.Custom', Source={x:Static task:InfrastSettingsUserControlModel.Instance}}">
                 <hc:ComboBox
                     Margin="0,4"
                     VerticalContentAlignment="Center"
@@ -73,21 +73,27 @@
             </StackPanel>
             <ComboBox
                 Margin="0,5"
+                d:IsEnabled="True"
                 hc:InfoElement.Title="{DynamicResource DroneUsage}"
                 DisplayMemberPath="Display"
                 IsEnabled="{c:Binding 'InfrastMode != task:InfrastMode.Custom',
-                                      Source={x:Static setting:TaskQueueViewModel.InfrastTask}}"
+                                      Source={x:Static task:InfrastSettingsUserControlModel.Instance}}"
                 ItemsSource="{Binding UsesOfDronesList}"
                 SelectedValue="{Binding UsesOfDrones}"
                 SelectedValuePath="Value" />
             <controls:TextBlock
                 Width="220"
                 Margin="0,4"
+                d:Visibility="Visible"
                 Text="{DynamicResource InfrastModeRotationTip}"
                 TextWrapping="Wrap"
                 Visibility="{c:Binding 'InfrastMode == task:InfrastMode.Rotation',
-                                       Source={x:Static setting:TaskQueueViewModel.InfrastTask}}" />
-            <StackPanel Margin="0" Visibility="{c:Binding 'InfrastMode != task:InfrastMode.Rotation', Source={x:Static setting:TaskQueueViewModel.InfrastTask}}">
+                                       Source={x:Static task:InfrastSettingsUserControlModel.Instance}}" />
+            <StackPanel
+                Margin="0"
+                d:Visibility="Visible"
+                Visibility="{c:Binding 'InfrastMode != task:InfrastMode.Rotation',
+                                       Source={x:Static task:InfrastSettingsUserControlModel.Instance}}">
                 <StackPanel
                     Margin="0,5"
                     HorizontalAlignment="Center"
@@ -154,22 +160,21 @@
         </StackPanel>
 
         <!--  高级设置  -->
-        <StackPanel Visibility="{c:Binding EnableAdvancedSettings, Source={x:Static setting:TaskQueueViewModel.TaskSettingVisibilities}}">
+        <StackPanel d:Visibility="Visible" Visibility="{c:Binding EnableAdvancedSettings, Source={x:Static setting:TaskQueueViewModel.TaskSettingVisibilities}}">
             <CheckBox
                 Margin="0,10"
+                d:Visibility="Visible"
                 Content="{DynamicResource DormTrustEnabled}"
                 IsChecked="{Binding DormTrustEnabled}"
                 Visibility="{c:Binding 'InfrastMode != task:InfrastMode.Rotation',
-                                       Source={x:Static setting:TaskQueueViewModel.InfrastTask}}" />
-            <StackPanel 
+                                       Source={x:Static task:InfrastSettingsUserControlModel.Instance}}" />
+            <StackPanel
                 Margin="0,10"
+                d:Visibility="Visible"
                 Orientation="Horizontal"
                 Visibility="{c:Binding 'InfrastMode != task:InfrastMode.Rotation',
-                                       Source={x:Static setting:TaskQueueViewModel.InfrastTask}}">
-                <CheckBox
-                    MaxWidth="{c:Binding '220 - ActualWidth',
-                                         ElementName=DormFilterNotStationedTipsTooltipBlock}"
-                    IsChecked="{c:Binding DormFilterNotStationedEnabled}">
+                                       Source={x:Static task:InfrastSettingsUserControlModel.Instance}}">
+                <CheckBox MaxWidth="{c:Binding '220 - ActualWidth', ElementName=DormFilterNotStationedTipsTooltipBlock}" IsChecked="{c:Binding DormFilterNotStationedEnabled}">
                     <controls:TextBlock Text="{DynamicResource DormFilterNotStationedEnabled}" TextWrapping="Wrap" />
                 </CheckBox>
                 <controls:TooltipBlock x:Name="DormFilterNotStationedTipsTooltipBlock" TooltipText="{DynamicResource DormFilterNotStationedTips}" />