Merge remote-tracking branch 'origin/master'

啊鑫

2024-11-02 cf8c3cb608bceb47bc4ea83fb7a9bfe22cb80d2e

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -369,6 +369,14 @@
                            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)
@@ -540,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)
                {
@@ -618,7 +633,12 @@
                    txt.ReadOnly = isEdt;
                    continue;
                }

                if (ctrl is MemoEdit)
                {
                    var txt = ctrl as MemoEdit;
                    txt.ReadOnly = isEdt;
                    continue;
                }
                //数字卡
                if (ctrl is NumericUpDown)
                {
@@ -626,7 +646,6 @@
                    txt.ReadOnly = isEdt;
                    continue;
                }

                //下拉
                if (ctrl is UcComBox)
                {