From 4c3eb7f334abb8129b57e86f2935d75d0b3070b4 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 03 三月 2025 18:55:31 +0800
Subject: [PATCH] 完善UI；新增TestResult;
---
HMI.ParameterManage/ParameterModal.xaml.cs | 66 ++++++---------------------------
1 files changed, 12 insertions(+), 54 deletions(-)
diff --git a/HMI.ParameterManage/ParameterModal.xaml.cs b/HMI.ParameterManage/ParameterModal.xaml.cs
index 6824e14..d30c52d 100644
--- a/HMI.ParameterManage/ParameterModal.xaml.cs
+++ b/HMI.ParameterManage/ParameterModal.xaml.cs
@@ -1,18 +1,11 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Windows;
-using Microsoft.Win32;
-using Panuon.WPF.UI;
-using HMI.Core.Annotation;
-using HMI.Core.Entity;
-using HMI.Core.Exceptions;
-using HMI.Core.Util;
+锘縰sing HMI.Core.Util;
using HMI.ParameterManage.Entity;
-using HMI.UI;
+using HMI.ParameterManage.Model;
+using HMI.UI.DpUtil;
+using Panuon.WPF.UI;
+using System;
+using System.ComponentModel;
+using System.Windows.Interop;
namespace HMI.ParameterManage
{
@@ -21,15 +14,15 @@
/// </summary>
public partial class ParameterModal : WindowX
{
- public ParameterModal()
+ private XmlModel DataModel;
+ public ParameterModal(XmlModel model)
{
+ DataModel = model;
this.DataContext = this;
InitializeComponent();
}
public ParameterData Data { get; set; }
-
- public SqliteHelper sqliteHelper { get; set; }
private bool _isProcessing;
@@ -54,7 +47,7 @@
return;
}
- SaveOrUpdateData();
+ DataModel.SaveOrUpdateParameter(Data);
}
catch (Exception ex)
{
@@ -73,15 +66,7 @@
public bool ValidateName(object value, out string err)
{
- err = null;
- string segment = string.IsNullOrEmpty(Data.Id) ? "" : $" AND id!='{Data.Id}'";
- string sql = $"SELECT 1 FROM parameter WHERE name='{TbName.Text}' AND productName='{Data.ProductName}'{segment};";
- if (sqliteHelper.HasData(sql))
- {
- err = "鍙傛暟鍚嶇О涓嶈兘閲嶅";
- return false;
- }
- return true;
+ return DataModel.ValidateParameterName(value, out err);
}
private bool ValidateForm()
@@ -109,33 +94,6 @@
TbDescription.Text = Data.Description;
TbPGroup.Text = Data.PGroup;
return this.ShowDialog();
- }
-
- private void SaveOrUpdateData()
- {
- if (string.IsNullOrEmpty(Data.Id))
- {
- InsertData(Data);
- }
- else
- {
- UpdateData(Data);
- }
- }
-
- public void InsertData(ParameterData data)
- {
- string sql = $@"INSERT INTO parameter (name,value,unit,description,productName,pGroup)
- VALUES
- ('{data.Name}','{data.Value}','{data.Unit}','{data.Description}','{data.ProductName}','{data.PGroup}');";
- sqliteHelper.ExecuteSql(sql);
- }
-
- public void UpdateData(ParameterData data)
- {
- string sql = $@"UPDATE parameter SET name='{data.Name}',value='{data.Value}',unit='{data.Unit}',
-description='{data.Description}',productName='{data.ProductName}',pGroup='{data.PGroup}' WHERE id='{data.Id}';";
- sqliteHelper.ExecuteSql(sql);
}
}
}
--
Gitblit v1.9.1