From 7b903bb86375e9df24a725288d1c876b8d2b0e61 Mon Sep 17 00:00:00 2001
From: chr <chr@mailcom>
Date: 星期一, 03 三月 2025 19:47:49 +0800
Subject: [PATCH] 整合TestResult;

---
 HMI.MenuManage/MenuManage.xaml.cs |   62 ++++++++++++++++--------------
 1 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/HMI.MenuManage/MenuManage.xaml.cs b/HMI.MenuManage/MenuManage.xaml.cs
index 25585e7..1e4a0e5 100644
--- a/HMI.MenuManage/MenuManage.xaml.cs
+++ b/HMI.MenuManage/MenuManage.xaml.cs
@@ -1,5 +1,7 @@
 锘縰sing System;
+using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;
@@ -16,29 +18,8 @@
     /// </summary>
     public partial class MenuManage : PluginControl
     {
-        #region ...
-        public virtual event PropertyChangedEventHandler PropertyChanged;
-
-        protected virtual void RaisePropertyChanged(string name)
-        {
-
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
-        }
-
-        protected void RaiseAndSetIfChanged<T>(ref T old, T @new, [CallerMemberName] string propertyName = null)
-        {
-            old = @new;
-            if (propertyName != null)
-            {
-                RaisePropertyChanged(propertyName);
-            }
-        }
-        #endregion
-
         #region 灞炴��
         private MenuManageModel Model;
-        private ILog log;
-
         #endregion
 
         public MenuManage()
@@ -74,6 +55,7 @@
                 catch (Exception ex)
                 {
                     log.Error("Add Menu Failed.", ex);
+                    ToastHelper.Error(Window.GetWindow(this), $"鏂板澶辫触锛亄ex.Message}");
                 }
             }
             else if (btn.Name == "refreshBtn")
@@ -85,9 +67,34 @@
                 catch (Exception ex)
                 {
                     log.Error("Refresh Menu List Failed.", ex);
+                    ToastHelper.Error(Window.GetWindow(this), $"鍒锋柊澶辫触锛亄ex.Message}");
                 }
             }
-            else if (btn.Name == "deleteBtn") { }
+            else if (btn.Name == "deleteBatchBtn")
+            {
+                try
+                {
+                    List<string> ids = Model.DataSource.Where(x => x.Selected).Select(x => x.Id).ToList();
+                    if (ids == null || ids.Count <= 0)
+                    {
+                        ToastHelper.Warning(Window.GetWindow(this), "璇烽�夋嫨瑕佸垹闄ょ殑鑿滃崟锛�");
+                        return;
+                    }
+
+                    var res = MsgBoxHelper.WarnMessage(Window.GetWindow(this),
+                        $"纭畾鍒犻櫎閫変腑鐨刐{ids.Count}]鏉¤彍鍗曞悧锛熻鎿嶄綔涓嶅彲閫嗭紒");
+                    if (res == MessageBoxResult.OK)
+                    {
+                        Model.DeleteMenuByIds(ids);
+                        Model.LoadData();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    log.Error("Delete Menu Batch Failed.", ex);
+                    ToastHelper.Error(Window.GetWindow(this), $"鍒犻櫎澶辫触锛亄ex.Message}");
+                }
+            }
             else if (btn.Name == "editBtn")
             {
                 try
@@ -107,8 +114,8 @@
                 }
                 catch (Exception ex)
                 {
-
                     log.Error("Edit Menu Failed.", ex);
+                    ToastHelper.Error(Window.GetWindow(this), $"缂栬緫澶辫触锛亄ex.Message}");
                 }
             }
             else if (btn.Name == "delBtn")
@@ -116,7 +123,8 @@
                 try
                 {
                     var data = (MenuData)((Button)sender).DataContext;
-                    var res = MsgBoxHelper.WarnMessage(Window.GetWindow(this), $"纭畾鍒犻櫎[{data.Name}]鍚楋紵璇ユ搷浣滀笉鍙�嗭紒");
+                    var res = MsgBoxHelper.WarnMessage(Window.GetWindow(this),
+                        $"纭畾鍒犻櫎鑿滃崟[{data.Name}]鍚楋紵璇ユ搷浣滀笉鍙�嗭紒");
                     if (res == MessageBoxResult.OK)
                     {
                         Model.DeleteMenuById(data.Id);
@@ -126,6 +134,7 @@
                 catch (Exception ex)
                 {
                     log.Error("Delete Menu Failed.", ex);
+                    ToastHelper.Error(Window.GetWindow(this), $"鍒犻櫎澶辫触锛亄ex.Message}");
                 }
             }
         }
@@ -139,11 +148,6 @@
         private void treeViewer_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
         {
             table.SelectedItem = e.NewValue;
-        }
-
-        public void SetLogger(ILog logger)
-        {
-            this.log = logger;
         }
     }
 }

--
Gitblit v1.9.1