From bd06bb837fa0c7edeeae56cb0fe4fb844f53fb2f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 23 十月 2024 16:42:34 +0800
Subject: [PATCH] 修改了报表设计器
---
DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs | 26 +++++-------
DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.Designer.cs | 45 +++++++++++-----------
DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.resx | 4 +-
3 files changed, 35 insertions(+), 40 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.Designer.cs
index a996fca..7376ae2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.Designer.cs
@@ -30,11 +30,11 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EasyRptDesign));
- FastReport.Design.DesignerSettings designerSettings1 = new FastReport.Design.DesignerSettings();
- FastReport.Design.DesignerRestrictions designerRestrictions1 = new FastReport.Design.DesignerRestrictions();
- FastReport.Export.Email.EmailSettings emailSettings1 = new FastReport.Export.Email.EmailSettings();
- FastReport.PreviewSettings previewSettings1 = new FastReport.PreviewSettings();
- FastReport.ReportSettings reportSettings1 = new FastReport.ReportSettings();
+ FastReport.Design.DesignerSettings designerSettings2 = new FastReport.Design.DesignerSettings();
+ FastReport.Design.DesignerRestrictions designerRestrictions2 = new FastReport.Design.DesignerRestrictions();
+ FastReport.Export.Email.EmailSettings emailSettings2 = new FastReport.Export.Email.EmailSettings();
+ FastReport.PreviewSettings previewSettings2 = new FastReport.PreviewSettings();
+ FastReport.ReportSettings reportSettings2 = new FastReport.ReportSettings();
this.designerControl1 = new FastReport.Design.StandardDesigner.DesignerControl();
this.environmentSettings1 = new FastReport.EnvironmentSettings();
this.sidePanel1 = new DevExpress.XtraEditors.SidePanel();
@@ -57,23 +57,23 @@
//
// environmentSettings1
//
- designerSettings1.ApplicationConnection = null;
- designerSettings1.DefaultFont = new System.Drawing.Font("瀹嬩綋", 9F);
- designerSettings1.Icon = null;
- designerSettings1.Restrictions = designerRestrictions1;
- designerSettings1.Text = "";
- this.environmentSettings1.DesignerSettings = designerSettings1;
- emailSettings1.Address = "";
- emailSettings1.Host = "";
- emailSettings1.MessageTemplate = "";
- emailSettings1.Name = "";
- emailSettings1.Password = "";
- emailSettings1.UserName = "";
- this.environmentSettings1.EmailSettings = emailSettings1;
- previewSettings1.Icon = ((System.Drawing.Icon)(resources.GetObject("previewSettings1.Icon")));
- previewSettings1.Text = "";
- this.environmentSettings1.PreviewSettings = previewSettings1;
- this.environmentSettings1.ReportSettings = reportSettings1;
+ designerSettings2.ApplicationConnection = null;
+ designerSettings2.DefaultFont = new System.Drawing.Font("瀹嬩綋", 9F);
+ designerSettings2.Icon = null;
+ designerSettings2.Restrictions = designerRestrictions2;
+ designerSettings2.Text = "";
+ this.environmentSettings1.DesignerSettings = designerSettings2;
+ emailSettings2.Address = "";
+ emailSettings2.Host = "";
+ emailSettings2.MessageTemplate = "";
+ emailSettings2.Name = "";
+ emailSettings2.Password = "";
+ emailSettings2.UserName = "";
+ this.environmentSettings1.EmailSettings = emailSettings2;
+ previewSettings2.Icon = ((System.Drawing.Icon)(resources.GetObject("previewSettings2.Icon")));
+ previewSettings2.Text = "";
+ this.environmentSettings1.PreviewSettings = previewSettings2;
+ this.environmentSettings1.ReportSettings = reportSettings2;
this.environmentSettings1.UIStyle = FastReport.Utils.UIStyle.Office2007Black;
//
// sidePanel1
@@ -119,7 +119,6 @@
this.Controls.Add(this.sidePanel1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png;
this.Name = "EasyRptDesign";
- this.Text = "鎶ヨ〃璁捐锛氳鍙傝�冨瓧娈佃鏄�,z寮�澶翠负涓昏〃,m寮�澶翠负鏄庣粏琛�";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
((System.ComponentModel.ISupportInitialize)(this.designerControl1)).EndInit();
this.sidePanel1.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs
index 344cdcb..a210e4a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs
@@ -14,17 +14,17 @@
{
public partial class EasyRptDesign : DevExpress.XtraEditors.XtraForm
{
- private string _reportType;
- public EasyRptDesign(string reportType)
+ private string _rptParameter;
+ public EasyRptDesign(string rptParameter)
{
- _reportType = reportType;
+ _rptParameter = rptParameter;
InitializeComponent();
- this.Text = (_reportType + "鎶ヨ〃璁捐锛氳鍙傝�冨瓧娈佃鏄�,z寮�澶翠负涓昏〃,m寮�澶翠负鏄庣粏琛�");
+ this.Text = (_rptParameter + "鎶ヨ〃璁捐锛氳璁℃椂璇峰弬鑰冨瓧娈佃鏄庯紝寤鸿z寮�澶翠负涓昏〃,m寮�澶翠负鏄庣粏琛�");
Report report = new Report();
DataTable RptRow = new DataTable();
var _obj = new
{
- reportType = _reportType,
+ rptParameter = _rptParameter,
};
try
{
@@ -40,15 +40,11 @@
{
report.Load(Stream);
}
- }
- else
- {
- report.Load((Application.StartupPath+@"\templeEasyCode\report\RptDemo.frx"));
- }
- var d = dy.colDec;
- foreach (var a in d)
- {
- listBox1.Items.Add(a);
+ var d = dy.reportCol;
+ foreach (var a in d)
+ {
+ listBox1.Items.Add(a);
+ }
}
}
else
@@ -78,7 +74,7 @@
byte[] dddd = ms.ToArray();
var _obj = new
{
- rptType = _reportType,
+ rptParameter = _rptParameter,
rptData = dddd,
};
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.resx b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.resx
index d5426c6..3bbe5d8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.resx
@@ -121,13 +121,13 @@
<value>17, 17</value>
</metadata>
<data name="designerControl1.LayoutState" xml:space="preserve">
- <value>锘�<?xml version="1.0" encoding="utf-8"?><Config><Designer><DockNew Text="&lt;dotnetbarlayout version=&quot;6&quot; zorder=&quot;3,4,1,2&quot;&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Top&quot; originaldocksitesize=&quot;0&quot; /&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Bottom&quot; originaldocksitesize=&quot;0&quot;&gt;&lt;dockcontainer orientation=&quot;1&quot; w=&quot;0&quot; h=&quot;0&quot;&gt;&lt;barcontainer w=&quot;0&quot; h=&quot;95&quot;&gt;&lt;bar name=&quot;MessagesWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;4&quot; visible=&quot;false&quot;&gt;&lt;items&gt;&lt;item name=&quot;MessagesWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; visible=&quot;false&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;/dockcontainer&gt;&lt;/docksite&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Left&quot; originaldocksitesize=&quot;0&quot; /&gt;&lt;docksite size=&quot;250&quot; dockingside=&quot;Right&quot; originaldocksitesize=&quot;0&quot;&gt;&lt;dockcontainer orientation=&quot;1&quot; w=&quot;0&quot; h=&quot;0&quot;&gt;&lt;barcontainer w=&quot;247&quot; h=&quot;92&quot;&gt;&lt;bar name=&quot;DictionaryWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;2&quot; visible=&quot;true&quot; seldocktab=&quot;0&quot;&gt;&lt;items&gt;&lt;item name=&quot;DictionaryWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; /&gt;&lt;item name=&quot;ReportTreeWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;1&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;barcontainer w=&quot;247&quot; h=&quot;4&quot;&gt;&lt;bar name=&quot;PropertiesWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;64&quot; state=&quot;2&quot; dockside=&quot;2&quot; visible=&quot;true&quot;&gt;&lt;items&gt;&lt;item name=&quot;PropertiesWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;/dockcontainer&gt;&lt;/docksite&gt;&lt;bars&gt;&lt;bar name=&quot;StandardToolbar&quot; dockline=&quot;0&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;TextToolbar&quot; dockline=&quot;1&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;BorderToolbar&quot; dockline=&quot;1&quot; layout=&quot;0&quot; dockoffset=&quot;280&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;LayoutToolbar&quot; dockline=&quot;2&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;false&quot; /&gt;&lt;bar name=&quot;StyleToolbar&quot; dockline=&quot;2&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;false&quot; /&gt;&lt;bar name=&quot;ObjectsToolbar&quot; dockline=&quot;0&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;1&quot; visible=&quot;true&quot; /&gt;&lt;/bars&gt;&lt;/dotnetbarlayout&gt;"/></Designer></Config></value>
+ <value>锘�<?xml version="1.0" encoding="utf-8"?><Config><Designer><DockNew Text="&lt;dotnetbarlayout version=&quot;6&quot; zorder=&quot;3,4,1,2&quot;&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Top&quot; originaldocksitesize=&quot;0&quot; /&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Bottom&quot; originaldocksitesize=&quot;0&quot;&gt;&lt;dockcontainer orientation=&quot;1&quot; w=&quot;0&quot; h=&quot;0&quot;&gt;&lt;barcontainer w=&quot;0&quot; h=&quot;95&quot;&gt;&lt;bar name=&quot;MessagesWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;4&quot; visible=&quot;false&quot;&gt;&lt;items&gt;&lt;item name=&quot;MessagesWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; visible=&quot;false&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;/dockcontainer&gt;&lt;/docksite&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Left&quot; originaldocksitesize=&quot;0&quot; /&gt;&lt;docksite size=&quot;250&quot; dockingside=&quot;Right&quot; originaldocksitesize=&quot;0&quot;&gt;&lt;dockcontainer orientation=&quot;1&quot; w=&quot;0&quot; h=&quot;0&quot;&gt;&lt;barcontainer w=&quot;247&quot; h=&quot;92&quot;&gt;&lt;bar name=&quot;DictionaryWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;2&quot; visible=&quot;true&quot; seldocktab=&quot;0&quot;&gt;&lt;items&gt;&lt;item name=&quot;DictionaryWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; /&gt;&lt;item name=&quot;ReportTreeWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;1&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;barcontainer w=&quot;247&quot; h=&quot;4&quot;&gt;&lt;bar name=&quot;PropertiesWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;64&quot; state=&quot;2&quot; dockside=&quot;2&quot; visible=&quot;true&quot;&gt;&lt;items&gt;&lt;item name=&quot;PropertiesWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;/dockcontainer&gt;&lt;/docksite&gt;&lt;bars&gt;&lt;bar name=&quot;StandardToolbar&quot; dockline=&quot;0&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;TextToolbar&quot; dockline=&quot;1&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;BorderToolbar&quot; dockline=&quot;1&quot; layout=&quot;0&quot; dockoffset=&quot;280&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;StyleToolbar&quot; dockline=&quot;2&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;false&quot; /&gt;&lt;bar name=&quot;LayoutToolbar&quot; dockline=&quot;2&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;false&quot; /&gt;&lt;bar name=&quot;ObjectsToolbar&quot; dockline=&quot;0&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;1&quot; visible=&quot;true&quot; /&gt;&lt;/bars&gt;&lt;/dotnetbarlayout&gt;"/></Designer></Config></value>
</data>
<metadata name="environmentSettings1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>202, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="previewSettings1.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="previewSettings2.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA
AAA4ODhhODg45zg4OP84ODj/ODg4/zg4OP84ODj/ODg4/zg4OP84ODj/ODg4/zg4OP84ODj/ODg4/zg4
--
Gitblit v1.9.3