From 64a6c4193199d15d7ac5aa67a9677df01a37a50d Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 12 六月 2025 08:04:31 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 420 +++++++++++++++++++++++++---------------------------------- 1 files changed, 181 insertions(+), 239 deletions(-) diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs index 9c514a6..f8c63f9 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs @@ -1,4 +1,15 @@ -锘縰sing System; +锘縰sing DevExpress.XtraBars; +using DevExpress.XtraEditors; +using DevExpress.XtraGrid; +using DevExpress.XtraGrid.Views.Grid; +using DevExpress.XtraLayout; +using Gs.DevApp.DevFrm.Rpt; +using Gs.DevApp.DevFrm.Sys; +using Gs.DevApp.Entity; +using Gs.DevApp.ToolBox; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; using System.Collections.Generic; using System.Configuration; using System.Data; @@ -7,19 +18,6 @@ using System.Net; using System.Text; using System.Windows.Forms; -using DevExpress.XtraBars; -using DevExpress.XtraEditors; -using DevExpress.XtraEditors.TextEditController; -using DevExpress.XtraGrid; -using DevExpress.XtraGrid.Views.Grid; -using DevExpress.XtraLayout; -using DevExpress.XtraRichEdit.Export.Rtf; -using Gs.DevApp.DevFrm.Rpt; -using Gs.DevApp.DevFrm.Sys; -using Gs.DevApp.Entity; -using Gs.DevApp.ToolBox; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; namespace Gs.DevApp.UserControl { @@ -41,15 +39,10 @@ btnIn.ItemClick += BtnIn_ItemClick; btnChk.ItemClick += BtnChk_ItemClick; btnFchk.ItemClick += BtnFchk_ItemClick; - btnJianYan.ItemClick += BtnJianYan_ItemClick; - btnFjianYan.ItemClick += BtnFjianYan_ItemClick; btnPiZhun.ItemClick += BtnPiZhun_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; @@ -59,6 +52,11 @@ btnHelp.ItemClick += BtnHelp_ItemClick; btnLayout.ItemClick += BtnLayout_ItemClick; btnFont.ItemClick += BtnFont_ItemClick; + btnShouJian.ItemClick += BtnShouJian_ItemClick; + btnCaiWuChk.ItemClick += BtnCaiWuChk_ItemClick; + btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick; + btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick; + btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick; var lst = new List<string>(); foreach (BarItem item in barManager1.Items) if (item is BarLargeButtonItem largeButtonItem) @@ -66,8 +64,6 @@ lst.Add(item.Caption); actions = lst; } - - /// <summary> @@ -114,111 +110,45 @@ } 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) btnCaiGouFchkClick(this, e); - //if (string.IsNullOrEmpty(guidKey)) - //{ - // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - // return; - //} - - //if (string.IsNullOrEmpty(chkParameter)) - //{ - // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); - // return; - //} - - //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘鍙嶅鏍稿悧锛�")) - // return; - //_ckService("-2"); } private void BtnCaiGouChk_ItemClick(object sender, ItemClickEventArgs e) { if (btnCaiGouChkClick != null) btnCaiGouChkClick(this, e); - //if (string.IsNullOrEmpty(guidKey)) - //{ - // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - // return; - //} - - //if (string.IsNullOrEmpty(chkParameter)) - //{ - // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); - // return; - //} - - //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘瀹℃牳鍚楋紵")) - // return; - //_ckService("2"); } - private void BtnZhiLiangFchk_ItemClick(object sender, ItemClickEventArgs e) + private void BtnCaiWuFchk_ItemClick(object sender, ItemClickEventArgs e) { - if (btnZhiLiangFchkClick != null) - btnZhiLiangFchkClick(this, e); - //if (string.IsNullOrEmpty(guidKey)) - //{ - // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - // return; - //} - - //if (string.IsNullOrEmpty(chkParameter)) - //{ - // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); - // return; - //} - - //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺鍙嶅鏍稿悧锛�")) - // return; - //_ckService("-3"); + if (btnCaiWuFchkClick != null) + btnCaiWuFchkClick(this, e); } - private void BtnZhiLiangChk_ItemClick(object sender, ItemClickEventArgs e) + private void BtnCaiWuChk_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"); + if (btnCaiWuChkClick != null) + btnCaiWuChkClick(this, e); + } + private void BtnShouHouFchk_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnShouHouFchkClick != null) + btnShouHouFchkClick(this, e); } + private void BtnShouHouChk_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnShouHouChkClick != null) + btnShouHouChkClick(this, e); + } + + + + private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e) { bool bl = _isCk(0); @@ -276,60 +206,12 @@ if (btnPiZhunClick != null) btnPiZhunClick(this, e); } - private void BtnFjianYan_ItemClick(object sender, ItemClickEventArgs e) + private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e) { - bool bl = _isCk(0); - if (bl) return; - if (btnFjianYanClick != null) - btnFjianYanClick(this, e); + if (btnShouJianClick != null) + btnShouJianClick(this, e); else return; - //if (string.IsNullOrEmpty(guidKey)) - //{ - // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - // return; - //} - - //if (string.IsNullOrEmpty(chkParameter)) - //{ - // MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); - // return; - //} - - //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎾ゅ洖妫�楠屽悧锛�")) - // return; - //_ckService(0.ToString()); - } - - private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e) - { - bool bl = _isCk(1); - if (bl) return; - if (btnJianYanClick != null) - btnJianYanClick(this, e); - else - return; - - //if (string.IsNullOrEmpty(guidKey)) - //{ - // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - // return; - //} - - //if (string.IsNullOrEmpty(chkParameter)) - //{ - // MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); - // return; - //} - - //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎻愪氦妫�楠屽悧锛�")) - // return; - //var _obj = new - //{ - // guid = guidKey, - // parameter = chkParameter - //}; - //_ckService(1.ToString()); } private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e) @@ -339,81 +221,87 @@ MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎叆鏈嶅姟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); return; } - - var openFileDialog = new OpenFileDialog(); - //openFileDialog.InitialDirectory = "c:\\"; - openFileDialog.Filter = "鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*"; - openFileDialog.Title = "閫夋嫨鏂囦欢"; - var result = openFileDialog.ShowDialog(); - if (result == DialogResult.OK) + //鐢ㄤ簬鍒ゆ柇iqc,ipqc棣栨锛宨pqc宸℃锛宖qc + string strType = ""; + string strService = ""; + if (xlsInService.Contains("&")) { - var WebApiUrl = ConfigurationManager.AppSettings["WebApiUrl"] + - "Upload/UploadFile"; - var strJson = - await UtilityHelper.UploadFileAsync(openFileDialog - .FileName); - var _rtn = UtilityHelper.ReturnToDynamic(strJson); - string filePath = _rtn.rtnData["filePath"].ToString(); - if (_rtn.rtnCode > 0) - { - var _obj = filePath; - try - { - strJson = UtilityHelper.HttpPost("", - "XlsInOut/" + xlsInService, - JsonConvert.SerializeObject(_obj)); - _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); - } - catch (Exception ex) - { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } - } + strType = xlsInService.Split('&')[1]; + strService = xlsInService.Split('&')[0]; } + else { + strType = ""; + strService = xlsInService; + } + //杩欐槸涓�涓殢鏈哄�硷紝灏嗕細琚綋浣滅埗浜瞘uid瀛樺埌file琛ㄤ腑锛屾湇鍔$鏍规嵁杩欎釜guid璇诲彇鐩稿簲鐨勬枃浠� + string upGuid = Guid.NewGuid().ToString(); + Gs.DevApp.UserControl.ShowUp frm = new Gs.DevApp.UserControl.ShowUp(upGuid); + frm.UpdateParent += (ss, ee) => + { + var _obj = new + { + tmpGuid = upGuid, + strType = strType, + }; + try + { + string strJson = UtilityHelper.HttpPost("", + "XlsInOut/" + strService, + JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + }; + frm.ShowDialog(); } 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) @@ -473,6 +361,11 @@ if (btnQueryClick != null) btnQueryClick(this, e); } + /// <summary> + /// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e) { if (MsgHelper.AskQuestion("纭畾瑕佽鍙栨秷鍚�?")) @@ -487,8 +380,6 @@ 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); @@ -496,11 +387,16 @@ 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); lst.Add(btnZhongTai.Name); + lst.Add(btnCaiWuChk.Name); + lst.Add(btnCaiWuFchk.Name); + lst.Add(btnCaiGouChk.Name); + lst.Add(btnCaiGouFchk.Name); + lst.Add(btnShouHouChk.Name); + lst.Add(btnShouHouFchk.Name); _enabledBtn(lst); this.currentAction = "esc"; if (btnEscClick != null) btnEscClick(this, e); @@ -508,6 +404,11 @@ } + /// <summary> + /// 淇濆瓨鎴愬姛鍚庯紝杩樺師鎸夐挳鍙敤鎬� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> private void BtnSave_ItemClick(object sender, ItemClickEventArgs e) { if (btnSaveClick != null) @@ -518,18 +419,12 @@ var lst = new List<string>(); lst.Add(btnAdd.Name); lst.Add(btnEdit.Name); - lst.Add(btnEsc.Name); 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(btnDesign.Name); lst.Add(btnReport.Name); lst.Add(btnKg.Name); @@ -540,8 +435,17 @@ lst.Add(btnFont.Name); lst.Add(btnLoad.Name); lst.Add(btnTzbl.Name); + lst.Add(btnZhongTai.Name); + lst.Add(btnCaiWuChk.Name); + lst.Add(btnCaiWuFchk.Name); + lst.Add(btnCaiGouChk.Name); + lst.Add(btnCaiGouFchk.Name); + lst.Add(btnShouHouChk.Name); + lst.Add(btnShouHouFchk.Name); _enabledBtn(lst); } + + } } @@ -564,6 +468,8 @@ lst.Add(btnHelp.Name); lst.Add(btnLayout.Name); lst.Add(btnFont.Name); + lst.Add(btnFont.Name); + lst.Add(btnLog.Name); _enabledBtn(lst); this.currentAction = "edit"; if (btnEdtClick != null) btnEdtClick(this, e); @@ -970,6 +876,29 @@ /// </summary> public event EventHandler btnZhiLiangFchkClick; + + /// <summary> + /// 璐㈠姟瀹℃牳 + /// </summary> + public event EventHandler btnCaiWuChkClick; + + + /// <summary> + /// 璐㈠姟鍙嶅鏍� + /// </summary> + public event EventHandler btnCaiWuFchkClick; + + /// <summary> + /// 鍞悗瀹℃牳 + /// </summary> + public event EventHandler btnShouHouChkClick; + + + /// <summary> + /// 鍞悗鍙嶅鏍� + /// </summary> + public event EventHandler btnShouHouFchkClick; + /// <summary> /// 椹冲洖 /// </summary> @@ -1016,8 +945,21 @@ /// </summary> public event EventHandler btnWgClick; + /// <summary> + /// 鐢熸垚棣栨 + /// </summary> + public event EventHandler btnShouJianClick; - //public event EventHandler btnLayoutClick; + /// <summary> + /// 鍙戦�丱A + /// </summary> + public event EventHandler btnOaClick; + + + /// <summary> + /// 瀵煎嚭 + /// </summary> + public event EventHandler btnOutClick; #endregion @@ -1228,7 +1170,7 @@ { spt.RestoreLayoutFromStream(stream); } - // spt.Horizontal = false; + // spt.Horizontal = false; spt.Panel1.AutoScroll = false; spt.Panel2.AutoScroll = false; //spt.Panel1.MaximumSize = new System.Drawing.Size(spt.Panel1.Width, 100); -- Gitblit v1.9.3