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

fix(legacy): complete hosted module cleanup

Browse Source
This commit is contained in:
SugarChes
2026-08-29 20:34:39 +08:00
parent 176952d52c
commit 9f5f548dea
15 changed files with 704 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.BaseAccraditation/FrmBaseAccraditation.cs
+42 -42
View File
@@ -2077,15 +2077,15 @@ namespace Lskj.BaseAccraditation
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)
{
@@ -2093,13 +2093,13 @@ namespace Lskj.BaseAccraditation
//要删除的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();
}
}
@@ -2261,15 +2261,15 @@ namespace Lskj.BaseAccraditation
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)
{
@@ -2277,13 +2277,13 @@ namespace Lskj.BaseAccraditation
//要删除的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();
}
}
@@ -2391,15 +2391,15 @@ namespace Lskj.BaseAccraditation
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)
{
@@ -2407,13 +2407,13 @@ namespace Lskj.BaseAccraditation
//要删除的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();
}
}
@@ -2451,15 +2451,15 @@ namespace Lskj.BaseAccraditation
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)
{
@@ -2467,13 +2467,13 @@ namespace Lskj.BaseAccraditation
//要删除的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();
}
}
@@ -2527,15 +2527,15 @@ namespace Lskj.BaseAccraditation
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)
{
@@ -2543,13 +2543,13 @@ namespace Lskj.BaseAccraditation
//要删除的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();
}
}
@@ -2609,15 +2609,15 @@ namespace Lskj.BaseAccraditation
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)
{
@@ -2625,13 +2625,13 @@ namespace Lskj.BaseAccraditation
//要删除的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();
}
}
@@ -2669,15 +2669,15 @@ namespace Lskj.BaseAccraditation
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)
{
@@ -2685,13 +2685,13 @@ namespace Lskj.BaseAccraditation
//要删除的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();
}
}
插件库/Lskj.BaseAccraditation/FrmMain.cs
+13 -13
View File
@@ -317,7 +317,7 @@ namespace Lskj.BaseAccraditation
if (SystemInfo.Instance.PageOpen)
{
foreach (XtraTabPage tablepage in ERPInfo.Instance.PageControl.TabPages)
foreach (XtraTabPage tablepage in ERPInfo.Instance.ModulePages)
{
int interceptionLocation = tablepage.Text.Length - frmbaseAccradit.SysModel.PrimaryValue.Length - 1;
if (interceptionLocation > 0 && tablepage.Text.Length > frmbaseAccradit.SysModel.PrimaryValue.Length)
@@ -326,7 +326,7 @@ namespace Lskj.BaseAccraditation
if (documentNo.Equals(frmbaseAccradit.SysModel.PrimaryValue))
{
MessageUtil.Show("已设置不能打开多个相同模块！");
ERPInfo.Instance.PageControl.SelectedTabPage = tablepage;
ERPInfo.Instance.CurrentModulePage = tablepage;
return;
}
}
@@ -336,7 +336,7 @@ namespace Lskj.BaseAccraditation
DllName = "",
Id = SysModel.ModuleId + "",
Name = SysModel.FormText,
BeforePage = ERPInfo.Instance.PageControl.SelectedTabPage,
BeforePage = ERPInfo.Instance.CurrentModulePage,
ModuleForm = frmbaseAccradit
};
frmbaseAccradit.refreshThePage += new FrmBaseAccraditation.RefreshThePage(refreshThePage);
@@ -353,8 +353,8 @@ namespace Lskj.BaseAccraditation
tp.Controls.Add(frmbaseAccradit);
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;
frmbaseAccradit.Opacity = 0;
frmbaseAccradit.SetFormSize();
frmbaseAccradit.Show();
@@ -440,7 +440,7 @@ namespace Lskj.BaseAccraditation
if (SystemInfo.Instance.PageOpen)
{
foreach (XtraTabPage tablepage in ERPInfo.Instance.PageControl.TabPages)
foreach (XtraTabPage tablepage in ERPInfo.Instance.ModulePages)
{
int interceptionLocation = tablepage.Text.Length - frmbaseAccradit.SysModel.PrimaryValue.Length - 1;
if (interceptionLocation > 0 && tablepage.Text.Length > frmbaseAccradit.SysModel.PrimaryValue.Length)
@@ -449,7 +449,7 @@ namespace Lskj.BaseAccraditation
if (documentNo.Equals(frmbaseAccradit.SysModel.PrimaryValue))
{
MessageUtil.Show("已设置不能打开多个相同模块！");
ERPInfo.Instance.PageControl.SelectedTabPage = tablepage;
ERPInfo.Instance.CurrentModulePage = tablepage;
return;
}
}
@@ -459,7 +459,7 @@ namespace Lskj.BaseAccraditation
DllName = "",
Id = SysModel.ModuleId + "",
Name = SysModel.FormText,
BeforePage = ERPInfo.Instance.PageControl.SelectedTabPage,
BeforePage = ERPInfo.Instance.CurrentModulePage,
ModuleForm = frmbaseAccradit
};
frmbaseAccradit.refreshThePage += new FrmBaseAccraditation.RefreshThePage(refreshThePage);
@@ -477,8 +477,8 @@ namespace Lskj.BaseAccraditation
tp.Controls.Add(frmbaseAccradit);
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;
frmbaseAccradit.Opacity = 0;
frmbaseAccradit.SetFormSize();
frmbaseAccradit.Show();
@@ -521,13 +521,13 @@ namespace Lskj.BaseAccraditation
//要删除的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);
}
}
}