From 9cdc1a0ed62b3672b63f065e2e2a98d46f966430 Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期三, 11 十二月 2024 18:15:21 +0800 Subject: [PATCH] 修改图片高度问题 --- WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/02-visual/HydroVisualViewModel.cs | 38 ++++++++++++++------------------------ 1 files changed, 14 insertions(+), 24 deletions(-) diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/02-visual/HydroVisualViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/02-visual/HydroVisualViewModel.cs index 350f349..23ac9ca 100644 --- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/02-visual/HydroVisualViewModel.cs +++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/02-visual/HydroVisualViewModel.cs @@ -15,42 +15,36 @@ /// </summary> public HydroVisualViewModel(Yw.Model.HydroVisualInfo rhs, Yw.Model.HydroModelInfo hydroInfo) : base(rhs, hydroInfo) { - this.FlowDirection = rhs.FlowDirection; - this.UpdatePropStatus(nameof(this.FlowDirection), rhs, nameof(rhs.FlowDirection)); - this.FlowDirectionX = rhs.FlowDirectionX; + this.FlowDirectionX = HydroFlowDirectionHelper.GetName(rhs.FlowDirectionX); this.UpdatePropStatus(nameof(this.FlowDirectionX), rhs, nameof(rhs.FlowDirectionX)); - this.FlowDirectionY = rhs.FlowDirectionY; + this.FlowDirectionY = HydroFlowDirectionHelper.GetName(rhs.FlowDirectionY); this.UpdatePropStatus(nameof(this.FlowDirectionY), rhs, nameof(rhs.FlowDirectionY)); this.Vmo = rhs; } - /// <summary> - /// 娴佸悜 - /// </summary> - [Category("鎷撴墤缁撴瀯")] - [DisplayName("娴佸悜")] - [PropertyOrder(101)] - [Browsable(true)] - public virtual int FlowDirection { get; set; } /// <summary> /// X娴佸悜 /// </summary> [Category("鎷撴墤缁撴瀯")] [DisplayName("X娴佸悜")] - [PropertyOrder(102)] + [HydroFlowDirectionPro] + [PropertyOrder(101)] [Browsable(true)] - public virtual int FlowDirectionX { get; set; } + [TypeConverter(typeof(HydroFlowDirectionConverter))] + public virtual string FlowDirectionX { get; set; } /// <summary> /// Y娴佸悜 /// </summary> [Category("鎷撴墤缁撴瀯")] [DisplayName("Y娴佸悜")] - [PropertyOrder(103)] + [HydroFlowDirectionPro] + [PropertyOrder(102)] [Browsable(true)] - public virtual int FlowDirectionY { get; set; } + [TypeConverter(typeof(HydroFlowDirectionConverter))] + public virtual string FlowDirectionY { get; set; } /// <summary> /// vmo @@ -64,11 +58,9 @@ public override void UpdateProperty() { base.UpdateProperty(); - this.FlowDirection = this.Vmo.FlowDirection; - this.UpdatePropStatus(nameof(this.FlowDirection), this.Vmo, nameof(this.Vmo.FlowDirection)); - this.FlowDirectionX = this.Vmo.FlowDirectionX; + this.FlowDirectionX = HydroFlowDirectionHelper.GetName(this.Vmo.FlowDirectionX); this.UpdatePropStatus(nameof(this.FlowDirectionX), this.Vmo, nameof(this.Vmo.FlowDirectionX)); - this.FlowDirectionY = this.Vmo.FlowDirectionY; + this.FlowDirectionY = HydroFlowDirectionHelper.GetName(this.Vmo.FlowDirectionY); this.UpdatePropStatus(nameof(this.FlowDirectionY), this.Vmo, nameof(this.Vmo.FlowDirectionY)); } @@ -78,11 +70,9 @@ public override void UpdateVmoProperty() { base.UpdateVmoProperty(); - this.Vmo.FlowDirection = this.FlowDirection; - this.Vmo.UpdatePropStatus(nameof(this.Vmo.FlowDirection), this, nameof(this.FlowDirection)); - this.Vmo.FlowDirectionX = this.FlowDirectionX; + this.Vmo.FlowDirectionX = HydroFlowDirectionHelper.GetCode(this.FlowDirectionX); this.Vmo.UpdatePropStatus(nameof(this.Vmo.FlowDirectionX), this, nameof(this.FlowDirectionX)); - this.Vmo.FlowDirectionY = this.FlowDirectionY; + this.Vmo.FlowDirectionY = HydroFlowDirectionHelper.GetCode(this.FlowDirectionY); this.Vmo.UpdatePropStatus(nameof(this.Vmo.FlowDirectionY), this, nameof(this.FlowDirectionY)); } -- Gitblit v1.9.3