提交单据管理和修改密码功能

插件库/Lskj.Control/MultiGridLookUp/FrmLookUp.cs

@@ -186,6 +186,8 @@ namespace Lskj.Control.MultiGridLookUp
                 this.Location = new Point((SystemInformation.PrimaryMonitorSize.Width - this.Width) / 2,
            (SystemInformation.PrimaryMonitorSize.Height - this.Height) / 2);
             }
+            // 自动列宽和弹窗尺寸计算完成后，最后应用个性化列配置，避免配置被覆盖。
+            this.SetCustomColumns();
         }
         /// <summary>
         /// <para>说明：计算控件Size,只计算一次</para>
@@ -374,7 +376,6 @@ namespace Lskj.Control.MultiGridLookUp
                         }
                     }
                 }
-                SetCustomColumns();
                 this.gcDetail.GridControl.DataSource = this.gridControl1.DataSourceTable().Clone();
                 this.gcMain.BestFitColumns();
                 //this.gcDetail.SelectAll();
@@ -397,28 +398,53 @@ namespace Lskj.Control.MultiGridLookUp
             DataTable customTable = this.gcMain.GetCustomColumnByDatabase(this.CurrentOperColumnKey);
             if (customTable != null && customTable.Rows.Count > 0)
             {
-                foreach (DataRow rowItem in customTable.Rows)
+                this.gcMain.BeginUpdate();
+                this.gcDetail.BeginUpdate();
+                try
                 {
-                    string fieldName = rowItem["fieldName"] + "";
-                    int fieldWidth = Convert.ToInt32(rowItem["fieldWidth"]);
-                    int index = Convert.ToInt32(rowItem["orderid"]);
-                    bool visible = "1".Equals(rowItem["isVisible"] + "") && fieldWidth > 0;
-                    bool isFix = "True".Equals(rowItem["IfFixColumn"] + "", StringComparison.OrdinalIgnoreCase);
-
-                    GridColumn gridColumn = this.gcMain.Columns.ColumnByName(fieldName);
-                    if (gridColumn != null && gridColumn.Visible && gridColumn.Width > 0)
+                    foreach (DataRow rowItem in customTable.Rows)
                     {
-                        GridColumn colObj = this.gcMain.Columns[fieldName];
-                        colObj.VisibleIndex = index;
-                        colObj.Width = fieldWidth;
-                        colObj.Visible = visible;
-                        colObj.Fixed = isFix ? FixedStyle.Left : FixedStyle.None;
-                        colObj.OptionsFilter.FilterPopupMode = FilterPopupMode.CheckedList;
+                        string fieldName = rowItem["fieldName"] + "";
+                        int fieldWidth = Convert.ToInt32(rowItem["fieldWidth"]);
+                        int index = Convert.ToInt32(rowItem["orderid"]);
+                        bool visible = "1".Equals(rowItem["isVisible"] + "") && fieldWidth > 0;
+                        bool isFix = "True".Equals(rowItem["IfFixColumn"] + "", StringComparison.OrdinalIgnoreCase);
+
+                        SetCustomColumn(this.gcMain.Columns.ColumnByName(fieldName), fieldWidth, index, visible, isFix);
+                        SetCustomColumn(this.gcDetail.Columns.ColumnByName(fieldName), fieldWidth, index, visible, isFix);
                     }
                 }
+                finally
+                {
+                    this.gcDetail.EndUpdate();
+                    this.gcMain.EndUpdate();
+                }
             }
         }
 
+        /// <summary>
+        /// 应用单列的个性化布局。
+        /// </summary>
+        private static void SetCustomColumn(GridColumn column, int width, int visibleIndex, bool visible, bool isFix)
+        {
+            if (column == null)
+            {
+                return;
+            }
+
+            column.Visible = visible;
+            if (visible)
+            {
+                column.VisibleIndex = visibleIndex;
+            }
+            if (width > 0)
+            {
+                column.Width = width;
+            }
+            column.Fixed = isFix ? FixedStyle.Left : FixedStyle.None;
+            column.OptionsFilter.FilterPopupMode = FilterPopupMode.CheckedList;
+        }
+
         /// <summary>
         /// <para>说明：设置默认选中</para>
         /// <para>创建人：龚宇超</para>