From 9872d678fc6703101d02f68b88b7519a0b6bc82c Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 05 十一月 2024 14:15:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs |   43 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 299df99..3a46885 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -369,7 +369,15 @@
                             txt.ReadOnly = isEdt;
                             continue;
                         }
-
+                        if (colType is MemoEdit)
+                        {
+                            var txt = colType as MemoEdit;
+                            if (txt != null)
+                                txt.Text = strVal;
+                            txt.ReadOnly = isEdt;
+                            continue;
+                        }
+                        
                         //鏁板瓧鍗�
                         if (colType is NumericUpDown)
                         {
@@ -463,6 +471,14 @@
                             txt.Enabled = !isEdt;
                             continue;
                         }
+                        //鑷畾涔夌墿鏂�
+                        if (colType is UcLookItems)
+                        {
+                            var txt = colType as UcLookItems;
+                            txt.SetIdOrCode(strVal);
+                            txt.Enabled = !isEdt;
+                            continue;
+                        }
                         if (colType is SimpleButton)
                         {
                             var txt = colType as SimpleButton;
@@ -532,7 +548,14 @@
                     txt.ReadOnly = isEdt;
                     continue;
                 }
-
+                if (ctrl is MemoEdit)
+                {
+                    var txt = ctrl as MemoEdit;
+                    if (txt != null)
+                        txt.Text = "";
+                    txt.ReadOnly = isEdt;
+                    continue;
+                }
                 //鏃堕棿
                 if (ctrl is DateTimePicker)
                 {
@@ -570,6 +593,14 @@
                     txt.Enabled = !isEdt;
                     continue;
                 }
+                //鑷畾涔夌墿鏂�
+                if (ctrl is UcLookItems)
+                {
+                    var txt = ctrl as UcLookItems;
+                    txt.SetIdOrCode("-1");
+                    txt.Enabled = !isEdt;
+                    continue;
+                }
                 if (ctrl is SimpleButton)
                 {
                     var txt = ctrl as SimpleButton;
@@ -602,7 +633,12 @@
                     txt.ReadOnly = isEdt;
                     continue;
                 }
-
+                if (ctrl is MemoEdit)
+                {
+                    var txt = ctrl as MemoEdit;
+                    txt.ReadOnly = isEdt;
+                    continue;
+                }
                 //鏁板瓧鍗�
                 if (ctrl is NumericUpDown)
                 {
@@ -610,7 +646,6 @@
                     txt.ReadOnly = isEdt;
                     continue;
                 }
-
                 //涓嬫媺
                 if (ctrl is UcComBox)
                 {

--
Gitblit v1.9.3