From 6d4874f6d9c271c67d72a62f08985c71f7f8bfac Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 05 十二月 2024 19:02:13 +0800
Subject: [PATCH] 界面修改

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.cs |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.cs
index c8ef05c..8f81ee6 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/EditElbowMainDlg.cs
@@ -64,6 +64,7 @@
             this.TextEditCoefficient.Text = _ElbowVmo.MinorLoss.ToString();
             this.DescriptionTextEdit.Text = _ElbowVmo.Description;
             this.TextEditKeyWorld.Text = string.Join(",", _ElbowVmo.KeyWord);
+            this.selectFlagsPopupCtrl1.SetBindingData<AssetsFlags>(_ElbowVmo.Flags);
         }
 
         public event Func<Vmo.AssetsElbowMainVmo, Task<bool>> ReloadDataEvent = null;
@@ -149,11 +150,22 @@
             _ElbowVmo.Description = DescriptionTextEdit.Text.Trim();
             _ElbowVmo.Name = TextEditName.Text.Trim();
             _ElbowVmo.KeyWord = this.TextEditKeyWorld.Text.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
-            _ElbowVmo.Material = TextEditMaterial.Text.Trim();
+            if (TextEditMaterial.Text != "榛樿")
+            {
+                _ElbowVmo.Material = TextEditMaterial.Text.Trim();
+            }
+            else
+            {
+                _ElbowVmo.Material = string.Empty;
+            }
             if (double.TryParse(TextEditCaliber.Text, out double caliber))
             {
                 _ElbowVmo.Caliber = caliber;
             }
+            else
+            {
+                _ElbowVmo.Caliber = null;
+             }
             if (double.TryParse(TextEditCoefficient.Text, out double Coefficient))
             {
                 _ElbowVmo.MinorLoss = Coefficient;
@@ -163,6 +175,7 @@
                 _ElbowVmo.Angle = angle;
             }
             _ElbowVmo.ElbowType = (eElbowType)this.imageComboBoxEditConnectlenght.EditValue;
+            _ElbowVmo.Flags = this.selectFlagsPopupCtrl1.SelectedFlags;
             if (await this.ReloadDataEvent.Invoke(_ElbowVmo))
             {
                 TipFormHelper.ShowSucceed("淇敼鎴愬姛!");

--
Gitblit v1.9.3