From a2ad15911dcde2d45cd546d5b8d7fb791f7afafd Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 17 十二月 2024 09:04:18 +0800
Subject: [PATCH] 优化计算属性

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/02-tank/00-core/HydroTankViewModel.cs |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/02-tank/00-core/HydroTankViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/02-tank/00-core/HydroTankViewModel.cs
index 9f88a5b..01b387b 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/02-tank/00-core/HydroTankViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/02-tank/00-core/HydroTankViewModel.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// 姘存睜瑙嗗浘
     /// </summary>
-    public class HydroTankViewModel : HydroSourceViewModel
+    public class HydroTankViewModel : HydroSourceViewModel, IHydroCalcuTankResult
     {
         /// <summary>
         /// 
@@ -31,8 +31,6 @@
             this.UpdatePropStatus(nameof(this.VolCurve), rhs, nameof(rhs.VolCurve));
             this.OverFlow = rhs.OverFlow;
             this.UpdatePropStatus(nameof(this.OverFlow), rhs, nameof(rhs.OverFlow));
-
-            this.Vmo = rhs;
         }
 
         /// <summary>
@@ -114,7 +112,8 @@
         [DisplayName("瀹圭Н鏇茬嚎")]
         [Display(Name = "瀹圭Н鏇茬嚎")]
         [PropertyOrder(1007)]
-        [HydroCurvePro(HydroCurve.Tank)]
+        [HydroCurvePro(HydroCurve.Tank, HydroCurveType.CurveVol)]
+        [ShowEditorInView(true)]
         [Browsable(true)]
         public string Curve
         {
@@ -135,7 +134,8 @@
         [DisplayName("瀹圭Н鏇茬嚎")]
         [Display(Name = "瀹圭Н鏇茬嚎")]
         [PropertyOrder(1008)]
-        [HydroCurvePro(HydroCurve.TankVol)]
+        [HydroCurvePro(HydroCurve.TankVol, HydroCurveType.CurveVol)]
+        [ShowEditorInView(true)]
         [Browsable(false)]
         public string VolCurve { get; set; }
 
@@ -153,7 +153,11 @@
         /// 
         /// </summary>
         [Browsable(false)]
-        public new Yw.Model.HydroTankInfo Vmo { get; set; }
+        public new Yw.Model.HydroTankInfo Vmo
+        {
+            get { return _vmo as Yw.Model.HydroTankInfo; }
+            set { _vmo = value; }
+        }
 
         /// <summary>
         /// 

--
Gitblit v1.9.3