diff --git a/插件库/Lskj.Control/LabelRemarkEdit.cs b/插件库/Lskj.Control/LabelRemarkEdit.cs
index 80e09fc..bf3c30a 100644
--- a/插件库/Lskj.Control/LabelRemarkEdit.cs
+++ b/插件库/Lskj.Control/LabelRemarkEdit.cs
@@ -16,6 +16,7 @@ using System.Linq;
using System.Text;
using System.Windows.Forms;
using DevExpress.XtraEditors;
+using System.IO;
namespace Lskj.Control
{
@@ -28,11 +29,50 @@ namespace Lskj.Control
/// 文本控件
///
public MemoEdit TextEdit { get { return txtEdit; } }
-
+ ///
+ /// 存储文件地址(用于保存上传)
+ ///
+ public string filepath;
public LabelRemarkEdit()
{
InitializeComponent();
}
+ public void BandAllowDrop()
+ {
+ txtEdit.AllowDrop = true;
+ txtEdit.DragEnter += OnDragEnter;
+ txtEdit.DragDrop += OnDragDrop;
+ }
+ ///
+ /// 拖拽完成触发
+ ///
+ ///
+ ///
+ private void OnDragDrop(object sender, DragEventArgs e)
+ {
+ var file = ((string[])e.Data.GetData(DataFormats.FileDrop))[0];
+ txtEdit.Text = Path.GetFileName(file);
+ this.filepath = file;
+ }
+ ///
+ /// 说明:移动到目标表格
+ /// 创建人:龚宇超
+ /// 创建日期:2017-11-13
+ /// 修改人:
+ /// 修改日期:
+ /// 修改备注:
+ /// 版本:1.0
+ ///
+ /// The source of the event.
+ /// The instance containing the event data.
+ protected void OnDragEnter(object sender, System.Windows.Forms.DragEventArgs e)
+ {
+ if (e.Data.GetDataPresent(DataFormats.FileDrop) &&
+ ((string[])e.Data.GetData(DataFormats.FileDrop)).Length == 1)
+ e.Effect = DragDropEffects.Copy;
+ else
+ e.Effect = DragDropEffects.None;
+ }
///
/// 说明:设置控件显示文本
@@ -70,7 +110,7 @@ namespace Lskj.Control
{
Graphics g = this.lblText.CreateGraphics();
SizeF sizeF = g.MeasureString(value, this.lblText.Font);
- this.plLeft.Width = (int)sizeF.Width + PaddingLeft ;
+ this.plLeft.Width = (int)sizeF.Width + PaddingLeft;
}
}
}
@@ -143,39 +183,4 @@ namespace Lskj.Control
///
/// 只读文本颜色
///
- /// The color of the read only label.
- public override bool ReadOnly
- {
- get
- {
- return base.ReadOnly;
- }
- set
- {
- base.ReadOnly = value;
- this.txtEdit.Properties.ReadOnly = value;
- this.lblText.ForeColor = value ? base.ReadOnlyLabelForceColor : Required ? base.RequiredLabelForceColor : base.DefaultLabelForceColor;
- }
- }
- ///
- /// 必填文本颜色
- ///
- /// The color of the required label.
- public override bool Required
- {
- get
- {
- return base.Required;
- }
- set
- {
- base.Required = value;
- if (value)
- {
- this.lblText.ForeColor = base.RequiredLabelForceColor;
- }
- }
- }
-
- }
-}
+ ///
\ No newline at end of file
diff --git a/插件库/Lskj.Control/Model/ControlModel.cs b/插件库/Lskj.Control/Model/ControlModel.cs
index 680c994..7b143b3 100644
--- a/插件库/Lskj.Control/Model/ControlModel.cs
+++ b/插件库/Lskj.Control/Model/ControlModel.cs
@@ -268,6 +268,10 @@ namespace Lskj.Control.Model
///
public bool HighlightContent { get; set; }
///
+ /// 是否为拖拽绑定控件
+ ///
+ public bool FileUploadControl { get; set; }
+ ///
///条件拼接
///
public bool Montage { get; set; }
diff --git a/插件库/Lskj.Control/Model/MyControl.cs b/插件库/Lskj.Control/Model/MyControl.cs
index a2eca89..72defb7 100644
--- a/插件库/Lskj.Control/Model/MyControl.cs
+++ b/插件库/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