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

SVN r1190

Browse Source 
SVN-Revision: r1190
This commit is contained in:
cyf
2026-06-01 01:53:15 +00:00
parent 6245aa0768
commit 141493a620
23 changed files with 1491 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/Model/CommonMenu.cs
+2 -1
View File
@@ -419,7 +419,8 @@ namespace Lskj.Control.Model
default:
List<string> str = new List<string>
{
_model.FormText,
//_model.FormText,
model.MenuName,
ERPInfo.Instance.UserId,
ERPInfo.Instance.UserName,
"3",
插件库/Lskj.Control/Model/ControlModel.cs
+8 -1
View File
@@ -332,4 +332,11 @@ namespace Lskj.Control.Model
///是否为 单据动态生成列开始日期控件
/// </summary>
public bool SchedStartDataControl { get; set; }
/// <summary>
/// <summary>
/// 弹出列表框中字体大小
/// </summary>
public int ListBoxFontSize { get; set; }
/// <summary>
/// 字段浏览权限
/// </summary>
public string PrivilegeVie
插件库/Lskj.Control/Model/ControlType.cs
+14 -1
View File
@@ -67,6 +67,10 @@ namespace Lskj.Control.Model
/// 日期框 显示(年-月)
/// </summary>
public const int LabShortDate = 444444;
/// <summary>
/// 日期框 显示(年-月-日 上午/下午)，保存字符串
/// </summary>
public const int LabDateHalfDay = 445;
/// <summary>
/// 自动搜索框 保存Value值, 显示Text值
@@ -477,6 +481,14 @@ namespace Lskj.Control.Model
///模块选择返回行，返回text
/// </summary>
public const int LabModuleAddRowsText = 168;
/// <summary>
/// 模块选择返回ID(新版)单选
/// </summary>
public const int LabSelectReturnIdSingleNew = 171;
/// <summary>
/// 模块选择返回Text（新版）单选
/// </summary>
public const int LabSelectReturnTextSingleNew = 172;
/// <summary>
/// <para>说明：是否为Value类型</para>
@@ -577,4 +589,5 @@ namespace Lskj.Control.Model
/// <summary>
/// 不需要根据数据源sql获取数据源的控件
/// </summary>
/// <param name=
/// <param name="fieldType"></param>
/// <returns></return
插件库/Lskj.Control/Model/GridColumnModel.cs
+5 -1
View File
@@ -489,4 +489,8 @@ namespace Lskj.Control.Model
this.PrivilegeOper = item.Table.Columns.Contains("PrivilegeOper") ? item["PrivilegeOper"] + "" : string.Empty;
this.AdditionalAssociations = item.Table.Columns.Contains("AdditionalAssociations") ? "1".Equals(item["AdditionalAssociations"] + "") : false;
this.ProhibitPaste = item.Table.Columns.Contains("ProhibitPaste") ? "1".Equals(item["ProhibitPaste"] + "") : false;
this.ModuleFrameDisplayText = item.Table.Columns.Contains("ModuleFrameDisplayText") ? "1".Equals(item["ModuleFrameDisplayT
this.ModuleFrameDisplayText = item.Table.Columns.Contains("ModuleFrameDisplayText") ? "1".Equals(item["ModuleFrameDisplayText"] + "") : false;
this.FormatEditBox = item.Table.Columns.Contains("FormatEditBox") ? "1".Equals(item["FormatEditBox"] + "") : false;
this.PromptText = item.Table.Columns.Contains("PromptText") ? item["PromptText"] + "" : string.Empty;
this.ColumnAnnotation = item.Table.Columns.Contains("ColumnAnnotation") ? item["ColumnAnnotation"] + "" : string.Empty;
t
插件库/Lskj.Control/Model/GridDetailModel.cs
+7 -2
View File
@@ -283,7 +283,7 @@ namespace Lskj.Control.Model
/// </summary>
public string PlanLetfControl;
/// <summary>
/// 隐藏下方操作按钮
/// 隐藏下方操作按钮(后续配置Dll模板，配置为Lskj.Report.dll也会隐藏下方，dll模板的配置是cs和bs通用的)
/// </summary>
public bool HideBottomPanel;
/// <summary>
@@ -298,6 +298,10 @@ namespace Lskj.Control.Model
/// 刷新单表明细时忽略关联字段（单表中，有关联模块，但是没有关联条件，关联值，是不会去查询数据的）
/// </summary>
public bool IgnoreAssociatedFields;
/// <summary>
/// Dll模板
/// </summary>
public string Library;
/// <summary>
/// 主模块编号
@@ -361,4 +365,5 @@ namespace Lskj.Control.Model
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.DynamicDetails = item.Table.Columns.Contains("DynamicDetails") ? "1".Equals(item["DynamicDetails"] + "") : false;
this.DetailSearch = item.Tabl
this.DetailSearch = item.Table.Columns.Contains("DetailSearch") ? "1".Equals(item["DetailSearch"] + "") : false;
插件库/Lskj.Control/Model/MyControl.cs
+48 -3
View File
@@ -402,6 +402,7 @@ namespace Lskj.Control.Model
if (control != null)
{
BaseUserControl baseControl = control as BaseUserControl;
baseControl.Location = model.Location;
System.Threading.SynchronizationContext.Current.Post(SetProperty, null);
void SetProperty(object state)
{
@@ -412,7 +413,7 @@ namespace Lskj.Control.Model
baseControl.LabelText = model.LabelText;
baseControl.NullText = model.NullText;
//baseControl.EditText = model.DefaultValue;
baseControl.Location = model.Location;
//baseControl.Location = model.Location;
baseControl.Size = model.Size;
if (!model.ReadOnly && !string.IsNullOrWhiteSpace(model.ControlTitleColor))
{
@@ -1647,11 +1648,18 @@ namespace Lskj.Control.Model
{
SetControlValue(model, this.ParentKey);
}
else if (model.RememberValue&& ConditionalCaching.ConditionalCaches.ContainsKey(model.id) && !string.IsNullOrWhiteSpace(ConditionalCaching.ConditionalCaches[model.id]))
{
SetControlValue(model, ConditionalCaching.ConditionalCaches[model.id]);
}
else if (!string.IsNullOrEmpty(model.DefaultValue))
{
string defaultValue = this.SystemModel != null ? ReplaceHelper.ReplaceRowParam(this.SystemModel.maintabFocusedRow, model.DefaultValue) : model.DefaultValue;
SetControlValue(model, defaultValue);
}
}
//智能搜索框第一次加载时手动触发
if (changeLabelAutoGridLooks.Count > 0)
@@ -2013,6 +2021,11 @@ namespace Lskj.Control.Model
}
//value = dateEdit.TextEdit.EditValue == null ? dateEdit.EditText : dateEdit.TextEdit.EditValue.ToString();
break;
case ControlType.LabDateHalfDay:
// 日期半天控件
LabelDateHalfDayEdit dateHalfDayEdit = ctr as LabelDateHalfDayEdit;
if (dateHalfDayEdit != null) value = dateHalfDayEdit.TextEdit.EditValue == null ? dateHalfDayEdit.EditText : dateHalfDayEdit.TextEdit.EditValue.ToString();
break;
case ControlType.LabShortDate:
//为保存和表格保存格式相同。默认取EditValue值
LabelDateEdit dateEditNew = ctr as LabelDateEdit;
@@ -4120,6 +4133,9 @@ namespace Lskj.Control.Model
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;
model.RememberValue = item.Table.Columns.Contains("RememberValue") ? "1".Equals(item["RememberValue"] + "") : false;
//为了和工具里和bs里统一
if (model.FieldType == 42)
{
@@ -4133,6 +4149,18 @@ namespace Lskj.Control.Model
model.FieldType = 160;
model.IsRadio = false;
}
if (model.FieldType == 171)
{
//模块选择返回ID(新版)单选
model.FieldType = 160;
model.IsRadio = true;
}
if (model.FieldType == 172)
{
//模块选择返回Text（新版）单选
model.FieldType = 161;
model.IsRadio = true;
}
return model;
}
@@ -4239,6 +4267,16 @@ namespace Lskj.Control.Model
}
baseControl = dateEdit;
break;
case ControlType.LabDateHalfDay:
// 日期半天控件
LabelDateHalfDayEdit dateHalfDayEdit = new LabelDateHalfDayEdit();
dateHalfDayEdit.TextEdit.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
dateHalfDayEdit.TextEdit.KeyDown += new KeyEventHandler(OnTextEditKeyDown);
dateHalfDayEdit.TextEdit.TextChanged += new EventHandler(OnTextEditTextChanged);
if (!isLoadBorder) dateHalfDayEdit.TextEdit.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
baseControl = dateHalfDayEdit;
break;
case ControlType.LabComboxValue:
case ControlType.LabComboxText:
case ControlType.LabComboxValueParam:
@@ -4667,7 +4705,7 @@ namespace Lskj.Control.Model
model.SourceSql = "";
//设置了ModuleFrameDisplayText（显示text值），就把配置的模块sql传给model.SourceSql
if (model.ModuleFrameDisplayText)
if (model.FieldType == ControlType.LabSelectReturnIdNew)
{
moduleReturnsIdNew.ModuleFrameDisplayText = true;
model.SourceSql = moduleReturnsIdNew._lookUpForm.SysModel.MenuSql;
@@ -5175,6 +5213,13 @@ namespace Lskj.Control.Model
if (baseControl != null && baseControl.Model != null)
{
ControlModel model = baseControl.Model as ControlModel;
if (model.RememberValue)
{
//记录控件值
string fieldValue = GetControlValue(model);
ConditionalCaching.ConditionalCaches[model.id] = fieldValue;
}
if (this.CanExecControl)
{
// 是否存在计算值
@@ -6258,4 +6303,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
else if (