From f7d479db638f3d9e3aeb05ec82dc2818f14bf903 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期一, 24 三月 2025 17:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI/03-elecPrice/EditElectricDlg.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI/03-elecPrice/EditElectricDlg.cs b/WinFrmUI/PBS.WinFrmUI/03-elecPrice/EditElectricDlg.cs
index e7917fb..37ad019 100644
--- a/WinFrmUI/PBS.WinFrmUI/03-elecPrice/EditElectricDlg.cs
+++ b/WinFrmUI/PBS.WinFrmUI/03-elecPrice/EditElectricDlg.cs
@@ -20,20 +20,20 @@
InitializeComponent();
}
- public event Func<List<ElecPriceHourSetting>, bool> ReLoadDataevent;
+ public event Func<List<Vmo.ElecPriceHourSetting>, Task<bool>> ReLoadDataevent;
- private BindingList<ElecPriceHourSetting> _allBindingHour = null;
+ private BindingList<Vmo.ElecPriceHourSetting> _allBindingHour = null;
- public void SetBindingData(List<ElecPriceHourSetting> elepriceHour)
+ public void SetBindingData(List<Vmo.ElecPriceHourSetting> elepriceHour)
{
if (elepriceHour == null)
return;
- _allBindingHour = new BindingList<ElecPriceHourSetting>();
+ _allBindingHour = new BindingList<Vmo.ElecPriceHourSetting>();
if (elepriceHour != null && elepriceHour.Any())
{
foreach (var item in elepriceHour)
{
- var model = new Model.ElecPriceHourSetting(item);
+ var model = new Vmo.ElecPriceHourSetting(item);
_allBindingHour.Add(model);
}
}
@@ -71,19 +71,19 @@
}
//纭畾
- private void btnOk_Click(object sender, EventArgs e)
+ private async void btnOk_Click(object sender, EventArgs e)
{
if (!Virify())
return;
- var Eleprice = new List<ElecPriceHourSetting>(_allBindingHour);
- var isok = this.ReLoadDataevent.Invoke(Eleprice);
+ var Eleprice = new List<Vmo.ElecPriceHourSetting>(_allBindingHour);
+ var isok = await this.ReLoadDataevent.Invoke(Eleprice);
if (isok == false)
{
- XtraMessageBox.Show("娣诲姞澶辫触");
+ XtraMessageBox.Show("缂栬緫澶辫触");
return;
}
- XtraMessageBox.Show("娣诲姞鎴愬姛");
- this.DialogResult = System.Windows.Forms.DialogResult.OK; //纭畾ok,鐒跺悗鍏抽棴
+ XtraMessageBox.Show("缂栬緫鎴愬姛");
+ this.DialogResult = System.Windows.Forms.DialogResult.OK;
this.Close();
}
@@ -92,7 +92,7 @@
{
if (_allBindingHour == null || _allBindingHour.Count < 1)
return;
- var row = this.gridView2.GetFocusedRow() as Model.ElecPriceHourSetting;
+ var row = this.gridView2.GetFocusedRow() as Vmo.ElecPriceHourSetting;
if (row == null)
return;
if (e.Column == this.colDelete)
--
Gitblit v1.9.3