优化老化；

alielie

2026-06-04 771a0e7b6b1276087515bbe94de28358cb92963b

 HMI.ParameterManage/ParameterManage.xaml.cs

@@ -1,11 +1,16 @@
using 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();
            }
        }

    }
}