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

1. 在 AppSettings 类中添加了 DefaultPollingInterval 属性，用于存储全局默认轮询间隔值

Browse Source 
2. 更新了 SettingViewModel 以包含对轮询间隔设置的支持，允许用户在设置页面中修改该值
   3. 修改了 VariableItemViewModel，使其在初始化时从 AppSettings 加载默认轮询间隔值
   4. 更新了 SettingView.xaml，在设置页面的"通用设置"部分添加了轮询间隔配置项
This commit is contained in:
David P.G
2025-10-02 12:35:42 +08:00
parent 6e9f7c4a44
commit 1a666b79c8
6 changed files with 181 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

272
DMS.WPF/ViewModels/SettingViewModel.cs
View File

@@ -1,151 +1,173 @@
using CommunityToolkit.Mvvm.Input;
using DMS.Infrastructure.Configurations;
using DMS.WPF.Helper;
using DMS.WPF.Interfaces;
namespace DMS.WPF.ViewModels;
public partial class SettingViewModel : ViewModelBase
{
// private AppSettings _settings;
private AppSettings _settings;
private readonly INotificationService _notificationService;
public SettingViewModel()
public SettingViewModel(AppSettings appSettings,INotificationService notificationService)
{
// _settings = AppSettings.Load();
// AvailableDbTypes = Enum.GetNames(typeof(SqlSugar.DbType)).ToList();
// Themes = new List<string> { "浅色", "深色", "跟随系统" };
// this.transaction = transaction;
_settings = appSettings;
_notificationService = notificationService;
AvailableDbTypes = Enum.GetNames(typeof(SqlSugar.DbType)).ToList();
Themes = new List<string> { "浅色", "深色", "跟随系统" };
}
public List<string> Themes { get; }
// public string SelectedTheme
// {
// get => _settings.Theme;
// set
// {
// if (_settings.Theme != value)
// {
// _settings.Theme = value;
// OnPropertyChanged();
// _settings.Save();
// ThemeHelper.ApplyTheme(value);
// }
// }
// }
public string SelectedTheme
{
get => _settings.Theme;
set
{
if (_settings.Theme != value)
{
_settings.Theme = value;
OnPropertyChanged();
_settings.Save();
ThemeHelper.ApplyTheme(value);
}
}
}
public List<string> AvailableDbTypes { get; set; }
// public string SelectedDbType
// {
// get => _settings.Database.DbType;
// set
// {
// if (_settings.Database.DbType != value)
// {
// _settings.Database.DbType = value;
// OnPropertyChanged();
// _settings.Save();
// }
// }
// }
public string SelectedDbType
{
get => _settings.Database.DbType;
set
{
if (_settings.Database.DbType != value)
{
_settings.Database.DbType = value;
OnPropertyChanged();
_settings.Save();
}
}
}
// public string Server
// {
// get => _settings.Database.Server;
// set
// {
// if (_settings.Database.Server != value)
// {
// _settings.Database.Server = value;
// OnPropertyChanged();
// _settings.Save();
// }
// }
// }
public string Server
{
get => _settings.Database.Server;
set
{
if (_settings.Database.Server != value)
{
_settings.Database.Server = value;
OnPropertyChanged();
_settings.Save();
}
}
}
// public int Port
// {
// get => _settings.Database.Port;
// set
// {
// if (_settings.Database.Port != value)
// {
// _settings.Database.Port = value;
// OnPropertyChanged();
// _settings.Save();
// }
// }
// }
public int Port
{
get => _settings.Database.Port;
set
{
if (_settings.Database.Port != value)
{
_settings.Database.Port = value;
OnPropertyChanged();
_settings.Save();
}
}
}
// public string UserId
// {
// get => _settings.Database.UserId;
// set
// {
// if (_settings.Database.UserId != value)
// {
// _settings.Database.UserId = value;
// OnPropertyChanged();
// _settings.Save();
// }
// }
// }
//
// public string Password
// {
// get => _settings.Database.Password;
// set
// {
// if (_settings.Database.Password != value)
// {
// _settings.Database.Password = value;
// OnPropertyChanged();
// _settings.Save();
// }
// }
// }
//
// public string Database
// {
// get => _settings.Database.Database;
// set
// {
// if (_settings.Database.Database != value)
// {
// _settings.Database.Database = value;
// OnPropertyChanged();
// _settings.Save();
// }
// }
// }
public string UserId
{
get => _settings.Database.UserId;
set
{
if (_settings.Database.UserId != value)
{
_settings.Database.UserId = value;
OnPropertyChanged();
_settings.Save();
}
}
}
public string Password
{
get => _settings.Database.Password;
set
{
if (_settings.Database.Password != value)
{
_settings.Database.Password = value;
OnPropertyChanged();
_settings.Save();
}
}
}
public string Database
{
get => _settings.Database.Database;
set
{
if (_settings.Database.Database != value)
{
_settings.Database.Database = value;
OnPropertyChanged();
_settings.Save();
}
}
}
// public bool MinimizeToTrayOnClose
// {
// get => _settings.MinimizeToTrayOnClose;
// set
// {
// if (_settings.MinimizeToTrayOnClose != value)
// {
// _settings.MinimizeToTrayOnClose = value;
// OnPropertyChanged(nameof(MinimizeToTrayOnClose));
// _settings.Save();
// }
// }
// }
public bool MinimizeToTrayOnClose
{
get => _settings.MinimizeToTrayOnClose;
set
{
if (_settings.MinimizeToTrayOnClose != value)
{
_settings.MinimizeToTrayOnClose = value;
OnPropertyChanged(nameof(MinimizeToTrayOnClose));
_settings.Save();
}
}
}
public int DefaultPollingInterval
{
get => _settings.DefaultPollingInterval;
set
{
if (_settings.DefaultPollingInterval != value)
{
_settings.DefaultPollingInterval = value;
OnPropertyChanged();
_settings.Save();
}
}
}
[RelayCommand]
private async Task TestConnection()
{
// try
// {
// using (var db = transaction.GetInstance())
// {
// await db.Ado.OpenAsync();
// NotificationHelper.ShowSuccess("连接成功！");
// }
// }
// catch (Exception ex)
// {
// NotificationHelper.ShowError($"连接失败：{ex.Message}", ex);
// }
try
{
// 使用当前配置测试数据库连接
using var db = new SqlSugar.SqlSugarScope(new SqlSugar.ConnectionConfig()
{
DbType = (SqlSugar.DbType)Enum.Parse(typeof(SqlSugar.DbType), _settings.Database.DbType),
ConnectionString = _settings.ToConnectionString(),
IsAutoCloseConnection = true
});
await db.Ado.ExecuteCommandAsync("SELECT 1");
_notificationService.ShowSuccess("连接成功！");
}
catch (Exception ex)
{
_notificationService.ShowError($"连接失败：{ex.Message}", ex);
}
}
}