From 00b53d0ecdf2c0ea0bd3ff8fd1abeaa4c21ab456 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 11 十一月 2024 10:14:21 +0800
Subject: [PATCH] 1

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs |   49 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 8becef4..ba0b8a3 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -54,6 +54,7 @@
 
 
 
+
         /// <summary>
         ///     鍒濆鍖栨寜閽姸鎬�
         /// </summary>
@@ -62,6 +63,9 @@
             base.OnCreateControl();
             if (Parent != null) getNamespace();
         }
+
+
+
         private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (btnBoHuiClick != null)
@@ -372,18 +376,24 @@
 
         private void BtnReport_ItemClick(object sender, ItemClickEventArgs 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(rptParameter);
-                frm.Show();
+                var frm = new RptPreview(guidKey, rptParameter);
+                frm.ShowDialog();
                 return;
             }
 
@@ -392,24 +402,27 @@
 
         private void BtnDesign_ItemClick(object sender, ItemClickEventArgs 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(rptParameter);
-                frm.Show();
+                var frm = new EasyRptDesign(guidKey, rptParameter);
+                frm.ShowDialog();
                 return;
             }
-
             //鍚﹀垯鍚戝璁捐妯℃澘
-            var rptWizard = new ShowRptWizard(rptParameter);
+            var rptWizard = new ShowRptWizard(guidKey, rptParameter);
             rptWizard.ShowDialog();
         }
 
@@ -665,9 +678,11 @@
             {
                 var _obj = new
                 {
-                    rptParameter
+                    guid = guidKey,
+                    rptParameter,
+                    isDesign = 1
                 };
-                var strJson = UtilityHelper.HttpPost("", "Report/GetTemplate",
+                var strJson = UtilityHelper.HttpPost("", "Report/GetRptData",
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                 if (_rtn.rtnCode > 0) return true;
@@ -806,6 +821,20 @@
         /// </summary>
         public event EventHandler btnBoHuiClick;
 
+        /// <summary>
+        /// 鎵撳嵃
+        /// </summary>
+        public event EventHandler btnPrintClick;
+
+        /// <summary>
+        /// 璁剧疆鎶ヨ〃
+        /// </summary>
+        public event EventHandler btnDesignClick;
+
+        /// <summary>
+        /// 鎶ヨ〃
+        /// </summary>
+        public event EventHandler btnReportClick;
         #endregion
 
         #region 鍏叡灞炴��

--
Gitblit v1.9.3