From 9eb94e9eec2e2e164698e34d0481d66093c8655b Mon Sep 17 00:00:00 2001 From: Shuxia Ning <NingShuxia0927@outlook.com> Date: 星期三, 15 一月 2025 17:40:55 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/Yw.WinFrmUI.Hydro.Core/01-scene/HydroSceneMgrViewModel.cs | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/01-scene/HydroSceneMgrViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/01-scene/HydroSceneMgrViewModel.cs index b66fd68..ea097ca 100644 --- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/01-scene/HydroSceneMgrViewModel.cs +++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/01-scene/HydroSceneMgrViewModel.cs @@ -13,16 +13,31 @@ /// <summary> /// /// </summary> - public HydroSceneMgrViewModel(Yw.Dto.HydroSceneDto rhs) + public HydroSceneMgrViewModel(Yw.Vmo.HydroSceneVmo rhs) { this.ID = rhs.ID; this.Name = rhs.Name; this.Code = rhs.Code; - this.FlagsString = Yw.Untity.FlagsHelper.ToString(rhs.Flags); + this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags); this.TagName = rhs.TagName; this.SortCode = rhs.SortCode; this.Description = rhs.Description; - this.Dto = rhs; + this.Vmo = rhs; + } + + /// <summary> + /// + /// </summary> + public void Reset(Yw.Vmo.HydroSceneVmo rhs) + { + this.ID = rhs.ID; + this.Name = rhs.Name; + this.Code = rhs.Code; + this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags); + this.TagName = rhs.TagName; + this.SortCode = rhs.SortCode; + this.Description = rhs.Description; + this.Vmo = rhs; } /// <summary> @@ -47,7 +62,7 @@ /// 鏍囩 /// </summary> [Display(Name = "鏍囩")] - public string FlagsString { get; set; } + public string Flags { get; set; } /// <summary> /// 鏍囧織 @@ -68,9 +83,9 @@ public string Description { get; set; } /// <summary> - /// Dto + /// Vmo /// </summary> - [Display(Name = "Dto")] - public Yw.Dto.HydroSceneDto Dto { get; set; } + [Display(Name = "Vmo")] + public Yw.Vmo.HydroSceneVmo Vmo { get; set; } } } -- Gitblit v1.9.3