From 99df058a665ea04065a23e729ec79a2f23f79881 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 20 五月 2025 16:59:43 +0800
Subject: [PATCH] 优化
---
HMI.ParameterManage/SettingModal.xaml.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/HMI.ParameterManage/SettingModal.xaml.cs b/HMI.ParameterManage/SettingModal.xaml.cs
index 4c19f6b..edd574b 100644
--- a/HMI.ParameterManage/SettingModal.xaml.cs
+++ b/HMI.ParameterManage/SettingModal.xaml.cs
@@ -1,5 +1,5 @@
-锘縰sing HMI.Core.Util;
-using HMI.ParameterManage.Entity;
+锘縰sing HMI.Core.Entity;
+using HMI.Core.Util;
using HMI.UI.DpUtil;
using HMI.UI.Util;
using Panuon.WPF.UI;
@@ -67,7 +67,8 @@
public bool ValidateName(object value, out string err)
{
err = null;
- if (Datasource?.FirstOrDefault(e => e.Name == value.ToString()) != null)
+ var data = Datasource?.FirstOrDefault(e => e.Name == value.ToString());
+ if (data != null && data != Data)
{
err = this.lang("App.MustBeUnique", this.lang("Pm.Parameter.Name"));
return false;
@@ -89,8 +90,8 @@
Data.Value = TbValue.Text;
Data.Unit = TbUnit.Text;
Data.Description = TbDescription.Text;
- Data.PGroup = CbGroup.Text;
- Data.Source = CbSource.Text;
+ Data.PGroup = TbGroup.Text;
+ Data.Source = TbSource.Text;
}
return flag;
}
@@ -104,8 +105,8 @@
TbValue.Text = Data.Value;
TbUnit.Text = Data.Unit;
TbDescription.Text = Data.Description;
- CbGroup.SelectedValue = Data.PGroup;
- CbSource.SelectedValue = Data.Source;
+ TbGroup.Text = Data.PGroup;
+ TbSource.Text = Data.Source;
return this.ShowDialog();
}
}
--
Gitblit v1.9.1