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

refactor:将所有的ItemViewMdoel的名字删除ViewModel，并将命名空间调整为DMS.WPF.ItemViewModel.

Browse Source
This commit is contained in:
David P.G
2025-10-06 18:17:56 +08:00
parent 6cff70cd87
commit c85f89db33
72 changed files with 316 additions and 1023 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DMS.WPF/ViewModels/Dialogs/VariableDialogViewModel.cs
View File

@@ -7,14 +7,14 @@ using DMS.Application.Interfaces.Database;
using DMS.Core.Enums;
using DMS.WPF.Interfaces;
using DMS.WPF.Services;
using DMS.WPF.ViewModels.Items;
using DMS.WPF.ItemViewModel;
namespace DMS.WPF.ViewModels.Dialogs;
public partial class VariableDialogViewModel : DialogViewModelBase<VariableItemViewModel>
public partial class VariableDialogViewModel : DialogViewModelBase<VariableItem>
{
[ObservableProperty]
private VariableItemViewModel _variable;
private VariableItem _variable;
[ObservableProperty]
private string _errorMessage = string.Empty;
@@ -33,7 +33,7 @@ public partial class VariableDialogViewModel : DialogViewModelBase<VariableItemV
public VariableDialogViewModel(IWPFDataService wpfDataService,IDataStorageService dataStorageService, IVariableAppService variableAppService, IMapper mapper)
{
Variable = new VariableItemViewModel();
Variable = new VariableItem();
_wpfDataService = wpfDataService;
_dataStorageService = dataStorageService;
@@ -84,7 +84,7 @@ public partial class VariableDialogViewModel : DialogViewModelBase<VariableItemV
}
//检查变量是否存在
var existVariables = _dataStorageService.Variables.Where(v => v.Value.Name == Variable.Name || (v.Value.Protocol == ProtocolType.S7 && v.Value.S7Address == Variable.S7Address) || (v.Value.Protocol == ProtocolType.OpcUa && v.Value.OpcUaNodeId == Variable.OpcUaNodeId)).Select(v=>v.Value).ToList();
VariableItemViewModel existVariable = null;
VariableItem existVariable = null;
if (IsAddModel)
{
existVariable = existVariables.FirstOrDefault();