From 56f8d725e3e195a937da02aff340deeb32e6e5ac Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 13 十二月 2024 14:36:20 +0800
Subject: [PATCH] new bug修复

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/03-junction/01-coupling/00-core/HydroCouplingViewModel.cs |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 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 f82d8ec..c98aa74 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
@@ -8,7 +8,7 @@
         /// <summary>
         /// 
         /// </summary>
-        public HydroCouplingViewModel() : base() { }
+        public HydroCouplingViewModel() { }
 
         /// <summary>
         /// 
@@ -19,8 +19,6 @@
             this.UpdatePropStatus(nameof(this.Material), rhs, nameof(rhs.Material));
             this.Caliber = rhs.Caliber;
             this.UpdatePropStatus(nameof(this.Caliber), rhs, nameof(rhs.Caliber));
-
-            this.Vmo = rhs;
         }
 
 
@@ -29,7 +27,8 @@
         /// </summary>
         [Category("鏁版嵁")]
         [DisplayName("鏉愭枡")]
-        [PropertyOrder(1001)]
+        [Display(Name = "鏉愭枡")]
+        [PropertyOrder(3001)]
         [Browsable(true)]
         public string Material { get; set; }
 
@@ -38,8 +37,9 @@
         /// </summary>
         [Category("鏁版嵁")]
         [DisplayName("鍙e緞")]
-        [PropertyOrder(1002)]
+        [Display(Name = "鍙e緞(mm)")]
         [DisplayUnit("mm")]
+        [PropertyOrder(3002)]
         [Browsable(true)]
         public double? Caliber { get; set; }
 
@@ -47,21 +47,35 @@
         /// 
         /// </summary>
         [Browsable(false)]
-        public new Yw.Model.HydroCouplingInfo Vmo { get; set; }
+        public new Yw.Model.HydroCouplingInfo Vmo
+        {
+            get { return _vmo as Yw.Model.HydroCouplingInfo; }
+            set { _vmo = value; }
+        }
 
         /// <summary>
         /// 
         /// </summary>
-        public override void Update()
+        public override void UpdateProperty()
         {
-            base.Update();
+            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>
+        /// 
+        /// </summary>
+        public override void UpdateVmoProperty()
+        {
+            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