From dd7c9629d16d81bde03e42b3e9e984088f3e4d2c Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 21 一月 2025 17:28:47 +0800 Subject: [PATCH] 细节 --- DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs index dc4be61..76a3f04 100644 --- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs +++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs @@ -190,11 +190,7 @@ 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; + var token = userGuid; return token; } @@ -785,7 +781,12 @@ { var txt = ctrl as CheckEdit; txt.ReadOnly = isEdt; - txt.Checked = false; + if (txt.Tag != null && txt.Tag.ToString().Length > 0 && txt.Tag.ToString().StartsWith("moren")) + { + txt.Checked = bool.Parse(txt.Tag.ToString().Replace("moren.", "")); + } + else + txt.Checked = false; continue; } @@ -1597,23 +1598,29 @@ /// <param name="fm">褰撳墠绐椾綋</param> /// <param name="fileName">1涓哄鏍革紝0涓哄弽瀹℃牳</param> /// <param name="icoName"></param> - public static void SetCheckIco(GridView gridView1,string zdChk,string zdChkUser,string zdCkDate, PictureBox btnChkIco, Form fm, string fileName, string icoName = "") + public static void SetCheckIco(GridView gridView1, string zdChk, string zdChkUser, string zdCkDate, PictureBox btnChkIco, Form fm, string fileName, string icoName = "") { if (fileName == "1" || fileName.ToUpper() == true.ToString().ToUpper()) { btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_check; btnChkIco.Tag = "宸插鏍�"; - gridView1.SetFocusedRowCellValue(zdChkUser, "宸插鏍�"); - gridView1.SetFocusedRowCellValue(zdCkDate, DateTime.Now.ToString()); - gridView1.SetFocusedRowCellValue(zdChk, true); + if (!string.IsNullOrEmpty(zdChkUser)) + gridView1.SetFocusedRowCellValue(zdChkUser, "宸插鏍�"); + if (!string.IsNullOrEmpty(zdCkDate)) + gridView1.SetFocusedRowCellValue(zdCkDate, DateTime.Now.ToString()); + if (!string.IsNullOrEmpty(zdChk)) + gridView1.SetFocusedRowCellValue(zdChk, true); } else { btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; btnChkIco.Tag = "鏈鏍�"; - gridView1.SetFocusedRowCellValue(zdChkUser, ""); - gridView1.SetFocusedRowCellValue(zdCkDate, ""); - gridView1.SetFocusedRowCellValue(zdChk, false); + if (!string.IsNullOrEmpty(zdChkUser)) + gridView1.SetFocusedRowCellValue(zdChkUser, ""); + if (!string.IsNullOrEmpty(zdCkDate)) + gridView1.SetFocusedRowCellValue(zdCkDate, ""); + if (!string.IsNullOrEmpty(zdChk)) + gridView1.SetFocusedRowCellValue(zdChk, false); } btnChkIco.Anchor = AnchorStyles.Top | AnchorStyles.Right; // 闈犲彸 btnChkIco.Location = new Point(fm.ClientSize.Width - btnChkIco.Width - 20, 80); // 璺濈椤堕儴10鍍忕礌 @@ -1774,7 +1781,7 @@ string _isRed = row["isRed"].ToString(); if (_isRed == "1") { - e.Appearance.BackColor = Color.LightPink; + e.Appearance.ForeColor = Color.Tomato; } } // 璁剧疆鐒︾偣琛岀殑鑳屾櫙鑹� -- Gitblit v1.9.3