From 0181c198addb8d3dcb816421c3401622d2c33340 Mon Sep 17 00:00:00 2001
From: cyf <cyf@local>
Date: Thu, 20 Nov 2025 09:05:10 +0000
Subject: [PATCH] SVN r1051

SVN-Revision: r1051
---
 插件库/Lskj.PubAdd/FrmMain.cs | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/插件库/Lskj.PubAdd/FrmMain.cs b/插件库/Lskj.PubAdd/FrmMain.cs
index d05b6de..898ff06 100644
--- a/插件库/Lskj.PubAdd/FrmMain.cs
+++ b/插件库/Lskj.PubAdd/FrmMain.cs
@@ -71,7 +71,7 @@ namespace Lskj.PubAdd
         private void OnFrmMainActivated(object sender, EventArgs e)
         {
             //新增时输入焦点
-            if (string.IsNullOrEmpty(this.ModuleAddControl.PrimaryValue))
+            if (string.IsNullOrEmpty(this.ModuleAddControl.PrimaryValue)&& ModuleAddControl.ControlObj!=null)
             {
                 ControlModel controlModel = ModuleAddControl.ControlObj.ControlModels.Where(n => n.Location.X != 0 || n.Location.Y != 0).OrderBy(n => n.TabOrder).FirstOrDefault();
                 if (controlModel != null)
@@ -721,4 +721,33 @@ namespace Lskj.PubAdd
         /// <para>修改日期：</para>
         /// <para>修改备注：</para>
         /// <para>版本：1.0</para>
-        /// </
\ No newline at end of file
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="FormClosingEventArgs"/> instance containing the event data.</param>
+        protected void OnFormClosing(object sender, FormClosingEventArgs e)
+        {
+            try
+            {
+                if (this.ModuleAddControl != null && this.ModuleAddControl.IsCard)
+                {
+                    this.ModuleAddControl.CloseIDCardThread();
+                }
+                this.DialogResult = DialogResult.OK;
+            }
+            catch (Exception ex)
+            {
+                string Message = ErrorMessage.PromptErrorMessage(ex);
+                MessageUtil.Show(Message, ex.Message);
+            }
+        }
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams cp = base.CreateParams;
+                cp.ExStyle |= 0x02000000;
+                return cp;
+            }
+        }
+    }
+}