From e371742bd4af8a180b51b9beb7282de33f6b53f5 Mon Sep 17 00:00:00 2001
From: wyf <wyf@local>
Date: Thu, 27 Mar 2025 08:47:23 +0000
Subject: [PATCH] SVN r419

SVN-Revision: r419
---
 插件库/Lskj.Control/GridControlEx.cs | 55 +++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/插件库/Lskj.Control/GridControlEx.cs b/插件库/Lskj.Control/GridControlEx.cs
index 7e9b730..f1d9203 100644
--- a/插件库/Lskj.Control/GridControlEx.cs
+++ b/插件库/Lskj.Control/GridControlEx.cs
@@ -6698,6 +6698,16 @@ namespace Lskj.Control
                         MaxWidth = normalCol.Width,
                         OptionsColumn = { AllowEdit = normalCol.Edit, FixedWidth = true }
                     };
+                    if (!normalCol.Edit)
+                    {
+                        col.AppearanceHeader.Options.UseForeColor = true;
+                        col.AppearanceHeader.ForeColor = ColorTranslator.FromHtml(HeaderColor);
+                    }
+                    if (normalCol.CanNull)
+                    {
+                        col.AppearanceHeader.Options.UseForeColor = true;
+                        col.AppearanceHeader.ForeColor = RequiredForceColor;
+                    }
                     bandedGridControlEx.SetColumnFormat(col, normalCol);
                     normalBand.Columns.Add(col);
                     bandedGridControlEx.BandedView.Columns.Add(col);
@@ -6730,7 +6740,16 @@ namespace Lskj.Control
                         MaxWidth = subField.Width,
                         OptionsColumn = { AllowEdit = subField.Edit, FixedWidth = true }
                     };
-
+                    if (!subField.Edit)
+                    {
+                        subColumn.AppearanceHeader.Options.UseForeColor = true;
+                        subColumn.AppearanceHeader.ForeColor = ColorTranslator.FromHtml(HeaderColor);
+                    }
+                    if (subField.CanNull)
+                    {
+                        subColumn.AppearanceHeader.Options.UseForeColor = true;
+                        subColumn.AppearanceHeader.ForeColor = RequiredForceColor;
+                    }
                     bandedGridControlEx.SetColumnFormat(subColumn, subField);
                     dynamicBand.Columns.Add(subColumn);
                     bandedGridControlEx.BandedView.Columns.Add(subColumn);
@@ -8174,4 +8193,36 @@ namespace Lskj.Control
         {
             int returnIndex = 0;
             isContain = false;
-            DataRow dragEn
\ No newline at end of file
+            DataRow dragEndRow = sourceTab.Rows[dragEndRowIndex];
+            if (selectRows.Contains(dragEndRow))
+            {
+                isContain = true;
+                dragEndRowIndex = dragEndRowIndex - 1;
+                if (dragEndRowIndex >= 0)
+                {
+                    dragEndRow = sourceTab.Rows[dragEndRowIndex];
+                    if (selectRows.Contains(dragEndRow))
+                    {
+                        bool iscontain = false;
+                        returnIndex = GetDragEndRowIndex(sourceTab, dragEndRowIndex, selectRows, out iscontain);
+                    }
+                    else
+                    {
+                        returnIndex = dragEndRowIndex;
+                    }
+                }
+                else
+                {
+                    returnIndex = -1;
+                }
+            }
+            else
+            {
+                returnIndex = dragEndRowIndex;
+            }
+            return returnIndex;
+        }
+        #endregion
+
+    }
+}
\ No newline at end of file