From 80ec78f9c85466b09ac4a4101d5073c26f37021e Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 06 一月 2025 09:14:32 +0800
Subject: [PATCH] 水力计算bug修复
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.cs | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.cs
index 49a7975..8907ace 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.cs
@@ -58,6 +58,16 @@
/// </summary>
public event Action<HydroVisualViewModel> HydroViewEvent;
+ //灞炴�х姸鎬佽緟鍔╃被
+ private HydroPropStatusHelper _propStatusHelper = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨暟鎹�
+ /// </summary>
+ public void InitialData(HydroPropStatusHelper propStatusHelper)
+ {
+ _propStatusHelper = propStatusHelper;
+ }
/// <summary>
/// 鍏佽淇敼
@@ -191,11 +201,11 @@
var vm = GetPropertyViewModel(e.Row);
if (vm != null)
{
- //var propStatus = vm.GetPropStatus(realFieldName);
- //if (propStatus != null)
- //{
- // e.Appearance.ForeColor = HydroPropStatusHelper.GetColor(propStatus.PropStatus);
- //}
+ var propStatusInfo = _propStatusHelper?.GetPropStatusInfo(vm.Code, realFieldName);
+ if (propStatusInfo != null)
+ {
+ e.Appearance.ForeColor = HydroPropStatusColorHelper.GetColor(propStatusInfo.PropStatus);
+ }
}
}
@@ -755,7 +765,7 @@
string caption = string.Empty;
string descrition = string.Empty;
-
+ string realFieldName = fieldName;
//灞炴�ф弿杩板櫒
@@ -775,10 +785,17 @@
{
descrition = descritionAttri.Description;
}
+
+ //鐪熷疄灞炴�у悕绉�
+ var realPropAttri = (HydroRealProAttribute)descriptor.Attributes[typeof(HydroRealProAttribute)];
+ if (realPropAttri != null)
+ {
+ realFieldName = realPropAttri.RealPropName;
+ }
}
- //var propStatus = vm.GetPropStatus(fieldName);
- //this.hydroVisualPropertyDescriptionCtrl1.SetBindingData(caption, descrition, propStatus);
+ var propStatusInfo = _propStatusHelper?.GetPropStatusInfo(vm.Code, realFieldName);
+ this.hydroVisualPropertyDescriptionCtrl1.SetBindingData(caption, descrition, propStatusInfo);
}
--
Gitblit v1.9.3