diff --git a/BPASmartClient.MorkCL/View/EditFunctionParamView.xaml b/BPASmartClient.MorkCL/View/EditFunctionParamView.xaml index 31260dd2..abe397c9 100644 --- a/BPASmartClient.MorkCL/View/EditFunctionParamView.xaml +++ b/BPASmartClient.MorkCL/View/EditFunctionParamView.xaml @@ -98,7 +98,7 @@ BorderThickness="1" DisplayMemberPath="Name" FontSize="18" - IsEditable="False" + IsEditable="False" ScrollViewer.VerticalScrollBarVisibility="Auto" ItemsSource="{Binding ComboBoxItemsSource}" Text="{Binding ParValue}" Visibility="{Binding IsUseComboBox, Converter={StaticResource Bool2VisibilityConverter}}"> diff --git a/BPASmartClient.MorkCL/ViewModel/ItemStorageViewModel.cs b/BPASmartClient.MorkCL/ViewModel/ItemStorageViewModel.cs index cfc2112f..d04d9854 100644 --- a/BPASmartClient.MorkCL/ViewModel/ItemStorageViewModel.cs +++ b/BPASmartClient.MorkCL/ViewModel/ItemStorageViewModel.cs @@ -34,7 +34,7 @@ namespace BPASmartClient.MorkCL.ViewModel ScaleCurrentWeight = 1.23f; #endif } - }, "SendCurrentWeight"); + }, "SendCurrentWeight",true); //ActionManage.GetInstance.Register((object o) => //{