From 9211ec11c112e18cd99e77f889a01110a70031ce Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 24 十一月 2025 17:47:15 +0800
Subject: [PATCH] 优化项目结构
---
WPFProject/Controls/MainTabControl.xaml.cs | 105 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 86 insertions(+), 19 deletions(-)
diff --git a/WPFProject/Controls/MainTabControl.xaml.cs b/WPFProject/Controls/MainTabControl.xaml.cs
index ea85aaf..39d6077 100644
--- a/WPFProject/Controls/MainTabControl.xaml.cs
+++ b/WPFProject/Controls/MainTabControl.xaml.cs
@@ -1,11 +1,14 @@
-锘縰sing System.Collections.ObjectModel;
+锘縰sing HMI.Base;
+using HMI.Core.Api;
+using Panuon.WPF.UI;
+using Plugin.TestResult_WPF.Model;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Runtime.CompilerServices;
using System.Windows;
using System.Windows.Controls;
-using HMI.Base;
-using HMI.Core.Api;
-using WPFProject.UI;
+using System.Windows.Data;
namespace WPFProject.Controls
{
@@ -33,12 +36,13 @@
}
#endregion
+ private WinFormHolder winFormHolder;
public MainTabControl()
{
- IPlugin plugin = new WorkControl();
- MenuItems = PluginLoader.GetLoader().Menus;
+ MenuItems = new ObservableCollection<PluginInfo>(PluginLoader.GetLoader().Menus);
SubMenuItems = MenuItems[0].Children;
this.DataContext = this;
+ winFormHolder = new WinFormHolder();
InitializeComponent();
}
@@ -87,6 +91,7 @@
}
}
+ private Dictionary<PluginInfo, PluginInfo> selectedCache = new Dictionary<PluginInfo, PluginInfo>();
private ObservableCollection<PluginInfo> _SubMenuItems;
@@ -120,9 +125,9 @@
set { RaiseAndSetIfChanged(ref _MenuVisibility, value); }
}
- public void ChangeItemVisibility()
+ public void ChangeItemVisibility(bool visiable)
{
- MenuVisibility = MenuVisibility == Visibility.Collapsed ? Visibility.Visible : Visibility.Collapsed;
+ MenuVisibility = visiable ? Visibility.Visible : Visibility.Collapsed;
}
private void Menu_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -131,26 +136,88 @@
{
var data = (PluginInfo)e.AddedItems[0];
SubMenuItems = data?.Children;
+ if (selectedCache.ContainsKey(data))
+ {
+ SelectedSubMenu = selectedCache[data];
+ }
+ else if (SubMenuItems.Count > 0)
+ {
+ SelectedSubMenu = SubMenuItems[0];
+ }
}
}
-
- private void SwithMenu(PluginInfo menu)
- {
-
- }
-
private void SubMenu_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (e.AddedItems?.Count > 0)
{
var data = (PluginInfo)e.AddedItems[0];
- var content = (UIElement)data.Content;
- var last = (IPlugin)page.Child;
- last?.DeActive();
- page.Child = content;
- ((IPlugin)content)?.Active();
+ if (SelectedMenu != null)
+ {
+ selectedCache[SelectedMenu] = data;
+ }
+
+ var content = data.Content;
+ var last = page.Child;
+ PluginPackage.Get(last)?.DeActive();
+ if (data.Type == "WinForm")
+ {
+ if (content is System.Windows.Forms.Form form)
+ {
+ winFormHolder.Content = form;
+ }
+ else
+ {
+ winFormHolder.Content = content;
+ }
+ page.Child = winFormHolder;
+ }
+ else
+ {
+ page.Child = (UIElement)content;
+ }
+
+ PluginPackage.Get(content)?.Active();
}
}
+
+ private void UserControl_Loaded(object sender, RoutedEventArgs e)
+ {
+ var ss = ((WindowX)Window.GetWindow(this));
+ Binding binding = new Binding("IsMaskVisible")
+ {
+ Source = ((WindowX)Window.GetWindow(this)),
+ Mode = BindingMode.TwoWay,
+ UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged
+ };
+ winFormHolder.SetBinding(WinFormHolder.MaskVisiableProperty, binding);
+ if (MenuItems != null && MenuItems.Count > 0)
+ {
+ SelectedMenu = MenuItems[0];
+ }
+ Loaded -= UserControl_Loaded;
+ }
+
+ private string alarmInfo;
+ public string AlarmInfo
+ {
+ get => alarmInfo;
+ set
+ {
+ RaiseAndSetIfChanged(ref alarmInfo, value);
+ }
+ }
+
+ private void Button_Click_1(object sender, RoutedEventArgs e)
+ {
+ alarmBorder.Visibility = Visibility.Collapsed;
+ AlarmInfo = string.Empty;
+ }
+
+ public void ShowAlarm(string message)
+ {
+ AlarmInfo = message;
+ alarmBorder.Visibility = Visibility.Visible;
+ }
}
}
--
Gitblit v1.9.1