diff --git a/TestingModule/ViewModels/Dialogs/ParameterSettingViewModel.cs b/TestingModule/ViewModels/Dialogs/ParameterSettingViewModel.cs index 8495166..d9b44a9 100644 --- a/TestingModule/ViewModels/Dialogs/ParameterSettingViewModel.cs +++ b/TestingModule/ViewModels/Dialogs/ParameterSettingViewModel.cs @@ -93,7 +93,20 @@ namespace TestingModule.ViewModels.Dialogs var index = Program.Parameters .Select((x, i) => new { x, i }) .FirstOrDefault(p => p.x.ID == _ScopedContext.SelectedParameter.ID)?.i; - + if (!_ScopedContext.SelectedParameter.IsEditable) + { + //公共变量只允许更改ParameterCategory为Input,Temp + if (Program.Parameters[index.Value].Value != Parameter.Value + || Program.Parameters[index.Value].UpperLimit != Parameter.UpperLimit + || Program.Parameters[index.Value].LowerLimit != Parameter.LowerLimit + || Program.Parameters[index.Value].Name != Parameter.Name + || Parameter.Category == ParameterCategory.Output + || Program.Parameters[index.Value].Type != Parameter.Type) + { + RequestClose.Invoke(ButtonResult.Yes); + return; + } + } if (index.HasValue) { Program.Parameters[index.Value] = Parameter; diff --git a/TestingModule/ViewModels/ParametersManagerViewModel.cs b/TestingModule/ViewModels/ParametersManagerViewModel.cs index 167af42..8c8e8e4 100644 --- a/TestingModule/ViewModels/ParametersManagerViewModel.cs +++ b/TestingModule/ViewModels/ParametersManagerViewModel.cs @@ -190,13 +190,13 @@ namespace TestingModule.ViewModels private void ParameterDelete() { - if (!_globalInfo.IsAdmin) return; + if (!_globalInfo.IsAdmin || !SelectedParameter.IsEditable) return; Program.Parameters.Remove(SelectedParameter); } private void ParameterEdit() { - if (!_globalInfo.IsAdmin||!SelectedParameter.IsEditable) return; + if (!_globalInfo.IsAdmin) return; var param = new DialogParameters { { "Mode",SelectedParameter==null?"ADD":"Edit" }, @@ -207,10 +207,11 @@ namespace TestingModule.ViewModels if (r.Result == ButtonResult.OK) { _eventAggregator.GetEvent().Publish(); + ShowInfoMessageBox("保存成功", () => { }); } - else + else if (r.Result == ButtonResult.Yes) { - + ShowErrorMessageBox("公共变量只能设置变量类型(Input,Temp)", ()=>{ }); } }); diff --git a/UIShare/ViewModelBase/NavigateViewModelBase.cs b/UIShare/ViewModelBase/NavigateViewModelBase.cs index ff328a9..9b56962 100644 --- a/UIShare/ViewModelBase/NavigateViewModelBase.cs +++ b/UIShare/ViewModelBase/NavigateViewModelBase.cs @@ -44,7 +44,7 @@ namespace UIShare.ViewModelBase var dialogParams = new DialogParameters(); dialogParams.Add("Title", "错误"); dialogParams.Add("Message", Message); - dialogParams.Add("Icon", "info"); + dialogParams.Add("Icon", "error"); dialogParams.Add("ShowOk", true); _dialogService.ShowDialog("MessageBox", dialogParams, result => {