From 12e606635c42ea20f4b7c2bdda5204237a4b4c96 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 02 三月 2026 16:14:49 +0800
Subject: [PATCH] 优化
---
HMI.ParameterManage/ParameterManage.xaml.cs | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/HMI.ParameterManage/ParameterManage.xaml.cs b/HMI.ParameterManage/ParameterManage.xaml.cs
index 8b6ee33..73685f9 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,13 +24,13 @@
public override void InitFinish()
{
Model = new XmlModel(BaseFolder);
- FileFolder = BaseFolder;
DataContext = Model;
}
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
Model.LoadProducts();
+ Model.LoadParameters();
Loaded -= UserControl_Loaded;
}
@@ -77,6 +76,7 @@
break;
}
}
+
private void OpenProductDialog(ProductData data)
{
var win = new ProductModal(Model)
@@ -84,7 +84,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 +102,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();
}
@@ -158,6 +158,5 @@
Model.LoadParameters();
}
}
-
}
}
--
Gitblit v1.9.1