huangsucan/ADP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

作用域配置

Browse Source
This commit is contained in:
czj
2026-06-05 14:29:22 +08:00
parent 347f292e9b
commit bb4fe61ded
5 changed files with 131 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MainModule/ViewModels/AutomatedTestingViewModel.cs
View File

@@ -86,8 +86,9 @@ namespace MainModule.ViewModels
private void OnRefresh() private void OnRefresh()
{ {
// 双击：把自己的名字扔出去 // 双击：把自己的名字扔出去
_eventAggregator.GetEvent<ExpandViewEvent>().Publish(TestStatus);
_globalInfo.CurrentScope = TestStatus; _globalInfo.CurrentScope = TestStatus;
_eventAggregator.GetEvent<ExpandViewEvent>().Publish(TestStatus);
} }
private void OnBackToProtocol() private void OnBackToProtocol()
@@ -106,6 +107,7 @@ namespace MainModule.ViewModels
TestStatus = navigationContext.Parameters.GetValue<string>("Name"); TestStatus = navigationContext.Parameters.GetValue<string>("Name");
_globalInfo.ContextDic.Add(TestStatus, _scopedContext); _globalInfo.ContextDic.Add(TestStatus, _scopedContext);
_globalInfo.StepRunningDic.Add(TestStatus, _stepRunning); _globalInfo.StepRunningDic.Add(TestStatus, _stepRunning);
_globalInfo.ScopeDic.Add(TestStatus, _scope);
} }
} }

105
MonitorModule/ViewModels/MonitorViewModel.cs
View File

