From 7d7f289200a8c73e7ba1ab0a4cc6f39e8c60b852 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 10 五月 2025 11:22:18 +0800
Subject: [PATCH] 优化测试
---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 164 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 115 insertions(+), 49 deletions(-)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index e74487a..b968cb5 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -489,7 +489,6 @@
txt.Text = strVal;
}
}
-
//鑷畾涔変粨搴�
if (colType is UcLookCk)
{
@@ -613,7 +612,10 @@
if (colType is SimpleButton)
{
var txt = colType as SimpleButton;
- txt.Enabled = !isEdt;
+ if (txt.Tag != null && txt.Tag.ToString() == "gvBtnAlawys")
+ txt.Enabled = true;
+ else
+ txt.Enabled = !isEdt;
continue;
}
//鑷畾宸ュ簭
@@ -628,6 +630,14 @@
if (colType is UcDictionary)
{
var txt = colType as UcDictionary;
+ txt.TextTxt = (strVal);
+ txt.IsReadly = isEdt;
+ continue;
+ }
+ //鑷畾鍗曟嵁绫诲瀷涓嬫媺
+ if (colType is UcDictionaryComBox)
+ {
+ var txt = colType as UcDictionaryComBox;
txt.TextTxt = (strVal);
txt.IsReadly = isEdt;
continue;
@@ -909,10 +919,21 @@
txt.IsReadly = isEdt;
continue;
}
+ //鑷畾涔夊崟鎹被鍨嬩笅鎷�
+ if (ctrl is UcDictionaryComBox)
+ {
+ var txt = ctrl as UcDictionaryComBox;
+ //txt.SetIdOrCode("-1");
+ txt.IsReadly = isEdt;
+ continue;
+ }
if (ctrl is SimpleButton)
{
var txt = ctrl as SimpleButton;
- txt.Enabled = !isEdt;
+ if (txt.Tag != null && txt.Tag.ToString() == "gvBtnAlawys")
+ txt.Enabled = true;
+ else
+ txt.Enabled = !isEdt;
continue;
}
}
@@ -1006,7 +1027,6 @@
ctrl.Enabled = !isEdt;
continue;
}
- //
if (ctrl is CheckEdit)
{
var txt = ctrl as CheckEdit;
@@ -1090,7 +1110,6 @@
txt.IsReadly = isEdt;
continue;
}
-
//鑷畾閮ㄩ棬
if (ctrl is UcLookDepartment)
{
@@ -1133,10 +1152,20 @@
txt.IsReadly = isEdt;
continue;
}
+ //鑷畾鍗曟嵁绫诲瀷涓嬫媺
+ if (ctrl is UcDictionaryComBox)
+ {
+ var txt = ctrl as UcDictionaryComBox;
+ txt.IsReadly = isEdt;
+ continue;
+ }
if (ctrl is SimpleButton)
{
var txt = ctrl as SimpleButton;
- txt.Enabled = !isEdt;
+ if (txt.Tag != null && txt.Tag.ToString() == "gvBtnAlawys")
+ txt.Enabled = true;
+ else
+ txt.Enabled = !isEdt;
continue;
}
}
@@ -1626,7 +1655,17 @@
public static FilterEntity getFilterEntityWord(string id, string idDec, string val, string type)
{
- return new FilterEntity(id, idDec + ")", " like ", "鍖呭惈)", "%" + val + "%", type);
+ switch (type)
+ {
+ case "Bit绫诲瀷":
+ string _val = (val.ToUpper() == "true".ToUpper() ? "1" : "0");
+ return new FilterEntity(id, idDec + ")", "=", "绛変簬)", "" + _val + "", type);
+ break;
+ default:
+ return new FilterEntity(id, idDec + ")", "like", "鍖呭惈)", "%" + val + "%", type);
+ break;
+ }
+
}
public static List<FilterEntity> GetDilter(GridColumnCollection Columns, GridView gridView1 = null)
{
@@ -1642,10 +1681,19 @@
ColumnFilterInfo filter = col.FilterInfo;
if (string.IsNullOrEmpty(filter.FilterString))
continue;
- // 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(), col.UnboundExpression));
+ string _filterString = filter.FilterString.Replace("Contains", "").Replace("(", "").Replace(")", "").Replace("'", "").Replace("'", "");
+ string[] ddd = _filterString.Split(',');
+ string _val = "";
+ if (ddd.Length > 1)
+ {
+ _val = ddd[1].Trim();
+ }
+ else
+ {
+ ddd = _filterString.Split('=');
+ _val = ddd[1].Trim();
+ }
+ fiList.Add(getFilterEntityWord(col.Tag.ToString(), col.Caption.Trim(), _val, col.UnboundExpression));
}
return fiList;
}
@@ -1676,19 +1724,17 @@
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;
+ case "Bit绫诲瀷":
+ _sbSqlWhere.Append(" and isnull(" + itm.fileId + ",0) =" + itm.fileValue + "");
+ break;
default:
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
+ _sbSqlWhere.Append(" and " + itm.fileId + " " + itm.fileOper + " '" + itm.fileValue + "'");
break;
}
}
}
return _sbSqlWhere.ToString();
}
-
-
public delegate void DelegateGetModel(string guid);
public delegate void DelegateGetList(int currentPage);
/// <summary>
@@ -1722,7 +1768,7 @@
}
};
gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
-
+
if (isPostSearch == true)
{
gridView1.OptionsView.ShowGroupPanel = false;
@@ -1766,7 +1812,7 @@
}
}
- gridView1.IndicatorWidth = 50;
+ gridView1.IndicatorWidth = 60;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -1996,7 +2042,7 @@
gridView1.OptionsFind.ShowSearchNavButtons = false;
gridView1.OptionsView.ShowAutoFilterRow = false;
gridView1.OptionsView.ShowGroupPanel = false;
- gridView1.IndicatorWidth = 40;
+ gridView1.IndicatorWidth = 60;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -2031,12 +2077,21 @@
}
#endregion
-
+ /// <summary>
+ /// 鍒ゆ柇鏄笉鏄竴涓湁鏁堢殑鏁板��
+ /// </summary>
+ /// <param name="str"></param>
+ /// <returns></returns>
public static bool IsNumeric(string str)
{
Regex regex = new Regex("^[0-9]+$");
return regex.IsMatch(str);
}
+ /// <summary>
+ /// 鍒ゆ柇鏄笉鏄竴涓湁鏁堟灉鐨刣ecimal鏁板��
+ /// </summary>
+ /// <param name="str"></param>
+ /// <returns></returns>
public static bool IsNumeric2(string str)
{
string input = str;
@@ -2044,8 +2099,30 @@
bool isNumeric = decimal.TryParse(input, out number);
return isNumeric;
}
+ /// <summary>
+ /// 鍒ゆ柇鏄笉鏄竴涓湁鏁堢殑姝ｆ暣鏁�
+ /// </summary>
+ /// <param name="str"></param>
+ /// <returns></returns>
+ public static bool IsNumeric3(string str)
+ {
+ string input = str;
+ decimal number;
+ bool isNumeric = decimal.TryParse(input, out number);
+ if (isNumeric && number > 0)
+ return true;
+ return false;
+ }
- public static void PrintJiSuan(DevExpress.XtraEditors.TextEdit box1, DevExpress.XtraEditors.TextEdit box2, string sum, DevExpress.XtraEditors.RadioGroup rd)
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="box1">txt_psnQty_1:姣忓紶鏉＄爜鏁伴噺</param>
+ /// <param name="box2">txt_iCount_1:鏁村紶鏁板��</param>
+ /// <param name="sum">txt_kQty:鍙墦鍗伴噺</param>
+ /// <param name="rd"></param>
+ /// <param name="txt_yuliang">txt_yuliang:浣欓噺</param>
+ public static void PrintJiSuan(DevExpress.XtraEditors.TextEdit box1, DevExpress.XtraEditors.TextEdit box2, string sum, DevExpress.XtraEditors.RadioGroup rd, DevExpress.XtraEditors.TextEdit txt_yuliang = null)
{
if (rd.SelectedIndex == 2)
return;
@@ -2055,51 +2132,39 @@
string t2 = box2.Text.Trim();
if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(t1))
return;
+ if (Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(t1) <= 0)
+ return;
decimal? dc = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(sum);
decimal? dc1 = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(t1);
+ decimal dividend = decimal.Parse(sum); // 琚櫎鏁�
+ decimal divisor = decimal.Parse(t1); // 闄ゆ暟
+ decimal shang = dividend / divisor;
- int dividend = int.Parse(sum); // 琚櫎鏁�
- int divisor = int.Parse(t1); // 闄ゆ暟
+ decimal integerPart = Math.Truncate(shang); // 鑾峰彇鏁存暟閮ㄥ垎
+ decimal decimalPart = dividend - divisor* integerPart; // 鑾峰彇灏忔暟閮ㄥ垎
- int quotient = dividend / divisor; // 鏁存暟閮ㄥ垎
- int remainder = dividend % divisor; // 浣欐暟
-
- box2.Text = quotient.ToString();
-
+ //decimal quotient = dividend / divisor; // 鏁存暟閮ㄥ垎
+ //decimal remainder = dividend % divisor; // 浣欐暟
+ box2.Text = integerPart.ToString();
if (rd.SelectedIndex == 0)
- rd.Properties.Items[0].Description = "鍏ㄨ嚜鍔ㄣ��" + remainder.ToString() + "銆�";
+ txt_yuliang.Text = decimalPart.ToString();
}
catch (Exception ex)
{
-
- Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("杈撳叆鏁版嵁閿欒:"+ex.Message);
}
-
}
- public static void PrintAuto(DevExpress.XtraEditors.TextEdit txt_psnQty_1, DevExpress.XtraEditors.TextEdit txt_iCount_1, DevExpress.XtraEditors.RadioGroup radOut)
+ public static void PrintAuto(DevExpress.XtraEditors.TextEdit txt_psnQty_1, DevExpress.XtraEditors.TextEdit txt_iCount_1, DevExpress.XtraEditors.RadioGroup radOut, DevExpress.XtraEditors.TextEdit txt_yuliang = null)
{
txt_psnQty_1.Text = "";
txt_iCount_1.Text = "";
- radOut.Properties.Items[0].Description = "鍏ㄨ嚜鍔�";
+ txt_yuliang.Text = "";
if (radOut.SelectedIndex == 2)
txt_iCount_1.ReadOnly = false;
else
txt_iCount_1.ReadOnly = true;
}
- public static decimal PrintYuLiang(DevExpress.XtraEditors.RadioGroup rd)
- {
- decimal dc = 0;
- if (rd.SelectedIndex != 0)
- return 0;
- string txt = rd.Properties.Items[0].Description;// = "鍏ㄨ嚜鍔ㄣ��" + remainder.ToString() + "銆�";
- txt = txt.Trim().Replace("鍏ㄨ嚜鍔ㄣ��", "");
- txt = txt.Replace("銆�", "");
- if (string.IsNullOrEmpty(txt))
- return 0;
- return decimal.Parse(txt);
- }
-
-
+
#region 缁樺埗琛ㄥご鍏ㄩ�夊嬀閫夋
/// <summary>
/// 缁樺埗琛ㄥご鍏ㄩ�夊嬀閫夋
@@ -2108,6 +2173,7 @@
// private GridColumn checkBoxColumn = null;
public static void CustomDrawColumnHeader(object sender, ColumnHeaderCustomDrawEventArgs e)
{
+
Rectangle checkBoxColumnHeaderRect = new Rectangle(51, 1, 37, 57);
if (e.Column != null && e.Column.AbsoluteIndex == 0)
{
--
Gitblit v1.9.3