xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成从TIA导入变量

Browse Source
This commit is contained in:
David P.G
2025-08-23 09:09:07 +08:00
parent 7e2e01e3cd
commit 32ade95742
10 changed files with 243 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
DMS.WPF/ViewModels/Dialogs/ConfrimDialogViewModel.cs
View File

@@ -3,25 +3,28 @@ using CommunityToolkit.Mvvm.Input;
namespace DMS.WPF.ViewModels.Dialogs;
public partial class ConfrimDialogViewModel : DialogViewModelBase<ConfrimDialogViewModel>
public partial class ConfrimDialogViewModel : DialogViewModelBase<Boolean>
{
public bool IsPrimaryButton { get; set; }
[ObservableProperty]
private string message;
private string _message;
public ConfrimDialogViewModel(string title,string message,string primaryButText)
{
Message = message;
Title = title;
PrimaryButContent = primaryButText;
}
[RelayCommand]
public void ParimaryButton()
private void PrimaryButton()
{
IsPrimaryButton=true;
Close(this);
Close(true);
}
[RelayCommand]
public void CancleButton()
private void CancleButton()
{
IsPrimaryButton=false;
Close(this);
Close(false);
}
}

13
DMS.WPF/ViewModels/Dialogs/ImportExcelDialogViewModel.cs
View File

@@ -13,6 +13,7 @@ namespace DMS.WPF.ViewModels.Dialogs;
public partial class ImportExcelDialogViewModel : DialogViewModelBase<List<Variable>>
{
private readonly IMapper _mapper;
private readonly IExcelService _excelService;
[ObservableProperty]
@@ -20,13 +21,18 @@ public partial class ImportExcelDialogViewModel : DialogViewModelBase<List<Varia
[ObservableProperty]
private List<Variable> _variables = new();
[ObservableProperty]
private ObservableCollection<VariableItemViewModel> _variableItemViewModels ;
[ObservableProperty]
private IList _selectedVariables = new ArrayList();
public ImportExcelDialogViewModel(IExcelService excelService)
public ImportExcelDialogViewModel(IMapper mapper,IExcelService excelService)
{
_mapper = mapper;
_excelService = excelService;
VariableItemViewModels = new();
}
partial void OnFilePathChanged(string? value)
@@ -39,6 +45,7 @@ public partial class ImportExcelDialogViewModel : DialogViewModelBase<List<Varia
try
{
Variables = _excelService.ImprotFromTiaVariableTable(value);
VariableItemViewModels=new ObservableCollection<VariableItemViewModel>(_mapper.Map<List<VariableItemViewModel>>(Variables));
}
catch (System.Exception ex)
{
@@ -55,8 +62,8 @@ public partial class ImportExcelDialogViewModel : DialogViewModelBase<List<Varia
[RelayCommand]
private void ImportSelected()
{
var selected = SelectedVariables.Cast<Variable>().ToList();
Close(selected);
var selected = SelectedVariables.Cast<VariableItemViewModel>().ToList();
Close(_mapper.Map<List<Variable>>(selected));
}
[RelayCommand]