From 15bbd62b0b24b72c717ae91ab45348a2083ad04e Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 10 十月 2025 08:58:18 +0800
Subject: [PATCH] 优化bug；
---
HMI.ParameterManage/ParameterSetting.xaml.cs | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/HMI.ParameterManage/ParameterSetting.xaml.cs b/HMI.ParameterManage/ParameterSetting.xaml.cs
index b720d3a..4039bf7 100644
--- a/HMI.ParameterManage/ParameterSetting.xaml.cs
+++ b/HMI.ParameterManage/ParameterSetting.xaml.cs
@@ -9,6 +9,7 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
+using System.Text.RegularExpressions;
using System.Windows;
using System.Windows.Controls;
@@ -29,6 +30,8 @@
Set(ref datasource, value);
}
}
+
+ public List<string> groups = new List<string>();
public ParameterSetting()
{
@@ -77,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}");
}
@@ -101,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