From 771a0e7b6b1276087515bbe94de28358cb92963b Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 04 六月 2026 10:32:27 +0800
Subject: [PATCH] 优化老化；
---
HMI.ParameterManage/ParameterManage.xaml.cs | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/HMI.ParameterManage/ParameterManage.xaml.cs b/HMI.ParameterManage/ParameterManage.xaml.cs
index 398bd8b..23e543f 100644
--- a/HMI.ParameterManage/ParameterManage.xaml.cs
+++ b/HMI.ParameterManage/ParameterManage.xaml.cs
@@ -1,11 +1,16 @@
锘縰sing HMI.Base;
using HMI.Core.Entity;
+using HMI.Core.Manager;
using HMI.Core.Util;
using HMI.ParameterManage.Model;
using HMI.UI.Util;
+using NPOI.POIFS.NIO;
+using NPOI.SS.Formula.Functions;
using System.Linq;
+using System.Text.RegularExpressions;
using System.Windows;
using System.Windows.Controls;
+using System.Windows.Markup;
namespace HMI.ParameterManage
{
@@ -30,6 +35,7 @@
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
Model.LoadProducts();
+ Model.LoadParameters();
Loaded -= UserControl_Loaded;
}
@@ -96,13 +102,34 @@
ToastHelper.Warning(Window.GetWindow(this), this.lang("Pm.PleaseSelectProduct"));
return;
}
- var win = new ParameterModal(Model)
+ //var win = new ParameterModal(Model)
+ //{
+ // Title = data == null ? this.lang("Pm.Parameter.Add") : this.lang("Pm.Parameter.Edit"),
+ // Owner = Window.GetWindow(this),
+ //};
+ //if (win.Open(Model.SelectedProduct.Name, data ?? new ParameterData { ProductName = Model.SelectedProduct.Name }, Model.groups) == true)
+ //{
+ // Model.LoadParameters();
+ //}
+
+ SettingModal modal = new SettingModal()
{
Title = data == null ? this.lang("Pm.Parameter.Add") : this.lang("Pm.Parameter.Edit"),
- Owner = Window.GetWindow(this),
+ Owner = Window.GetWindow(this)
};
- if (win.Open(Model.SelectedProduct.Name, data ?? new ParameterData { ProductName = Model.SelectedProduct.Name }) == true)
+ var target = data ?? new ParameterData();
+ if (modal.Open(target, Model.Parameters, Model.groups, Model.SelectedProduct.Name) == true)
{
+ //if (index == -1)
+ //{
+ // Datasource.Add(modal.Data);
+ // ParameterManager.SaveCommonParameter(Datasource);
+ //}
+ //else
+ //{
+ // ParameterManager.SaveCommonParameter(Datasource);
+ //}
+ Model.SaveOrUpdateParameter(target);
Model.LoadParameters();
}
}
@@ -157,6 +184,5 @@
Model.LoadParameters();
}
}
-
}
}
--
Gitblit v1.9.1