From 28999ee3f86d70c5be79f6f6a686c59e56bcad32 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 24 十二月 2024 21:22:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs
index d35beb8..6a6dcb2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs
@@ -59,7 +59,7 @@
/// </summary>
public event Action<HydroVisualInfo> FlowEffectPropertyValueChangedEvent;
- #endregion 浜嬩欢闆�
+ #endregion
#region 灞炴�ц祴鍊�
@@ -81,7 +81,12 @@
set { this.hydroVisualPropertyCtrl1.SelectedObject = value; }
}
- #endregion 灞炴�ц祴鍊�
+ /// <summary>
+ /// 璁＄畻缁撴灉
+ /// </summary>
+ public Func<HydroCalcuResult> CalcuResult { get; set; }
+
+ #endregion
#region 灞炴�ф洿鏂�
@@ -115,7 +120,7 @@
this.hydroVisualPropertyCtrl1.UpdateRows();
}
- #endregion 灞炴�ф洿鏂�
+ #endregion
#region 浜嬩欢瀹炵幇
@@ -455,7 +460,7 @@
pumpViewModel.UpdateProperty();
this.hydroVisualPropertyCtrl1.UpdateRows();
};
- dlg.SetBindingData(pumpViewModel);
+ dlg.SetBindingData(pumpViewModel, this.CalcuResult?.Invoke());
dlg.ShowDialog();
}
break;
@@ -512,7 +517,7 @@
}
}
- #endregion 浜嬩欢瀹炵幇
+ #endregion
#region 浜嬩欢绌块��
@@ -560,6 +565,8 @@
this.FlowEffectPropertyValueChangedEvent?.Invoke(vm?.Vmo);
}
- #endregion 浜嬩欢绌块��
+ #endregion
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3