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 | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 8651965..5a8d8f1 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -57,6 +57,8 @@
btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
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)
@@ -310,7 +312,7 @@
btnPrintClick(this, e);
else
return;
-
+ // 2025 - 09 - 01 kyy 娉ㄩ噴涓嶄娇鐢ㄨ繖涓叕鐢ㄦ柟娉�
if (rptParameter == "return false")
return;
if (string.IsNullOrEmpty(rptParameter))
@@ -399,6 +401,8 @@
lst.Add(btnShouHouChk.Name);
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);
@@ -446,6 +450,9 @@
lst.Add(btnShouHouChk.Name);
lst.Add(btnShouHouFchk.Name);
lst.Add(btnEdit.Name);
+ lst.Add(btnHb.Name);
+ lst.Add(btnChbg.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
}
@@ -474,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);
@@ -532,7 +540,14 @@
private void BtnHb_ItemClick(object sender, ItemClickEventArgs e)
{
- if (btnHbClick != null) btnHbClick(this, e);
+
+ bool bl = _isCk(1);
+ if (bl) return;
+ if (btnHbClick != null)
+ {
+ btnHbClick(this, e);
+ }
+ return;
}
@@ -598,6 +613,17 @@
{
Gs.DevApp.UserControl.SelectFont DevFrm = new SelectFont();
DevFrm.ShowDialog();
+ }
+
+ private void BtnChbg_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ 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)
{
@@ -980,6 +1006,16 @@
/// </summary>
public event EventHandler btnHbClick;
+ /// <summary>
+ /// 鎾ゅ洖鎶ュ伐
+ /// </summary>
+ public event EventHandler btnChbgClick;
+
+ /// <summary>
+ /// 鐢熸垚鎶ュ憡
+ /// </summary>
+ public event EventHandler btnBaoGaoClick;
+
#endregion
#region 鍏叡灞炴��
@@ -1112,7 +1148,6 @@
}
return spcList;
}
-
/// <summary>
/// 璇诲彇xml閰嶇疆锛岀洰鍓嶉厤缃甮cMain1,layoutMx1,鍔犳煡璇㈡潯浠�
/// </summary>
--
Gitblit v1.9.3