From 89776d6f53dff45b1ac0ee20438f5aa8dab2d0e5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 16 六月 2025 17:13:31 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 104 ++++++---------------------------------------------
1 files changed, 13 insertions(+), 91 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index c8cdce5..b70ed3b 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -11,11 +11,9 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Data;
using System.IO;
using System.Linq;
-using System.Net;
using System.Text;
using System.Windows.Forms;
@@ -39,15 +37,11 @@
btnIn.ItemClick += BtnIn_ItemClick;
btnChk.ItemClick += BtnChk_ItemClick;
btnFchk.ItemClick += BtnFchk_ItemClick;
- btnJianYan.ItemClick += BtnJianYan_ItemClick;
- btnFjianYan.ItemClick += BtnFjianYan_ItemClick;
btnPiZhun.ItemClick += BtnPiZhun_ItemClick;
+ btnFPiZhun.ItemClick += BtnFPiZhun_ItemClick;
btnLog.ItemClick += BtnLog_ItemClick;
- btnZhiLiangChk.ItemClick += BtnZhiLiangChk_ItemClick;
- btnZhiLiangFchk.ItemClick += BtnZhiLiangFchk_ItemClick;
btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
- btnBoHui.ItemClick += BtnBoHui_ItemClick;
btnJieAn.ItemClick += BtnJieAn_ItemClick;
btnFjieAn.ItemClick += BtnFjieAn_ItemClick;
btnTzbl.ItemClick += BtnTzbl_ItemClick;
@@ -62,7 +56,6 @@
btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick;
btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
- btnOa.ItemClick += BtnOa_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -71,7 +64,7 @@
actions = lst;
}
-
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
/// </summary>
@@ -116,27 +109,7 @@
}
return false;
}
-
- private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e)
- {
- if (btnBoHuiClick != null)
- btnBoHuiClick(this, e);
- //if (string.IsNullOrEmpty(guidKey))
- //{
- // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- // return;
- //}
-
- //if (string.IsNullOrEmpty(chkParameter))
- //{
- // MsgHelper.ShowError("娌℃湁鎸囧畾椹冲洖鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- // return;
- //}
-
- //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾椹冲洖閲嶆鍚楋紵"))
- // return;
- //_ckService("5");
- }
+
private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnCaiGouFchkClick != null)
@@ -171,34 +144,7 @@
if (btnShouHouChkClick != null)
btnShouHouChkClick(this, e);
}
-
- private void BtnZhiLiangFchk_ItemClick(object sender, ItemClickEventArgs e)
- {
- if (btnZhiLiangFchkClick != null)
- btnZhiLiangFchkClick(this, e);
- }
-
- private void BtnZhiLiangChk_ItemClick(object sender, ItemClickEventArgs e)
- {
- if (btnZhiLiangChkClick != null)
- btnZhiLiangChkClick(this, e);
- //if (string.IsNullOrEmpty(guidKey))
- //{
- // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- // return;
- //}
-
- //if (string.IsNullOrEmpty(chkParameter))
- //{
- // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- // return;
- //}
-
- //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺瀹℃牳鍚楋紵"))
- // return;
- //_ckService("3");
- }
-
+
private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
{
bool bl = _isCk(0);
@@ -236,7 +182,6 @@
return;
}
-
private void BtnLog_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnLogClick != null) btnLogClick(this, e);
@@ -255,26 +200,11 @@
{
if (btnPiZhunClick != null) btnPiZhunClick(this, e);
}
-
- private void BtnFjianYan_ItemClick(object sender, ItemClickEventArgs e)
+ private void BtnFPiZhun_ItemClick(object sender, ItemClickEventArgs e)
{
- bool bl = _isCk(0);
- if (bl) return;
- if (btnFjianYanClick != null)
- btnFjianYanClick(this, e);
- else
- return;
+ if (btnFPiZhunClick != null) btnFPiZhunClick(this, e);
}
- private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e)
- {
- bool bl = _isCk(1);
- if (bl) return;
- if (btnJianYanClick != null)
- btnJianYanClick(this, e);
- else
- return;
- }
private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnShouJianClick != null)
@@ -430,11 +360,6 @@
if (btnQueryClick != null) btnQueryClick(this, e);
}
- private void BtnOa_ItemClick(object sender, ItemClickEventArgs e)
- {
- if (btnOaClick != null) btnOaClick(this, e);
- }
-
/// <summary>
/// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
/// </summary>
@@ -454,16 +379,14 @@
lst.Add(btnDesign.Name);
lst.Add(btnChk.Name);
lst.Add(btnFchk.Name);
- lst.Add(btnJianYan.Name);
- lst.Add(btnFjianYan.Name);
lst.Add(btnOut.Name);
lst.Add(btnIn.Name);
lst.Add(btnLog.Name);
lst.Add(btnPiZhun.Name);
+ lst.Add(btnFPiZhun.Name);
lst.Add(btnHelp.Name);
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
- lst.Add(btnBoHui.Name);
lst.Add(btnTzbl.Name);
lst.Add(btnKg.Name);
lst.Add(btnWg.Name);
@@ -499,14 +422,10 @@
lst.Add(btnChk.Name);
lst.Add(btnFchk.Name);
lst.Add(btnDel.Name);
- lst.Add(btnJianYan.Name);
- lst.Add(btnFjianYan.Name);
lst.Add(btnQuery.Name);
lst.Add(btnLog.Name);
- lst.Add(btnZhiLiangChk.Name);
- lst.Add(btnZhiLiangFchk.Name);
lst.Add(btnPiZhun.Name);
- lst.Add(btnBoHui.Name);
+ lst.Add(btnFPiZhun.Name);
lst.Add(btnDesign.Name);
lst.Add(btnReport.Name);
lst.Add(btnKg.Name);
@@ -551,7 +470,6 @@
lst.Add(btnLayout.Name);
lst.Add(btnFont.Name);
lst.Add(btnFont.Name);
- lst.Add(btnJianYan.Name);
lst.Add(btnLog.Name);
_enabledBtn(lst);
this.currentAction = "edit";
@@ -715,7 +633,6 @@
JsonConvert.SerializeObject(_obj));
var dd = UtilityHelper.ReturnToList(strReturn);
var dt = dd.rtnData;
-
if (!string.IsNullOrEmpty(defaultActions) && defaultActions.Contains("鏌ヨ"))
{
if (dt == null || dt.Rows.Count <= 0)
@@ -931,6 +848,11 @@
/// </summary>
public event EventHandler btnPiZhunClick;
+ /// <summary>
+ /// 鎵瑰噯
+ /// </summary>
+ public event EventHandler btnFPiZhunClick;
+
/// <summary>
/// 鏃ュ織
--
Gitblit v1.9.3