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

临时提交3

Browse Source
This commit is contained in:
David P.G
2025-07-19 11:11:01 +08:00
parent 01fe2e14ef
commit ca67d2e6df
117 changed files with 476 additions and 910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DMS.WPF/Views/DataTransformView.xaml
View File

@@ -1,4 +1,4 @@
<UserControl x:Class="DMS.Views.DataTransformView"
<UserControl x:Class="DMS.WPF.Views.DataTransformView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

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

@@ -1,6 +1,6 @@
using System.Windows.Controls;
namespace DMS.Views;
namespace DMS.WPF.Views;
public partial class DataTransformView : UserControl
{

2
DMS.WPF/Views/DeviceDetailView.xaml
View File

@@ -1,4 +1,4 @@
<UserControl x:Class="DMS.Views.DeviceDetailView"
<UserControl x:Class="DMS.WPF.Views.DeviceDetailView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

2
DMS.WPF/Views/DevicesView.xaml
View File

@@ -1,4 +1,4 @@
<UserControl x:Class="DMS.Views.DevicesView"
<UserControl x:Class="DMS.WPF.Views.DevicesView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

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

@@ -1,9 +1,9 @@
using System.Windows.Controls;
using DMS.ViewModels;
using DMS.WPF.ViewModels;
using iNKORE.UI.WPF.Modern.Controls;
using Microsoft.Extensions.DependencyInjection;
namespace DMS.Views;
namespace DMS.WPF.Views;
public partial class DevicesView : UserControl
{

2
DMS.WPF/Views/Dialogs/ConfirmDialog.xaml
View File

@@ -1,4 +1,4 @@
<ui:ContentDialog x:Class="DMS.Views.Dialogs.ConfirmDialog"
<ui:ContentDialog x:Class="DMS.WPF.Views.Dialogs.ConfirmDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
DMS.WPF/Views/Dialogs/ConfirmDialog.xaml.cs
View File

@@ -1,5 +1,5 @@
using System.Windows.Controls;
using DMS.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Dialogs;
using iNKORE.UI.WPF.Modern.Controls;
namespace DMS.Views.Dialogs;

2
DMS.WPF/Views/Dialogs/DeviceDialog.xaml
View File

@@ -1,4 +1,4 @@
<ui:ContentDialog x:Class="DMS.Views.Dialogs.DeviceDialog"
<ui:ContentDialog x:Class="DMS.WPF.Views.Dialogs.DeviceDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
DMS.WPF/Views/Dialogs/ImportExcelDialog.xaml
View File

@@ -1,4 +1,4 @@
<ui:ContentDialog x:Class="DMS.Views.Dialogs.ImportExcelDialog"
<ui:ContentDialog x:Class="DMS.WPF.Views.Dialogs.ImportExcelDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
DMS.WPF/Views/Dialogs/ImportExcelDialog.xaml.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.Win32;
using System.IO;
using System.Windows;
using DMS.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Dialogs;
using iNKORE.UI.WPF.Modern.Controls;
namespace DMS.Views.Dialogs;

2
DMS.WPF/Views/Dialogs/ImportResultDialog.xaml
View File

@@ -1,5 +1,5 @@
<ui:ContentDialog
x:Class="DMS.Views.Dialogs.ImportResultDialog"
x:Class="DMS.WPF.Views.Dialogs.ImportResultDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
DMS.WPF/Views/Dialogs/ImportResultDialog.xaml.cs
View File

@@ -1,4 +1,4 @@
using DMS.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Dialogs;
using iNKORE.UI.WPF.Modern.Controls;
namespace DMS.Views.Dialogs;

2
DMS.WPF/Views/Dialogs/IsActiveDialog.xaml
View File

@@ -1,4 +1,4 @@
<controls:ContentDialog x:Class="DMS.Views.Dialogs.IsActiveDialog"
<controls:ContentDialog x:Class="DMS.WPF.Views.Dialogs.IsActiveDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
DMS.WPF/Views/Dialogs/IsActiveDialog.xaml.cs
View File

@@ -1,5 +1,5 @@
using System.Windows;
using DMS.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Dialogs;
using iNKORE.UI.WPF.Modern.Controls;
namespace DMS.Views.Dialogs;

2
DMS.WPF/Views/Dialogs/MqttAliasBatchEditDialog.xaml
View File

@@ -1,5 +1,5 @@
<ui:ContentDialog
x:Class="DMS.Views.Dialogs.MqttAliasBatchEditDialog"
x:Class="DMS.WPF.Views.Dialogs.MqttAliasBatchEditDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
DMS.WPF/Views/Dialogs/MqttAliasBatchEditDialog.xaml.cs
View File

@@ -1,4 +1,4 @@
using DMS.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Dialogs;
using iNKORE.UI.WPF.Modern.Controls;
namespace DMS.Views.Dialogs;

2
DMS.WPF/Views/Dialogs/MqttAliasDialog.xaml
View File

@@ -1,5 +1,5 @@
<ui:ContentDialog
x:Class="DMS.Views.Dialogs.MqttAliasDialog"
x:Class="DMS.WPF.Views.Dialogs.MqttAliasDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
DMS.WPF/Views/Dialogs/MqttAliasDialog.xaml.cs
View File

@@ -1,4 +1,4 @@
using DMS.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Dialogs;
using iNKORE.UI.WPF.Modern.Controls;
namespace DMS.Views.Dialogs;

2
DMS.WPF/Views/Dialogs/MqttDialog.xaml
View File

@@ -1,4 +1,4 @@
<ui:ContentDialog x:Class="DMS.Views.Dialogs.MqttDialog"
<ui:ContentDialog x:Class="DMS.WPF.Views.Dialogs.MqttDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

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

@@ -1,10 +1,10 @@
using System.Windows.Controls;
using DMS.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Dialogs;
using iNKORE.UI.WPF.Modern.Controls;
namespace DMS.Views.Dialogs;
using DMS.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Dialogs;
public partial class MqttDialog : ContentDialog
{

2
DMS.WPF/Views/Dialogs/MqttSelectionDialog.xaml
View File

@@ -1,4 +1,4 @@
<controls:ContentDialog x:Class="DMS.Views.Dialogs.MqttSelectionDialog"
<controls:ContentDialog x:Class="DMS.WPF.Views.Dialogs.MqttSelectionDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

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

@@ -1,6 +1,6 @@
using DMS.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Dialogs;
using iNKORE.UI.WPF.Modern.Controls;
using DMS.Models;
using DMS.WPF.Models;
namespace DMS.Views.Dialogs;

2
DMS.WPF/Views/Dialogs/OpcUaImportDialog.xaml
View File

@@ -1,4 +1,4 @@
<controls:ContentDialog x:Class="DMS.Views.Dialogs.OpcUaImportDialog"
<controls:ContentDialog x:Class="DMS.WPF.Views.Dialogs.OpcUaImportDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

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

@@ -1,8 +1,8 @@
using System.Windows;
using System.Windows.Controls;
using CommunityToolkit.Mvvm.Messaging;
using DMS.Models;
using DMS.ViewModels.Dialogs;
using DMS.WPF.Models;
using DMS.WPF.ViewModels.Dialogs;
using iNKORE.UI.WPF.Modern.Controls;
namespace DMS.Views.Dialogs;

2
DMS.WPF/Views/Dialogs/OpcUaUpdateTypeDialog.xaml
View File

@@ -1,4 +1,4 @@
<ui:ContentDialog x:Class="DMS.Views.Dialogs.OpcUaUpdateTypeDialog"
<ui:ContentDialog x:Class="DMS.WPF.Views.Dialogs.OpcUaUpdateTypeDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

2
DMS.WPF/Views/Dialogs/OpcUaUpdateTypeDialog.xaml.cs
View File

@@ -1,4 +1,4 @@
using DMS.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Dialogs;
using iNKORE.UI.WPF.Modern.Controls;
namespace DMS.Views.Dialogs

2
DMS.WPF/Views/Dialogs/PollLevelDialog.xaml
View File

@@ -1,4 +1,4 @@
<ui:ContentDialog x:Class="DMS.Views.Dialogs.PollLevelDialog"
<ui:ContentDialog x:Class="DMS.WPF.Views.Dialogs.PollLevelDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

2
DMS.WPF/Views/Dialogs/PollLevelDialog.xaml.cs
View File

@@ -1,4 +1,4 @@
using DMS.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Dialogs;
using iNKORE.UI.WPF.Modern.Controls;
namespace DMS.Views.Dialogs

2
DMS.WPF/Views/Dialogs/ProcessingDialog.xaml
View File

@@ -1,4 +1,4 @@
<ui:ContentDialog x:Class="DMS.Views.Dialogs.ProcessingDialog"
<ui:ContentDialog x:Class="DMS.WPF.Views.Dialogs.ProcessingDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
DMS.WPF/Views/Dialogs/ProcessingDialog.xaml.cs
View File

@@ -1,4 +1,4 @@
using DMS.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Dialogs;
using iNKORE.UI.WPF.Modern.Controls;
namespace DMS.Views.Dialogs;

2
DMS.WPF/Views/Dialogs/VarDataDialog.xaml
View File

@@ -1,4 +1,4 @@
<ui:ContentDialog x:Class="DMS.Views.Dialogs.VarDataDialog"
<ui:ContentDialog x:Class="DMS.WPF.Views.Dialogs.VarDataDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
DMS.WPF/Views/Dialogs/VarDataDialog.xaml.cs
View File

@@ -1,5 +1,5 @@
using System.Windows.Controls;
using DMS.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Dialogs;
namespace DMS.Views.Dialogs;

2
DMS.WPF/Views/Dialogs/VarTableDialog.xaml
View File

@@ -1,4 +1,4 @@
<ui:ContentDialog x:Class="DMS.Views.Dialogs.VarTableDialog"
<ui:ContentDialog x:Class="DMS.WPF.Views.Dialogs.VarTableDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
DMS.WPF/Views/Dialogs/VarTableDialog.xaml.cs
View File

@@ -1,4 +1,4 @@
using DMS.ViewModels.Dialogs;
using DMS.WPF.ViewModels.Dialogs;
using iNKORE.UI.WPF.Modern.Controls;
namespace DMS.Views.Dialogs;

2
DMS.WPF/Views/HomeView.xaml
View File

@@ -1,4 +1,4 @@
<UserControl x:Class="DMS.Views.HomeView"
<UserControl x:Class="DMS.WPF.Views.HomeView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

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

@@ -1,6 +1,6 @@
using System.Windows.Controls;
namespace DMS.Views;
namespace DMS.WPF.Views;
public partial class HomeView : UserControl
{

2
DMS.WPF/Views/MainView.xaml
View File

@@ -1,4 +1,4 @@
<Window x:Class="DMS.Views.MainView"
<Window x:Class="DMS.WPF.Views.MainView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

2
DMS.WPF/Views/MqttServerDetailView.xaml
View File

@@ -1,4 +1,4 @@
<UserControl x:Class="DMS.Views.MqttServerDetailView"
<UserControl x:Class="DMS.WPF.Views.MqttServerDetailView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

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

@@ -1,6 +1,6 @@
using System.Windows.Controls;
using Microsoft.Extensions.DependencyInjection;
using DMS.ViewModels;
using DMS.WPF.ViewModels;
namespace DMS.Views
{

2
DMS.WPF/Views/MqttsView.xaml
View File

@@ -1,4 +1,4 @@
<UserControl x:Class="DMS.Views.MqttsView"
<UserControl x:Class="DMS.WPF.Views.MqttsView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

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

@@ -1,6 +1,6 @@
using System.Windows.Controls;
namespace DMS.Views;
namespace DMS.WPF.Views;
public partial class MqttsView : UserControl
{

2
DMS.WPF/Views/SettingView.xaml
View File

@@ -1,4 +1,4 @@
<UserControl x:Class="DMS.Views.SettingView"
<UserControl x:Class="DMS.WPF.Views.SettingView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

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

@@ -1,8 +1,8 @@
using System.Windows.Controls;
using DMS.ViewModels;
using DMS.WPF.ViewModels;
using Microsoft.Extensions.DependencyInjection;
namespace DMS.Views;
namespace DMS.WPF.Views;
public partial class SettingView : UserControl
{

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

@@ -1,4 +1,4 @@
<UserControl x:Class="DMS.Views.VariableTableView"
<UserControl x:Class="DMS.WPF.Views.VariableTableView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

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

@@ -3,15 +3,15 @@ using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Media;
using DMS.Helper;
using DMS.Models;
using DMS.ViewModels;
using DMS.WPF.Models;
using DMS.WPF.ViewModels;
using iNKORE.UI.WPF.Modern.Controls;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog;
using DMS.Core.Enums;
namespace DMS.Views;
namespace DMS.WPF.Views;
public partial class VariableTableView : UserControl
{