From 7e19e55e39ddda2e7d76514753973ffb7f710261 Mon Sep 17 00:00:00 2001
From: hsc <huangsucan@kaiyili-lab.com>
Date: Mon, 10 Nov 2025 10:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=95=B0=E6=8D=AE=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BOB/App.xaml                                     |  2 +-
 BOB/ViewModels/Dialogs/DeviceSettingViewModel.cs |  2 +-
 BOB/ViewModels/SingleStepEditViewModel.cs        | 10 ++++++++--
 BOB/Views/Dialogs/ParameterSetting.xaml          |  1 -
 BOB/Views/SingleStepEdit.xaml                    |  7 ++++---
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/BOB/App.xaml b/BOB/App.xaml
index 5a6c6e5..e8fe893 100644
--- a/BOB/App.xaml
+++ b/BOB/App.xaml
@@ -26,7 +26,7 @@
                 <ResourceDictionary Source="Resources\Styles\WindowStyle.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="TextBox"
-                   BasedOn="{StaticResource MaterialDesignTextBox}">
+                   BasedOn="{StaticResource MaterialDesignFilledTextBox}">
                 <!-- 禁用自动化属性，避免 null 报错 -->
                 <Setter Property="AutomationProperties.Name"
                         Value="" />
diff --git a/BOB/ViewModels/Dialogs/DeviceSettingViewModel.cs b/BOB/ViewModels/Dialogs/DeviceSettingViewModel.cs
index bf4e81c..615101b 100644
--- a/BOB/ViewModels/Dialogs/DeviceSettingViewModel.cs
+++ b/BOB/ViewModels/Dialogs/DeviceSettingViewModel.cs
@@ -178,7 +178,7 @@ namespace BOB.ViewModels.Dialogs
             {
                 Device = new();
                 IsAdd = true;
-                Device.Type = "TCP";
+                Device.Type = "Tcp";
                 SelectionChanged();
             }
             else
diff --git a/BOB/ViewModels/SingleStepEditViewModel.cs b/BOB/ViewModels/SingleStepEditViewModel.cs
index 1b4dcff..4f97fb6 100644
--- a/BOB/ViewModels/SingleStepEditViewModel.cs
+++ b/BOB/ViewModels/SingleStepEditViewModel.cs
@@ -18,7 +18,12 @@ namespace BOB.ViewModels
             get => _SelectedStep;
             set => SetProperty(ref _SelectedStep, value);
         }
-
+        private ProgramModel _Program;
+        public ProgramModel Program
+        {
+            get => _Program;
+            set => SetProperty(ref _Program, value);
+        }
         #endregion
         private GlobalVariables _globalVariables;
         private IEventAggregator _eventAggregator;
@@ -29,9 +34,10 @@ namespace BOB.ViewModels
             _globalVariables= globalVariables;
             _eventAggregator= eventAggregator;
             _eventAggregator.GetEvent<EditSetpEvent>().Subscribe(EditSingleSetp);
-            CancelEditCommand = new DelegateCommand(CancelEdit);
+            CancelEditCommand = new DelegateCommand(CancelEdit);    
             SaveStepCommand = new DelegateCommand(SaveStep);
             _eventAggregator.GetEvent<DeletedStepEvent>().Subscribe(DisposeSelectedStep);
+            Program = _globalVariables.Program;
         }
 
         private void DisposeSelectedStep(Guid id)
diff --git a/BOB/Views/Dialogs/ParameterSetting.xaml b/BOB/Views/Dialogs/ParameterSetting.xaml
index 4f50670..b043975 100644
--- a/BOB/Views/Dialogs/ParameterSetting.xaml
+++ b/BOB/Views/Dialogs/ParameterSetting.xaml
@@ -38,7 +38,6 @@
                                    VerticalAlignment="Bottom"
                                    Content="参数名称*" />
                             <TextBox Width="120"
-                                     VerticalAlignment="Bottom"
                                      Text="{Binding Parameter.Name}" />
                         </StackPanel>
                         <StackPanel Height="30"
diff --git a/BOB/Views/SingleStepEdit.xaml b/BOB/Views/SingleStepEdit.xaml
index 6b37bcb..d03e6f8 100644
--- a/BOB/Views/SingleStepEdit.xaml
+++ b/BOB/Views/SingleStepEdit.xaml
@@ -43,6 +43,7 @@
                     <Label Width="60"
                            Content="名称" />
                     <TextBox MinWidth="120"
+                            
                              Text="{Binding SelectedStep.Name}" />
                 </StackPanel>
 
@@ -168,7 +169,7 @@
                                                                 <MultiBinding Converter="{StaticResource FilteredParametersConverter}">
                                                                     <Binding Path="Type" />
                                                                     <Binding Path="DataContext.Program.Parameters"
-                                                                             RelativeSource="{RelativeSource AncestorType=Window}" />
+                                                                             RelativeSource="{RelativeSource AncestorType=UserControl}" />
                                                                 </MultiBinding>
                                                             </ComboBox.ItemsSource>
                                                             <ComboBox.ItemTemplate>
@@ -204,7 +205,7 @@
                                                             <MultiBinding Converter="{StaticResource FilteredParametersConverter}">
                                                                 <Binding Path="Type" />
                                                                 <Binding Path="DataContext.Program.Parameters"
-                                                                         RelativeSource="{RelativeSource AncestorType=Window}" />
+                                                                         RelativeSource="{RelativeSource AncestorType=UserControl}" />
                                                             </MultiBinding>
                                                         </ComboBox.ItemsSource>
                                                         <ComboBox.ItemTemplate>
@@ -286,7 +287,7 @@
                                                         <ComboBox Height="22"
                                                                   MinWidth="120"
                                                                   VerticalAlignment="Bottom"
-                                                                  ItemsSource="{Binding RelativeSource={RelativeSource AncestorType=Window}, Path=DataContext.Program.Parameters}"
+                                                                  ItemsSource="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=DataContext.Program.Parameters}"
                                                                   SelectedValue="{Binding VariableName}"
                                                                   SelectedValuePath="Name"
                                                                   Visibility="{Binding IsUseVar, Converter={StaticResource BooleanToVisibilityConverter}}">