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
@@ -2627,27 +2627,27 @@ namespace Lskj.PubAccraditation
this.DialogResult = DialogResult.OK;
if (refreshThePage != null)
{
refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
refreshThePage("", ERPInfo.Instance.CurrentModulePage.Tag + "");
}
else
{
//上一次点开page 当前打开page删除后要选中的page
if (ERPInfo.Instance.PageControl != null)
if (ERPInfo.Instance.HasModulePageSurface)
{
string id = ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "";
string id = ERPInfo.Instance.CurrentModulePage.Tag + "";
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
if (beforePage != null)
{
//要删除的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);
removePage.Dispose();
}
}
@@ -2694,14 +2694,14 @@ namespace Lskj.PubAccraditation
this.DialogResult = DialogResult.OK;
if (refreshThePage != null)
{
refreshThePage("审核成功", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
refreshThePage("审核成功", ERPInfo.Instance.CurrentModulePage.Tag + "");
}
else
{
//上一次点开page 当前打开page删除后要选中的page
if (ERPInfo.Instance.PageControl != null)
if (ERPInfo.Instance.HasModulePageSurface)
{
string id = ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "";
string id = ERPInfo.Instance.CurrentModulePage.Tag + "";
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
if (beforePage != null)
{
@@ -2709,13 +2709,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);
removePage.Dispose();
}
}
@@ -2773,27 +2773,27 @@ namespace Lskj.PubAccraditation
//this.Close();
if (refreshThePage != null)
{
refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
refreshThePage("", ERPInfo.Instance.CurrentModulePage.Tag + "");
}
else
{
//上一次点开page 当前打开page删除后要选中的page
if (ERPInfo.Instance.PageControl != null)
if (ERPInfo.Instance.HasModulePageSurface)
{
string id = ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "";
string id = ERPInfo.Instance.CurrentModulePage.Tag + "";
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
if (beforePage != null)
{
//要删除的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);
removePage.Dispose();
}
}
@@ -2879,14 +2879,14 @@ namespace Lskj.PubAccraditation
this.DialogResult = DialogResult.OK;
if (refreshThePage != null)
{
refreshThePage("审核成功", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
refreshThePage("审核成功", ERPInfo.Instance.CurrentModulePage.Tag + "");
}
else
{
//上一次点开page 当前打开page删除后要选中的page
if (ERPInfo.Instance.PageControl != null)
if (ERPInfo.Instance.HasModulePageSurface)
{
string id = ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "";
string id = ERPInfo.Instance.CurrentModulePage.Tag + "";
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
if (beforePage != null)
{
@@ -2894,13 +2894,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);
removePage.Dispose();
}
}
@@ -3218,27 +3218,27 @@ namespace Lskj.PubAccraditation
this.DialogResult = DialogResult.OK;
if (refreshThePage != null)
{
refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
refreshThePage("", ERPInfo.Instance.CurrentModulePage.Tag + "");
}
else
{
//上一次点开page 当前打开page删除后要选中的page
if (ERPInfo.Instance.PageControl != null)
if (ERPInfo.Instance.HasModulePageSurface)
{
string id = ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "";
string id = ERPInfo.Instance.CurrentModulePage.Tag + "";
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
if (beforePage != null)
{
//要删除的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);
removePage.Dispose();
}
}
@@ -3278,27 +3278,27 @@ namespace Lskj.PubAccraditation
this.DialogResult = DialogResult.OK;
if (refreshThePage != null)
{
refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
refreshThePage("", ERPInfo.Instance.CurrentModulePage.Tag + "");
}
else
{
//上一次点开page 当前打开page删除后要选中的page
if (ERPInfo.Instance.PageControl != null)
if (ERPInfo.Instance.HasModulePageSurface)
{
string id = ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "";
string id = ERPInfo.Instance.CurrentModulePage.Tag + "";
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
if (beforePage != null)
{
//要删除的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);
removePage.Dispose();
}
}
@@ -3352,27 +3352,27 @@ namespace Lskj.PubAccraditation
this.DialogResult = DialogResult.OK;
if (refreshThePage != null)
{
refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
refreshThePage("", ERPInfo.Instance.CurrentModulePage.Tag + "");
}
else
{
//上一次点开page 当前打开page删除后要选中的page
if (ERPInfo.Instance.PageControl != null)
if (ERPInfo.Instance.HasModulePageSurface)
{
string id = ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "";
string id = ERPInfo.Instance.CurrentModulePage.Tag + "";
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
if (beforePage != null)
{
//要删除的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);
removePage.Dispose();
}
}
@@ -3432,27 +3432,27 @@ namespace Lskj.PubAccraditation
this.DialogResult = DialogResult.OK;
if (refreshThePage != null)
{
refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
refreshThePage("", ERPInfo.Instance.CurrentModulePage.Tag + "");
}
else
{
//上一次点开page 当前打开page删除后要选中的page
if (ERPInfo.Instance.PageControl != null)
if (ERPInfo.Instance.HasModulePageSurface)
{
string id = ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "";
string id = ERPInfo.Instance.CurrentModulePage.Tag + "";
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
if (beforePage != null)
{
//要删除的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);
removePage.Dispose();
}
}
@@ -3517,27 +3517,27 @@ namespace Lskj.PubAccraditation
this.DialogResult = DialogResult.OK;
if (refreshThePage != null)
{
refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
refreshThePage("", ERPInfo.Instance.CurrentModulePage.Tag + "");
}
else
{
//上一次点开page 当前打开page删除后要选中的page
if (ERPInfo.Instance.PageControl != null)
if (ERPInfo.Instance.HasModulePageSurface)
{
string id = ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "";
string id = ERPInfo.Instance.CurrentModulePage.Tag + "";
XtraTabPage beforePage = ERPInfo.Instance.ModuleForms[id].BeforePage;
if (beforePage != null)
{
//要删除的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);
removePage.Dispose();
}
}