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

提交当前本机最新程序

Browse Source
This commit is contained in:
cyf
2026-07-16 16:05:38 +08:00
parent 43ae774164
commit 6be6607a40
47 changed files with 7895 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.FastReport/FormMain.cs
+56 -10
View File
@@ -300,14 +300,18 @@ namespace Lskj.FastReportDesign
{
if (ERPInfo.Instance.IsUserManager || SystemInfo.Instance.PrintTemplate.Split(',').Contains(ERPInfo.Instance.UserName))
{
this.ReportObj.Prepare();
this.ReportObj.Design(form);
this.ReportObj.Designer.BorderStyle = BorderStyle.None;
this.ReportObj.Designer.cmdPreview.CustomAction += OnCustomAction;
form.ShowDialog();
//this.ReportObj.Design(form);
//this.ReportObj.Designer.cmdPreview.CustomAction += OnCustomAction;
//form.ShowDialog();
try
{
this.ReportObj.Prepare();
this.ReportObj.Design(form);
this.ReportObj.Designer.BorderStyle = BorderStyle.None;
this.ReportObj.Designer.cmdPreview.CustomAction += OnCustomAction;
form.ShowDialog();
}
finally
{
ReleaseDesignerResource();
}
}
else
{
@@ -349,11 +353,53 @@ namespace Lskj.FastReportDesign
MessageUtil.Show(Message, ex.Message);
//MessageUtil.Show(ex);
this.ReportObj.Design();
if (this.ReportObj != null)
{
this.ReportObj.Design();
}
WaitForm.HideForm();
}
}
private void ReleaseDesignerResource()
{
try
{
if (this.ReportObj != null && this.ReportObj.Designer != null)
{
try
{
this.ReportObj.Designer.StopAutoSave();
}
catch
{
}
try
{
this.ReportObj.Designer.cmdPreview.CustomAction -= OnCustomAction;
}
catch
{
}
}
if (form != null && !form.IsDisposed)
{
form.Dispose();
}
if (this.ReportObj != null)
{
this.ReportObj.Dispose();
this.ReportObj = null;
}
}
catch
{
}
}
private void OnCustomAction(object sender, EventArgs e)
{
FastReport.Design.StandardDesigner.DesignerControl design = sender as FastReport.Design.StandardDesigner.DesignerControl;
@@ -402,4 +448,4 @@ namespace Lskj.FastReportDesign
}
}
}
}