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

SVN r1167

Browse Source 
SVN-Revision: r1167
This commit is contained in:
cyf
2026-05-11 02:19:43 +00:00
parent 2e85136fbb
commit 2ed5b7975f
21 changed files with 475 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/Model/ControlModel.cs
+4 -1
View File
@@ -329,4 +329,7 @@ namespace Lskj.Control.Model
/// </summary>
public bool ImportCurrentValue { get; set; }
/// <summary>
///是否为 �
///是否为 单据动态生成列开始日期控件
/// </summary>
public bool SchedStartDataControl { get; set; }
/// <summary>
插件库/Lskj.Control/Model/ControlType.cs
+12 -1
View File
@@ -67,6 +67,7 @@ namespace Lskj.Control.Model
/// 日期框 显示(年-月)
/// </summary>
public const int LabShortDate = 444444;
/// <summary>
/// 自动搜索框 保存Value值, 显示Text值
/// </summary>
@@ -468,6 +469,14 @@ namespace Lskj.Control.Model
///提示框
/// </summary>
public const int LabPrompt = 166;
/// <summary>
///模块选择返回行，返回ID
/// </summary>
public const int LabModuleAddRowsID = 167;
/// <summary>
///模块选择返回行，返回text
/// </summary>
public const int LabModuleAddRowsText = 168;
/// <summary>
/// <para>说明：是否为Value类型</para>
@@ -566,4 +575,6 @@ namespace Lskj.Control.Model
}
/// <summary>
/// 不需要根据数据源sql获取数据源的控件
/// </summary>
/// <param name=
插件库/Lskj.Control/Model/GridColumnModel.cs
+3
View File
@@ -228,6 +228,9 @@ namespace Lskj.Control.Model
/// 合计计算公式
/// </summary>
public string sumCalc { get; set; }
/// <summary>
/// 合并分组
/// </summary>
public string MergeGroup { get; set; }
/// <summary>
/// 合并数据是否求和(合并单元格只计算一次)
插件库/Lskj.Control/Model/GridDetailModel.cs
+7 -2
View File
@@ -160,7 +160,7 @@ namespace Lskj.Control.Model
/// <value>The union module.</value>
public string UnionModule { get { return _unionModule; } }
/// <summary>
/// 关联模块
/// 关联条件
/// </summary>
/// <value>The union module.</value>
public string UnionCond { get { return _unionCond; } }
@@ -294,6 +294,10 @@ namespace Lskj.Control.Model
/// 隐藏下方操作按钮
/// </summary>
public string ChartTextColor;
/// <summary>
/// 刷新单表明细时忽略关联字段（单表中，有关联模块，但是没有关联条件，关联值，是不会去查询数据的）
/// </summary>
public bool IgnoreAssociatedFields;
/// <summary>
/// 主模块编号
@@ -356,4 +360,5 @@ namespace Lskj.Control.Model
this.QueryAgain = item.Table.Columns.Contains("QueryAgain") ? "1".Equals(item["QueryAgain"] + "") : false;
this.BottomRefreshMain = item.Table.Columns.Contains("BottomRefreshMain") ? "1".Equals(item["BottomRefreshMain"] + "") : false;
this.LoadFilter = item.Table.Columns.Contains("LoadFilter") ? "1".Equals(item["LoadFilter"] + "") : false;
this.
this.DynamicDetails = item.Table.Columns.Contains("DynamicDetails") ? "1".Equals(item["DynamicDetails"] + "") : false;
this.DetailSearch = item.Tabl
插件库/Lskj.Control/Model/GridExtend.cs
+19 -9
View File
@@ -2395,6 +2395,11 @@ namespace Lskj.Control.Model
if (cell != null)
{
if (cell.CellType == CellType.Error)
{
// 你可以返回空，或者标记为 "错误值"
continue;
}
if (cell.CellType == CellType.Blank)
{
//isImportRows = false;
@@ -2440,7 +2445,7 @@ namespace Lskj.Control.Model
model.FieldType == ControlType.LabDateTime ||
model.FieldType == ControlType.LabDateTimeShort ||
model.FieldType == ControlType.LabTime ||
model.FieldType == ControlType.LabShortTime) && (cell == null && cell.StringCellValue != null && cell.CellType == CellType.Blank && string.IsNullOrWhiteSpace(cell + "")))
model.FieldType == ControlType.LabShortTime) && (cell == null || string.IsNullOrWhiteSpace(cell + "")))
{
//日期框如果值是空，就直接跳过。赋空值（""）会报错
continue;
@@ -2499,7 +2504,8 @@ namespace Lskj.Control.Model
|| model.FieldType == ControlType.LabAutoGridValue
|| model.FieldType == ControlType.LabAutoGridValueParam
|| model.FieldType == ControlType.LabSelectReturnId
|| (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
|| (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)||
model.FieldType == ControlType.LabModuleAddRowsID
))
{
bool isEmpty = model.CanNull;
@@ -2846,7 +2852,8 @@ namespace Lskj.Control.Model
|| model.FieldType == ControlType.LabAutoGridValue
|| model.FieldType == ControlType.LabAutoGridValueParam
|| model.FieldType == ControlType.LabSelectReturnId
|| (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
|| (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)||
model.FieldType == ControlType.LabModuleAddRowsID
))
{
bool isEmpty = model.CanNull;
@@ -3275,7 +3282,8 @@ namespace Lskj.Control.Model
model.FieldType == ControlType.LabMultiSelectValueParam ||
model.FieldType == ControlType.LabAutoGridValue ||
model.FieldType == ControlType.LabSelectReturnId ||
(model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
(model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)||
model.FieldType == ControlType.LabModuleAddRowsID
))
{
string fieldValue = GetValueByImportText(dr, gc.FieldName, dr[gc.FieldName] + "");
@@ -3691,13 +3699,14 @@ namespace Lskj.Control.Model
|| model.FieldType == ControlType.LabAutoGridValue
|| model.FieldType == ControlType.LabAutoGridValueParam
|| model.FieldType == ControlType.LabSelectReturnId
|| (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
|| (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)||
model.FieldType == ControlType.LabModuleAddRowsID
)
{
string sqlValue = model.SqlSource;
if (model.FieldType == ControlType.LabSelectReturnId || model.FieldType == ControlType.LabSelectReturnIdNew)
if (model.FieldType == ControlType.LabSelectReturnId || model.FieldType == ControlType.LabSelectReturnIdNew || model.FieldType == ControlType.LabModuleAddRowsID)
{
if ((model.IsRadio && !string.IsNullOrWhiteSpace(model.addModuleld)) || model.FieldType == ControlType.LabSelectReturnIdNew)
if ((model.IsRadio && !string.IsNullOrWhiteSpace(model.addModuleld)) || model.FieldType == ControlType.LabSelectReturnIdNew || model.FieldType == ControlType.LabModuleAddRowsID)
{
//单选模式数据源为模块sql 新版模块选中返回id固定位模块sql
DataRow modelRow = Business.Impl.MainImpl.GetSystemdllTab(model.addModuleld);
@@ -3767,13 +3776,14 @@ namespace Lskj.Control.Model
|| model.FieldType == ControlType.LabAutoGridValueParam
|| model.FieldType == ControlType.LabSelectReturnId
|| (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
|| model.FieldType == ControlType.LabModuleAddRowsID
)
{
string sqlValue = model.SqlSource;
if (model.FieldType == ControlType.LabSelectReturnId || model.FieldType == ControlType.LabSelectReturnIdNew)
if (model.FieldType == ControlType.LabSelectReturnId || model.FieldType == ControlType.LabSelectReturnIdNew|| model.FieldType == ControlType.LabModuleAddRowsID)
{
if ((model.IsRadio && !string.IsNullOrWhiteSpace(model.addModuleld)) || model.FieldType == ControlType.LabSelectReturnIdNew)
if ((model.IsRadio && !string.IsNullOrWhiteSpace(model.addModuleld)) || model.FieldType == ControlType.LabSelectReturnIdNew|| model.FieldType == ControlType.LabModuleAddRowsID)
{
//单选模式数据源为模块sql 新版模块选中返回id固定位模块sql
DataRow modelRow = Business.Impl.MainImpl.GetSystemdllTab(model.addModuleld);
插件库/Lskj.Control/Model/MenuStrip/BaseMenuStrip.cs
+2 -1
View File
@@ -699,6 +699,7 @@ namespace Lskj.Control.Model
}
//打开导入覆盖控件
public bool OpenFrmcCover(GridRightMenuModel model, List<string> paramList)
{
@@ -1784,7 +1785,7 @@ namespace Lskj.Control.Model
paramList[2] = ReplaceHelper.ReplaceRowParam(rows, url) + "";
}
}
if (model.DllName.ToLower().Contains("p_PubPrint.lsp".ToLower()))
if (model.DllName.ToLower().Contains("p_PubPrint.lsp".ToLower())&& !model.CancelDefaultReplace)
{
string paramsql1 = paramList[2];
paramList[2] = ReplaceHelper.ReplaceRowParam(rows, paramsql1, "'", "'");
插件库/Lskj.Control/Model/MenuStrip/RightMenuModel.cs
+8 -2
View File
@@ -129,7 +129,7 @@ namespace Lskj.Control.Model
/// <value><c>true</c> if [more click]; otherwise, <c>false</c>.</value>
public bool MoreClick { get { return _moreClick; } }
/// <summary>
/// 右键菜单是否可执参数替换
/// 右键菜单是否可执参数替换(合并)
/// </summary>
/// <value><c>true</c> if [merg Eexec]; otherwise, <c>false</c>.</value>
public bool Mergeexec { get { return _mergEexec; } }
@@ -342,6 +342,10 @@ namespace Lskj.Control.Model
/// 右键验证是否有修改后的数据
/// </summary>
public bool VerifyUpdate;
/// <summary>
/// 右键多选合并不走默认替换（p_PubPrint.lsp）
/// </summary>
public bool CancelDefaultReplace;
/// <summary>
@@ -471,4 +475,6 @@ namespace Lskj.Control.Model
this.SqlDirectExecution = string.IsNullOrWhiteSpace(item["SqlDirectExecution"] + "") ? false : "1".Equals(item["SqlDirectExecution"] + "");
if (item.Table.Columns.Contains("UnionZTid"))
this.UnionZTid = string.IsNullOrWhiteSpace(item["UnionZTid"] + "") ? "" : item["UnionZTid"] + "";
if (item.Table.Columns.Contains("Di
if (item.Table.Columns.Contains("DisableSuccessfulPrompt"))
this.DisableSuccessfulPrompt = string.IsNullOrWhiteSpace(item["DisableSuccessfulPrompt"] + "") ? false : "1".Equals(item["DisableSuccessfulPrompt"] + "");
if (item.Table.Columns.
插件库/Lskj.Control/Model/MyControl.cs
+25 -35
View File
@@ -250,6 +250,10 @@ namespace Lskj.Control.Model
/// </summary>
public event EventHandler OpenDocumentSource;
/// <summary>
///特殊左侧表
/// </summary>
public GridControlEx SpecialLeftTable;
/// <summary>
/// 控件Panel对象
/// </summary>
public XtraScrollableControl ParentPanel
@@ -3458,14 +3462,14 @@ namespace Lskj.Control.Model
this.GridRowCount = this._mainGridEx.SetGridViewDataSource(MainImpl.GetAdapterResult(sqlValue));
}
}
//if (RememberRow)
//{
// if (this.GridRowCount <= oldRowHandle && SystemInfo.Instance.DeleteSelectedEndOf)
// {
// oldRowHandle = this.GridRowCount - 1;
// }
// SetFocusedRowHandle(oldRowHandle);
//}
if (RememberRow)
{
if (this.GridRowCount <= oldRowHandle && SystemInfo.Instance.DeleteSelectedEndOf)
{
oldRowHandle = this.GridRowCount - 1;
}
SetFocusedRowHandle(oldRowHandle);
}
}
}
else
@@ -4091,6 +4095,7 @@ namespace Lskj.Control.Model
model.AdditionalAssociations = item.Table.Columns.Contains("AdditionalAssociations") && !string.IsNullOrWhiteSpace(item["AdditionalAssociations"] + "") ? "1".Equals(item["AdditionalAssociations"] + "") : false;
model.AuditControlTitleColor = item.Table.Columns.Contains("AuditControlTitleColor") ? item["AuditControlTitleColor"] + "" : "";
model.ModuleFrameDisplayText = item.Table.Columns.Contains("ModuleFrameDisplayText") ? "1".Equals(item["ModuleFrameDisplayText"] + "") : false;
model.InputBoxFontSize = item.Table.Columns.Contains("InputBoxFontSize") && !string.IsNullOrEmpty(item["InputBoxFontSize"] + "") ? Convert.ToInt32(item["InputBoxFontSize"] + "") : 0;
//为了和工具里和bs里统一
if (model.FieldType == 42)
{
@@ -4366,6 +4371,7 @@ namespace Lskj.Control.Model
remarkEdit.TextEdit.ForeColor = Color.Red;
}
remarkEdit.TextEdit.KeyDown += new KeyEventHandler(OnTextEditKeyDown);
remarkEdit.TextEdit.TextChanged += new EventHandler(OnTextEditTextChanged);
if (!isLoadBorder) remarkEdit.TextEdit.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
@@ -4384,6 +4390,11 @@ namespace Lskj.Control.Model
case ControlType.LabMemoEdit:
// 备注框A
LabelMemoEdit memoEdit = new LabelMemoEdit();
if (model.InputBoxFontSize > 0)
{
//memoEdit.TextEdit.Properties.Appearance.Font = new Font(memoEdit.TextEdit.Properties.Appearance.Font.FontFamily, model.RemarkBoxFontSize);
memoEdit.TextEdit.Properties.AppearanceDropDown.Font = new Font(memoEdit.TextEdit.Properties.Appearance.Font.FontFamily, model.InputBoxFontSize);
}
memoEdit.TextEdit.KeyDown += new KeyEventHandler(OnTextEditKeyDown);
memoEdit.TextEdit.TextChanged += new EventHandler(OnTextEditTextChanged);
if (!isLoadBorder) memoEdit.TextEdit.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
@@ -4392,6 +4403,11 @@ namespace Lskj.Control.Model
case ControlType.LabMemoSpaceEdit:
// 备注框A
LabelMemoSpaceEdit memoSpacEdit = new LabelMemoSpaceEdit();
if (model.InputBoxFontSize > 0)
{
//memoSpacEdit.TextEdit.Properties.Appearance.Font = new Font(memoSpacEdit.TextEdit.Properties.Appearance.Font.FontFamily, model.RemarkBoxFontSize);
memoSpacEdit.TextEdit.Properties.AppearanceDropDown.Font = new Font(memoSpacEdit.TextEdit.Properties.Appearance.Font.FontFamily, model.InputBoxFontSize);
}
memoSpacEdit.TextEdit.KeyDown += new KeyEventHandler(OnTextEditKeyDown);
memoSpacEdit.TextEdit.TextChanged += new EventHandler(OnTextEditTextChanged);
if (!isLoadBorder) memoSpacEdit.TextEdit.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
@@ -6183,30 +6199,4 @@ 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 (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;
}
}
}
else if