From a75a2d05afbd147ecb44fc1b520180424b99c910 Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期六, 23 八月 2025 10:21:11 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs index dc8dd2f..da1b4e2 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs @@ -3,8 +3,10 @@ using DevExpress.XtraGrid; using DevExpress.XtraGrid.Views.Grid; using DevExpress.XtraLayout; +using Gs.DevApp.DevFrm.QC; using Gs.DevApp.DevFrm.Rpt; using Gs.DevApp.DevFrm.Sys; +using Gs.DevApp.DevFrm.Work; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Newtonsoft.Json; @@ -59,6 +61,8 @@ btnAll.ItemClick += BtnAll_ItemClick; btnGongZi.ItemClick += BtnGongZi_ItemClick; btnLianBan.ItemClick += BtnLianBan_ItemClick; + btnGx.ItemClick += BtnGx_ItemClick; + btnBaoGao.ItemClick += BtnBaoGao_ItemClick; var lst = new List<string>(); foreach (BarItem item in barManager1.Items) if (item is BarLargeButtonItem largeButtonItem) @@ -67,6 +71,9 @@ actions = lst; } + + + /// <summary> /// 鍒濆鍖栨寜閽姸鎬� /// </summary> @@ -380,8 +387,16 @@ if (btnGongZiClick != null) btnGongZiClick(this, e); } - - + private void BtnGx_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnGxClick != null) + btnGxClick(this, e); + } + private void BtnBaoGao_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnBaoGaoClick != null) + btnBaoGaoClick(this, e); + } /// <summary> /// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬� /// </summary> @@ -421,6 +436,8 @@ lst.Add(btnShouHouFchk.Name); lst.Add(btnGongZi.Name); lst.Add(btnLianBan.Name); + // lst.Add(btnEsc.Name); + lst.Add(btnGx.Name); _enabledBtn(lst); this.currentAction = "esc"; if (btnEscClick != null) btnEscClick(this, e); @@ -471,6 +488,8 @@ lst.Add(btnOut.Name); lst.Add(btnGongZi.Name); lst.Add(btnLianBan.Name); + // lst.Add(btnEsc.Name); + lst.Add(btnGx.Name); _enabledBtn(lst); } } @@ -494,7 +513,6 @@ lst.Add(btnEsc.Name); lst.Add(btnHelp.Name); lst.Add(btnLayout.Name); - lst.Add(btnFont.Name); lst.Add(btnFont.Name); lst.Add(btnLog.Name); _enabledBtn(lst); @@ -996,6 +1014,15 @@ /// </summary> public event EventHandler btnGongZiClick; + /// <summary> + /// 宸ュ簭鍙樻洿 + /// </summary> + public event EventHandler btnGxClick; + + /// <summary> + /// 鐢熸垚鎶ュ憡 + /// </summary> + public event EventHandler btnBaoGaoClick; #endregion #region 鍏叡灞炴�� -- Gitblit v1.9.3