From c0aa9538d0c080a0ede4fe80b61bb3901db82621 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 13 二月 2025 09:45:35 +0800
Subject: [PATCH] 细节修改
---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 145 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 119 insertions(+), 26 deletions(-)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index e59d30d..a3f5459 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -24,6 +24,7 @@
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using OracleInternal.Sharding;
using UserControls.Data;
using static System.Windows.Forms.Control;
@@ -189,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;
}
@@ -454,7 +451,6 @@
txt.Enabled = !isEdt;
continue;
}
-
//鏃堕棿
if (colType is DateTimePicker)
{
@@ -644,6 +640,17 @@
txt.Enabled = false;
continue;
}
+ //鑷畾璐т富
+ if (colType is UcLookHuoZhu)
+ {
+ var txt = colType as UcLookHuoZhu;
+ //txt.SetIdOrCode(strVal);
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
+ continue;
+ }
if (colType is SimpleButton)
{
var txt = colType as SimpleButton;
@@ -765,7 +772,6 @@
txt.ReadOnly = isEdt;
continue;
}
-
//鏃堕棿
if (ctrl is DateTimePicker)
{
@@ -784,10 +790,14 @@
{
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;
}
-
//鑷畾涔変粨搴�
if (ctrl is UcLookCk)
{
@@ -905,6 +915,15 @@
{
var txt = ctrl as UcLookWwgd;
txt.SetIdOrCode("-1");
+ txt.Enabled = !isEdt;
+ continue;
+ }
+ //鑷畾涔夎揣涓�
+ if (ctrl is UcLookHuoZhu)
+ {
+ var txt = ctrl as UcLookHuoZhu;
+ txt.SetHzId("-1");
+ txt.SetHzLx(0);
txt.Enabled = !isEdt;
continue;
}
@@ -1159,6 +1178,18 @@
txt.Enabled = false;
continue;
}
+
+ //鑷畾涔夎揣涓�
+ if (ctrl is UcLookHuoZhu)
+ {
+ var txt = ctrl as UcLookHuoZhu;
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
+ continue;
+ }
+
if (ctrl is SimpleButton)
{
var txt = ctrl as SimpleButton;
@@ -1333,7 +1364,18 @@
if (string.IsNullOrEmpty(str)) return Guid.Empty;
return Guid.Parse(str);
}
+ public static decimal ToDecimal(string str)
+ {
+ try
+ {
+ return decimal.Parse(str);
+ }
+ catch (Exception)
+ {
+ return 0;
+ }
+ }
public static int ToInt(string str)
{
try
@@ -1371,12 +1413,7 @@
return true;
return false;
}
- public string GetIsNullOrEmpty(string str)
- {
- if (string.IsNullOrEmpty(str.Trim()))
- return "{>";
- return str.Trim();
- }
+
/// <summary>
/// 璇诲彇grid鐨勫綋鍓嶈
@@ -1568,7 +1605,7 @@
var checkStatus = dgv.GetRowCellValue(selectedRow, fileName).ToString(); // 鑾峰彇鎸囧畾鍒楃殑鍊�
btnChkIco.Text = checkStatus;
btnChkIco.Visible = true;
- if (checkStatus == "1" || checkStatus.ToUpper() == true.ToString().ToUpper())
+ if (checkStatus == "1" || checkStatus.ToUpper() == true.ToString().ToUpper()|| checkStatus == "宸插鏍�")
{
btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_check;
btnChkIco.Tag = "宸插鏍�";
@@ -1585,7 +1622,44 @@
}
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="gridView1"></param>
+ /// <param name="zdChk">chk瀛楁</param>
+ /// <param name="zdChkUser">chk user</param>
+ /// <param name="zdCkDate">chk date</param>
+ /// <param name="btnChkIco"></param>
+ /// <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 = "")
+ {
+ if (fileName == "1" || fileName.ToUpper() == true.ToString().ToUpper())
+ {
+ btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_check;
+ btnChkIco.Tag = "宸插鏍�";
+ 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 = "鏈鏍�";
+ 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鍍忕礌
+ }
#region 璁剧疆鎼滅储
public static string getQueryWord(string str)
{
@@ -1657,9 +1731,11 @@
/// <param name="action"></param>
public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null)
{
+ gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;
gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
foreach (GridColumn column in gridView1.Columns)
{
+ column.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
column.OptionsColumn.AllowEdit = true;
column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains;
column.OptionsFilter.AutoFilterCondition = DevExpress.XtraGrid.Columns.AutoFilterCondition.Contains;
@@ -1685,10 +1761,6 @@
gridView1.IndicatorWidth = 50;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
- //if (e.RowHandle == GridControl.AutoFilterRowHandle)
- //{
- // e.Info.DisplayText = "绛涢�夎";
- //}
if (e.Info.IsRowIndicator && e.RowHandle >= 0)
e.Info.DisplayText = (e.RowHandle + 1).ToString();
};
@@ -1731,8 +1803,10 @@
}
gridView1.RowStyle += (s, e) =>
{
- gridView1.OptionsSelection.EnableAppearanceFocusedRow = false;//榛樿閫変腑琛屼笉鍙樿壊
- gridView1.OptionsSelection.EnableAppearanceFocusedCell = false;//榛樿閫変腑鍗曞厓鏍间笉鍙樿壊
+ //榛樿閫変腑琛屼笉鍙樿壊
+ gridView1.OptionsSelection.EnableAppearanceFocusedRow = false;
+ //榛樿閫変腑鍗曞厓鏍间笉鍙樿壊
+ gridView1.OptionsSelection.EnableAppearanceFocusedCell = false;
if (e.RowHandle >= 0)
{
DataRow row = gridView1.GetDataRow(e.RowHandle);
@@ -1744,11 +1818,24 @@
string _isRed = row["isRed"].ToString();
if (_isRed == "1")
{
- e.Appearance.BackColor = Color.LightPink;
+ e.Appearance.ForeColor = Color.Tomato;
}
}
+ // 璁剧疆鐒︾偣琛岀殑鑳屾櫙鑹�
+ if (gridView1.GetRow(e.RowHandle) == gridView1.GetFocusedRow())
+ {
+ e.Appearance.BackColor = Color.Azure;
+ e.Appearance.BackColor2 = Color.LightSkyBlue;
+ }
+ //else if (gridView1.IsRowHotTracked(e.RowHandle))
+ //{
+ // // 璁剧疆榧犳爣鎮仠琛岀殑鑳屾櫙鑹�
+ // e.Appearance.BackColor = Color.LightBlue;
+ // e.Appearance.BackColor2 = Color.LightBlue;
+ //}
}
};
+
}
private static void ActiveEditor_MouseUp(object sender, MouseEventArgs e)
{
@@ -1766,7 +1853,7 @@
int _handle = gridView1.FocusedRowHandle;
bool _bl = xtraTabControl1.TabPages[0].PageEnabled;
if (_bl == false) { return; };
- if (_handle < 0 )
+ if (_handle < 0)
{
xtraTabControl1.SelectedTabPageIndex = -1;
Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇烽�夋嫨浣犺鏄剧ず鐨勮锛�" + _handle.ToString() + "tag" + xtraTabControl1.SelectedTabPageIndex.ToString());
@@ -1790,7 +1877,7 @@
}
if (xtraTabControl1.SelectedTabPageIndex == 0)
{
- // page(pageBar1.CurrentPage);
+ // page(pageBar1.CurrentPage);
}
};
}
@@ -1805,6 +1892,12 @@
/// <param name="icoName"></param>
public static void SetGridViewParameterMx(GridView gridView1)
{
+ // gridView1.OptionsView.Alignment = DataGridViewContentAlignment.MiddleLeft;
+ foreach (GridColumn column in gridView1.Columns)
+ {
+ // column.DefaultCellStyle.Alignment = true;
+ column.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
+ }
gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
gridView1.OptionsFilter.AllowFilterEditor = false;
gridView1.OptionsFilter.ShowCustomFunctions = DevExpress.Utils.DefaultBoolean.False;
--
Gitblit v1.9.3