@@ -21,15 +21,53 @@ namespace MonitorModule.ViewModels
/// </summary> /// </summary>
public class MonitorViewModel : NavigateViewModelBase, IRegionMemberLifetime, IDisposable public class MonitorViewModel : NavigateViewModelBase, IRegionMemberLifetime, IDisposable
{ {
#region 属性
public bool KeepAlive => true;
public ScopedContext _scopedContext { get; set; }
public GlobalInfo _globalInfo { get; set; }
public string TestStatus
{
get => _testStatus;
set => SetProperty(ref _testStatus, value);
}
/// <summary>PlotView 直接绑这个 PlotModel</summary>
public PlotModel Plot { get; }
/// <summary>当前已添加的信号集合（左侧列表展示）</summary>
public ObservableCollection<SignalItem> Signals { get; } = new();
public SignalItem? SelectedSignal
{
get => _selectedSignal;
set => SetProperty(ref _selectedSignal, value);
}
public string StatusMessage
{
get => _statusMessage;
set => SetProperty(ref _statusMessage, value);
}
#endregion
#region 命令
public ICommand AddSignalCommand { get; }
public ICommand DeleteSignalCommand { get; }
public ICommand ResetViewCommand { get; }
public ICommand RefreshDataCommand { get; }
// 双击展开/折叠：与 RecordView/AutomatedTestingView 共用同一套 ExpandViewEvent
public ICommand RefreshCommand { get; }
#endregion
#region 私有字段 #region 私有字段
private readonly IScopedProvider _scope; private bool IsInitiated = false;
private IScopedProvider _scope;
// 颜色轮转池，给新加的信号自动分配区分色 // 颜色轮转池，给新加的信号自动分配区分色
private static readonly OxyColor[] _palette = private static readonly OxyColor[] _palette =
{ {
OxyColors.SteelBlue, OxyColors.IndianRed, OxyColors.SeaGreen, OxyColors.SteelBlue, OxyColors.IndianRed, OxyColors.SeaGreen,
OxyColors.DarkOrange, OxyColors.MediumPurple, OxyColors.Goldenrod, OxyColors.DarkOrange, OxyColors.MediumPurple, OxyColors.Goldenrod,
OxyColors.Teal, OxyColors.Crimson, OxyColors.OliveDrab OxyColors.Teal, OxyColors.Crimson, OxyColors.OliveDrab
}; };
private int _signalCounter; private int _signalCounter;
// ===== 模拟数据相关 ===== // ===== 模拟数据相关 =====
@@ -43,60 +81,15 @@ namespace MonitorModule.ViewModels
private const int _maxPoints = 200; private const int _maxPoints = 200;
// 用于 random walk 的随机源 // 用于 random walk 的随机源
private static readonly Random _rng = new(); private static readonly Random _rng = new();
#endregion
#region 隔离 / 标题
public bool KeepAlive => true;
public ScopedContext _scopedContext { get; }
public GlobalInfo GlobalInfoRef { get; }
private string _testStatus = string.Empty; private string _testStatus = string.Empty;
public string TestStatus
{
get => _testStatus;
set => SetProperty(ref _testStatus, value);
}
#endregion
#region OxyPlot
/// <summary>PlotView 直接绑这个 PlotModel</summary>
public PlotModel Plot { get; }
/// <summary>当前已添加的信号集合（左侧列表展示）</summary>
public ObservableCollection<SignalItem> Signals { get; } = new();
private SignalItem? _selectedSignal; private SignalItem? _selectedSignal;
public SignalItem? SelectedSignal
{
get => _selectedSignal;
set => SetProperty(ref _selectedSignal, value);
}
private string _statusMessage = "图表已就绪，暂无信号"; private string _statusMessage = "图表已就绪，暂无信号";
public string StatusMessage
{
get => _statusMessage;
set => SetProperty(ref _statusMessage, value);
}
#endregion
#region 命令
public ICommand AddSignalCommand { get; }
public ICommand DeleteSignalCommand { get; }
public ICommand ResetViewCommand { get; }
public ICommand RefreshDataCommand { get; }
// 双击展开/折叠：与 RecordView/AutomatedTestingView 共用同一套 ExpandViewEvent
public ICommand RefreshCommand { get; }
#endregion #endregion
public MonitorViewModel(IContainerExtension container) : base(container) public MonitorViewModel(IContainerExtension container) : base(container)
{ {
_scope = container.CreateScope(); _globalInfo = container.Resolve<GlobalInfo>();
GlobalInfoRef = container.Resolve<GlobalInfo>();
_scopedContext = _scope.Resolve<ScopedContext>();
Plot = BuildEmptyPlot(); Plot = BuildEmptyPlot();
AddSignalCommand = new DelegateCommand(OnAddSignal); AddSignalCommand = new DelegateCommand(OnAddSignal);
DeleteSignalCommand = new DelegateCommand(OnDeleteSignal); DeleteSignalCommand = new DelegateCommand(OnDeleteSignal);
ResetViewCommand = new DelegateCommand(OnResetView); ResetViewCommand = new DelegateCommand(OnResetView);
@@ -257,8 +250,9 @@ namespace MonitorModule.ViewModels
private void OnExpand() private void OnExpand()
{ {
if (string.IsNullOrEmpty(TestStatus)) return; if (string.IsNullOrEmpty(TestStatus)) return;
_globalInfo.CurrentScope = TestStatus;
_eventAggregator.GetEvent<ExpandViewEvent>().Publish(TestStatus); _eventAggregator.GetEvent<ExpandViewEvent>().Publish(TestStatus);
GlobalInfoRef.CurrentScope = TestStatus;
} }
/// <summary> /// <summary>
@@ -297,15 +291,18 @@ namespace MonitorModule.ViewModels
} }
#endregion #endregion
#region 导航 #region 重写
public override void OnNavigatedTo(NavigationContext navigationContext) public override void OnNavigatedTo(NavigationContext navigationContext)
{ {
base.OnNavigatedTo(navigationContext); base.OnNavigatedTo(navigationContext);
if (navigationContext.Parameters.ContainsKey("Name")) if (!IsInitiated && navigationContext.Parameters.ContainsKey("Name"))
{ {
TestStatus = navigationContext.Parameters.GetValue<string>("Name"); TestStatus = navigationContext.Parameters.GetValue<string>("Name");
Plot.Title = $"监控 - {TestStatus}"; Plot.Title = $"监控 - {TestStatus}";
Plot.InvalidatePlot(false); Plot.InvalidatePlot(false);
_scope = _globalInfo.ScopeDic[TestStatus];
_scopedContext = _globalInfo.ContextDic[TestStatus];
IsInitiated = true;
} }
} }
#endregion #endregion

63
MonitorModule/ViewModels/RecordViewModel.cs
View File

@@ -18,40 +18,24 @@ namespace MonitorModule.ViewModels
/// </summary> /// </summary>
public class RecordViewModel : NavigateViewModelBase, IRegionMemberLifetime, IDisposable public class RecordViewModel : NavigateViewModelBase, IRegionMemberLifetime, IDisposable
{ {
#region 私有字段
// 数据库相对路径：运行目录\SQL\ADP.db（数据库未就绪时容错处理，不抛异常）
private static readonly string DbFolder = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SQL");
private static readonly string DbPath = Path.Combine(DbFolder, "ADP.db");
private static readonly string ConnStr = $"Data Source={DbPath};Version=3;";
private readonly IScopedProvider _scope; #region 属性
#endregion
#region 隔离演示属性（保留 ScopedContext 验证用）
public bool KeepAlive => true; public bool KeepAlive => true;
public ScopedContext _scopedContext { get; } public ScopedContext _scopedContext { get; set; }
// 公开一份 GlobalInfo 供双击展开逻辑使用（基类的 _globalInfo 是 private） public GlobalInfo _globalInfo { get; }
public GlobalInfo GlobalInfoRef { get; }
#endregion
#region 顶部工位标题
private string _testStatus = string.Empty;
public string TestStatus public string TestStatus
{ {
get => _testStatus; get => _testStatus;
set => SetProperty(ref _testStatus, value); set => SetProperty(ref _testStatus, value);
} }
#endregion
#region 数据库 / 表 / 查询条件
private ObservableCollection<string> _tableNames = new();
public ObservableCollection<string> TableNames public ObservableCollection<string> TableNames
{ {
get => _tableNames; get => _tableNames;
set => SetProperty(ref _tableNames, value); set => SetProperty(ref _tableNames, value);
} }
private string? _selectedTable;
public string? SelectedTable public string? SelectedTable
{ {
get => _selectedTable; get => _selectedTable;
@@ -66,37 +50,30 @@ namespace MonitorModule.ViewModels
} }
// 用户填写的 WHERE 子句（不带 WHERE 关键字），例如：Status='OK' AND Id>10 // 用户填写的 WHERE 子句（不带 WHERE 关键字），例如：Status='OK' AND Id>10
private string _whereClause = string.Empty;
public string WhereClause public string WhereClause
{ {
get => _whereClause; get => _whereClause;
set => SetProperty(ref _whereClause, value); set => SetProperty(ref _whereClause, value);
} }
private DataTable _resultTable = new();
public DataTable ResultTable public DataTable ResultTable
{ {
get => _resultTable; get => _resultTable;
set => SetProperty(ref _resultTable, value); set => SetProperty(ref _resultTable, value);
} }
private string _statusMessage = "未连接";
public string StatusMessage public string StatusMessage
{ {
get => _statusMessage; get => _statusMessage;
set => SetProperty(ref _statusMessage, value); set => SetProperty(ref _statusMessage, value);
} }
#endregion
#region 分页
private int _pageIndex = 1;
public int PageIndex public int PageIndex
{ {
get => _pageIndex; get => _pageIndex;
set => SetProperty(ref _pageIndex, value); set => SetProperty(ref _pageIndex, value);
} }
private int _pageSize = 50;
public int PageSize public int PageSize
{ {
get => _pageSize; get => _pageSize;
@@ -111,7 +88,6 @@ namespace MonitorModule.ViewModels
} }
} }
private long _totalCount;
public long TotalCount public long TotalCount
{ {
get => _totalCount; get => _totalCount;
@@ -145,13 +121,27 @@ namespace MonitorModule.ViewModels
// 双击展开/折叠：与 MonitorView/AutomatedTestingView 共用 // 双击展开/折叠：与 MonitorView/AutomatedTestingView 共用
public ICommand RefreshCommand { get; } public ICommand RefreshCommand { get; }
#endregion #endregion
#region 私有字段
// 数据库相对路径：运行目录\SQL\ADP.db（数据库未就绪时容错处理，不抛异常）
private static readonly string DbFolder = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SQL");
private static readonly string DbPath = Path.Combine(DbFolder, "ADP.db");
private static readonly string ConnStr = $"Data Source={DbPath};Version=3;";
private bool IsInitiated = false;
private IScopedProvider _scope;
private string _testStatus = string.Empty;
private ObservableCollection<string> _tableNames = new();
private string? _selectedTable;
private string _whereClause = string.Empty;
private DataTable _resultTable = new();
private string _statusMessage = "未连接";
private int _pageIndex = 1;
private int _pageSize = 50;
private long _totalCount;
#endregion
public RecordViewModel(IContainerExtension container) : base(container) public RecordViewModel(IContainerExtension container) : base(container)
{ {
_scope = container.CreateScope(); _globalInfo = container.Resolve<GlobalInfo>();
GlobalInfoRef = container.Resolve<GlobalInfo>();
_scopedContext = _scope.Resolve<ScopedContext>();
LoadedCommand = new DelegateCommand(LoadTables); LoadedCommand = new DelegateCommand(LoadTables);
RefreshTablesCommand = new DelegateCommand(LoadTables); RefreshTablesCommand = new DelegateCommand(LoadTables);
QueryCommand = new DelegateCommand(() => { PageIndex = 1; Query(); }); QueryCommand = new DelegateCommand(() => { PageIndex = 1; Query(); });
@@ -341,20 +331,23 @@ namespace MonitorModule.ViewModels
private void OnExpand() private void OnExpand()
{ {
if (string.IsNullOrEmpty(TestStatus)) return; if (string.IsNullOrEmpty(TestStatus)) return;
_globalInfo.CurrentScope = TestStatus;
_eventAggregator.GetEvent<ExpandViewEvent>().Publish(TestStatus); _eventAggregator.GetEvent<ExpandViewEvent>().Publish(TestStatus);
GlobalInfoRef.CurrentScope = TestStatus;
} }
#endregion #endregion
#region 导航 #region 重写
public override void OnNavigatedTo(NavigationContext navigationContext) public override void OnNavigatedTo(NavigationContext navigationContext)
{ {
base.OnNavigatedTo(navigationContext); base.OnNavigatedTo(navigationContext);
if (navigationContext.Parameters.ContainsKey("Name")) if (!IsInitiated&&navigationContext.Parameters.ContainsKey("Name"))
{ {
TestStatus = navigationContext.Parameters.GetValue<string>("Name"); TestStatus = navigationContext.Parameters.GetValue<string>("Name");
_scope = _globalInfo.ScopeDic[TestStatus];
_scopedContext = _globalInfo.ContextDic[TestStatus];
IsInitiated = true;
} }
// 进入界面时自动加载表
LoadTables(); LoadTables();
} }
#endregion #endregion

84
SettingModule/ViewModels/SettingViewModel.cs
View File

@@ -1,23 +1,27 @@
using System; using System;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Windows.Input; using System.Windows.Input;
using Prism.Commands;
using Prism.Ioc;
using UIShare.GlobalVariable; using UIShare.GlobalVariable;
using UIShare.PubEvent; using UIShare.PubEvent;
using UIShare.UIViewModel; using UIShare.UIViewModel;
using UIShare.ViewModelBase; using UIShare.ViewModelBase;
namespace SettingModule.ViewModels namespace SettingModule.ViewModels
{ {
public class SettingViewModel : NavigateViewModelBase, IRegionMemberLifetime, IDisposable public class SettingViewModel : NavigateViewModelBase, IRegionMemberLifetime, IDisposable
{ {
#region 属性 #region 属性
public bool KeepAlive => true; public bool KeepAlive => true;
private string _testStatus = string.Empty;
public string TestStatus public string TestStatus
{ {
get => _testStatus; get => _testStatus;
set => SetProperty(ref _testStatus, value); set => SetProperty(ref _testStatus, value);
} }
private DeviceInfoModel? _selectedDevice;
public DeviceInfoModel? SelectedDevice public DeviceInfoModel? SelectedDevice
{ {
get => _selectedDevice; get => _selectedDevice;
@@ -29,26 +33,23 @@ namespace SettingModule.ViewModels
} }
} }
} }
private ObservableCollection<DeviceInfoModel> _deviceList;
public ObservableCollection<DeviceInfoModel> DeviceList public ObservableCollection<DeviceInfoModel> DeviceList
{ {
get { return _deviceList; } get => _deviceList;
set { SetProperty(ref _deviceList,value); } set => SetProperty(ref _deviceList, value);
} }
private string _statusMessage = "请在左侧选择设备查看 / 编辑配置";
public string StatusMessage public string StatusMessage
{ {
get => _statusMessage; get => _statusMessage;
set => SetProperty(ref _statusMessage, value); set => SetProperty(ref _statusMessage, value);
} }
#endregion
#region 私有字段
private readonly IScopedProvider _scope;
private readonly SystemConfig _systemConfig;
private ScopedContext _scopedContext { get; }
private GlobalInfo GlobalInfoRef { get; }
public ObservableCollection<string> ConnectionTypes { get; } = new()
{
"None", "TCP", "Serial"
};
#endregion #endregion
#region 命令 #region 命令
@@ -57,32 +58,25 @@ namespace SettingModule.ViewModels
public ICommand ResetCommand { get; } public ICommand ResetCommand { get; }
public ICommand OpenConnectionConfigCommand { get; } public ICommand OpenConnectionConfigCommand { get; }
#endregion #endregion
#region 私有字段
public ObservableCollection<string> ConnectionTypes { get; } = new() private IScopedProvider _scope;
{ private SystemConfig _systemConfig;
"None", "TCP", "Serial" private ScopedContext _scopedContext { get; set; }
}; private GlobalInfo _globalInfo { get; }
private bool IsInitiated = false;
private string _testStatus = string.Empty;
private DeviceInfoModel? _selectedDevice;
private ObservableCollection<DeviceInfoModel> _deviceList;
private string _statusMessage = "请在左侧选择设备查看 / 编辑配置";
#endregion
public SettingViewModel(IContainerExtension container) : base(container) public SettingViewModel(IContainerExtension container) : base(container)
{ {
_scope = container.CreateScope(); _globalInfo = container.Resolve<GlobalInfo>();
GlobalInfoRef = container.Resolve<GlobalInfo>();
_scopedContext = _scope.Resolve<ScopedContext>();
_systemConfig = _scope.Resolve<SystemConfig>();
// 直接复用 SystemConfig 的 DeviceList，外部修改可同步反映
DeviceList = _systemConfig.DeviceList;
RefreshCommand = new DelegateCommand(OnExpand); RefreshCommand = new DelegateCommand(OnExpand);
SaveCommand = new DelegateCommand(OnSave); SaveCommand = new DelegateCommand(OnSave);
ResetCommand = new DelegateCommand(OnReset); ResetCommand = new DelegateCommand(OnReset);
OpenConnectionConfigCommand = new DelegateCommand(OnOpenConnectionConfig); OpenConnectionConfigCommand = new DelegateCommand(OnOpenConnectionConfig);
// 进来默认选中第一个，让右侧不为空
if (DeviceList.Count > 0)
{
SelectedDevice = DeviceList[0];
}
} }
public void Dispose() public void Dispose()
@@ -90,7 +84,7 @@ namespace SettingModule.ViewModels
_scope?.Dispose(); _scope?.Dispose();
} }
#region 命令处理 #region 命令
/// <summary> /// <summary>
/// 选中设备切换：右侧配置面板靠 SelectedDevice 绑定自动刷新， /// 选中设备切换：右侧配置面板靠 SelectedDevice 绑定自动刷新，
/// 这里只负责更新状态栏提示。 /// 这里只负责更新状态栏提示。
@@ -109,8 +103,8 @@ namespace SettingModule.ViewModels
private void OnExpand() private void OnExpand()
{ {
if (string.IsNullOrEmpty(TestStatus)) return; if (string.IsNullOrEmpty(TestStatus)) return;
_globalInfo.CurrentScope = TestStatus;
_eventAggregator.GetEvent<ExpandViewEvent>().Publish(TestStatus); _eventAggregator.GetEvent<ExpandViewEvent>().Publish(TestStatus);
GlobalInfoRef.CurrentScope = TestStatus;
} }
/// <summary>保存当前选中设备的配置（占位，实际写盘逻辑后续接入）。</summary> /// <summary>保存当前选中设备的配置（占位，实际写盘逻辑后续接入）。</summary>
@@ -159,7 +153,13 @@ namespace SettingModule.ViewModels
return; return;
} }
var p = new DialogParameters { { "Device", SelectedDevice } }; // 【关键修改】在此处将选中的设备以及隔离作用域内的 _systemConfig 一并传进弹窗
var p = new DialogParameters
{
{ "Device", SelectedDevice },
{ "SystemConfig", _systemConfig }
};
_dialogService.ShowDialog(dialogName, p, r => _dialogService.ShowDialog(dialogName, p, r =>
{ {
if (r.Result == ButtonResult.OK) if (r.Result == ButtonResult.OK)
@@ -170,15 +170,25 @@ namespace SettingModule.ViewModels
} }
#endregion #endregion
#region 导航 #region 重写
public override void OnNavigatedTo(NavigationContext navigationContext) public override void OnNavigatedTo(NavigationContext navigationContext)
{ {
base.OnNavigatedTo(navigationContext); base.OnNavigatedTo(navigationContext);
if (navigationContext.Parameters.ContainsKey("Name")) if (!IsInitiated && navigationContext.Parameters.ContainsKey("Name"))
{ {
TestStatus = navigationContext.Parameters.GetValue<string>("Name"); TestStatus = navigationContext.Parameters.GetValue<string>("Name");
_scope = _globalInfo.ScopeDic[TestStatus];
_scopedContext = _globalInfo.ContextDic[TestStatus];
_systemConfig = _scope.Resolve<SystemConfig>();
DeviceList = _systemConfig.DeviceList;
if (DeviceList != null && DeviceList.Count > 0)
{
SelectedDevice = DeviceList[0];
}
IsInitiated = true;
} }
} }
#endregion #endregion
} }
} }

2
UIShare/GlobalVariable/GlobalInfo.cs
View File

@@ -11,6 +11,7 @@ namespace UIShare.GlobalVariable
public event EventHandler? ScopeChanged; public event EventHandler? ScopeChanged;
public Dictionary<string,ScopedContext> ContextDic { get; set; } public Dictionary<string,ScopedContext> ContextDic { get; set; }
public Dictionary<string,StepRunning> StepRunningDic { get; set; } public Dictionary<string,StepRunning> StepRunningDic { get; set; }
public Dictionary<string, IScopedProvider> ScopeDic { get; set; }
public String UserName { get; set; } = "Not Logged in"; public String UserName { get; set; } = "Not Logged in";
public bool IsAdmin { get; set; } = true; public bool IsAdmin { get; set; } = true;
private string _currentScope = "default"; private string _currentScope = "default";
@@ -30,6 +31,7 @@ namespace UIShare.GlobalVariable
{ {
ContextDic = new(); ContextDic = new();
StepRunningDic = new(); StepRunningDic = new();
ScopeDic = new();
CurrentScope = "default"; CurrentScope = "default";
} }