提交当前本机整理版本

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

@@ -1656,4 +1656,33 @@ namespace Lskj.Control
                     if (this.InvokeRequired)
                     {
                         this.Invoke(new EventHandler(delegate
-                        
+                        {
+                            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.DataSourceTable = table.Copy();
+                            this._working = false;
+                            this.CalcFormAndGrid(true);
+                        }));
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+
+            }
+        }
+
+        /// <summary>
+        /// 注销时
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void OnDisposed(object sender, EventArgs e)
+        {
+            this._popup?.Dispose();
+            this._popup = null;
+        }
+    }
+}

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

@@ -1386,4 +1386,41 @@ namespace Lskj.Control
                         {
                             int second = Convert.ToInt32((endTime - beginTime).TotalSeconds);
                             string tipMsg = "数据筛选完成.";
-                            this.Popup.LabelObj.Text = 
+                            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);
+            }
+        }
+
+        /// <summary>
+        /// 注销时
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void OnDisposed(object sender, EventArgs e)
+        {
+            this._popup?.Dispose();
+            this._popup = null;
+        }
+    }
+}