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/ProductModal.xaml.cs | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/HMI.ParameterManage/ProductModal.xaml.cs b/HMI.ParameterManage/ProductModal.xaml.cs
index 53eea7b..9210a3d 100644
--- a/HMI.ParameterManage/ProductModal.xaml.cs
+++ b/HMI.ParameterManage/ProductModal.xaml.cs
@@ -1,20 +1,13 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Windows;
-using Microsoft.Win32;
-using Panuon.WPF.UI;
-using HMI.Core.Annotation;
-using HMI.Core.Entity;
-using HMI.Core.Exceptions;
-using HMI.Core.Util;
-using HMI.ParameterManage.Entity;
-using HMI.UI;
+锘縰sing HMI.Core.Entity;
using HMI.ParameterManage.Model;
using HMI.UI.DpUtil;
+using HMI.UI.Util;
+using Panuon.WPF.UI;
+using System;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
namespace HMI.ParameterManage
{
@@ -62,7 +55,7 @@
}
catch (Exception ex)
{
- Panuon.WPF.UI.Toast.Show(this, "Error锛�", ToastPosition.Top);
+ ToastHelper.Error(this, $"Error: {ex.Message}");
e.Cancel = true;
return;
}
@@ -87,16 +80,20 @@
{
Data.Name = TbName.Text;
Data.IsMaster = TbIsMaster.IsChecked == true;
+ Data.ParentId = CbParent.Text;
}
return flag;
}
- public bool? Open(ProductData data)
+ public bool? Open(ProductData data, bool isEdit)
{
Data = data;
TbName.Text = Data.Name;
TbIsMaster.IsChecked = Data.IsMaster;
- TbParentId.Text = Data.ParentId;
+ FgParentId.Visibility = isEdit ? Visibility.Collapsed : Visibility.Visible;
+
+ CbParent.ItemsSource = DataModel.Products.Select(e => e.Name).ToList();
+ //TbParentId.Text = Data.ParentId;
return this.ShowDialog();
}
--
Gitblit v1.9.1