cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r649

Browse Source 
SVN-Revision: r649
This commit is contained in:
tdx
2025-05-29 09:44:44 +00:00
parent d110a6b666
commit fda12c3c48
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Main/Control/MainPanelControlEx.cs
+16 -5
View File
@@ -26,6 +26,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Linq; 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.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pl_top_left.BackgroundImage")));
this.pl_top_left.Visible = true; this.pl_top_left.Visible = true;
this.menuMain.Visible = true; this.menuMain.Visible = true;
this.lblSubTitle.Visible = SystemInfo.Instance.HideSubtitle?false:true; this.lblSubTitle.Visible = SystemInfo.Instance.HideSubtitle ? false : true;
this.ResetPanelWidth(); this.ResetPanelWidth();
} }
/// <summary> /// <summary>
@@ -2892,8 +2893,18 @@ namespace Lskj.Main.Control
if (Manager.ModuleForms.ContainsKey(guid)) if (Manager.ModuleForms.ContainsKey(guid))
{ {
Form form = m.ModuleForm as Form; 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; bool isclose = true;
try try
{ {
@@ -3305,7 +3316,7 @@ namespace Lskj.Main.Control
string serverIP = RT["IP"] + ""; string serverIP = RT["IP"] + "";
string dbName = RT["DBName"] + ""; string dbName = RT["DBName"] + "";
string dataBook = RT["ShowName"] + ""; 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)) if (!ToLoginMatching(serverIP, dbName, dataBook, btnSubItem.Text, false, isInternal))
{ {
@@ -3416,7 +3427,7 @@ namespace Lskj.Main.Control
/// <param name="dataBook">当前账套名</param> /// <param name="dataBook">当前账套名</param>
/// <param name="AccountBook">登录帐套</param> /// <param name="AccountBook">登录帐套</param>
/// <param name="Reset">是否为重新登录初始账套</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 try
{ {