SVN r567

SVN-Revision: r567

插件库/Lskj.PubAdd/FrmMain.cs

@@ -73,9 +73,7 @@ namespace Lskj.PubAdd
                 //this.SuspendLayout();
                 this.SysModel = new ModuleModel(MainImpl.GetSystemdllTab(this.Model.ModuleCode));
                 this.SysModel.ParmaryKey = BaseImpl.GetBasePrimaryKey(this.Model.ModuleCode);
-                this.SysModel.maintabFocusedRow = Model.GetMaintabFocusedRow();
                 this.ModuleAddControl.OnAddRecordCallBack += OnAddRecordCallBack;
-
                 this.details = BaseModuleImpl.GetBaseAddTabDetail(Model.ModuleCode);
 
                 this.CreateControlLocation();
@@ -129,12 +127,9 @@ namespace Lskj.PubAdd
 
                 int height = this.ModuleAddControl.ControlHeight + this.ModuleAddControl.OperatePanelControlObj.Height + this.ModuleAddControl.SpeciesPanelControlObj.Height;
                 height = Convert.ToInt32(item["height"] + "") > height ? height : Convert.ToInt32(item["height"] + "");//如果控件高度小于设置高度，以实际高度为准
-               
-                
                 if (ModuleAddControl.SplitContainerControl.PanelVisibility == SplitPanelVisibility.Both)
                 {
-                    //加上下方明细的高度（上方的一半）
+                    height += 200;
-                    //height = height+height / 2;
                 }
                 this.Height = height + otherHeight;
 
@@ -151,16 +146,20 @@ namespace Lskj.PubAdd
                     this.Top = (Screen.PrimaryScreen.WorkingArea.Height - this.Height) / 2;
                     isAutoScroll = true;
                     ModuleAddControl.plMainControlObj.AutoScroll = isAutoScroll;
-                }
-                else {
-                    this.ModuleAddControl.plMainControlObj.AutoScroll = true;
-                    this.ModuleAddControl.plMainControlObj.HorizontalScroll.Visible = false;
-                }
                     if (ModuleAddControl.SplitContainerControl.PanelVisibility == SplitPanelVisibility.Both)
                     {
-                    this.ModuleAddControl.SplitContainerControl.SplitterPosition = this.Height / 3 * 2;
+                        this.ModuleAddControl.SplitContainerControl.SplitterPosition = (this.Height * 2) / 3;
+                    }
+                }
+                else
+                {
+                    this.ModuleAddControl.plMainControlObj.AutoScroll = true;
+                    this.ModuleAddControl.plMainControlObj.HorizontalScroll.Visible = false;
+                    if (ModuleAddControl.SplitContainerControl.PanelVisibility == SplitPanelVisibility.Both)
+                    {
+                        this.ModuleAddControl.SplitContainerControl.SplitterPosition = this.ModuleAddControl.ControlHeight;
+                    }
                 }
-
             }
         }
         /// <summary>
@@ -579,4 +578,33 @@ namespace Lskj.PubAdd
         /// <para>修改日期：</para>
         /// <para>修改备注：</para>
         /// <para>版本：1.0</para>
-        /// </
+        /// </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;
+            }
+        }
+    }
+}