From 5fcc843704ca90c742b578aa5898acf0097f753b Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 24 十月 2024 10:15:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/99-common/PumpParallelChartDlg.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/99-common/PumpParallelChartDlg.cs b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/99-common/PumpParallelChartDlg.cs
index cdaac14..38eaa63 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/99-common/PumpParallelChartDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/99-common/PumpParallelChartDlg.cs
@@ -14,7 +14,7 @@
{
var list = this.pumpParallelInfoCtrl1.GetRunList();
SetParallel(list);
- };
+ };
this.pumpParallelInfoCtrl1.SetInfoEvent += (id, name, color) =>
{
this.pumpSerialParallelChart.SetInfo(id, name, color);
@@ -46,7 +46,7 @@
var list = this.pumpParallelInfoCtrl1.GetRunList();
SetParallel(list);
};
- this.pumpParallelInfoCtrl1.SaveEvent += () =>
+ this.pumpParallelInfoCtrl1.SaveEvent += () =>
{
var run_list = this.pumpParallelInfoCtrl1.GetRunList();
var list = new List<XhsSingleResultViewModel>();
@@ -64,12 +64,16 @@
list.Add(vm);
}
}
- this.ReloadDataEvent?.Invoke(list);
+ var bol = this.ReloadDataEvent?.Invoke(list);
+ if (bol.HasValue && bol.Value)
+ {
+ this.Close();
+ }
};
}
private string _parallel_id = "parallel";
- public event Func<List<XhsSingleResultViewModel>, Task<bool>> ReloadDataEvent;
+ public event Func<List<XhsSingleResultViewModel>, bool> ReloadDataEvent;
/// <summary>
--
Gitblit v1.9.3