From a44e14cc44c5beea13cfa0accd2237c3a8a07202 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 01 四月 2025 16:56:35 +0800
Subject: [PATCH] 现场修理
---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 100 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 78 insertions(+), 22 deletions(-)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 9eea9e9..e2dae72 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -282,6 +282,8 @@
if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
{
colmn.Visible = !isEdt;
+ if (colmn.Visible==true)
+ colmn.VisibleIndex = 99999;
}
else
{
@@ -409,7 +411,14 @@
if (colType is CheckEdit)
{
var txt = colType as CheckEdit;
+ if (_isRead(txt.Tag))
+ {
+ txt.ReadOnly = true;
+ }
+ else
+ txt.ReadOnly = isEdt;
if (txt != null)
+ {
switch (strVal)
{
case "True":
@@ -425,8 +434,8 @@
txt.Checked = false;
break;
}
+ }
- txt.ReadOnly = isEdt;
continue;
}
//鍗曢��
@@ -452,6 +461,7 @@
txt.Enabled = !isEdt;
continue;
}
+
//鏃堕棿
if (colType is DateTimePicker)
{
@@ -797,7 +807,6 @@
else
txt.ReadOnly = isEdt;
continue;
-
}
//鑷畾涔変粨搴�
if (ctrl is UcLookCk)
@@ -1582,7 +1591,6 @@
return rowGuid;
}
}
-
return "";
}
@@ -1600,7 +1608,7 @@
GridView dgv = s as GridView;
if (dgv != null)
{
- if (dgv.GetSelectedRows() != null && dgv.GetSelectedRows().Count()>0)
+ if (dgv.GetSelectedRows() != null && dgv.GetSelectedRows().Count() > 0)
{
var selectedRow = dgv.GetSelectedRows()[0]; // 鑾峰彇绗竴涓�変腑琛岀殑绱㈠紩
if (selectedRow >= 0)
@@ -1638,6 +1646,23 @@
/// <param name="icoName"></param>
public static void SetCheckIco(GridView gridView1, string zdChk, string zdChkUser, string zdCkDate, PictureBox btnChkIco, Form fm, string fileName, string icoName = "")
{
+ btnChkIco.Anchor = AnchorStyles.Top | AnchorStyles.Right; // 闈犲彸
+ btnChkIco.Location = new Point(fm.ClientSize.Width - btnChkIco.Width - 20, 80); // 璺濈椤堕儴10鍍忕礌
+ if (gridView1 == null)
+ {
+ btnChkIco.Visible = true;
+ if (fileName == "1")
+ {
+ btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_check;
+ btnChkIco.Tag = "宸插鏍�";
+ }
+ else
+ {
+ btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ btnChkIco.Tag = "鏈鏍�";
+ }
+ return;
+ }
if (fileName == "1" || fileName.ToUpper() == true.ToString().ToUpper())
{
btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_check;
@@ -1660,17 +1685,14 @@
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)
+
+ public static FilterEntity getFilterEntityWord(string id, string idDec, string val, string type)
{
- return str.ToUpper().Replace("query_".ToUpper(), "");
- }
- public static FilterEntity getFilterEntityWord(string id, string idDec, string val)
- {
- return new FilterEntity(getQueryWord(id), idDec + ")", " like ", "鍖呭惈)", "%" + val + "%");
+ return new FilterEntity(id, idDec + ")", " like ", "鍖呭惈)", "%" + val + "%", type);
}
public static List<FilterEntity> GetDilter(GridColumnCollection Columns, GridView gridView1 = null)
{
@@ -1689,7 +1711,7 @@
// fiList.Add(new FilterEntity("b.FNumber", "浣跨敤缁勭粐", " like ", "鍖呭惈", "%" + filter.Value + "%"));
string[] ddd = filter.FilterString.Replace("Contains", "").Replace("(", "").Replace(")", "").Replace("'", "").Replace("'", "").Split(',');
//Contains([fSubsidiary], '005')
- fiList.Add(getFilterEntityWord(col.Tag.ToString(), col.Caption.Trim(), ddd[1].Trim()));
+ fiList.Add(getFilterEntityWord(col.Tag.ToString(), col.Caption.Trim(), ddd[1].Trim(), col.UnboundExpression));
}
return fiList;
}
@@ -1714,8 +1736,20 @@
}
}
else
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
+ {
+ switch (itm.fileType)
+ {
+ case "鏃堕棿绫诲瀷":
+ _sbSqlWhere.Append(" and CONVERT(nvarchar(30)," + itm.fileId + ",23)" + itm.fileOper + "'" + itm.fileValue + "'");
+ break;
+ //case "鏁板�肩被鍨�":
+ // _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
+ // break;
+ default:
+ _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
+ break;
+ }
+ }
}
return _sbSqlWhere.ToString();
}
@@ -1724,7 +1758,7 @@
public delegate void DelegateGetModel(string guid);
public delegate void DelegateGetList(int currentPage);
/// <summary>
- ///
+ /// 璁剧疆涓昏〃鐨勬牱寮�
/// </summary>
/// <param name="gridView1">gridview</param>
/// <param name="picCheckBox">鍥炬爣鎸夐挳</param>
@@ -1755,14 +1789,13 @@
};
gridView1.OptionsView.ShowGroupPanel = false;
gridView1.OptionsCustomization.AllowGroup = false;
-
- gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;
+ // 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 = AutoFilterCondition.Contains;
column.OptionsFilter.AutoFilterCondition = DevExpress.XtraGrid.Columns.AutoFilterCondition.Contains;
column.OptionsFilter.ImmediateUpdateAutoFilter = false;
if (column.Tag == null || column.Tag.ToString().EndsWith("edit"))
@@ -1868,6 +1901,23 @@
edit.SelectAll();
}
+ public static void SetGridLayout(GridView gridView1)
+ {
+ foreach (GridColumn column in gridView1.Columns)
+ {
+ if (column.Width > 500)
+ column.Width = 500;
+ }
+ }
+
+ /// <summary>
+ /// 璁剧疆閫夐」鍗�
+ /// </summary>
+ /// <param name="gridView1"></param>
+ /// <param name="xtraTabControl1"></param>
+ /// <param name="pageBar1"></param>
+ /// <param name="action"></param>
+ /// <param name="page"></param>
public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null)
{
xtraTabControl1.SelectedPageChanged += (s, e) =>
@@ -2058,7 +2108,7 @@
column.Visible = bool.Parse(controlVisible);
}
}
-
+
}
}
}
@@ -2072,10 +2122,11 @@
{
}
- public CboItemEntity(string val, string text)
+ public CboItemEntity(string val, string text, string fType = "")
{
Text = text;
Value = val;
+ FType = fType;
}
/// <summary>
@@ -2087,6 +2138,8 @@
/// 瀵硅薄鍊�
/// </summary>
public object Value { get; set; } = "";
+
+ public object FType { get; set; } = "";
public override string ToString()
{
@@ -2108,13 +2161,14 @@
/// <param name="operDec">鎿嶄綔绗﹀娉�</param>
/// <param name="val"></param>
public FilterEntity(string id, string idDec, string oper,
- string operDec, string val)
+ string operDec, string val, string type)
{
fileId = id;
fileIdDec = idDec;
fileOper = oper;
fileOperDec = operDec;
fileValue = val;
+ fileType = type;
}
public string fileId { get; set; }
@@ -2126,5 +2180,7 @@
public string fileOperDec { get; set; }
public string fileValue { get; set; }
+
+ public string fileType { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3