From 5dd7ab9852c9a5659cc916e9ed986b5099efeaf8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 23 十月 2024 13:04:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.cs | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.cs
index 7e00a0f..03fbaad 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.cs
@@ -12,15 +12,19 @@
InitializeComponent();
}
- public event Func<Yw.Vmo.SysPropVmo, Task<bool>> ReloadDataEvent;
+ public event Func<Yw.Vmo.SysPropVmo, string, string, Task<bool>> ReloadDataEvent; //灞炴�х被, 缁勫悕,灞炴�у��
private Yw.Vmo.SysPropVmo _AddPropDto { get; set; }
+ private Yw.BLL.SysPropMapping _bll = null;
+
+ private long _catalogId;
/// <summary>
/// 鍒濆鍖栨暟鎹�
/// </summary>
public async void SetBindingData(long CatalogID)
{
+ _catalogId = CatalogID;
var catalogVmo = await new Yw.BLL.SysCatalog().GetByID(CatalogID);
if (catalogVmo == null)
return;
@@ -41,12 +45,12 @@
this.dxErrorProvider1.ClearErrors();
if (imageComboBoxEditPropGroup.EditValue == null)
{
- this.dxErrorProvider1.SetError(imageComboBoxEditPropGroup, "涓嶈兘涓虹┖!");
+ this.dxErrorProvider1.SetError(imageComboBoxEditPropGroup, "蹇呭～椤�!");
isContinue = false;
}
- if (textEditName.Text == null)
+ if (textEditName.EditValue == null)
{
- this.dxErrorProvider1.SetError(textEditName, "涓嶈兘涓虹┖!");
+ this.dxErrorProvider1.SetError(textEditName, "蹇呭～椤�!");
isContinue = false;
}
return isContinue;
@@ -90,7 +94,8 @@
{
_AddPropDto.Format = (Yw.Basic.ePropFormat)ePropFormat.Boolen;
}
- if (await this.ReloadDataEvent.Invoke(_AddPropDto))
+ var selected = (ImageComboBoxItem)this.imageComboBoxEditPropGroup.SelectedItem;
+ if (await this.ReloadDataEvent.Invoke(_AddPropDto, selected.Description, TextEditValue.Text))
{
MessageBoxHelper.ShowSuccess("娣诲姞鎴愬姛!");
}
--
Gitblit v1.9.3