From 714cba76f99b7a6959b8420cd5a6c54396e0d111 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 18 六月 2025 15:24:11 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs | 127 ++++++++++++++++++------------------------
1 files changed, 54 insertions(+), 73 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
index 1196a45..3c712ab 100644
--- a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
@@ -1,18 +1,7 @@
-锘縰sing DevExpress.Utils.VisualEffects;
-using DevExpress.XtraBars;
-using DevExpress.XtraEditors;
-using Gs.DevApp.DevFrm.Rpt;
-using Gs.DevApp.DevFrm.Sys;
+锘縰sing Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
@@ -22,82 +11,74 @@
public UcBtnPrint()
{
InitializeComponent();
- btnReport.Click += BtnReport_ItemClick;
- btnDesign.Click += BtnDesign_ItemClick;
+ this.btnPrint.Click += (s, e) =>
+ {
+ if (btnPrintClick != null)
+ btnPrintClick(this, e);
+ else
+ return;
-
+ if (rptParameter == "return false")
+ return;
+ if (string.IsNullOrEmpty(rptParameter))
+ {
+ MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
+ return;
+ }
+ var _bl = false;
+ _bl = _ckRptService();
+ if (_bl)
+ {
+ try
+ {
+ using (Form frm = new RptPreview(guidKey, rptParameter))
+ {
+ frm.ShowDialog();
+ }
+ }
+ catch (Exception)
+ {
+ }
+ return;
+ }
+
+ MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
+ };
+ this.btnAll.Click += (s, e) =>
+ {
+ if (btnAllClick != null)
+ btnAllClick(this, e);
+ else
+ return;
+ };
}
/// <summary>
/// 鍏抽敭瀛楋紝涓�鑸槸涓婚敭
/// </summary>
public string guidKey { get; set; }
+
+
+ /// <summary>
+ /// 鎵归噺鎿嶄綔鏃剁殑鍏抽敭瀛楋細鎵樻澘鐮�
+ /// </summary>
+ public string allClickKey { get; set; }
+
+
/// <summary>
/// 鎶ヨ〃锛屽湪鏁版嵁搴撲腑瑕佸敮涓�,濡傦細瀛樺偍杩囩▼鍚峽鍏ュ弬1鍚峾鍏ュ弬鍊�,鍏ュ弬2鍚峾鍏ュ弬鍊紏
/// </summary>
public string rptParameter { get; set; }
+ /// <summary>
+ /// 鎵撳嵃
+ /// </summary>
+ public event EventHandler btnPrintClick;
/// <summary>
- /// 璁剧疆鎶ヨ〃
+ /// 鎵归噺鎿嶄綔
/// </summary>
- public event EventHandler btnDesignClick;
+ public event EventHandler btnAllClick;
- /// <summary>
- /// 鎶ヨ〃
- /// </summary>
- public event EventHandler btnReportClick;
-
- private void BtnReport_ItemClick(object sender, EventArgs e)
- {
- if (btnReportClick != null)
- btnReportClick(this, e);
- else
- return;
-
- if (rptParameter == "return false")
- return;
- if (string.IsNullOrEmpty(rptParameter))
- {
- MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
- return;
- }
- var _bl = false;
- _bl = _ckRptService();
- if (_bl)
- {
- var frm = new RptPreview(guidKey, rptParameter);
- frm.ShowDialog();
- return;
- }
-
- MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
- }
-
- private void BtnDesign_ItemClick(object sender, EventArgs e)
- {
- if (btnDesignClick != null)
- btnDesignClick(this, e);
- else
- return;
-
- if (string.IsNullOrEmpty(rptParameter))
- {
- MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
- return;
- }
- var _bl = false;
- _bl = _ckRptService();
- //濡傛灉宸茬粡鏈夋ā鏉夸簡锛岀洿鎺ユ墦寮�璁剧疆妯℃澘
- if (_bl)
- {
- var frm = new EasyRptDesign(guidKey, rptParameter);
- frm.ShowDialog();
- return;
- }
- //鍚﹀垯鍚戝璁捐妯℃澘
- var rptWizard = new ShowRptWizard(guidKey, rptParameter);
- rptWizard.ShowDialog();
- }
private bool _ckRptService()
{
try
--
Gitblit v1.9.3