From e3868d4d61ded0e76fc8fe3fdacdd9e6d9113cf1 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 13 十月 2025 08:50:15 +0800
Subject: [PATCH] 优化HMI;
---
HMI.ParameterManage/ParameterSetting.xaml.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/HMI.ParameterManage/ParameterSetting.xaml.cs b/HMI.ParameterManage/ParameterSetting.xaml.cs
index 7db5211..4039bf7 100644
--- a/HMI.ParameterManage/ParameterSetting.xaml.cs
+++ b/HMI.ParameterManage/ParameterSetting.xaml.cs
@@ -1,7 +1,7 @@
锘縰sing HMI.Base;
+using HMI.Core.Entity;
+using HMI.Core.Manager;
using HMI.Core.Util;
-using HMI.ParameterManage.Entity;
-using HMI.ParameterManage.Util;
using HMI.UI.Util;
using HMI.Util;
using Microsoft.Win32;
@@ -9,9 +9,9 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
+using System.Text.RegularExpressions;
using System.Windows;
using System.Windows.Controls;
-using System.Windows.Markup;
namespace HMI.ParameterManage
{
@@ -30,6 +30,8 @@
Set(ref datasource, value);
}
}
+
+ public List<string> groups = new List<string>();
public ParameterSetting()
{
@@ -78,10 +80,12 @@
{
Datasource = ParameterManager.GetCommonParameter<ObservableCollection<ParameterData>>()
?? new ObservableCollection<ParameterData>();
+ groups = Datasource.Where(d => !string.IsNullOrEmpty(d.ShowGroup)).Select(d => d.ShowGroup).Distinct().ToList();
}
catch (Exception ex)
{
Datasource = new ObservableCollection<ParameterData>();
+ groups = new List<string>();
log.Error("Refresh Data Failed.", ex);
ToastHelper.Error(Window.GetWindow(this), $"{this.lang("App.RefreshFailed")}: {ex.Message}");
}
@@ -102,7 +106,7 @@
Title = title,
Owner = Window.GetWindow(this)
};
- if (modal.Open(data ?? new ParameterData(), Datasource) == true)
+ if (modal.Open(data ?? new ParameterData(), Datasource, groups) == true)
{
if (index == -1)
{
--
Gitblit v1.9.1