SVN r649

SVN-Revision: r649

插件库/Lskj.Main/Control/MainPanelControlEx.cs

@@ -26,6 +26,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
+using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -450,7 +451,7 @@ namespace Lskj.Main.Control
             //this.pl_top_left.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pl_top_left.BackgroundImage")));
             this.pl_top_left.Visible = true;
             this.menuMain.Visible = true;
-            this.lblSubTitle.Visible = SystemInfo.Instance.HideSubtitle?false:true;
+            this.lblSubTitle.Visible = SystemInfo.Instance.HideSubtitle ? false : true;
             this.ResetPanelWidth();
         }
         /// <summary>
@@ -2892,8 +2893,18 @@ namespace Lskj.Main.Control
                         if (Manager.ModuleForms.ContainsKey(guid))
                         {
                             Form form = m.ModuleForm as Form;
-                            if (form != null) form.Close();
-
+                            if (form != null)
+                            {
+                                form.Close();
+                            }
+                            if (m.ModuleInPtr != null)
+                            {
+                                HandleHelper.SendMessage(m.ModuleInPtr, 0x0010, 0, 0);
+                            }
+                            if (m.ModuleProcess != null)
+                            {
+                                m.ModuleProcess.Kill();
+                            }
                             bool isclose = true;
                             try
                             {
@@ -3305,7 +3316,7 @@ namespace Lskj.Main.Control
                     string serverIP = RT["IP"] + "";
                     string dbName = RT["DBName"] + "";
                     string dataBook = RT["ShowName"] + "";
-                    bool isInternal = RT.Table.Columns.Contains("IsInternalNetwork") && !string.IsNullOrEmpty(RT["IsInternalNetwork"] + "")? "1".Equals(RT["IsInternalNetwork"] + "") : false;
+                    bool isInternal = RT.Table.Columns.Contains("IsInternalNetwork") && !string.IsNullOrEmpty(RT["IsInternalNetwork"] + "") ? "1".Equals(RT["IsInternalNetwork"] + "") : false;
 
                     if (!ToLoginMatching(serverIP, dbName, dataBook, btnSubItem.Text, false, isInternal))
                     {
@@ -3416,7 +3427,7 @@ namespace Lskj.Main.Control
         ///  <param name="dataBook">当前账套名</param>
         ///  <param name="AccountBook">登录帐套</param>
         ///  <param name="Reset">是否为重新登录初始账套</param>
-        private bool ToLoginMatching(string serverIP, string dbName, string dataBook, string AccountBook, bool Reset,bool isInternal)
+        private bool ToLoginMatching(string serverIP, string dbName, string dataBook, string AccountBook, bool Reset, bool isInternal)
         {
             try
             {