From 01b2f38f35dc97cf65bb51bdee7a4dbba352e2ca Mon Sep 17 00:00:00 2001
From: wyf <wyf@local>
Date: Mon, 24 Mar 2025 01:38:41 +0000
Subject: [PATCH] SVN r377

SVN-Revision: r377
---
 插件库/Lskj.Control/TreeGridControlEx.cs | 38 ++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/插件库/Lskj.Control/TreeGridControlEx.cs b/插件库/Lskj.Control/TreeGridControlEx.cs
index bbec304..d43f0d1 100644
--- a/插件库/Lskj.Control/TreeGridControlEx.cs
+++ b/插件库/Lskj.Control/TreeGridControlEx.cs
@@ -88,10 +88,13 @@ namespace Lskj.Control
             this.TreeListObj.CustomDrawNodeIndicator += TreeListObj_CustomDrawNodeIndicator;//显示行号
             this.gcMain.CellValueChanged += GcMain_CellValueChanged;
             this.gcMain.NodesReloaded += OnNodesReloaded;
-            this.SetGridRowHeightAndFont();
-            if (SystemInfo.Instance.ExpandButtonType.Equals("1"))
+            if (LicenseManager.UsageMode != LicenseUsageMode.Designtime)
             {
-                this.gcMain.CustomDrawNodeButton += OnCustomDrawNodeButton;//绘制按钮
+                this.SetGridRowHeightAndFont();
+                if (SystemInfo.Instance.ExpandButtonType.Equals("1"))
+                {
+                    this.gcMain.CustomDrawNodeButton += OnCustomDrawNodeButton;//绘制按钮
+                }
             }
             //InitializeTreeMethod();
             //this.gcMain.OptionsBehavior.EnableFiltering = true;
@@ -4053,3 +4056,32 @@ namespace Lskj.Control
                 {
                     item.OptionsColumn.AllowEdit = ModifyFields.IndexOf(item.FieldName + ",", StringComparison.OrdinalIgnoreCase) != -1;
                     item.OptionsColumn.ReadOnly = !item.OptionsColumn.AllowEdit;
+
+                    if (!item.OptionsColumn.AllowEdit)
+                    {
+                        item.AppearanceHeader.Options.UseForeColor = true;
+                        item.AppearanceHeader.ForeColor = ColorTranslator.FromHtml(HeaderColor);
+                    }
+                    else
+                    {
+                        item.AppearanceHeader.Options.UseForeColor = true;
+                        item.AppearanceHeader.ForeColor = ColorTranslator.FromHtml("#00000");
+                    }
+                    if (model.FieldType == ControlType.LabMemoEdit) item.OptionsColumn.AllowEdit = true;
+
+                }
+                //必填
+                if (Required && RequiredFields.IndexOf(item.FieldName + ",", StringComparison.OrdinalIgnoreCase) != -1)
+                {
+                    item.AppearanceHeader.Options.UseForeColor = true;
+                    item.AppearanceHeader.ForeColor = RequiredForceColor;
+                }
+
+            }
+
+        }
+
+
+
+    }
+}
\ No newline at end of file