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

4
DMS.WPF/Views/Dialogs/ImportOpcUaDialog.xaml.cs
View File

@@ -3,7 +3,7 @@ using DMS.WPF.Helper;
using DMS.WPF.Interfaces;
using DMS.WPF.Services;
using DMS.WPF.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Items;
using DMS.WPF.ItemViewModel;
using iNKORE.UI.WPF.Modern.Controls;
using System.Threading.Tasks;
using System.Windows;
@@ -63,7 +63,7 @@ public partial class ImportOpcUaDialog : ContentDialog
//事件
public async void SelectedItemChanged(object selectedObj)
{
if (selectedObj is OpcUaNodeItemViewModel selectedNode)
if (selectedObj is OpcUaNodeItem selectedNode)
{
if (this.DataContext is ImportOpcUaDialogViewModel viewModel)

6
DMS.WPF/Views/Dialogs/TriggerDialog.xaml
View File

@@ -9,7 +9,7 @@
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:ex="clr-namespace:DMS.Extensions"
xmlns:converters="clr-namespace:DMS.WPF.Converters"
xmlns:items="clr-namespace:DMS.WPF.ViewModels.Items"
xmlns:items="clr-namespace:DMS.WPF.ItemViewModel"
Title="{Binding Title}"
mc:Ignorable="d"
d:DesignHeight="700"
@@ -68,7 +68,7 @@
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type items:VariableItemViewModel}">
<DataTemplate DataType="{x:Type items:VariableItem}">
<Border Background="LightBlue"
CornerRadius="3"
Margin="2"
@@ -115,7 +115,7 @@
SelectionMode="Single"
MouseDoubleClick="VariableListBox_MouseDoubleClick">
<ListBox.ItemTemplate>
<DataTemplate DataType="{x:Type items:VariableItemViewModel}">
<DataTemplate DataType="{x:Type items:VariableItem}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Name}" FontWeight="Bold"/>
<TextBlock Text=" - " />

6
DMS.WPF/Views/Dialogs/TriggerDialog.xaml.cs
View File

@@ -1,7 +1,7 @@
using System.Windows.Controls;
using System.Windows.Input;
using DMS.WPF.Helper;
using DMS.WPF.ViewModels.Items;
using DMS.WPF.ItemViewModel;
using iNKORE.UI.WPF.Modern.Controls;
namespace DMS.WPF.Views.Dialogs
@@ -36,7 +36,7 @@ namespace DMS.WPF.Views.Dialogs
/// </summary>
private void VariableListBox_MouseDoubleClick(object sender, MouseButtonEventArgs e)
{
if (VariableListBox.SelectedItem is VariableItemViewModel selectedVariable)
if (VariableListBox.SelectedItem is VariableItem selectedVariable)
{
var viewModel = DataContext as ViewModels.Dialogs.TriggerDialogViewModel;
viewModel?.AddVariable(selectedVariable);
@@ -48,7 +48,7 @@ namespace DMS.WPF.Views.Dialogs
/// </summary>
private void RemoveVariableButton_Click(object sender, System.Windows.RoutedEventArgs e)
{
if (sender is System.Windows.Controls.Button button && button.Tag is VariableItemViewModel variable)
if (sender is System.Windows.Controls.Button button && button.Tag is VariableItem variable)
{
var viewModel = DataContext as ViewModels.Dialogs.TriggerDialogViewModel;
viewModel?.RemoveVariable(variable);

4
DMS.WPF/Views/MainView.xaml.cs
View File

@@ -6,7 +6,7 @@ using Microsoft.Extensions.DependencyInjection;
using DMS.Core.Enums;
using DMS.Core.Models;
using DMS.WPF.Interfaces;
using DMS.WPF.ViewModels.Items;
using DMS.WPF.ItemViewModel;
namespace DMS.WPF.Views;
@@ -48,7 +48,7 @@ public partial class MainView : Window
/// <param name="args"></param>
private async void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
{
var menu = args.SelectedItem as MenuItemViewModel;
var menu = args.SelectedItem as MenuItem;
if (menu != null)
{

2
DMS.WPF/Views/VariableTableView.xaml.cs
View File

@@ -10,7 +10,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog;
using DMS.Core.Enums;
using DMS.WPF.ViewModels.Items;
using DMS.WPF.ItemViewModel;
namespace DMS.WPF.Views;