From a061384ba628a09bf4df91f50321ab22c03129aa Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 18 三月 2025 20:58:36 +0800
Subject: [PATCH] Winform支持遮罩层;

---
 HMI.Base/PluginLoader.cs |   42 ++++++++++++++++++++++++------------------
 1 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/HMI.Base/PluginLoader.cs b/HMI.Base/PluginLoader.cs
index cf98bd3..ae11ccb 100644
--- a/HMI.Base/PluginLoader.cs
+++ b/HMI.Base/PluginLoader.cs
@@ -97,31 +97,36 @@
                         {
                             string dllPath = Path.Combine(PluginFolder, menu.DllPath);
                             Assembly ass = Assembly.LoadFrom(dllPath);
+                            var tss = ass.GetTypes();
                             Type ClassType = ass.GetType(menu.ClassName);
                             object Instance = Activator.CreateInstance(ClassType);
                             menu.Content = Instance;
                             if (Instance is IPlugin plugin)
                             {
-                                plugin.SetLogger(LogManager.GetLogger(menu.Code));
-                                string configFolder = Path.Combine(PathHelper.ConfigFolder, menu.Code);
-                                if (!Directory.Exists(configFolder))
+                            }
+                            else
+                            {
+                                plugin = new PluginPackage(Instance);
+                            }
+                            plugin.SetLogger(LogManager.GetLogger(menu.Code));
+                            string configFolder = Path.Combine(PathHelper.ConfigFolder, menu.Code);
+                            if (!Directory.Exists(configFolder))
+                            {
+                                Directory.CreateDirectory(configFolder);
+                            }
+                            plugin.SetBaseFolder(configFolder);
+                            plugin.InitFinish();
+                            pluginContainer.OnCloseEvent += plugin.OnClose;
+                            pluginContainer.DoCloseEvent += plugin.DoClose;
+                            Type SettingType = ass.GetType($"{menu.ClassName}_Setting");
+                            if (SettingType != null)
+                            {
+                                object SettingInstance = Activator.CreateInstance(SettingType);
+                                if (SettingInstance is IFolderOwner fo)
                                 {
-                                    Directory.CreateDirectory(configFolder);
+                                    fo.SetBaseFolder(configFolder);
                                 }
-                                plugin.SetBaseFolder(configFolder);
-                                plugin.InitFinish();
-                                pluginContainer.OnCloseEvent += plugin.OnClose;
-                                pluginContainer.DoCloseEvent += plugin.DoClose;
-                                Type SettingType = ass.GetType($"{menu.ClassName}_Setting");
-                                if (SettingType != null)
-                                {
-                                    object SettingInstance = Activator.CreateInstance(SettingType);
-                                    if (SettingInstance is IFolderOwner fo)
-                                    {
-                                        fo.SetBaseFolder(configFolder);
-                                    }
-                                    menu.SettingControl = SettingInstance;
-                                }
+                                menu.SettingControl = SettingInstance;
                             }
                         }
                         LoadMessageAppend?.Invoke(this,
@@ -184,6 +189,7 @@
                             {
                                 Code = dr["code"].ToString(),
                                 Name = dr["name"].ToString(),
+                                Type = dr["type"].ToString(),
                                 ParentCode = dr["parentCode"].ToString(),
                                 DllPath = dr["dllPath"].ToString(),
                                 ClassName = dr["className"].ToString(),

--
Gitblit v1.9.1