From 8366fcbfed5c66fa1fab4f6dba964a3451c24091 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 12 九月 2025 16:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 41 +++++++++++------------------------------
1 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index d3ffe88..b62ed97 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -65,19 +65,21 @@
btnLianBan.ItemClick += BtnLianBan_ItemClick;
btnGx.ItemClick += BtnGx_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)
if (!string.IsNullOrEmpty(item.Caption) && item.Caption != "淇濆瓨" && item.Caption != "鍒锋柊" && item.Caption != "甯姪" && item.Caption != "淇濆瓨鐗堥潰" && item.Caption != "鍙栨秷")
lst.Add(item.Caption);
actions = lst;
+
+
+
+
}
-
+
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
/// </summary>
@@ -86,6 +88,7 @@
base.OnCreateControl();
if (Parent != null) getNamespace();
}
+
private bool _isCk(int _type)
{
Form parentForm = this.FindForm();
@@ -121,11 +124,13 @@
}
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)
@@ -398,17 +403,6 @@
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>
@@ -448,8 +442,6 @@
lst.Add(btnShouHouFchk.Name);
lst.Add(btnGongZi.Name);
lst.Add(btnLianBan.Name);
- lst.Add(btnFPingZhi.Name);
- lst.Add(btnPingZhi.Name);
// lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
lst.Add(btnBaoGao.Name);
@@ -458,6 +450,7 @@
if (btnEscClick != null) btnEscClick(this, e);
}
}
+
/// <summary>
/// 淇濆瓨鎴愬姛鍚庯紝杩樺師鎸夐挳鍙敤鎬�
@@ -502,8 +495,6 @@
lst.Add(btnOut.Name);
lst.Add(btnGongZi.Name);
lst.Add(btnLianBan.Name);
- lst.Add(btnFPingZhi.Name);
- lst.Add(btnPingZhi.Name);
// lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
lst.Add(btnBaoGao.Name);
@@ -1041,17 +1032,6 @@
/// 鐢熸垚鎶ュ憡
/// </summary>
public event EventHandler btnBaoGaoClick;
-
- /// <summary>
- /// 鍝佽川
- /// </summary>
- public event EventHandler btnPingZhiClick;
-
- /// <summary>
- /// 鍙嶅搧璐�
- /// </summary>
- public event EventHandler btnFPingZhiClick;
-
#endregion
#region 鍏叡灞炴��
@@ -1195,6 +1175,7 @@
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();
--
Gitblit v1.9.3