SVN r1047

SVN-Revision: r1047

插件库/Lskj.Control/TreeGridControlEx.cs

@@ -105,6 +105,7 @@ namespace Lskj.Control
 
             this.gcMain.CustomDrawFooterCell += GcMain_CustomDrawFooterCell;
 
+
             if (LicenseManager.UsageMode != LicenseUsageMode.Designtime)
             {
                 this.SetGridRowHeightAndFont();
@@ -115,6 +116,10 @@ namespace Lskj.Control
             }
 
             this.gcMain.PopupMenuShowing += new PopupMenuShowingEventHandler(OnPopupMenuShowing);
+            #region LabPicUrl控件实现事件
+            LabPicUrlPreview_TreeList.Attach(this.gcMain);    // 必须
+            LabPicUrlPreview_TreeList.AttachPreview(this.gcMain); // 新增（双击预览）
+            #endregion
             //InitializeTreeMethod();
             //this.gcMain.OptionsBehavior.EnableFiltering = true;
             //this.gcMain.OptionsFind.AlwaysVisible = true;
@@ -419,6 +424,7 @@ namespace Lskj.Control
             {
                 this.gcMain.CollapseAll();
             }
+            
             //if (selectRowHandler)
             //{
             //    this.TreeListObj.FocusedNode = this.TreeListObj.GetNodeByVisibleIndex(lastNodeIndex);
@@ -595,6 +601,10 @@ namespace Lskj.Control
                 case ControlType.LabPic:
                     InitPicEdit(column);
                     break;
+                case ControlType.LabPicUrl:
+                    // 用工具类创建图片列（绑定 Tag、Repository、UnboundType）
+                    LabPicUrlPreview_TreeList.InitPicColumn(this.gcMain, column, model);
+                    break;
                 case ControlType.LabSelectReturnId:
                 case ControlType.LabSelectReturnText:
                     InitSelectReturnId(column, model);
@@ -2377,6 +2387,7 @@ namespace Lskj.Control
             GetTreeExpanded();
             this.gcMain.ClearNodes();
             this.gcMain.DataSource = table;
+            this.AdjustIndicatorWidthSmart();
             this.SetAutoColumns();
         }
         public override int SetGridViewDataSource(SqlDataAdapter adapter, bool selectRowHandler = true)
@@ -2433,7 +2444,9 @@ namespace Lskj.Control
             SqlCommandBuilder cb = new SqlCommandBuilder(this.AdapterObj);
 
             GetTreeExpanded();
+
             this.gcMain.DataSource = dataSet.Tables[0];
+            this.AdjustIndicatorWidthSmart();
             this.SetAutoColumns();
 
             if ((Expansion + "").Equals("1"))
@@ -2449,6 +2462,7 @@ namespace Lskj.Control
                 this.gcMain.CollapseAll();
             }
             return dataSet.Tables[0] != null ? dataSet.Tables[0].Rows.Count : 0;
+            
         }
 
 
@@ -3803,7 +3817,7 @@ namespace Lskj.Control
             try
             {
                 TreeList tree = sender as DevExpress.XtraTreeList.TreeList;
-                tree.IndicatorWidth = 30;
+                if(tree.IndicatorWidth<30) tree.IndicatorWidth = 30;
                 DevExpress.Utils.Drawing.IndicatorObjectInfoArgs args = e.ObjectArgs as DevExpress.Utils.Drawing.IndicatorObjectInfoArgs;
                 args.DisplayText = (tree.GetVisibleIndexByNode(e.Node) + 1).ToString();
 
@@ -4536,3 +4550,26 @@ namespace Lskj.Control
                     if (model.FieldType == ControlType.LabMemoEdit) item.OptionsColumn.AllowEdit = true;
 
                 }
+                //必填
+                if (Required && RequiredFields.IndexOf(item.FieldName + ",", StringComparison.OrdinalIgnoreCase) != -1)
+                {
+                    item.AppearanceHeader.Options.UseForeColor = true;
+                    item.AppearanceHeader.ForeColor = RequiredForceColor;
+                }
+
+            }
+
+        }
+
+
+
+        /// <summary>
+        /// <para>说明：刷新数据源</para>
+        /// <para>创建人：曹屹峰</para>
+        /// <para>创建日期：2023-9-30 </para>
+        /// <para>修改人：</para>
+        /// <para>修改日期：</para>
+        /// <para>修改备注：</para>
+        /// <para>版本：1.0</para>
+        /// </summary>
+        /// <param name="UpdateColumnRefresh">判断是否只刷新Upd