From 00ab1b5282ada6ffdc78b3dd46f0ce08726a51e6 Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期四, 20 三月 2025 13:47:24 +0800
Subject: [PATCH] 优化IBox界面

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/01-coupling/00-core/HydroCouplingViewModel.cs |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/01-coupling/00-core/HydroCouplingViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/01-coupling/00-core/HydroCouplingViewModel.cs
index c98aa74..49a25b9 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/01-coupling/00-core/HydroCouplingViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/01-coupling/00-core/HydroCouplingViewModel.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// 杩炴帴浠跺睘鎬ц鍥�
     /// </summary>
-    public class HydroCouplingViewModel : HydroJunctionViewModel
+    public class HydroCouplingViewModel : HydroJunctionViewModel, IHydroCalcuCouplingResult
     {
         /// <summary>
         /// 
@@ -16,9 +16,7 @@
         public HydroCouplingViewModel(Yw.Model.HydroCouplingInfo rhs, Yw.Model.HydroModelInfo hydroInfo) : base(rhs, hydroInfo)
         {
             this.Material = rhs.Material;
-            this.UpdatePropStatus(nameof(this.Material), rhs, nameof(rhs.Material));
             this.Caliber = rhs.Caliber;
-            this.UpdatePropStatus(nameof(this.Caliber), rhs, nameof(rhs.Caliber));
         }
 
 
@@ -41,7 +39,20 @@
         [DisplayUnit("mm")]
         [PropertyOrder(3002)]
         [Browsable(true)]
-        public double? Caliber { get; set; }
+        public double Caliber { get; set; }
+
+        /// <summary>
+        /// 灞�閮ㄦ崯澶�
+        /// </summary>
+        [Category("璁$畻缁撴灉")]
+        [DisplayName("灞�閮ㄦ崯澶�")]
+        [DisplayUnit("m")]
+        [Display(Name = "灞�閮ㄦ崯澶�(m)")]
+        [HydroCalcuPro]
+        [PropertyOrder(19001)]
+        [ShowEditor(false)]
+        [Browsable(true)]
+        public override double? CalcuMinorLoss { get; set; }
 
         /// <summary>
         /// 
@@ -60,9 +71,7 @@
         {
             base.UpdateProperty();
             this.Material = this.Vmo.Material;
-            this.UpdatePropStatus(nameof(this.Material), this.Vmo, nameof(this.Vmo.Material));
             this.Caliber = this.Vmo.Caliber;
-            this.UpdatePropStatus(nameof(this.Caliber), this.Vmo, nameof(this.Vmo.Caliber));
         }
 
         /// <summary>
@@ -72,9 +81,7 @@
         {
             base.UpdateVmoProperty();
             this.Vmo.Material = this.Material;
-            this.Vmo.UpdatePropStatus(nameof(this.Vmo.Material), this, nameof(this.Material));
             this.Vmo.Caliber = this.Caliber;
-            this.Vmo.UpdatePropStatus(nameof(this.Vmo.Caliber), this, nameof(this.Caliber));
         }
 
 

--
Gitblit v1.9.3