From 9702c6a4dc358c7bff2eb18c8426229a0140e34a Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 15 九月 2025 08:29:16 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 120 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 79 insertions(+), 41 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index c429e15..2de362f 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -3,6 +3,10 @@
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout;
+using DevExpress.XtraRichEdit.Model;
+using DevExpress.XtraWaitForm;
+using Gs.DevApp.DevFrm;
+using Gs.DevApp.DevFrm.QC;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
using Gs.DevApp.DevFrm.Work;
@@ -61,8 +65,9 @@
btnGongZi.ItemClick += BtnGongZi_ItemClick;
btnLianBan.ItemClick += BtnLianBan_ItemClick;
btnGx.ItemClick += BtnGx_ItemClick;
- btnWeight.ItemClick += BtnWeight_ItemClick;
btnBaoGao.ItemClick += BtnBaoGao_ItemClick;
+ btnPingZhi.ItemClick += BtnPingZhi_ItemClick;
+ btnFPingZhi.ItemClick += BtnFPingZhi_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -71,32 +76,7 @@
actions = lst;
}
-
- /// <summary>
- /// 鍚姩绉伴噸
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void BtnWeight_ItemClick(object sender, ItemClickEventArgs e)
- {
- bool isOpen = false;
- foreach (Form form in Application.OpenForms)
- {
- if (form is Frm_Work09)
- {
- isOpen = true;
- form.Activate(); // 婵�娲诲凡瀛樺湪鐨勭獥浣�
- break;
- }
- }
- if (!isOpen)
- {
- var form = new Frm_Work09(QcSeason.iqc绉伴噸.ToString());
- form.Show();
- }
- }
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
@@ -106,7 +86,6 @@
base.OnCreateControl();
if (Parent != null) getNamespace();
}
-
private bool _isCk(int _type)
{
Form parentForm = this.FindForm();
@@ -142,13 +121,11 @@
}
return false;
}
-
private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouFchkClick != null)
btnCaiGouFchkClick(this, e);
}
-
private void BtnCaiGouChk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouChkClick != null)
@@ -359,7 +336,6 @@
frm.ShowDialog();
return;
}
-
MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
}
@@ -399,7 +375,6 @@
if (btnAllClick != null)
btnAllClick(this, e);
}
-
private void BtnLianBan_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnLianBanClick != null)
@@ -421,6 +396,17 @@
if (btnBaoGaoClick != null)
btnBaoGaoClick(this, e);
}
+ private void BtnFPingZhi_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnFPingZhiClick != null)
+ btnFPingZhiClick(this, e);
+ }
+ private void BtnPingZhi_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnPingZhiClick != null)
+ btnPingZhiClick(this, e);
+ }
+
/// <summary>
/// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
/// </summary>
@@ -460,15 +446,16 @@
lst.Add(btnShouHouFchk.Name);
lst.Add(btnGongZi.Name);
lst.Add(btnLianBan.Name);
- // lst.Add(btnEsc.Name);
+ lst.Add(btnFPingZhi.Name);
+ lst.Add(btnPingZhi.Name);
+ // lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
- lst.Add(btnWeight.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
this.currentAction = "esc";
if (btnEscClick != null) btnEscClick(this, e);
}
}
-
/// <summary>
/// 淇濆瓨鎴愬姛鍚庯紝杩樺師鎸夐挳鍙敤鎬�
@@ -513,9 +500,11 @@
lst.Add(btnOut.Name);
lst.Add(btnGongZi.Name);
lst.Add(btnLianBan.Name);
- // lst.Add(btnEsc.Name);
+ lst.Add(btnFPingZhi.Name);
+ lst.Add(btnPingZhi.Name);
+ // lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
- lst.Add(btnWeight.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
}
}
@@ -541,7 +530,7 @@
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
lst.Add(btnLog.Name);
- lst.Add(btnWeight.Name);
+ lst.Add(btnBaoGao.Name);
_enabledBtn(lst);
this.currentAction = "edit";
if (btnEdtClick != null) btnEdtClick(this, e);
@@ -569,7 +558,6 @@
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
- lst.Add(btnWeight.Name);
_enabledBtn(lst);
this.currentAction = "add";
if (btnAddClick != null) btnAddClick(this, e);
@@ -782,7 +770,6 @@
// continue;
// }
//}
-
//鎸夐挳鏄惁鍦ㄦ潈闄愯〃涓�
var exists = dt.AsEnumerable().Any(row =>
row.Field<string>("name") == item.Caption);
@@ -796,7 +783,6 @@
_enabledList.Add(_btnName);
}
}
-
//榛樿鍚敤鐨勬寜閽�
_enabledList.Add(btnLoad.Name);
_enabledList.Add(btnHelp.Name);
@@ -1051,6 +1037,17 @@
/// 鐢熸垚鎶ュ憡
/// </summary>
public event EventHandler btnBaoGaoClick;
+
+ /// <summary>
+ /// 鍝佽川
+ /// </summary>
+ public event EventHandler btnPingZhiClick;
+
+ /// <summary>
+ /// 鍙嶅搧璐�
+ /// </summary>
+ public event EventHandler btnFPingZhiClick;
+
#endregion
#region 鍏叡灞炴��
@@ -1096,6 +1093,47 @@
#endregion
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="inType"></param>
+ public void SetAllButton(int inType)
+ {
+ var lstBtn = new List<string>();
+ if (inType == 0)
+ {
+ lstBtn.Add(btnSave.Name);
+ lstBtn.Add(btnEsc.Name);
+ foreach (BarItem item in barManager1.Items)
+ if (item is BarLargeButtonItem largeButtonItem)
+ {
+ if (!lstBtn.Contains(item.Name))
+ largeButtonItem.Enabled = true;
+ else
+ largeButtonItem.Enabled = false;
+ }
+ return;
+ }
+ if (inType == 2)
+ {
+ lstBtn.Add(btnHelp.Name);
+ lstBtn.Add(btnLoad.Name);
+ lstBtn.Add(btnQuery.Name);
+ lstBtn.Add(btnLayout.Name);
+ lstBtn.Add(btnFont.Name);
+ lstBtn.Add(btnAdd.Name);
+ foreach (BarItem item in barManager1.Items)
+ if (item is BarLargeButtonItem largeButtonItem)
+ {
+ if (lstBtn.Contains(item.Name))
+ largeButtonItem.Enabled = true;
+ else
+ largeButtonItem.Enabled = false;
+ }
+ return;
+ }
+
+ }
/// <summary>
/// 鏌ユ壘gridView
@@ -1194,7 +1232,6 @@
parentForm = this.Parent as Form;
else
parentForm = this.Parent.Parent as Form;
-
string _formNamespace = parentForm.GetType().FullName;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = getGvList();
List<DevExpress.XtraLayout.LayoutControl> layList = getLayList();
@@ -1305,5 +1342,6 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3