SVN r973

SVN-Revision: r973

插件库/Lskj.Control/TreeBandedGridControlEx.cs

@@ -337,7 +337,7 @@ namespace Lskj.Control
         {
             if (table == null) return;
             this.CustomColumKey = customColumKey;
-          
+
 
             //设置列头自动高度
             this.gcMain.OptionsView.ColumnHeaderAutoHeight = DefaultBoolean.True;
@@ -1189,7 +1189,11 @@ namespace Lskj.Control
             btnEdit.DisplayMember = model.TextMember;
             btnEdit.SeparatorChar = ',';
             btnEdit.ValueMember = model.FieldType == ControlType.LabSelectReturnIdNew ? model.ValueMember : model.TextMember;
-            btnEdit.DataSource = MainImpl.GetDataTableResult(model.SqlSource);
+            if (model.ModuleFrameDisplayText)
+            {
+                DataTable dataTable = MainImpl.GetDataTableResult(modelLookUp.SysModel.MenuSql);
+                btnEdit.DataSource = dataTable;
+            }
             btnEdit.Buttons[0].Visible = false; // 不能移除,移除后事件不起作用.
             btnEdit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Ellipsis) });
 
@@ -1703,7 +1707,7 @@ namespace Lskj.Control
         /// </summary>
         /// <param name="gridColumn">The grid column.</param>
         /// <param name="model">The model.</param>
-        private void SetColumnFormat(TreeListColumn gridColumn, GridColumnModel model)
+        protected virtual void SetColumnFormat(TreeListColumn gridColumn, GridColumnModel model)
         {
             if (gridColumn == null || model == null) return;