From cefcc903f51610846fa313a3a35bca34e129c1fe Mon Sep 17 00:00:00 2001 From: 啊鑫 <t2856754968@163.com> Date: 星期五, 25 十月 2024 08:57:01 +0800 Subject: [PATCH] 代码清理以及格式化 --- DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 532 +++++++++++++++++++++++++++++------------------------------ 1 files changed, 262 insertions(+), 270 deletions(-) diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs index 24cf5c3..385e3e1 100644 --- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs +++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs @@ -1,45 +1,40 @@ -锘縰sing Newtonsoft.Json.Linq; -using System; -using System.Data; -using System.IO; -using System.Linq; -using System.Net; -using System.Reflection; -using System.Text; -using System.Resources; -using System.Drawing; -using Newtonsoft.Json; -using Gs.DevApp.Entity; -using System.Windows.Forms; -using static System.Windows.Forms.Control; -using DevExpress.XtraEditors; -using DevExpress.XtraTab; -using System.Text.RegularExpressions; +锘縰sing System; using System.Collections.Generic; -using Gs.DevApp.UserControl; -using DevExpress.XtraGrid.Columns; -using DevExpress.XtraGrid; -using DevExpress.XtraGrid.Views.Grid; using System.Configuration; -using DevExpress.XtraGrid.Views.Grid.ViewInfo; -using DevExpress.XtraTreeList.Nodes; -using DevExpress.XtraTreeList; +using System.Data; +using System.Drawing; +using System.IO; +using System.Net; using System.Net.Http; +using System.Reflection; +using System.Resources; +using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; -using DevExpress.Data.Helpers; -using DevExpress.Utils.About; -using DevExpress.Office.Model; +using System.Windows.Forms; +using DevExpress.XtraEditors; +using DevExpress.XtraEditors.Controls; +using DevExpress.XtraGrid; +using DevExpress.XtraGrid.Columns; +using DevExpress.XtraGrid.Views.Grid; +using DevExpress.XtraTab; +using DevExpress.XtraTreeList; +using Gs.DevApp.Entity; +using Gs.DevApp.UserControl; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using static System.Windows.Forms.Control; namespace Gs.DevApp.ToolBox { /// <summary> - /// 閫氱敤绫� + /// 閫氱敤绫� /// </summary> public class UtilityHelper { - private static string WebApiUrl = ConfigurationManager.AppSettings["WebApiUrl"].ToString(); - + private static readonly string WebApiUrl = + ConfigurationManager.AppSettings["WebApiUrl"]; public static async Task<string> UploadFileAsync(string filePath) @@ -47,20 +42,24 @@ using (var httpClient = new HttpClient()) using (var form = new MultipartFormDataContent()) { - httpClient.DefaultRequestHeaders.Add("token", ToolBox.UtilityHelper.GetBasicAuthTicket()); + httpClient.DefaultRequestHeaders.Add("token", + GetBasicAuthTicket()); using (var fs = File.OpenRead(filePath)) using (var streamContent = new StreamContent(fs)) { form.Add(streamContent, "file", Path.GetFileName(filePath)); - var response = await httpClient.PostAsync(WebApiUrl + "Upload/UploadFile", form); - string responseString = await response.Content.ReadAsStringAsync(); + var response = + await httpClient.PostAsync( + WebApiUrl + "Upload/UploadFile", form); + var responseString = + await response.Content.ReadAsStringAsync(); return responseString; } } } /// <summary> - /// httpPost璁块棶鏈嶅姟 + /// httpPost璁块棶鏈嶅姟 /// </summary> /// <param name="url">鏈嶅姟鍦板潃</param> /// <param name="meth">鏂规硶鍚嶇О</param> @@ -71,7 +70,7 @@ if (string.IsNullOrEmpty(url)) url = WebApiUrl; url += meth; - HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url); + var request = (HttpWebRequest)WebRequest.Create(url); request.Method = "POST"; request.ContentType = "application/json"; request.Headers.Add("token", GetBasicAuthTicket()); @@ -89,7 +88,8 @@ response = request.GetResponse(); if (response != null) { - StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8); + var reader = new StreamReader(response.GetResponseStream(), + Encoding.UTF8); responseStr = reader.ReadToEnd(); //File.WriteAllText(Server.MapPath("~/") + @"\test.txt", responseStr); reader.Close(); @@ -106,105 +106,112 @@ requestStream = null; response = null; } + return responseStr; } /// <summary> - /// 榛樿椤靛ぇ灏� + /// 榛樿椤靛ぇ灏� /// </summary> /// <returns></returns> public static int GetPageSize() { - return int.Parse(System.Configuration.ConfigurationSettings.AppSettings.Get("PageSize").ToString()); + return int.Parse(ConfigurationSettings.AppSettings.Get("PageSize")); } /// <summary> - /// 鏍规嵁鍥剧墖鍚嶈鍙栬祫婧愭枃浠�,涓嶅甫鍚庣紑鍚� + /// 鏍规嵁鍥剧墖鍚嶈鍙栬祫婧愭枃浠�,涓嶅甫鍚庣紑鍚� /// </summary> /// <param name="imageName"></param> /// <param name="lay">1涓哄ぇ鍥�</param> /// <returns></returns> public static Image GetImgFromResource(string imageName, int lay) { - Assembly assembly = Assembly.GetExecutingAssembly(); - ResourceManager resourceManager = new ResourceManager("Gs.DevApp.Properties.Resources", assembly); + var assembly = Assembly.GetExecutingAssembly(); + var resourceManager = + new ResourceManager("Gs.DevApp.Properties.Resources", assembly); try { - Image image = resourceManager.GetObject(imageName) as Image; - if (image != null) - { - return image; - } + var image = resourceManager.GetObject(imageName) as Image; + if (image != null) return image; } catch (Exception ex) { - } - Image image2 = resourceManager.GetObject(lay == 1 ? "chartsshowlegend_32x32" : "linktoprevious_16x16") as Image; + + var image2 = resourceManager.GetObject(lay == 1 + ? "chartsshowlegend_32x32" + : "linktoprevious_16x16") as Image; return image2; } /// <summary> - /// 鍒濆鍖栦竴涓〃 + /// 鍒濆鍖栦竴涓〃 /// </summary> /// <param name="gc"></param> /// <param name="gv"></param> public static void SetDefaultTable(GridControl gc, GridView gv) { - DataTable dt = new DataTable(); + var dt = new DataTable(); foreach (GridColumn col in gv.Columns) - { dt.Columns.Add(col.FieldName, typeof(string)); - } gc.BindingContext = new BindingContext(); gc.DataSource = dt; gc.ForceInitialize(); } + /// <summary> - /// 鐢熸垚璁块棶鏈嶅姟鐨則oken + /// 鐢熸垚璁块棶鏈嶅姟鐨則oken /// </summary> /// <returns></returns> public static string GetBasicAuthTicket() { - string userGuid = string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginUserGuid) ? Guid.NewGuid().ToString() : LoginInfoModel.CurrentUser.LoginUserGuid; - string orgGuid = string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginOrgGuid) ? Guid.NewGuid().ToString() : LoginInfoModel.CurrentUser.LoginOrgGuid; - string token = (userGuid + "~" + orgGuid); + var userGuid = + string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginUserGuid) + ? Guid.NewGuid().ToString() + : LoginInfoModel.CurrentUser.LoginUserGuid; + var orgGuid = + string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginOrgGuid) + ? Guid.NewGuid().ToString() + : LoginInfoModel.CurrentUser.LoginOrgGuid; + var token = userGuid + "~" + orgGuid; return token; } + /// <summary> - /// 鏈嶅姟杩斿洖鐨刯son杞负ReturnModel-->鍖呭惈TablePage鍒嗛〉锛� + /// 鏈嶅姟杩斿洖鐨刯son杞负ReturnModel-->鍖呭惈TablePage鍒嗛〉锛� /// </summary> /// <param name="strReturn"></param> /// <returns></returns> - public static ReturnModel<PageListModel> ReturnToTablePage(string strReturn) + public static ReturnModel<PageListModel> ReturnToTablePage( + string strReturn) { - ReturnModel<PageListModel> rto = new ReturnModel<PageListModel>(); - JObject json = JObject.Parse(strReturn); + var rto = new ReturnModel<PageListModel>(); + var json = JObject.Parse(strReturn); rto.rtnCode = int.Parse(json["rtnCode"].ToString()); rto.rtnMsg = json["rtnMsg"].ToString(); rto.rtnData = new PageListModel(); rto.rtnData.pages = int.Parse(json["rtnData"]["pages"].ToString()); rto.rtnData.total = int.Parse(json["rtnData"]["total"].ToString()); - rto.rtnData.everyPageSize = int.Parse(json["rtnData"]["everyPageSize"].ToString()); - JArray array = new JArray(); + rto.rtnData.everyPageSize = + int.Parse(json["rtnData"]["everyPageSize"].ToString()); + var array = new JArray(); var d = json["rtnData"]["list"]; - foreach (var a in d) - { - array.Add(a); - } - DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString()); + foreach (var a in d) array.Add(a); + var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString()); rto.rtnData.list = dt; return rto; } + /// <summary> - /// 鏈嶅姟杩斿洖鐨刯son杩斿洖ReturnModel锛� + /// 鏈嶅姟杩斿洖鐨刯son杩斿洖ReturnModel锛� /// </summary> /// <param name="strReturn"></param> /// <returns></returns> public static ReturnModel<dynamic> ReturnToDynamic(string strReturn) { - ReturnModel<dynamic> rto = new ReturnModel<dynamic>(); - JObject json = JObject.Parse(strReturn); + var rto = new ReturnModel<dynamic>(); + var json = JObject.Parse(strReturn); rto.rtnCode = int.Parse(json["rtnCode"].ToString()); rto.rtnMsg = json["rtnMsg"].ToString(); rto.rtnData = json["rtnData"]; @@ -212,133 +219,135 @@ } /// <summary> - /// 鏈嶅姟杩斿洖鐨刯son涓茶繑鍥濺eturnModel-->浠呬粎鏈塴ist,涓嶅垎椤碉紝 + /// 鏈嶅姟杩斿洖鐨刯son涓茶繑鍥濺eturnModel-->浠呬粎鏈塴ist,涓嶅垎椤碉紝 /// </summary> /// <param name="strReturn"></param> /// <returns></returns> public static ReturnModel<DataTable> ReturnToList(string strReturn) { - ReturnModel<DataTable> rto = new ReturnModel<DataTable>(); - JObject json = JObject.Parse(strReturn); + var rto = new ReturnModel<DataTable>(); + var json = JObject.Parse(strReturn); rto.rtnCode = int.Parse(json["rtnCode"].ToString()); rto.rtnMsg = json["rtnMsg"].ToString(); rto.rtnData = new DataTable(); - JArray array = new JArray(); + var array = new JArray(); var d = json["rtnData"]; - foreach (var a in d) - { - array.Add(a); - } - DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString()); + foreach (var a in d) array.Add(a); + var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString()); rto.rtnData = dt; return rto; } /// <summary> - /// 鏍规嵁瀵硅薄鎵归噺璁剧疆鏂囨湰妗嗙殑鍊� + /// 鏍规嵁瀵硅薄鎵归噺璁剧疆鏂囨湰妗嗙殑鍊� /// </summary> /// <param name="controls">controls:涓篻roupBox1.Controls/panel1.Controls</param> /// <param name="dynamicObject">瀵瑰儚</param> /// <param name="isEdt">鏄惁鍙紪杈�</param> /// <param name="gridViews">鍏宠仈鐨刧rid</param> - public static void SetValueByObj(ControlCollection controls, dynamic dynamicObject, Boolean isEdt, List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = null) + public static void SetValueByObj(ControlCollection controls, + dynamic dynamicObject, bool isEdt, List<GridView> gridViews = null) { isEdt = !isEdt; if (gridViews != null) - { - foreach (DevExpress.XtraGrid.Views.Grid.GridView gv in gridViews) - { + foreach (var gv in gridViews) gv.OptionsBehavior.Editable = !isEdt; - } - } foreach (JProperty property in dynamicObject.Properties()) { - string strName = property.Name; - string strVal = property.Value.ToString(); + var strName = property.Name; + var strVal = property.Value.ToString(); try { - string _dddddd = "txt_" + strName; - Control[] cols = controls.Find(_dddddd, true); + var _dddddd = "txt_" + strName; + var cols = controls.Find(_dddddd, true); if (cols.Length > 0) { - Control colType = cols[0]; + var colType = cols[0]; if (colType is LookUpEdit) { - LookUpEdit txt = colType as LookUpEdit; - if (txt != null) - { - txt.EditValue = strVal; - } + var txt = colType as LookUpEdit; + if (txt != null) txt.EditValue = strVal; txt.ReadOnly = isEdt; continue; } + if (colType is ImageComboBoxEdit) { - ImageComboBoxEdit txt = colType as ImageComboBoxEdit; - for (int i = 0; i < txt.Properties.Items.Count; i++) + var txt = colType as ImageComboBoxEdit; + for (var i = 0; i < txt.Properties.Items.Count; i++) { - if (txt.Properties.Items[i].Description == strVal) + if (txt.Properties.Items[i].Description == + strVal) { txt.ReadOnly = isEdt; txt.SelectedIndex = i; - continue; - }; + } + + ; } + continue; } + if (colType is ComboBoxEdit) { - ComboBoxEdit txt = colType as ComboBoxEdit; - if (txt.Properties.TextEditStyle == DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor) + var txt = colType as ComboBoxEdit; + if (txt.Properties.TextEditStyle == + TextEditStyles.DisableTextEditor) txt.SelectedIndex = int.Parse(strVal); else txt.Text = strVal; txt.ReadOnly = isEdt; continue; } + //涓嬫媺 if (colType is ComboBoxEdit) { - ComboBoxEdit txt = colType as ComboBoxEdit; - if (txt.Properties.TextEditStyle == DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor) + var txt = colType as ComboBoxEdit; + if (txt.Properties.TextEditStyle == + TextEditStyles.DisableTextEditor) txt.SelectedIndex = int.Parse(strVal); else txt.Text = strVal; txt.ReadOnly = isEdt; continue; } + //鑷畾涔変笅鎷� if (colType is UcComBox) { - UcComBox txt = colType as UcComBox; + var txt = colType as UcComBox; txt.Val = strVal; txt.Enabled = !isEdt; continue; } + //鏂囨湰 if (colType is TextEdit) { - TextEdit txt = colType as TextEdit; + var txt = colType as TextEdit; if (txt != null) txt.Text = strVal; txt.ReadOnly = isEdt; continue; } + //鏁板瓧鍗� if (colType is NumericUpDown) { - NumericUpDown txt = colType as NumericUpDown; + var txt = colType as NumericUpDown; if (txt != null) txt.Text = strVal; txt.ReadOnly = isEdt; continue; } + //鍗曢�� if (colType is CheckEdit) { - CheckEdit txt = colType as CheckEdit; + var txt = colType as CheckEdit; if (txt != null) - { switch (strVal) { case "True": @@ -354,41 +363,45 @@ txt.Checked = false; break; } - } + txt.ReadOnly = isEdt; continue; } + //鍗曢�� if (colType is CheckBox) { - CheckBox txt = colType as CheckBox; + var txt = colType as CheckBox; if (txt != null) txt.Checked = bool.Parse(strVal); txt.Enabled = !isEdt; continue; } + //鏃堕棿 if (colType is DateTimePicker) { - DateTimePicker txt = colType as DateTimePicker; - txt.Text = strVal.ToString(); + var txt = colType as DateTimePicker; + txt.Text = strVal; txt.Enabled = !isEdt; continue; } + //Label if (colType is Label) { - Label txt = colType as Label; + var txt = colType as Label; if (_dddddd == "txt_checkStatus") { - if (strVal.ToString() == "True") + if (strVal == "True") txt.Text = "宸插鏍�"; - if (strVal.ToString() == "False") + if (strVal == "False") txt.Text = "鏈鏍�"; } else - txt.Text = strVal.ToString(); - continue; + { + txt.Text = strVal; + } } } } @@ -400,133 +413,132 @@ } /// <summary> - /// 娓呯┖瀹瑰櫒閲岄潰鐨勬帶浠� + /// 娓呯┖瀹瑰櫒閲岄潰鐨勬帶浠� /// </summary> /// <param name="controls">controls:涓篻roupBox1.Controls/panel1.Controls</param> /// <param name="isEdt">鏄惁鍙紪杈�</param> /// <param name="gridViews">鍏宠仈鐨刧rid</param> - public static void CleanValueByControl(ControlCollection controls, Boolean isEdt, List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = null) + public static void CleanValueByControl(ControlCollection controls, + bool isEdt, List<GridView> gridViews = null) { isEdt = !isEdt; if (gridViews != null) - { - foreach (DevExpress.XtraGrid.Views.Grid.GridView gv in gridViews) - { + foreach (var gv in gridViews) gv.OptionsBehavior.Editable = !isEdt; - } - } foreach (Control ctrl in controls) { //澶氳鏂囨湰 if (ctrl is MemoEdit) { - MemoEdit txt = ctrl as MemoEdit; + var txt = ctrl as MemoEdit; txt.Text = ""; txt.ReadOnly = isEdt; continue; } + //涓嬫媺 if (ctrl is ComboBoxEdit) { - ComboBoxEdit txt = ctrl as ComboBoxEdit; - if (txt.Properties.TextEditStyle == DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor) + var txt = ctrl as ComboBoxEdit; + if (txt.Properties.TextEditStyle == + TextEditStyles.DisableTextEditor) txt.SelectedIndex = 0; else txt.Text = ""; txt.ReadOnly = isEdt; continue; } + //鑷畾涔夌殑涓嬫媺 if (ctrl is UcComBox) { - UcComBox txt = ctrl as UcComBox; + var txt = ctrl as UcComBox; txt.Val = "0"; txt.Enabled = !isEdt; continue; } + //鏂囨湰 if (ctrl is TextEdit) { - TextEdit txt = ctrl as TextEdit; + var txt = ctrl as TextEdit; txt.Text = ""; txt.ReadOnly = isEdt; continue; } + //鏃堕棿 if (ctrl is DateTimePicker) { - DateTimePicker txt = ctrl as DateTimePicker; + var txt = ctrl as DateTimePicker; txt.Enabled = !isEdt; continue; } + //鍗曢�� if (ctrl is CheckBox) { - CheckBox txt = ctrl as CheckBox; + var txt = ctrl as CheckBox; txt.Checked = false; txt.Enabled = !isEdt; - continue; } } } /// <summary> - /// 绂佺敤鎴栧惎鐢ㄥ鍣ㄩ噷闈㈢殑鎺т欢 + /// 绂佺敤鎴栧惎鐢ㄥ鍣ㄩ噷闈㈢殑鎺т欢 /// </summary> /// <param name="controls">controls:涓篻roupBox1.Controls/panel1.Controls</param> /// <param name="isEdt"></param> /// <param name="gridViews"></param> - public static void ChangeEnableByControl(ControlCollection controls, Boolean isEdt, List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = null) + public static void ChangeEnableByControl(ControlCollection controls, + bool isEdt, List<GridView> gridViews = null) { isEdt = !isEdt; if (gridViews != null) - { - foreach (DevExpress.XtraGrid.Views.Grid.GridView gv in gridViews) - { + foreach (var gv in gridViews) gv.OptionsBehavior.Editable = !isEdt; - } - } foreach (Control ctrl in controls) { //鏂囨湰 if (ctrl is TextEdit) { - TextEdit txt = ctrl as TextEdit; + var txt = ctrl as TextEdit; txt.ReadOnly = isEdt; continue; } + //鏁板瓧鍗� if (ctrl is NumericUpDown) { - NumericUpDown txt = ctrl as NumericUpDown; + var txt = ctrl as NumericUpDown; txt.ReadOnly = isEdt; continue; } + //涓嬫媺 if (ctrl is UcComBox) { - UcComBox txt = ctrl as UcComBox; + var txt = ctrl as UcComBox; txt.Val = "0"; txt.Enabled = !isEdt; continue; } + //鏃ユ湡 if (ctrl is DateTimePicker) { ctrl.Enabled = !isEdt; continue; } + //鍗曢�� - if (ctrl is CheckBox) - { - ctrl.Enabled = !isEdt; - continue; - } + if (ctrl is CheckBox) ctrl.Enabled = !isEdt; } } /// <summary> - ///鍒囨崲閫夐」鍗� + /// 鍒囨崲閫夐」鍗� /// </summary> /// <param name="tabControl">閫夐」鍗″鍣�</param> /// <param name="idx">浠�0寮�濮嬶紝濡傛灉鏄�999锛屽垯鍏ㄩ儴鍙敤</param> @@ -534,23 +546,20 @@ { if (idx == 999) { - for (int i = 0; i < tabControl.TabPages.Count; i++) - { + for (var i = 0; i < tabControl.TabPages.Count; i++) tabControl.TabPages[i].PageEnabled = true; - } tabControl.SelectedTabPageIndex = tabControl.TabPages.Count - 1; return; } - for (int i = 0; i < tabControl.TabPages.Count; i++) - { + + for (var i = 0; i < tabControl.TabPages.Count; i++) tabControl.TabPages[i].PageEnabled = false; - } tabControl.TabPages[idx].PageEnabled = true; tabControl.SelectedTabPageIndex = idx; } /// <summary> - /// TreeView鑱斿姩閫夋嫨 + /// TreeView鑱斿姩閫夋嫨 /// </summary> /// <param name="e"></param> public static void TreeViewCheck(TreeViewEventArgs e) @@ -558,7 +567,6 @@ try { if (e.Node.Nodes.Count > 0) - { foreach (TreeNode tn in e.Node.Nodes) { tn.Checked = e.Node.Checked; @@ -566,15 +574,14 @@ { x.Checked = e.Node.Checked; foreach (TreeNode y in x.Nodes) - { y.Checked = e.Node.Checked; - } } } - } - if (e.Node.Checked == true && e.Node.Parent != null && e.Node.Parent.Nodes.Count > 0) + + if (e.Node.Checked && e.Node.Parent != null && + e.Node.Parent.Nodes.Count > 0) { - TreeNode currentNode = e.Node; + var currentNode = e.Node; while (currentNode != null) { currentNode.Checked = e.Node.Checked; @@ -584,41 +591,42 @@ } catch (Exception ex) { - ToolBox.MsgHelper.ShowError(ex.Message); + MsgHelper.ShowError(ex.Message); } } /// <summary> - /// 杞┘宄板懡鍚� + /// 杞┘宄板懡鍚� /// </summary> /// <param name="input"></param> /// <returns></returns> public static string ToCamelCase(string strItem) { //濡傛灉鍖呭惈灏忓啓锛屼絾涓嶅寘鍚笅鍒掔嚎 - bool hasLowercase = Regex.IsMatch(strItem, @"[a-z]"); + var hasLowercase = Regex.IsMatch(strItem, @"[a-z]"); if (hasLowercase && !strItem.Contains("_")) { - char[] chars = strItem.ToCharArray(); + var chars = strItem.ToCharArray(); chars[0] = char.ToLower(chars[0]); return new string(chars); } - string[] strItems = strItem.ToLower().Split('_'); - string strItemTarget = strItems[0]; - for (int j = 1; j < strItems.Length; j++) + + var strItems = strItem.ToLower().Split('_'); + var strItemTarget = strItems[0]; + for (var j = 1; j < strItems.Length; j++) { - string temp = strItems[j].ToString(); - string temp1 = temp[0].ToString().ToUpper(); - string temp2 = ""; + var temp = strItems[j]; + var temp1 = temp[0].ToString().ToUpper(); + var temp2 = ""; temp2 = temp1 + temp.Remove(0, 1); strItemTarget += temp2; } - return strItemTarget; + return strItemTarget; } /// <summary> - /// 璇诲彇grid鐨勫綋鍓嶈 + /// 璇诲彇grid鐨勫綋鍓嶈 /// </summary> /// <param name="xtraTabControl1"></param> /// <param name="lbGuid">缂栬緫妗嗕腑鐨勪富閿悕</param> @@ -626,25 +634,26 @@ /// <param name="gridView1"></param> /// <param name="SelectedTabPageIndex"></param> /// <returns></returns> - public static (string, string) GetCurrentRow(XtraTabControl xtraTabControl1 - , System.Windows.Forms.Label lbGuid - , DevExpress.XtraEditors.TextEdit txtName - , DevExpress.XtraGrid.Views.Grid.GridView gridView1 + public static (string, string) GetCurrentRow( + XtraTabControl xtraTabControl1 + , Label lbGuid + , TextEdit txtName + , GridView gridView1 , int SelectedTabPageIndex = 1) { - string _strGuid = ""; - string _strName = ""; - if (xtraTabControl1.SelectedTabPageIndex == SelectedTabPageIndex && lbGuid.Text.Length > 10) + var _strGuid = ""; + var _strName = ""; + if (xtraTabControl1.SelectedTabPageIndex == SelectedTabPageIndex && + lbGuid.Text.Length > 10) { _strGuid = lbGuid.Text.Trim(); _strName = txtName.Text.Trim(); } else { - DataRow dr = gridView1.GetFocusedDataRow(); + var dr = gridView1.GetFocusedDataRow(); if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString())) { - } else { @@ -652,10 +661,12 @@ _strName = dr[2].ToString(); } } + return (_strGuid, _strName); } + /// <summary> - /// 璇诲彇TreeView鐨勫綋鍓嶈 + /// 璇诲彇TreeView鐨勫綋鍓嶈 /// </summary> /// <param name="xtraTabControl1"></param> /// <param name="lbGuid"></param> @@ -663,33 +674,36 @@ /// <param name="tlMenu"></param> /// <param name="SelectedTabPageIndex"></param> /// <returns></returns> - public static (string, string) GetCurrentRow(XtraTabControl xtraTabControl1 - , System.Windows.Forms.Label lbGuid - , DevExpress.XtraEditors.TextEdit txtName - , System.Windows.Forms.TreeView tlMenu + public static (string, string) GetCurrentRow( + XtraTabControl xtraTabControl1 + , Label lbGuid + , TextEdit txtName + , TreeView tlMenu , int SelectedTabPageIndex = 1) { - string _strGuid = ""; - string _strName = ""; - if (xtraTabControl1.SelectedTabPageIndex == SelectedTabPageIndex && lbGuid.Text.Length > 10) + var _strGuid = ""; + var _strName = ""; + if (xtraTabControl1.SelectedTabPageIndex == SelectedTabPageIndex && + lbGuid.Text.Length > 10) { _strGuid = lbGuid.Text.Trim(); _strName = txtName.Text.Trim(); } else { - TreeNode clickedNode = tlMenu.SelectedNode; + var clickedNode = tlMenu.SelectedNode; if (clickedNode != null) { - _strGuid = clickedNode.Name.ToString(); + _strGuid = clickedNode.Name; _strName = clickedNode.Text.Trim(); } } + return (_strGuid, _strName); } /// <summary> - /// 璇诲彇TreeList鐨勫綋鍓嶈 + /// 璇诲彇TreeList鐨勫綋鍓嶈 /// </summary> /// <param name="xtraTabControl1"></param> /// <param name="lbGuid"></param> @@ -697,15 +711,17 @@ /// <param name="tlMenu"></param> /// <param name="SelectedTabPageIndex"></param> /// <returns></returns> - public static (string, string) GetCurrentRow(XtraTabControl xtraTabControl1 - , System.Windows.Forms.Label lbGuid - , DevExpress.XtraEditors.TextEdit txtName - , DevExpress.XtraTreeList.TreeList tlMenu + public static (string, string) GetCurrentRow( + XtraTabControl xtraTabControl1 + , Label lbGuid + , TextEdit txtName + , TreeList tlMenu , int SelectedTabPageIndex = 1) { - string _strGuid = ""; - string _strName = ""; - if (xtraTabControl1.SelectedTabPageIndex == SelectedTabPageIndex && lbGuid.Text.Length > 10) + var _strGuid = ""; + var _strName = ""; + if (xtraTabControl1.SelectedTabPageIndex == SelectedTabPageIndex && + lbGuid.Text.Length > 10) { _strGuid = lbGuid.Text.Trim(); _strName = txtName.Text.Trim(); @@ -715,151 +731,127 @@ _strGuid = tlMenu.FocusedNode.GetValue("guid").ToString(); _strName = tlMenu.FocusedNode.GetValue(0).ToString(); } + return (_strGuid, _strName); } /// <summary> - /// 璇诲彇GridView鍙屽嚮鐨勪富閿� + /// 璇诲彇GridView鍙屽嚮鐨勪富閿� /// </summary> /// <param name="gridView1"></param> /// <param name="e"></param> /// <param name="colName"></param> /// <returns></returns> - public static string GetCurrentDoubleRow(DevExpress.XtraGrid.Views.Grid.GridView gridView1 + public static string GetCurrentDoubleRow(GridView gridView1 , MouseEventArgs e , string colName) { - GridHitInfo info = gridView1.CalcHitInfo(e.Location); + var info = gridView1.CalcHitInfo(e.Location); if (info.InRow) { - GridView view = info.View as GridView; + var view = info.View; if (view != null) { - DataRow row = view.GetDataRow(info.RowHandle); + var row = view.GetDataRow(info.RowHandle); if (row != null) { - string rowGuid = (row[colName].ToString()); + var rowGuid = row[colName].ToString(); return rowGuid; } } } + return ""; } /// <summary> - /// 璇诲彇GridView鍙屽嚮鐨勪富閿� + /// 璇诲彇GridView鍙屽嚮鐨勪富閿� /// </summary> /// <param name="gridView1"></param> /// <param name="e"></param> /// <param name="colName"></param> /// <returns></returns> - public static string GetCurrentDoubleRow(DevExpress.XtraTreeList.TreeList tlMenu + public static string GetCurrentDoubleRow(TreeList tlMenu , MouseEventArgs e , string colName) { - TreeListHitInfo info = tlMenu.CalcHitInfo(e.Location); + var info = tlMenu.CalcHitInfo(e.Location); if (info.Node != null) { - TreeListNode clickedNode = tlMenu.FocusedNode; + var clickedNode = tlMenu.FocusedNode; if (clickedNode.FirstNode == null) { - string rowGuid = clickedNode.GetValue(colName).ToString(); + var rowGuid = clickedNode.GetValue(colName).ToString(); return rowGuid; } } + return ""; } - - } /// <summary> - /// 涓嬫媺妗嗘潯鐩被 + /// 涓嬫媺妗嗘潯鐩被 /// </summary> public class CboItemEntity { public CboItemEntity() { } + public CboItemEntity(string val, string text) { - this.Text = text; - this.Value = val; + Text = text; + Value = val; } - private object _text = 0; - private object _Value = ""; + /// <summary> - /// 鏄剧ず鍊� + /// 鏄剧ず鍊� /// </summary> - public object Text - { - get { return this._text; } - set { this._text = value; } - } + public object Text { get; set; } = 0; + /// <summary> - /// 瀵硅薄鍊� + /// 瀵硅薄鍊� /// </summary> - public object Value - { - get { return this._Value; } - set { this._Value = value; } - } + public object Value { get; set; } = ""; public override string ToString() { - return this.Text.ToString(); + return Text.ToString(); } } /// <summary> - /// 鏌ヨ妗� + /// 鏌ヨ妗� /// </summary> public class FilterEntity { /// <summary> - /// /// </summary> /// <param name="id">瀛楁鍚�</param> /// <param name="idDec">瀛楁鍚嶅娉�</param> /// <param name="oper">鎿嶄綔绗�</param> /// <param name="operDec">鎿嶄綔绗﹀娉�</param> /// <param name="val"></param> - public FilterEntity(string id, string idDec, string oper, string operDec, string val) + public FilterEntity(string id, string idDec, string oper, + string operDec, string val) { - this.fileId = id; - this.fileIdDec = idDec; - this.fileOper = oper; - this.fileOperDec = operDec; - this.fileValue = val; + fileId = id; + fileIdDec = idDec; + fileOper = oper; + fileOperDec = operDec; + fileValue = val; } - public string fileId - { - get; - set; - } - public string fileIdDec - { - get; - set; - } - public string fileOper - { - get; - set; - } - public string fileOperDec - { - get; - set; - } - public string fileValue - { - get; - set; - } + + public string fileId { get; set; } + + public string fileIdDec { get; set; } + + public string fileOper { get; set; } + + public string fileOperDec { get; set; } + + public string fileValue { get; set; } } - - - -} +} \ No newline at end of file -- Gitblit v1.9.3