优化项目结构

alielie

2025-11-24 9211ec11c112e18cd99e77f889a01110a70031ce

 HMI.AlermInfoManage/Modal/AlarmSettingModal.xaml.cs

@@ -1,6 +1,6 @@
using HMI.AlarmInfoManage.Entity;
using HMI.Core.Util;
using HMI.UI;
using HMI.UI.DpUtil;
using HMI.UI.Util;
using log4net;
using Panuon.WPF.UI;
@@ -8,6 +8,7 @@
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Linq;
using System.Windows;

namespace HMI.AlarmInfoManage
{
@@ -56,7 +57,7 @@
                catch (Exception ex)
                {
                    log.Error("AlarmSetting Form Submit Failed.", ex);
                    ToastHelper.Error(this, $"未知异常！{ex.Message}");
                    ToastHelper.Error(this, $"Error: {ex.Message}");
                    e.Cancel = true;
                    return;
                }
@@ -72,10 +73,9 @@
        public bool ValidateDBAddress(object value, out string err)
        {
            err = null;
            int dbAddress = Convert.ToInt32(value);
            if (Datasource.FirstOrDefault(e => e.DBAddress == dbAddress) != null)
            if (Datasource?.FirstOrDefault(e => e.DBAddress == value) != null)
            {
                err = "DB地址已存在";
                err = this.lang("App.MustBeUnique", this.lang("Alm.DbAddress"));
                return false;
            }
            return true;
@@ -86,24 +86,27 @@
            bool flag = FormGroupHelper.ValidateForm(formPanel);
            if (flag)
            {
                Data.DBAddress = Convert.ToInt32(dbAddress.Value);
                Data.StartAddress = Convert.ToInt32(startAddress.Value);
                Data.DBAddress = dbAddress.Text;
                Data.StartAddress = startAddress.Text;
                Data.Length = Convert.ToInt32(length.Value);
                Data.Description = TbDesc.Text;
            }
            return flag;
        }

        public bool? Open(int index, AlarmSetting data,
            ObservableCollection<AlarmSetting> dataSource,
            string filePath)
            string filePath, bool showDescription)
        {
            FgDesc.Visibility = showDescription ? Visibility.Visible : Visibility.Collapsed;
            FilePath = filePath;
            DataIndex = index;
            Data = data;
            Datasource = dataSource;
            dbAddress.Value = Data.DBAddress;
            startAddress.Value = Data.StartAddress;
            dbAddress.Text = Data.DBAddress;
            startAddress.Text = Data.StartAddress;
            length.Value = Data.Length;
            TbDesc.Text = Data.Description;
            return this.ShowDialog();
        }