From 12a6316ffa897b4ce4205f545b88359195b386d6 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 25 九月 2024 17:34:24 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/EditPipeLineMainDlg.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/EditPipeLineMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/EditPipeLineMainDlg.cs
index 0929db7..37b98b3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/EditPipeLineMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/EditPipeLineMainDlg.cs
@@ -43,7 +43,7 @@
}
else
{
- TextEditCaliber.EditValue = _PipeLineVmo.Caliber;
+ TextEditCaliber.EditValue = _PipeLineVmo.Caliber.ToString();
}
this.TextEditName.Text = _PipeLineVmo.Name;
this.DescriptionTextEdit.Text = _PipeLineVmo.Description;
@@ -89,6 +89,10 @@
{
_PipeLineVmo.Caliber = caliber;
}
+ else if (TextEditCaliber.Text == "榛樿")
+ {
+ _PipeLineVmo.Caliber = null;
+ }
if (await this.ReloadDataEvent.Invoke(_PipeLineVmo))
{
TipFormHelper.ShowSucceed("淇敼鎴愬姛!");
--
Gitblit v1.9.3