From 9211ec11c112e18cd99e77f889a01110a70031ce Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 24 十一月 2025 17:47:15 +0800
Subject: [PATCH] 优化项目结构
---
HMI.ParameterManage/ParameterManage.xaml.cs | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/HMI.ParameterManage/ParameterManage.xaml.cs b/HMI.ParameterManage/ParameterManage.xaml.cs
index 8b6ee33..52ed3f5 100644
--- a/HMI.ParameterManage/ParameterManage.xaml.cs
+++ b/HMI.ParameterManage/ParameterManage.xaml.cs
@@ -1,6 +1,6 @@
锘縰sing HMI.Base;
+using HMI.Core.Entity;
using HMI.Core.Util;
-using HMI.ParameterManage.Entity;
using HMI.ParameterManage.Model;
using HMI.UI.Util;
using System.Linq;
@@ -14,7 +14,6 @@
/// </summary>
public partial class ParameterManage : PluginControl
{
- public static string FileFolder { get; private set; }
private XmlModel Model;
public ParameterManage()
@@ -25,7 +24,6 @@
public override void InitFinish()
{
Model = new XmlModel(BaseFolder);
- FileFolder = BaseFolder;
DataContext = Model;
}
@@ -77,6 +75,7 @@
break;
}
}
+
private void OpenProductDialog(ProductData data)
{
var win = new ProductModal(Model)
@@ -84,7 +83,7 @@
Title = data == null ? this.lang("Pm.Product.Add") : this.lang("Pm.Product.Edit"),
Owner = Window.GetWindow(this),
};
- if (win.Open(data ?? new ProductData()) == true)
+ if (win.Open(data ?? new ProductData(), data != null) == true)
{
Model.LoadProducts();
}
@@ -102,7 +101,7 @@
Title = data == null ? this.lang("Pm.Parameter.Add") : this.lang("Pm.Parameter.Edit"),
Owner = Window.GetWindow(this),
};
- if (win.Open(data ?? new ParameterData { ProductName = Model.SelectedProduct.Name }) == true)
+ if (win.Open(Model.SelectedProduct.Name, data ?? new ParameterData { ProductName = Model.SelectedProduct.Name }, Model.groups) == true)
{
Model.LoadParameters();
}
--
Gitblit v1.9.1