From ac796549b72fe860e2a3d00f62fa85f68da772d9 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 10 十月 2025 09:40:38 +0800
Subject: [PATCH] daa导入

---
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 872ac86..b9dc39c 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -87,7 +87,7 @@
                 request.ContentType = "application/json";
                 request.Headers.Add("token", GetBasicAuthTicket());
                 request.Accept = "*/*";
-                request.Timeout = 150000;
+               // request.Timeout = 150000;
                 request.AllowAutoRedirect = false;
                 request.ServicePoint.Expect100Continue = false;
                 HttpRequestCachePolicy noCachePolicy = new HttpRequestCachePolicy(HttpRequestCacheLevel.NoCacheNoStore);
@@ -1787,8 +1787,10 @@
                 // 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"))
+                if (column.Tag == null || column.Tag.ToString().EndsWith("edit") || column.Name== "colChkInt")
+                {
                     column.OptionsColumn.ReadOnly = false;
+                }
                 else
                     column.OptionsColumn.ReadOnly = true;
 
@@ -1868,14 +1870,16 @@
                     if (e.Column.FieldName.EndsWith("Color"))
                     {
                         int rowHandle = e.RowHandle;
-                        DataRow row = gridView1.GetDataRow(e.RowHandle);
-                        string _bgColor = row[e.Column.FieldName + "Rgb"].ToString();
-                        if (!string.IsNullOrEmpty(_bgColor))
-                        {
-                            Color bgColor = ColorTranslator.FromHtml(_bgColor);
-                            e.Appearance.BackColor = bgColor;
-                            //   e.Appearance.BackColor2 = Color.LightSkyBlue;
-                            //e.Appearance.ForeColor = ColorTranslator.FromHtml("#ffffff") ;
+                        if (rowHandle >= 0) {
+                            DataRow row = gridView1.GetDataRow(e.RowHandle);
+                            string _bgColor = row[e.Column.FieldName + "Rgb"].ToString();
+                            if (!string.IsNullOrEmpty(_bgColor))
+                            {
+                                Color bgColor = ColorTranslator.FromHtml(_bgColor);
+                                e.Appearance.BackColor = bgColor;
+                                //e.Appearance.BackColor2 = Color.LightSkyBlue;
+                                //e.Appearance.ForeColor = ColorTranslator.FromHtml("#ffffff") ;
+                            }
                         }
                     }
                 }

--
Gitblit v1.9.3