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 |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 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 5d346ab..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
@@ -24,7 +24,7 @@
             this.Code = rhs.Code;
             this.ModelType = rhs.ModelType;
             this.DbId = rhs.DbId;
-            this.Flags = rhs.Flags?.ToList();
+            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
             this.Description = rhs.Description;
         }
 
@@ -36,7 +36,7 @@
         [DisplayName("ID")]
         [PropertyOrder(1)]
         [Browsable(false)]
-        public long ID { get; set; }
+        public virtual long ID { get; set; }
 
         /// <summary>
         /// 鍒嗙被
@@ -45,7 +45,7 @@
         [DisplayName("鍒嗙被")]
         [PropertyOrder(2)]
         [Browsable(true)]
-        public string Catalog { get; set; }
+        public virtual string Catalog { get; set; }
 
         /// <summary>
         /// 鍚嶇О
@@ -54,7 +54,7 @@
         [DisplayName("鍚嶇О")]
         [PropertyOrder(3)]
         [Browsable(true)]
-        public string Name { get; set; }
+        public virtual string Name { get; set; }
 
         /// <summary>
         /// 缂栫爜
@@ -63,7 +63,7 @@
         [DisplayName("缂栫爜")]
         [PropertyOrder(4)]
         [Browsable(true)]
-        public string Code { get; set; }
+        public virtual string Code { get; set; }
 
         /// <summary>
         /// 鍨嬪彿
@@ -72,7 +72,7 @@
         [DisplayName("鍨嬪彿")]
         [PropertyOrder(5)]
         [Browsable(true)]
-        public string ModelType { get; set; }
+        public virtual string ModelType { get; set; }
 
         /// <summary>
         /// DbId
@@ -81,7 +81,7 @@
         [DisplayName("DbId")]
         [PropertyOrder(6)]
         [Browsable(false)]
-        public string DbId { get; set; }
+        public virtual string DbId { get; set; }
 
         /// <summary>
         /// 閿佸畾
@@ -90,7 +90,7 @@
         [DisplayName("閿佸畾")]
         [PropertyOrder(7)]
         [Browsable(true)]
-        public bool DbLocked { get; set; }
+        public virtual bool DbLocked { get; set; }
 
         /// <summary>
         /// 鏍囩
@@ -98,8 +98,9 @@
         [Category("鍩虹淇℃伅")]
         [DisplayName("鏍囩")]
         [PropertyOrder(8)]
+        [IsHydroFlagsPro(true)]
         [Browsable(true)]
-        public List<string> Flags { get; set; }
+        public virtual string Flags { get; set; }
 
         /// <summary>
         /// 璇存槑
@@ -109,7 +110,7 @@
         [PropertyOrder(9)]
         [MultiText]
         [Browsable(true)]
-        public string Description { get; set; }
+        public virtual string Description { get; set; }
 
         /// <summary>
         /// 鏇存柊灞炴��
@@ -125,7 +126,7 @@
             this.ModelType = rhs.ModelType;
             this.DbId = rhs.DbId;
             this.DbLocked = rhs.DbLocked;
-            this.Flags = rhs.Flags?.ToList();
+            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
             this.Description = rhs.Description;
         }
 
@@ -133,7 +134,7 @@
         /// 鏇存柊璁＄畻灞炴��
         /// </summary>
         /// <param name="rhs">璁＄畻灞炴��</param>
-        public virtual void UpdateCalcuProperty(IHydroCalcuProperty rhs)
+        public virtual void UpdateCalcuProperty(IHydroCalcuResult rhs)
         {
 
         }

--
Gitblit v1.9.3