cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r327

Browse Source 
SVN-Revision: r327
This commit is contained in:
tdx
2025-03-16 02:39:51 +00:00
parent 0e7d44e3bb
commit f65b3ddfe1
4 changed files with 71 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/GridControlEx.cs
+22 -6
View File
@@ -402,13 +402,9 @@ namespace Lskj.Control
{
this.gridView.CustomRowFilter += GridView_CustomRowFilter;
}
this.gridView.CustomUnboundColumnData += OnGridViewCustomUnboundColumnData;
}
/// <summary>
/// <para>说明：单元格合并</para>
/// <para>创建人：王一帆</para>
@@ -799,6 +795,9 @@ namespace Lskj.Control
case ControlType.LabPic:
InitPicEdit(column);
break;
case ControlType.LabPicNew:
InitPicEditNew(column);
break;
case ControlType.LabSelectReturnId:
case ControlType.LabSelectReturnText:
InitSelectReturnId(column, model);
@@ -4241,6 +4240,14 @@ namespace Lskj.Control
picEdit.CustomHeight = 16;
gridColumn.ColumnEdit = picEdit;
}
public void InitPicEditNew(GridColumn gridColumn)
{
RepositoryItemPictureEdit pictureEdit = new RepositoryItemPictureEdit();
pictureEdit.SizeMode = PictureSizeMode.Zoom;
gridControl.RepositoryItems.Add(pictureEdit);
gridColumn.UnboundType = UnboundColumnType.Object;
gridColumn.ColumnEdit = pictureEdit;
}
/// <summary>
/// <para>说明：</para>
/// <para>创建人：龚宇超</para>
@@ -5462,6 +5469,7 @@ namespace Lskj.Control
{
if (e.Column.Tag == null) return;
GridColumnModel model = e.Column.Tag as GridColumnModel;
if (model == null) return;
DataRow rowHandleRow = this.GridView.GetDataRow(e.RowHandle);
//值改变时，如果是验证是否重复的列报错就清除
@@ -7422,9 +7430,17 @@ namespace Lskj.Control
e.Visible = true;
}
}
}
/// <summary>
/// 自定义表格数据
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void OnGridViewCustomUnboundColumnData(object sender, CustomColumnDataEventArgs e)
{
}
#region 当前表格的拖拽方法
/// <summary>
插件库/Lskj.Control/Model/ControlModel.cs
+4 -1
View File
@@ -284,4 +284,7 @@ namespace Lskj.Control.Model
/// <summary>
///下拉列宽度，逗号分隔一一对应
/// </summary>
/// <value>The LookUpFieldsWidth.</value
/// <value>The LookUpFieldsWidth.</value>
public string LookUpFieldsWidth { get; set; }
/// <summary>
///文本框禁编（不是禁编状态，可以点击按钮，但是不能��
插件库/Lskj.Control/Model/ControlType.cs
+4
View File
@@ -408,6 +408,10 @@ namespace Lskj.Control.Model
/// 模块选择返回Text（新版）
/// </summary>
public const int LabSelectReturnTextNew = 161;
/// <summary>
/// 图片,url图片展示
/// </summary>
public const int LabPicNew = 162;
/// <summary>
插件库/Lskj.Control/Model/MyControl.cs
+41 -9
View File
@@ -215,8 +215,10 @@ namespace Lskj.Control.Model
/// 模块选择框 选中后返回关联的字典
/// </summary>
public Dictionary<string, string> ModuleResultDic = new Dictionary<string, string>();
/// <summary>
/// 控件值改变动态刷新表格列
/// </summary>
public event KeyEventHandler OnDataFileRefrshCallBack;
/// <summary>
/// 控件Panel对象
/// </summary>
@@ -863,7 +865,7 @@ namespace Lskj.Control.Model
{
//放到外面避免线程问题
BaseUserControl baseControl = control as BaseUserControl;
baseControl.Model = model;
baseControl.FontSize = model.FontSize;
baseControl.Name = "txt_" + model.FieldName;
@@ -2698,14 +2700,14 @@ namespace Lskj.Control.Model
/// <returns></returns>
public string getImportReturnValueControl()
{
foreach (System.Windows.Forms.Control item in _parentPanel.Controls)
{
if (item is BaseUserControl)
{
var baseControl = item as BaseUserControl;
if(baseControl.Model.ImportReturnValue) return baseControl.Model.FieldName;
if (baseControl.Model.ImportReturnValue) return baseControl.Model.FieldName;
}
}
@@ -3759,6 +3761,7 @@ namespace Lskj.Control.Model
model.IsRadio = item.Table.Columns.Contains("IsRadio") && !string.IsNullOrWhiteSpace(item["IsRadio"] + "") ? "1".Equals(item["IsRadio"] + "") : false;
model.ScanAfterEmpty = item.Table.Columns.Contains("ScanAfterEmpty") && !string.IsNullOrWhiteSpace(item["ScanAfterEmpty"] + "") ? "1".Equals(item["ScanAfterEmpty"] + "") : false;
model.ImportReturnValue = item.Table.Columns.Contains("ImportReturnValue") && !string.IsNullOrWhiteSpace(item["ImportReturnValue"] + "") ? "1".Equals(item["ImportReturnValue"] + "") : false;
model.SchedStartDataControl = item.Table.Columns.Contains("SchedStartDataControl") && !string.IsNullOrWhiteSpace(item["SchedStartDataControl"] + "") ? "1".Equals(item["SchedStartDataControl"] + "") : false;
return model;
}
/// <summary>
@@ -5093,12 +5096,15 @@ namespace Lskj.Control.Model
{
BaseUserControl baseControl = (sender as System.Windows.Forms.Control).ToBaseUserControl();
this.SetUnionAncCalcControl(baseControl);
if (baseControl.Model != null && baseControl.Model.IsRefreshSource == 1 && OnSourceRefrshCallBack != null)
{
this.RefreshControl = baseControl.Model.FieldName;//条件表刷新上表的关键字段名
OnSourceRefrshCallBack(sender, null);
}
if (baseControl.Model != null && baseControl.Model.SchedStartDataControl && OnDataFileRefrshCallBack != null)
{
OnDataFileRefrshCallBack(sender, null);
}
}
/// <summary>
@@ -5261,7 +5267,7 @@ namespace Lskj.Control.Model
{
try
{
if (Model != null)
if (Model != null)
{
bool allowBefore = ApiHelper.IsExecEventApi(Interface.Api.OperateEvent.BeforeSearchBtnClick, Model.ModuleCode, 0);
//查询前调用Api接口
@@ -5283,7 +5289,7 @@ namespace Lskj.Control.Model
}
}
}
}
catch (Exception ex)
{
@@ -5608,4 +5614,30 @@ namespace Lskj.Control.Model
LabelDateEdit dateEdit = controlObj as LabelDateEdit;
value = dateEdit.TextEdit.EditValue == null ? dateEdit.EditText : dateEdit.TextEdit.DateTime.ToString("yyyy-MM-dd");
}
else if
else if (controlObj is LabelCheckEdit)
{
LabelCheckEdit checkEdit = controlObj as LabelCheckEdit;
value = checkEdit.EditText;
}
else if (controlObj is LabelComboxEdit)
{
LabelComboxEdit autoEdit = controlObj as LabelComboxEdit;
value = autoEdit.EditValue;
}
else if (controlObj is LabelTextEdit)
{
LabelTextEdit textIntEdit = controlObj as LabelTextEdit;
if (textIntEdit != null) value = string.IsNullOrEmpty(textIntEdit.EditText) ? "0" : textIntEdit.EditText;
}
defaultValue = defaultValue.Replace(item, value);
}
}
}
return defaultValue;
}
}
}