From 9eb94e9eec2e2e164698e34d0481d66093c8655b Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 15 一月 2025 17:40:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/00-core/HydroVisualListCtrl.cs | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/00-core/HydroVisualListCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/00-core/HydroVisualListCtrl.cs
index 1660e39..8058039 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/00-core/HydroVisualListCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/00-core/HydroVisualListCtrl.cs
@@ -27,10 +27,6 @@
{
this.HydroChangedViewEvent?.Invoke(viewList);
};
- ctrl.ParterChangedEvent += (parter, changeType) =>
- {
- this.ParterChangedEvent?.Invoke(parter, changeType);
- };
}
}
}
@@ -53,11 +49,6 @@
public event Action<List<HydroVisualViewModel>> HydroChangedViewEvent;
/// <summary>
- /// 鏋勪欢鏀瑰彉浜嬩欢
- /// </summary>
- public event Action<HydroParterInfo, eChangeType> ParterChangedEvent;
-
- /// <summary>
/// 鍒楄〃涓虹┖鏃堕殣钘廝age
/// </summary>
[Browsable(true)]
@@ -73,24 +64,41 @@
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(Yw.Model.HydroModelInfo hydroInfo)
+ public void SetBindingData
+ (
+ Yw.Model.HydroModelInfo hydroInfo,
+ HydroChangeHelper changeHelper = null,
+ HydroPropStatusHelper propStatusHelper = null
+ )
{
- this.SetBindingData(hydroInfo, allCalcuResultVisualDict: null);
+ this.SetBindingData(hydroInfo, allCalcuResultVisualDict: null, changeHelper, propStatusHelper);
}
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(Yw.Model.HydroModelInfo hydroInfo, List<HydroCalcuVisualResult> allCalcuResultList)
+ public void SetBindingData
+ (
+ Yw.Model.HydroModelInfo hydroInfo,
+ List<HydroCalcuVisualResult> allCalcuResultList,
+ HydroChangeHelper changeHelper = null,
+ HydroPropStatusHelper propStatusHelper = null
+ )
{
var allCalcuResultVisualDict = allCalcuResultList?.ToDictionary(x => x.Code);
- SetBindingData(hydroInfo, allCalcuResultVisualDict);
+ SetBindingData(hydroInfo, allCalcuResultVisualDict, changeHelper, propStatusHelper);
}
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(Yw.Model.HydroModelInfo hydroInfo, Dictionary<string, HydroCalcuVisualResult> allCalcuResultVisualDict)
+ public void SetBindingData
+ (
+ Yw.Model.HydroModelInfo hydroInfo,
+ Dictionary<string, HydroCalcuVisualResult> allCalcuResultVisualDict,
+ HydroChangeHelper changeHelper = null,
+ HydroPropStatusHelper propStatusHelper = null
+ )
{
if (hydroInfo == null)
{
@@ -100,7 +108,7 @@
{
if (page.Controls[0] is IHydroVisualList ctrl)
{
- ctrl.SetBindingData(hydroInfo, allCalcuResultVisualDict);
+ ctrl.SetBindingData(hydroInfo, allCalcuResultVisualDict, changeHelper, propStatusHelper);
if (HidePageWhenListIsNull)
{
if (!ctrl.HasHydroList)
@@ -115,7 +123,12 @@
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
- public void SetBindingData(List<HydroVisualViewModel> allVisualViewModelList)
+ public void SetBindingData
+ (
+ List<HydroVisualViewModel> allVisualViewModelList,
+ HydroChangeHelper changeHelper = null,
+ HydroPropStatusHelper propStatusHelper = null
+ )
{
if (allVisualViewModelList == null || allVisualViewModelList.Count < 1)
{
@@ -125,7 +138,7 @@
{
if (page.Controls[0] is IHydroVisualList ctrl)
{
- ctrl.SetBindingData(allVisualViewModelList);
+ ctrl.SetBindingData(allVisualViewModelList, changeHelper, propStatusHelper);
if (HidePageWhenListIsNull)
{
if (!ctrl.HasHydroList)
--
Gitblit v1.9.3