SVN r325

SVN-Revision: r325

插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp.cs

@@ -379,7 +379,7 @@ namespace Lskj.Control.MultiModelLookUp
         /// </summary>
         private void SetReadOnlyColumns()
         {
-            if ( SingleChoiceMode) //this.ConfigureColumnMode &&
+            if (this.ConfigureColumnMode && SingleChoiceMode) //this.ConfigureColumnMode &&
             {
                 DataTable _gridColumns = BaseModuleImpl.GetBaseGridColumns(this.UnionModuleCodel);
                 this.gcMain.SetReadOnlyColumns(_gridColumns, GridCustomColumnStruct.BaseMainGridView + this.SysModel.FormKey);

插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp2.cs

@@ -209,6 +209,19 @@ namespace Lskj.Control.MultiModelLookUp
                 this.splitMain_Right.SplitterMoved += new EventHandler(PositionChange);
             }
 
+            //右键
+            DataTable dt = BaseModuleImpl.GetBaseGridRightMenus(this.UnionModuleCodel);
+            string[] obj = new string[]{
+                "",
+                ERPInfo.Instance.UserId,
+                ERPInfo.Instance.UserName,
+                "3",
+                this.UnionModuleCodel,
+            }; ;
+            DynamicModel dynamicModel = new DynamicModel(obj);
+            this.gcMain.SetGridRightMenus(dt, dynamicModel, this.OnGridViewRightCallBack, this.SearchObj, null);
+
+
             this.SourceSQL = this.SysModel.MenuSql;
             this.gcDetail.GridView.OptionsSelection.EnableAppearanceFocusedCell = false;
 
@@ -554,7 +567,7 @@ namespace Lskj.Control.MultiModelLookUp
                            ReplaceHelper.ReplaceTreeViewParentKeyCond(NewSourceSQL, treeLeft.GetSelectNodeValue()) :
                             ReplaceHelper.ReplaceWhereCond(this.NewSourceSQL) + where;
             this.DataSource = MainImpl.GetDataTableResult(sqlValue);
-            this.SetSelectionBox();
+            //this.SetSelectionBox();
             //this.SetDefaultValue();
 
         }
@@ -1087,4 +1100,47 @@ namespace Lskj.Control.MultiModelLookUp
                         case 2: // 左侧为表格
                             this.gridLeft.Visible = true;
                             this.treeLeft.Visible = false;
-                            this.InitlizeSpiltL
+                            this.InitlizeSpiltLocation();
+                            this.SetLeftGridView();
+                            //this.ModuleGridObj.SaveEvent += new Lskj.Control.ModuleGridEx.SaveEventHander(SetDetailGridView);
+                            this.LeftGridEx = this.gridLeft;
+                            break;
+                        case 3: // 左侧为空
+                        default:
+                            this.splitMain.PanelVisibility = SplitPanelVisibility.Panel2;
+                            break;
+                    }
+
+                }
+                else
+                {
+                    this.splitMain.PanelVisibility = SplitPanelVisibility.Panel2;
+                }
+                return true;
+            }
+            return false;
+        }
+        #endregion
+
+        //设置选中框的值
+        private void SetSelectionBox()
+        {
+            this.gcDetail.GridControl.DataSource = this.gcMain.gridControl.DataSourceTable().Clone();
+        }
+
+        #endregion
+
+
+
+        /// <summary>
+        /// <para>说明：右键菜单执行后刷新数据，刷新规则按照上一次查询条件刷新</para>
+        /// <para>创建人：龚宇超</para>
+        /// <para>创建日期：2017-11-02 </para>
+        /// <para>修改人：</para>
+        /// <para>修改日期：</para>
+        /// <para>修改备注：</para>
+        /// <para>版本：1.0</para>
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
+        protected void OnGridViewRightCallBack(object sender, EventAr