From b2db1fbcea11f4dbdbca91f4ebe72e916fb509f2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 21 七月 2025 16:28:10 +0800
Subject: [PATCH] 增加按钮
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 249 ++++++++++++++++++++-----------------------------
1 files changed, 104 insertions(+), 145 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 73e5650..4e4d283 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,9 @@
btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick;
btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
- btnOa.ItemClick += BtnOa_ItemClick;
+ btnAll.ItemClick += BtnAll_ItemClick;
+ btnGongZi.ItemClick += BtnGongZi_ItemClick;
+ btnLianBan.ItemClick += BtnLianBan_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -70,6 +66,8 @@
lst.Add(item.Caption);
actions = lst;
}
+
+
/// <summary>
@@ -117,26 +115,6 @@
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)
@@ -170,33 +148,6 @@
{
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)
@@ -236,7 +187,6 @@
return;
}
-
private void BtnLog_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnLogClick != null) btnLogClick(this, e);
@@ -255,26 +205,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)
@@ -298,9 +233,10 @@
strType = xlsInService.Split('&')[1];
strService = xlsInService.Split('&')[0];
}
- else {
- strType = "";
- strService = xlsInService;
+ else
+ {
+ strType = "";
+ strService = xlsInService;
}
//杩欐槸涓�涓殢鏈哄�硷紝灏嗕細琚綋浣滅埗浜瞘uid瀛樺埌file琛ㄤ腑锛屾湇鍔＄鏍规嵁杩欎釜guid璇诲彇鐩稿簲鐨勬枃浠�
string upGuid = Guid.NewGuid().ToString();
@@ -322,7 +258,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
};
frm.ShowDialog();
@@ -330,51 +266,53 @@
private void BtnOut_ItemClick(object sender, ItemClickEventArgs e)
{
- if (string.IsNullOrEmpty(this.xlsOutParameter))
- {
- ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎嚭瀛樺偍杩囩▼锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- return;
- }
- using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
- {
- folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
- DialogResult dialogResult = folderBrowserDialog.ShowDialog();
- if (dialogResult == DialogResult.OK)
- {
- string _folder = folderBrowserDialog.SelectedPath;
- var _obj = new Gs.DevApp.Entity.XlsOutModel(this.xlsOutParameter);
- try
- {
- string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- string _file = _rtn.rtnData.fileUrl.ToString();
- string _folderName = _folder + "\\" + _file.Replace("down/", "");
- string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
- using (WebClient client = new WebClient())
- {
- client.DownloadFile(_url, _folderName);
- }
- ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
- }
- else
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
+ if (btnOutClick != null) btnOutClick(this, e);
+
+ //if (string.IsNullOrEmpty(this.xlsOutParameter))
+ //{
+ // ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎嚭瀛樺偍杩囩▼锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ // return;
+ //}
+ //using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
+ //{
+ // folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
+ // DialogResult dialogResult = folderBrowserDialog.ShowDialog();
+ // if (dialogResult == DialogResult.OK)
+ // {
+ // string _folder = folderBrowserDialog.SelectedPath;
+ // var _obj = new Gs.DevApp.Entity.XlsOutModel(this.xlsOutParameter);
+ // try
+ // {
+ // string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView", JsonConvert.SerializeObject(_obj));
+ // ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ // if (_rtn.rtnCode > 0)
+ // {
+ // string _file = _rtn.rtnData.fileUrl.ToString();
+ // string _folderName = _folder + "\\" + _file.Replace("down/", "");
+ // string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
+ // using (WebClient client = new WebClient())
+ // {
+ // client.DownloadFile(_url, _folderName);
+ // }
+ // ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
+ // }
+ // else
+ // {
+ // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ // }
+ // }
+ //}
}
private void BtnReport_ItemClick(object sender, ItemClickEventArgs e)
{
- if (btnReportClick != null)
- btnReportClick(this, e);
+ if (btnPrintClick != null)
+ btnPrintClick(this, e);
else
return;
@@ -428,10 +366,24 @@
if (btnQueryClick != null) btnQueryClick(this, e);
}
- private void BtnOa_ItemClick(object sender, ItemClickEventArgs e)
+ private void BtnAll_ItemClick(object sender, ItemClickEventArgs e)
{
- if (btnOaClick != null) btnOaClick(this, e);
+ if (btnAllClick != null)
+ btnAllClick(this, e);
}
+
+ private void BtnLianBan_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnLianBanClick != null)
+ btnLianBanClick(this, e);
+ }
+
+ private void BtnGongZi_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnGongZiClick != null)
+ btnGongZiClick(this, e);
+ }
+
/// <summary>
/// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
@@ -452,16 +404,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);
@@ -497,14 +447,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);
@@ -522,10 +468,10 @@
lst.Add(btnCaiGouFchk.Name);
lst.Add(btnShouHouChk.Name);
lst.Add(btnShouHouFchk.Name);
+ lst.Add(btnIn.Name);
+ lst.Add(btnOut.Name);
_enabledBtn(lst);
}
-
-
}
}
@@ -549,7 +495,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";
@@ -713,7 +658,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)
@@ -912,22 +856,15 @@
/// </summary>
public event EventHandler btnFChkClick;
-
- /// <summary>
- /// 妫�楠�
- /// </summary>
- public event EventHandler btnJianYanClick;
-
- /// <summary>
- /// 鍙嶆楠�
- /// </summary>
- public event EventHandler btnFjianYanClick;
-
-
/// <summary>
/// 鎵瑰噯
/// </summary>
public event EventHandler btnPiZhunClick;
+
+ /// <summary>
+ /// 鎵瑰噯
+ /// </summary>
+ public event EventHandler btnFPiZhunClick;
/// <summary>
@@ -993,7 +930,7 @@
/// <summary>
/// 鎶ヨ〃
/// </summary>
- public event EventHandler btnReportClick;
+ public event EventHandler btnPrintClick;
/// <summary>
/// 缁撴
@@ -1036,6 +973,28 @@
/// </summary>
public event EventHandler btnOaClick;
+
+ /// <summary>
+ /// 瀵煎嚭
+ /// </summary>
+ public event EventHandler btnOutClick;
+
+ /// <summary>
+ /// 鎵归噺璁剧疆
+ /// </summary>
+ public event EventHandler btnAllClick;
+
+ /// <summary>
+ /// 杩炵彮璁剧疆
+ /// </summary>
+ public event EventHandler btnLianBanClick;
+
+
+ /// <summary>
+ /// 璁＄畻宸ヨ祫
+ /// </summary>
+ public event EventHandler btnGongZiClick;
+
#endregion
#region 鍏叡灞炴��
--
Gitblit v1.9.3