From c4408f6dbef369110f17808808ae45e48726f3f1 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 14 十月 2024 14:27:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/SetHydroMarkCtrl.cs | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/SetHydroMarkCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/SetHydroMarkCtrl.cs
index fee072b..dfe4612 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/SetHydroMarkCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/SetHydroMarkCtrl.cs
@@ -33,15 +33,14 @@
private void btnCancel_Click(object sender, EventArgs e)
{
- var list = this.setHydroMarkPureCtrl1.GetResultList();
- this.ReloadDataEvent?.Invoke(list);
- this.OkEvent?.Invoke();
-
+ this.CancelEvent?.Invoke();
}
private void btnOk_Click(object sender, EventArgs e)
{
- this.CancelEvent?.Invoke();
+ var list = this.setHydroMarkPureCtrl1.GetResultList();
+ this.ReloadDataEvent?.Invoke(list);
+ this.OkEvent?.Invoke();
}
--
Gitblit v1.9.3