From 9010fdfa1f7f6fe29c76111ef95d6383c74ea313 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期一, 22 九月 2025 11:09:10 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesClient
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index a28e513..5a8d8f1 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -58,6 +58,7 @@
btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
btnHb.ItemClick += BtnHb_ItemClick;
btnChbg.ItemClick += BtnChbg_ItemClick;
+ btnBaoGao.ItemClick += BtnBaoGao_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -311,24 +312,24 @@
btnPrintClick(this, e);
else
return;
- //2025-09-01 kyy 娉ㄩ噴涓嶄娇鐢ㄨ繖涓叕鐢ㄦ柟娉�
- //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;
- //}
+ // 2025 - 09 - 01 kyy 娉ㄩ噴涓嶄娇鐢ㄨ繖涓叕鐢ㄦ柟娉�
+ 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("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
+ MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
}
private void BtnDesign_ItemClick(object sender, ItemClickEventArgs e)
@@ -401,6 +402,7 @@
lst.Add(btnShouHouFchk.Name);
lst.Add(btnHb.Name);
lst.Add(btnChbg.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
this.currentAction = "esc";
if (btnEscClick != null) btnEscClick(this, e);
@@ -450,6 +452,7 @@
lst.Add(btnEdit.Name);
lst.Add(btnHb.Name);
lst.Add(btnChbg.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
}
@@ -478,6 +481,7 @@
lst.Add(btnFont.Name);
lst.Add(btnFont.Name);
lst.Add(btnLog.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
this.currentAction = "edit";
if (btnEdtClick != null) btnEdtClick(this, e);
@@ -616,7 +620,11 @@
if (btnChbgClick != null) btnChbgClick(this, e);
}
-
+ private void BtnBaoGao_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnBaoGaoClick != null)
+ btnBaoGaoClick(this, e);
+ }
private void _enabledBtn(List<string> lstBtn)
{
foreach (BarItem item in barManager1.Items)
@@ -1003,6 +1011,11 @@
/// </summary>
public event EventHandler btnChbgClick;
+ /// <summary>
+ /// 鐢熸垚鎶ュ憡
+ /// </summary>
+ public event EventHandler btnBaoGaoClick;
+
#endregion
#region 鍏叡灞炴��
--
Gitblit v1.9.3