From 00f75453f7c1d91e898beb830222f37db6058168 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 14 十月 2024 13:29:00 +0800
Subject: [PATCH] 1

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModel.cs |   88 ++++++++++++++++++++++++++-----------------
 1 files changed, 53 insertions(+), 35 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..efcb4ce 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,6 +1,4 @@
-锘縰sing SqlSugar;
-
-namespace Yw.WinFrmUI
+锘縩amespace Yw.WinFrmUI
 {
     /// <summary>
     /// 姘村姏缁勪欢灞炴�ц鍥�
@@ -11,12 +9,15 @@
         /// <summary>
         /// 
         /// </summary>
-        public HydroParterPropertyViewModel() { }
+        public HydroParterPropertyViewModel()
+        {
+            this.PropStatusList = new List<HydroParterPropStatusViewModel>();
+        }
 
         /// <summary>
         /// 
         /// </summary>
-        public HydroParterPropertyViewModel(Yw.Model.HydroParterInfo rhs)
+        public HydroParterPropertyViewModel(Yw.Model.HydroParterInfo rhs) : this()
         {
             this.ID = rhs.ID;
             this.Catalog = HydroParterCatalogHelper.GetCatalogName(rhs.Catalog);
@@ -24,92 +25,109 @@
             this.Code = rhs.Code;
             this.ModelType = rhs.ModelType;
             this.DbId = rhs.DbId;
-            this.Flags = rhs.Flags?.ToList();
+            this.HasDb = !string.IsNullOrEmpty(rhs.DbId);
+            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
             this.Description = rhs.Description;
+            this.DbLocked = rhs.DbLocked;
         }
 
 
         /// <summary>
         /// ID
         /// </summary>
-        [Category("鍩虹淇℃伅")]
-        [DisplayName("ID")]
-        [PropertyOrder(1)]
         [Browsable(false)]
-        public long ID { get; set; }
+        public virtual long ID { get; set; }
 
         /// <summary>
         /// 鍒嗙被
         /// </summary>
         [Category("鍩虹淇℃伅")]
         [DisplayName("鍒嗙被")]
-        [PropertyOrder(2)]
+        [PropertyOrder(1)]
         [Browsable(true)]
-        public string Catalog { get; set; }
+        [ReadOnly(true)]
+        public virtual string Catalog { get; set; }
 
         /// <summary>
         /// 鍚嶇О
         /// </summary>
         [Category("鍩虹淇℃伅")]
         [DisplayName("鍚嶇О")]
-        [PropertyOrder(3)]
+        [PropertyOrder(2)]
         [Browsable(true)]
-        public string Name { get; set; }
+        public virtual string Name { get; set; }
 
         /// <summary>
         /// 缂栫爜
         /// </summary>
         [Category("鍩虹淇℃伅")]
         [DisplayName("缂栫爜")]
-        [PropertyOrder(4)]
+        [PropertyOrder(3)]
         [Browsable(true)]
-        public string Code { get; set; }
+        [ReadOnly(true)]
+        public virtual string Code { get; set; }
 
         /// <summary>
         /// 鍨嬪彿
         /// </summary>
         [Category("鍩虹淇℃伅")]
         [DisplayName("鍨嬪彿")]
-        [PropertyOrder(5)]
+        [PropertyOrder(4)]
+        [IsHydroModelType]
         [Browsable(true)]
-        public string ModelType { get; set; }
+        public virtual string ModelType { get; set; }
 
         /// <summary>
         /// DbId
         /// </summary>
-        [Category("鍩虹淇℃伅")]
-        [DisplayName("DbId")]
-        [PropertyOrder(6)]
         [Browsable(false)]
-        public string DbId { get; set; }
+        public virtual string DbId { get; set; }
 
         /// <summary>
-        /// 閿佸畾
+        /// 鍖归厤
         /// </summary>
         [Category("鍩虹淇℃伅")]
-        [DisplayName("閿佸畾")]
-        [PropertyOrder(7)]
-        [Browsable(true)]
-        public bool DbLocked { get; set; }
+        [DisplayName("鍖归厤")]
+        [PropertyOrder(5)]
+        [ReadOnly(true)]
+        public virtual bool HasDb { get; set; }
 
         /// <summary>
         /// 鏍囩
         /// </summary>
         [Category("鍩虹淇℃伅")]
         [DisplayName("鏍囩")]
-        [PropertyOrder(8)]
+        [PropertyOrder(6)]
+        [IsHydroFlagsPro(true)]
         [Browsable(true)]
-        public List<string> Flags { get; set; }
+        public virtual string Flags { get; set; }
 
         /// <summary>
         /// 璇存槑
         /// </summary>
         [Category("鍩虹淇℃伅")]
         [DisplayName("璇存槑")]
-        [PropertyOrder(9)]
+        [PropertyOrder(7)]
         [MultiText]
         [Browsable(true)]
-        public string Description { get; set; }
+        public virtual string Description { get; set; }
+
+        /// <summary>
+        /// 閿佸畾
+        /// </summary>
+        [Category("鍩虹淇℃伅")]
+        [DisplayName("閿佸畾")]
+        [PropertyOrder(8)]
+        [Browsable(true)]
+        public virtual bool DbLocked { get; set; }
+
+        /// <summary>
+        /// 灞炴�х姸鎬佸垪琛�
+        /// </summary>
+        [Browsable(false)]
+        public virtual List<HydroParterPropStatusViewModel> PropStatusList { get; set; }
+
+
 
         /// <summary>
         /// 鏇存柊灞炴��
@@ -124,20 +142,20 @@
             this.Code = rhs.Code;
             this.ModelType = rhs.ModelType;
             this.DbId = rhs.DbId;
-            this.DbLocked = rhs.DbLocked;
-            this.Flags = rhs.Flags?.ToList();
+            this.HasDb = !string.IsNullOrEmpty(rhs.DbId);
+            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
             this.Description = rhs.Description;
+            this.DbLocked = rhs.DbLocked;
         }
 
         /// <summary>
         /// 鏇存柊璁＄畻灞炴��
         /// </summary>
         /// <param name="rhs">璁＄畻灞炴��</param>
-        public virtual void UpdateCalcuProperty(IHydroCalcuProperty rhs)
+        public virtual void UpdateCalcuProperty(IHydroCalcuResult rhs)
         {
 
         }
-
 
 
 

--
Gitblit v1.9.3