From 4999c3c3884084c10c8a4bb2426e92cb63600166 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 09 十一月 2024 09:58:22 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/01-reservoir/SetHydroReservoirDlg.cs | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/01-reservoir/SetHydroReservoirDlg.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/01-reservoir/SetHydroReservoirDlg.cs
similarity index 62%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/01-reservoir/SetHydroReservoirDlg.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/01-reservoir/SetHydroReservoirDlg.cs
index 7361640..65ff4c6 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/01-reservoir/SetHydroReservoirDlg.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/01-reservoir/SetHydroReservoirDlg.cs
@@ -7,34 +7,34 @@
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
this.layoutControl1.SetupLayoutControl();
+ this.generalOkAndCancelCtrl1.OkEvent += GeneralOkAndCancelCtrl1_OkEvent;
}
/// <summary>
- /// 杩斿洖鏁版嵁浜嬩欢
+ /// 閲嶈浇鏁版嵁浜嬩欢
/// </summary>
public event Action<List<Yw.Model.HydroReservoirInfo>> ReloadDataEvent;
- //鎵�鏈夋瀯浠跺垪琛�
- private List<Yw.Model.HydroReservoirInfo> _allParterList = null;
+ private List<Yw.Model.HydroReservoirInfo> _allVisualList = null;//鎵�鏈夋瀯浠跺垪琛�
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(Yw.Model.HydroReservoirInfo parter)
+ public void SetBindingData(Yw.Model.HydroReservoirInfo visual)
{
- var allParterList = parter == null ? null : new List<Yw.Model.HydroReservoirInfo>() { parter };
- SetBindingData(allParterList);
+ var allVisualList = visual == null ? null : new List<Yw.Model.HydroReservoirInfo>() { visual };
+ SetBindingData(allVisualList);
}
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(List<Yw.Model.HydroReservoirInfo> allParterList)
+ public void SetBindingData(List<Yw.Model.HydroReservoirInfo> allVisualList)
{
- _allParterList = allParterList;
- if (_allParterList != null && _allParterList.Count == 1)
+ _allVisualList = allVisualList;
+ if (_allVisualList != null && _allVisualList.Count == 1)
{
- var reservoir = _allParterList.FirstOrDefault();
+ var reservoir = _allVisualList.FirstOrDefault();
this.txtHead.EditValue = reservoir.Head;
}
}
@@ -51,10 +51,10 @@
return true;
}
- //
- private void btnOk_Click(object sender, EventArgs e)
+ //纭畾
+ private void GeneralOkAndCancelCtrl1_OkEvent()
{
- if (_allParterList == null || _allParterList.Count < 1)
+ if (_allVisualList == null || _allVisualList.Count < 1)
{
return;
}
@@ -63,12 +63,11 @@
return;
}
var head = double.Parse(this.txtHead.EditValue.ToString());
- _allParterList.ForEach(x => x.Head = head);
- this.ReloadDataEvent?.Invoke(_allParterList);
+ _allVisualList.ForEach(x => x.Head = head);
+ this.ReloadDataEvent?.Invoke(_allVisualList);
this.DialogResult = DialogResult.OK;
this.Close();
}
-
}
--
Gitblit v1.9.3