临时提交3

This commit is contained in:
2025-07-19 11:11:01 +08:00
parent 01fe2e14ef
commit ca67d2e6df
117 changed files with 476 additions and 910 deletions

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"

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;

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"

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"

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;

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"

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;

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"

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;

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"

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;

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"

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;

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"

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
{

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"

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;

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"

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;

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"

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

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"

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

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"

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;

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"

View File

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

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"

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;