SVN r534

SVN-Revision: r534

插件库/Lskj.Control/Model/ControlModel.cs

@@ -268,6 +268,10 @@ namespace Lskj.Control.Model
         /// </summary>
         public bool HighlightContent { get; set; }
         /// <summary>
+        /// 是否为拖拽绑定控件
+        /// </summary>
+        public bool FileUploadControl { get; set; }
+        /// <summary>
         ///条件拼接
         /// </summary>
         public bool Montage { get; set; }

插件库/Lskj.Control/Model/MyControl.cs

@@ -3819,6 +3819,7 @@ namespace Lskj.Control.Model
             model.TreeCheckModel = item.Table.Columns.Contains("TreeCheckModel") ? item["TreeCheckModel"] + "" : "";
 
             model.ControlTitleColor = item.Table.Columns.Contains("ControlTitleColor") ? item["ControlTitleColor"] + "" : "";
+            model.FileUploadControl = item.Table.Columns.Contains("FileUploadControl") ? "1".Equals(item["FileUploadControl"] + "") : false;
             model.HighlightContent = item.Table.Columns.Contains("HighlightContent") ? "1".Equals(item["HighlightContent"] + "") : false;
             model.Montage = item.Table.Columns.Contains("montage") ? "1".Equals(item["montage"] + "") : false;
             model.DisplayPermissions = item.Table.Columns.Contains("DisplayPermissions") ? item["DisplayPermissions"] + "" : "";
@@ -4084,6 +4085,10 @@ namespace Lskj.Control.Model
                     remarkEdit.TextEdit.TextChanged += new EventHandler(OnTextEditTextChanged);
                     if (!isLoadBorder) remarkEdit.TextEdit.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
                     baseControl = remarkEdit;
+                    if (!model.FileUploadControl)
+                    {
+                        remarkEdit.BandAllowDrop();
+                    }
                     break;
                 case ControlType.LabMemoEdit:
                     // 备注框A