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

SVN r949

Browse Source 
SVN-Revision: r949
This commit is contained in:
cyf
2025-08-14 08:47:36 +00:00
parent 648ff1099d
commit 18b823a11e
6 changed files with 135 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/Model/GridExtend.cs
+44 -26
View File
@@ -1964,7 +1964,9 @@ namespace Lskj.Control.Model
string selWhere = "1=1";
DataTable table = ValueGridColumnTable[model];
if (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew || model.FieldType == ControlType.LabMultiSelectValueParam)
if (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew || model.FieldType == ControlType.LabMultiSelectValueParam
|| (model.FieldType == ControlType.LabSelectReturnId && !model.IsRadio)
|| (model.FieldType == ControlType.LabSelectReturnIdNew && !model.IsRadio && model.ModuleFrameDisplayText))
{
string[] splitString = text.Split(',');
string nemValue = string.Empty;
@@ -2181,7 +2183,7 @@ namespace Lskj.Control.Model
model.FieldType == ControlType.LabDateTime ||
model.FieldType == ControlType.LabDateTimeShort ||
model.FieldType == ControlType.LabTime ||
model.FieldType == ControlType.LabShortTime)&& (cell == null || cell.CellType == CellType.Blank||string.IsNullOrWhiteSpace(cell+"")))
model.FieldType == ControlType.LabShortTime)&& (cell == null&&cell.StringCellValue!=null && cell.CellType == CellType.Blank && string.IsNullOrWhiteSpace(cell+"")))
{
//日期框如果值是空，就直接跳过。赋空值（""）会报错
continue;
@@ -2240,20 +2242,21 @@ namespace Lskj.Control.Model
|| model.FieldType == ControlType.LabAutoGridValue
|| model.FieldType == ControlType.LabAutoGridValueParam
|| model.FieldType == ControlType.LabSelectReturnId
||(model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
))
{
bool isEmpty = model.CanNull;
string fieldValue = GetValueByImportText(dataRow, col.FieldName, cell + "", isBillImport);
if ((model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew ||
model.FieldType == ControlType.LabMultiSelectValueParam) && cell.ToString().Contains(","))
{
string[] cellText = cell.ToString().Split(',');
foreach (string cellValue in cellText)
{
fieldValue += GetValueByImportText(dataRow, col.FieldName, cellValue, isBillImport) + ',';
}
fieldValue = fieldValue.TrimEnd(',');
}
// if ((model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew ||
//model.FieldType == ControlType.LabMultiSelectValueParam) && cell.ToString().Contains(","))
// {
// string[] cellText = cell.ToString().Split(',');
// foreach (string cellValue in cellText)
// {
// fieldValue += GetValueByImportText(dataRow, col.FieldName, cellValue, isBillImport) + ',';
// }
// fieldValue = fieldValue.TrimEnd(',');
// }
if (string.IsNullOrEmpty(fieldValue))
{
if (isEmpty)
@@ -2585,20 +2588,21 @@ namespace Lskj.Control.Model
|| model.FieldType == ControlType.LabAutoGridValue
|| model.FieldType == ControlType.LabAutoGridValueParam
|| model.FieldType == ControlType.LabSelectReturnId
|| (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
))
{
bool isEmpty = model.CanNull;
string fieldValue = GetValueByImportText(dataRow, col.FieldName, cell + "", isBillImport);
if ((model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew ||
model.FieldType == ControlType.LabMultiSelectValueParam) && cell.ToString().Contains(","))
{
string[] cellText = cell.ToString().Split(',');
foreach (string cellValue in cellText)
{
fieldValue += GetValueByImportText(dataRow, col.FieldName, cellValue, isBillImport) + ',';
}
fieldValue = fieldValue.TrimEnd(',');
}
// if ((model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew ||
//model.FieldType == ControlType.LabMultiSelectValueParam) && cell.ToString().Contains(","))
// {
// string[] cellText = cell.ToString().Split(',');
// foreach (string cellValue in cellText)
// {
// fieldValue += GetValueByImportText(dataRow, col.FieldName, cellValue, isBillImport) + ',';
// }
// fieldValue = fieldValue.TrimEnd(',');
// }
if (string.IsNullOrEmpty(fieldValue))
{
if (isEmpty)
@@ -3009,7 +3013,8 @@ namespace Lskj.Control.Model
model.FieldType == ControlType.LabMultiSelectValue ||
model.FieldType == ControlType.LabMultiSelectValueParam ||
model.FieldType == ControlType.LabAutoGridValue ||
model.FieldType == ControlType.LabSelectReturnId
model.FieldType == ControlType.LabSelectReturnId||
(model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
))
{
string fieldValue = GetValueByImportText(dr, gc.FieldName, dr[gc.FieldName] + "");
@@ -3417,14 +3422,15 @@ namespace Lskj.Control.Model
|| model.FieldType == ControlType.LabAutoGridValue
|| model.FieldType == ControlType.LabAutoGridValueParam
|| model.FieldType == ControlType.LabSelectReturnId
|| (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
)
{
string sqlValue = model.SqlSource;
if (model.FieldType == ControlType.LabSelectReturnId)
if (model.FieldType == ControlType.LabSelectReturnId || model.FieldType == ControlType.LabSelectReturnIdNew)
{
if (model.IsRadio && !string.IsNullOrWhiteSpace(model.addModuleld))
if ((model.IsRadio && !string.IsNullOrWhiteSpace(model.addModuleld)) ||model.FieldType == ControlType.LabSelectReturnIdNew)
{
//单选模式数据源为模块sql
//单选模式数据源为模块sql 新版模块选中返回id固定位模块sql
DataRow modelRow = Business.Impl.MainImpl.GetSystemdllTab(model.addModuleld);
sqlValue = modelRow["SQL"] + "";
}
@@ -3491,9 +3497,21 @@ namespace Lskj.Control.Model
|| model.FieldType == ControlType.LabAutoGridValue
|| model.FieldType == ControlType.LabAutoGridValueParam
|| model.FieldType == ControlType.LabSelectReturnId
|| (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
)
{
string sqlValue = model.SqlSource;
if (model.FieldType == ControlType.LabSelectReturnId || model.FieldType == ControlType.LabSelectReturnIdNew)
{
if ((model.IsRadio && !string.IsNullOrWhiteSpace(model.addModuleld)) || model.FieldType == ControlType.LabSelectReturnIdNew)
{
//单选模式数据源为模块sql 新版模块选中返回id固定位模块sql
DataRow modelRow = Business.Impl.MainImpl.GetSystemdllTab(model.addModuleld);
sqlValue = modelRow["SQL"] + "";
}
}
if (sqlValue.Contains(" #"))
{
//sqlValue = sqlValue.Replace("#", "");