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/15-translation/SetHydroTranslationDlg.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/14-pipe/SetHydroPipeDlg.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/15-translation/SetHydroTranslationDlg.cs
similarity index 85%
copy from WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/14-pipe/SetHydroPipeDlg.cs
copy to WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/15-translation/SetHydroTranslationDlg.cs
index a88ed21..c8ab4d7 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/14-pipe/SetHydroPipeDlg.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/15-translation/SetHydroTranslationDlg.cs
@@ -1,36 +1,37 @@
锘縩amespace Yw.WinFrmUI
{
- public partial class SetHydroPipeDlg : DevExpress.XtraEditors.XtraForm
+ public partial class SetHydroTranslationDlg : DevExpress.XtraEditors.XtraForm
{
- public SetHydroPipeDlg()
+ public SetHydroTranslationDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
this.layoutControl1.SetupLayoutControl();
+ this.generalOkAndCancelCtrl1.OkEvent += GeneralOkAndCancelCtrl1_OkEvent;
InitialLinkStatus();
}
/// <summary>
/// 閲嶈浇鏁版嵁浜嬩欢
/// </summary>
- public event Action<List<Yw.Model.HydroPipeInfo>> ReloadDataEvent;
+ public event Action<List<Yw.Model.HydroTranslationInfo>> ReloadDataEvent;
//鎵�鏈夐儴浠跺垪琛�
- private List<Yw.Model.HydroPipeInfo> _allParterList = null;
+ private List<Yw.Model.HydroTranslationInfo> _allParterList = null;
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(Yw.Model.HydroPipeInfo parter)
+ public void SetBindingData(Yw.Model.HydroTranslationInfo parter)
{
- var allParterList = parter == null ? null : new List<Yw.Model.HydroPipeInfo>() { parter };
+ var allParterList = parter == null ? null : new List<Yw.Model.HydroTranslationInfo>() { parter };
this.SetBindingData(allParterList);
}
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(List<Yw.Model.HydroPipeInfo> allParterList)
+ public void SetBindingData(List<Yw.Model.HydroTranslationInfo> allParterList)
{
_allParterList = allParterList;
if (_allParterList != null && _allParterList.Count == 1)
@@ -88,7 +89,7 @@
}
//纭畾
- private void btnOk_Click(object sender, EventArgs e)
+ private void GeneralOkAndCancelCtrl1_OkEvent()
{
if (_allParterList == null || _allParterList.Count < 1)
{
--
Gitblit v1.9.3