From c401a2f2fd1a509cdeb33e850bb5c2827074af48 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 17 三月 2025 08:44:51 +0800
Subject: [PATCH] 完善框架,新增两个close方法;

---
 HMI.UI/DpUtil/FormGroupHelper.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/HMI.UI/DpUtil/FormGroupHelper.cs b/HMI.UI/DpUtil/FormGroupHelper.cs
index feda1f9..e6ac850 100644
--- a/HMI.UI/DpUtil/FormGroupHelper.cs
+++ b/HMI.UI/DpUtil/FormGroupHelper.cs
@@ -89,7 +89,7 @@
                 return elementCollection.Count > 0 ? GetValidateValue(elementCollection[0]) : null;
             if (content is TextBox tb) return tb.Text;
             if (content is CheckBox cb) return cb.IsChecked;
-            if (content is ComboBox cBox) return cBox.SelectedValue;
+            if (content is ComboBox cBox) return cBox.SelectedItem ?? cBox.SelectedValue ?? cBox.Text;
 
             if (content is Panel panel) return GetValidateValue(panel.Children);
             if (content is NumberInput numberInput) return numberInput.Value;

--
Gitblit v1.9.1