共有变量添加
This commit is contained in:
@@ -16,13 +16,6 @@ namespace TestingModule.ViewModels
|
||||
public class ParametersManagerViewModel:NavigateViewModelBase, IDisposable
|
||||
{
|
||||
#region 属性
|
||||
//private ObservableCollection<DeviceConfigModel> _DeviceList;
|
||||
|
||||
//public ObservableCollection<DeviceConfigModel> DeviceList
|
||||
//{
|
||||
// get { return _DeviceList; }
|
||||
// set { SetProperty(ref _DeviceList,value); }
|
||||
//}
|
||||
private ObservableCollection<DeviceInfoVM> _DeviceInfoModel;
|
||||
|
||||
public ObservableCollection<DeviceInfoVM> DeviceInfoVM
|
||||
@@ -82,7 +75,6 @@ namespace TestingModule.ViewModels
|
||||
|
||||
public ParametersManagerViewModel(IContainerProvider containerProvider) : base(containerProvider)
|
||||
{
|
||||
|
||||
_ScopedContext = containerProvider.Resolve<ScopedContext>();
|
||||
_systemConfig = containerProvider.Resolve<SystemConfig>();
|
||||
_deviceManager = containerProvider.Resolve<DeviceManager>();
|
||||
@@ -96,8 +88,24 @@ namespace TestingModule.ViewModels
|
||||
ReConnectCommand = new AsyncDelegateCommand(OnReConnect);
|
||||
CloseCommand = new AsyncDelegateCommand(OnClose);
|
||||
LoadedCommand = new DelegateCommand(OnLoad);
|
||||
InitParameters();
|
||||
}
|
||||
|
||||
|
||||
#region 委托命令
|
||||
private void InitParameters()
|
||||
{
|
||||
foreach(var item in _systemConfig.ParameterList)
|
||||
{
|
||||
var copy=new ParameterVM(item);
|
||||
var param = _systemConfig.SharedParameterList.FirstOrDefault(x => x.ParameterName == copy.Name);
|
||||
if (param != null)
|
||||
{
|
||||
copy.Value = param.Value;
|
||||
}
|
||||
Program.Parameters.Add(copy);
|
||||
}
|
||||
}
|
||||
#region 委托命令
|
||||
private void OnLoad()
|
||||
{
|
||||
DeviceInfoVM = _systemConfig.DeviceList;
|
||||
|
||||
@@ -110,10 +110,7 @@
|
||||
ItemsSource="{Binding EnumValues}"
|
||||
SelectedItem="{Binding Parameter.Value}"
|
||||
Visibility="{Binding Parameter.Type, Converter={StaticResource IsEnumTypeConverter}}" />-->
|
||||
<CheckBox Margin="10,0"
|
||||
VerticalAlignment="Bottom"
|
||||
Content="保存数据"
|
||||
IsChecked="{Binding Parameter.IsSave}" />
|
||||
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
|
||||
Reference in New Issue
Block a user