SVN r279

SVN-Revision: r279

插件库/Lskj.Control/AutoGridLookUp/AutoGridRevLookUp.cs

@@ -317,9 +317,9 @@ namespace Lskj.Control
         public event EventHandler OnPopupClosed;
         public AutoGridRevLookUp()
         {
-            InitializeComponent();
             InitializePopup();
             InitializeEvent();
+            this.Disposed += OnDisposed;
         }
         /// <summary>
         /// <para>说明：初始化事件</para>
@@ -342,6 +342,7 @@ namespace Lskj.Control
             this._popup.OnGridViewMouseClick += new EventHandler(OnPopupGridViewMouseClick);
             this._popup.OnGridViewEnter += new KeyEventHandler(OnPopupGridViewEnter);
         }
+
         /// <summary>
         /// <para>说明：初始化弹出框</para>
         /// <para>创建人：龚宇超</para>
@@ -1160,31 +1161,6 @@ namespace Lskj.Control
             }
             //this.ShowPopup();
         }
-        /// <summary>
-        /// <para>说明:释放时清理数据源</para>
-        /// <para>创建人：龚宇超</para>
-        /// <para>创建日期：2018-03-16 </para>
-        /// <para>修改人：</para>
-        /// <para>修改日期：</para>
-        /// <para>修改备注：</para>
-        /// <para>版本：1.0</para>
-        private void OnAutoGridLookUp_Disposed(object sender, EventArgs e)
-        {
-            if (this.DataSourceTable != null)
-            {
-                this.DataSourceTable.Clear();
-                this.DataSourceTable.Dispose();
-            }
-            if (this.DataSource != null)
-            {
-                this.DataSource = null;
-            }
-            GC.Collect();
-        }
-
-
-
-
         /// <summary>
         /// <para>说明：判断输入的是否是中文</para>
         /// <para>创建人：龚宇超</para>
@@ -1410,30 +1386,4 @@ namespace Lskj.Control
                         {
                             int second = Convert.ToInt32((endTime - beginTime).TotalSeconds);
                             string tipMsg = "数据筛选完成.";
-                            this.Popup.LabelObj.Text = second > 0 ? string.Format(tipMsg + "(耗时{0}秒)", second) : tipMsg;
-                            this.Popup.GridControlObj.DataSource = table;
-                            this._working = false;
-                            //this.CalcFormAndGrid();
-                        }));
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-
-            }
-        }
-
-        /// <summary>
-        /// 搜索回调
-        /// </summary>
-        public void SearchCallBack()
-        {
-            this.HidePopup();
-            if (this.OnSearchCallBack != null)
-            {
-                OnSearchCallBack(this, null);
-            }
-        }
-    }
-}
+                            this.Popup.LabelObj.Text =