From 19542281826dbf98a7e4ebf9e7dd4a0c31247c7f Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 10 十月 2024 11:20:17 +0800
Subject: [PATCH] 优化标签显示

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModel.cs |   83 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 72 insertions(+), 11 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModel.cs
index 9175d10..3b75903 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModel.cs
@@ -1,4 +1,6 @@
-锘縩amespace Yw.WinFrmUI
+锘縰sing SqlSugar;
+
+namespace Yw.WinFrmUI
 {
     /// <summary>
     /// 姘村姏缁勪欢灞炴�ц鍥�
@@ -17,10 +19,12 @@
         public HydroParterPropertyViewModel(Yw.Model.HydroParterInfo rhs)
         {
             this.ID = rhs.ID;
-            this.Catalog = HydroPropertyCatalogHelper.GetCatalogName(rhs.Catalog);
+            this.Catalog = HydroParterCatalogHelper.GetCatalogName(rhs.Catalog);
             this.Name = rhs.Name;
             this.Code = rhs.Code;
-            this.Flags = rhs.Flags;
+            this.ModelType = rhs.ModelType;
+            this.DbId = rhs.DbId;
+            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
             this.Description = rhs.Description;
         }
 
@@ -32,7 +36,7 @@
         [DisplayName("ID")]
         [PropertyOrder(1)]
         [Browsable(false)]
-        public long ID { get; set; }
+        public virtual long ID { get; set; }
 
         /// <summary>
         /// 鍒嗙被
@@ -41,7 +45,7 @@
         [DisplayName("鍒嗙被")]
         [PropertyOrder(2)]
         [Browsable(true)]
-        public string Catalog { get; set; }
+        public virtual string Catalog { get; set; }
 
         /// <summary>
         /// 鍚嶇О
@@ -50,7 +54,7 @@
         [DisplayName("鍚嶇О")]
         [PropertyOrder(3)]
         [Browsable(true)]
-        public string Name { get; set; }
+        public virtual string Name { get; set; }
 
         /// <summary>
         /// 缂栫爜
@@ -59,26 +63,83 @@
         [DisplayName("缂栫爜")]
         [PropertyOrder(4)]
         [Browsable(true)]
-        public string Code { get; set; }
+        public virtual string Code { get; set; }
+
+        /// <summary>
+        /// 鍨嬪彿
+        /// </summary>
+        [Category("鍩虹淇℃伅")]
+        [DisplayName("鍨嬪彿")]
+        [PropertyOrder(5)]
+        [Browsable(true)]
+        public virtual string ModelType { get; set; }
+
+        /// <summary>
+        /// DbId
+        /// </summary>
+        [Category("鍩虹淇℃伅")]
+        [DisplayName("DbId")]
+        [PropertyOrder(6)]
+        [Browsable(false)]
+        public virtual string DbId { get; set; }
+
+        /// <summary>
+        /// 閿佸畾
+        /// </summary>
+        [Category("鍩虹淇℃伅")]
+        [DisplayName("閿佸畾")]
+        [PropertyOrder(7)]
+        [Browsable(true)]
+        public virtual bool DbLocked { get; set; }
 
         /// <summary>
         /// 鏍囩
         /// </summary>
         [Category("鍩虹淇℃伅")]
         [DisplayName("鏍囩")]
-        [PropertyOrder(5)]
+        [PropertyOrder(8)]
+        [IsHydroFlagsPro(true)]
         [Browsable(true)]
-        public List<string> Flags { get; set; }
+        public virtual string Flags { get; set; }
 
         /// <summary>
         /// 璇存槑
         /// </summary>
         [Category("鍩虹淇℃伅")]
         [DisplayName("璇存槑")]
-        [PropertyOrder(5)]
+        [PropertyOrder(9)]
         [MultiText]
         [Browsable(true)]
-        public string Description { get; set; }
+        public virtual string Description { get; set; }
+
+        /// <summary>
+        /// 鏇存柊灞炴��
+        /// </summary>
+        /// <param name="rhs">褰撳墠缁勪欢</param>
+        /// <param name="allParterList">鎵�鏈夌粍浠跺垪琛�</param>
+        public virtual void UpdateProperty(Yw.Model.HydroParterInfo rhs, List<Yw.Model.HydroParterInfo> allParterList)
+        {
+            this.ID = rhs.ID;
+            this.Catalog = HydroParterCatalogHelper.GetCatalogName(rhs.Catalog);
+            this.Name = rhs.Name;
+            this.Code = rhs.Code;
+            this.ModelType = rhs.ModelType;
+            this.DbId = rhs.DbId;
+            this.DbLocked = rhs.DbLocked;
+            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
+            this.Description = rhs.Description;
+        }
+
+        /// <summary>
+        /// 鏇存柊璁＄畻灞炴��
+        /// </summary>
+        /// <param name="rhs">璁＄畻灞炴��</param>
+        public virtual void UpdateCalcuProperty(IHydroCalcuResult rhs)
+        {
+
+        }
+
+
 
 
 

--
Gitblit v1.9.3