From 6e62e968ae7caeb1b7c8907929ef8c237dfba068 Mon Sep 17 00:00:00 2001
From: tdx <tdx@local>
Date: Thu, 6 Feb 2025 10:24:47 +0000
Subject: [PATCH] SVN r245

SVN-Revision: r245
---
 插件库/Lskj.Control/GridControlEx.cs          |  2 +-
 .../MultiModelLookUp/FrmModelLookUp.cs        | 48 ++-----------------
 2 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/插件库/Lskj.Control/GridControlEx.cs b/插件库/Lskj.Control/GridControlEx.cs
index ff4b921..0b4dace 100644
--- a/插件库/Lskj.Control/GridControlEx.cs
+++ b/插件库/Lskj.Control/GridControlEx.cs
@@ -6011,7 +6011,7 @@ namespace Lskj.Control
                         {
                             if (focusedRow.Table.Columns.Contains(resultField))
                             {
-                                focusedRow[resultField] = modelLookUp.EditValue;
+                                focusedRow[resultField] = modelLookUp.EditText;
                             }
                         }
                     }
diff --git a/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp.cs b/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp.cs
index 4ad185c..697dd68 100644
--- a/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp.cs
+++ b/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp.cs
@@ -1,7 +1,5 @@
-using DevExpress.Utils.Menu;
-using DevExpress.XtraEditors;
+using DevExpress.XtraEditors;
 using DevExpress.XtraGrid.Columns;
-using DevExpress.XtraGrid.Menu;
 using DevExpress.XtraGrid.Views.Grid;
 using Lskj.Business;
 using Lskj.Business.Impl;
@@ -10,13 +8,9 @@ using Lskj.Data;
 using Lskj.Model;
 using Lskj.Util;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
 using System.Data.SqlClient;
-using System.Drawing;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Lskj.Control.MultiModelLookUp
@@ -641,7 +635,7 @@ namespace Lskj.Control.MultiModelLookUp
                 LeftTreeViewEx.TreeView.SelectedNode = LeftTreeViewEx.TreeView.Nodes[0];//重新打开时默认选中第一条
                 LeftTreeViewEx.TreeView.Nodes[0].Expand();
             }
-            else if (LeftGridEx != null) 
+            else if (LeftGridEx != null)
             {
                 LeftGridEx.GridView.SelectRow(0);
             }
@@ -1045,40 +1039,4 @@ namespace Lskj.Control.MultiModelLookUp
 
                 }
                 else
-                {
-                    this.splitMain.PanelVisibility = SplitPanelVisibility.Panel2;
-                }
-                return true;
-            }
-            return false;
-        }
-        #endregion
-
-
-        //设置选中框的值
-        private void SetSelectionBox()
-        {
-            if (this.DataSource != null)
-            {
-                if (!this.DataSource.Columns.Contains(_checkFieldName))
-                {
-                    this.DataSource.Columns.Add(_checkFieldName, typeof(bool));
-                    this.DataSource.Columns.Add(_id, typeof(int));
-
-                    for (int i = 0; i < DataSource.Rows.Count; i++)
-                    {
-                        DataSource.Rows[i][_checkFieldName] = 0;
-                        DataSource.Rows[i][_id] = i;
-                    }
-                }
-                this.gcDetail.GridControl.DataSource = this.gcMain.gridControl.DataSourceTable().Clone();
-            }
-        }
-
-
-
-        #endregion
-
-
-    }
-}
+               
\ No newline at end of file