fix(legacy): complete hosted module cleanup

This commit is contained in:
2026-08-29 20:34:39 +08:00
parent 176952d52c
commit 9f5f548dea
15 changed files with 704 additions and 422 deletions
+13 -13
View File
@@ -259,7 +259,7 @@ namespace Lskj.PubAccraditation
if (SystemInfo.Instance.PageOpen)
{
foreach (XtraTabPage tablepage in ERPInfo.Instance.PageControl.TabPages)
foreach (XtraTabPage tablepage in ERPInfo.Instance.ModulePages)
{
int interceptionLocation = tablepage.Text.Length - frm.SysModel.BillDocumentId.Length - 1;
if (interceptionLocation > 0 && tablepage.Text.Length > frm.SysModel.BillDocumentId.Length)
@@ -269,7 +269,7 @@ namespace Lskj.PubAccraditation
if (documentNo.Equals(frm.SysModel.BillDocumentId))
{
MessageUtil.Show("已设置不能打开多个相同模块!");
ERPInfo.Instance.PageControl.SelectedTabPage = tablepage;
ERPInfo.Instance.CurrentModulePage = tablepage;
return;
}
}
@@ -279,7 +279,7 @@ namespace Lskj.PubAccraditation
DllName = "",
Id = SysModel.ModuleId + "",
Name = SysModel.FormText,
BeforePage = ERPInfo.Instance.PageControl.SelectedTabPage,
BeforePage = ERPInfo.Instance.CurrentModulePage,
ModuleForm = frm
};
frm.refreshThePage += new FrmAccraditation.RefreshThePage(refreshThePage);
@@ -295,8 +295,8 @@ namespace Lskj.PubAccraditation
tp.Controls.Add(frm);
tp.ShowCloseButton = DefaultBoolean.True;
tp.Dock = DockStyle.Fill;
ERPInfo.Instance.PageControl.TabPages.Add(tp);
ERPInfo.Instance.PageControl.SelectedTabPage = tp;
ERPInfo.Instance.AddModulePage(tp);
ERPInfo.Instance.CurrentModulePage = tp;
frm.Show();
tp.Text = frm.Text;
ERPInfo.Instance.ModuleForms.Add(guid, module);
@@ -345,7 +345,7 @@ namespace Lskj.PubAccraditation
if (SystemInfo.Instance.PageOpen)
{
foreach (XtraTabPage tablepage in ERPInfo.Instance.PageControl.TabPages)
foreach (XtraTabPage tablepage in ERPInfo.Instance.ModulePages)
{
int interceptionLocation = tablepage.Text.Length - frm.SysModel.BillDocumentId.Length - 1;
if (interceptionLocation > 0 && tablepage.Text.Length > frm.SysModel.BillDocumentId.Length)
@@ -355,7 +355,7 @@ namespace Lskj.PubAccraditation
if (documentNo.Equals(frm.SysModel.BillDocumentId))
{
MessageUtil.Show("已设置不能打开多个相同模块!");
ERPInfo.Instance.PageControl.SelectedTabPage = tablepage;
ERPInfo.Instance.CurrentModulePage = tablepage;
return;
}
}
@@ -365,7 +365,7 @@ namespace Lskj.PubAccraditation
DllName = "",
Id = SysModel.ModuleId + "",
Name = SysModel.FormText,
BeforePage = ERPInfo.Instance.PageControl.SelectedTabPage,
BeforePage = ERPInfo.Instance.CurrentModulePage,
ModuleForm = frm
};
frm.refreshThePage += new FrmAccraditation.RefreshThePage(refreshThePage);
@@ -382,8 +382,8 @@ namespace Lskj.PubAccraditation
tp.Controls.Add(frm);
tp.ShowCloseButton = DefaultBoolean.True;
tp.Dock = DockStyle.Fill;
ERPInfo.Instance.PageControl.TabPages.Add(tp);
ERPInfo.Instance.PageControl.SelectedTabPage = tp;
ERPInfo.Instance.AddModulePage(tp);
ERPInfo.Instance.CurrentModulePage = tp;
frm.Show();
tp.Text = frm.Text;
ERPInfo.Instance.ModuleForms.Add(guid, module);
@@ -422,13 +422,13 @@ namespace Lskj.PubAccraditation
//要删除的page
XtraTabPage removePage = new XtraTabPage();
ERPInfo.Instance.ModuleForms.Remove(id);
foreach (XtraTabPage tablepage in ERPInfo.Instance.PageControl.TabPages)
foreach (XtraTabPage tablepage in ERPInfo.Instance.ModulePages)
{
if (tablepage.Tag == null) continue;
if (tablepage.Tag.ToString().Equals(id)) removePage = tablepage;
if (tablepage == beforePage) ERPInfo.Instance.PageControl.SelectedTabPage = beforePage;
if (tablepage == beforePage) ERPInfo.Instance.CurrentModulePage = beforePage;
}
ERPInfo.Instance.PageControl.TabPages.Remove(removePage);
ERPInfo.Instance.RemoveModulePage(removePage);
}
}