lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-11-07 18:04:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: #I7XLQK

Browse Source
This commit is contained in:
yubaolee
2025-05-16 14:34:16 +08:00
parent 9a7d114658
commit 61cf133db0
2 changed files with 65 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
OpenAuth.App/Flow/FlowLine.cs
View File

@@ -34,11 +34,31 @@ namespace OpenAuth.App.Flow
bool result = true; bool result = true;
foreach (var compare in Compares) foreach (var compare in Compares)
{ {
object objVal = frmDataJson.GetValue(compare.FieldName.ToLower());
string fieldVal = null;
List<string> fieldVals = new List<string>();
if(compare.FieldType == "checkbox")
{
if (objVal is JArray jArray)
{
var tempvals = jArray.ToObject<List<string>>();
if (tempvals != null && tempvals.Any())
{
fieldVals.AddRange(tempvals);
}
}
}
else
{
fieldVal = objVal?.ToString();
}
// 判断是否为空值操作符 // 判断是否为空值操作符
if (compare.Operation == DataCompare.IsNull || compare.Operation == DataCompare.IsNotNull) if (compare.Operation == DataCompare.IsNull || compare.Operation == DataCompare.IsNotNull)
{ {
var fieldExists = frmDataJson.GetValue(compare.FieldName.ToLower()) != null; var fieldExists = objVal != null;
var fieldEmpty = !fieldExists || string.IsNullOrWhiteSpace(frmDataJson.GetValue(compare.FieldName.ToLower())?.ToString()); var fieldEmpty = !fieldExists || string.IsNullOrWhiteSpace(objVal.ToString());
if (compare.Operation == DataCompare.IsNull) if (compare.Operation == DataCompare.IsNull)
{ {
@@ -52,14 +72,48 @@ namespace OpenAuth.App.Flow
} }
// 确保字段存在且不为空 // 确保字段存在且不为空
if (frmDataJson.GetValue(compare.FieldName.ToLower()) == null) if (objVal == null)
{ {
result = false; result = false;
continue; continue;
} }
var fieldVal = frmDataJson.GetValue(compare.FieldName.ToLower()).ToString(); // checkbox类型特殊处理
if (compare.FieldType == "checkbox")
{
// 针对checkbox的IN和NOT IN操作
if (compare.Operation == DataCompare.In || compare.Operation == DataCompare.NotIn)
{
if (compare.ValueList == null || compare.ValueList.Length == 0)
{
result = false;
continue;
}
// 检查是否有交集
bool hasIntersection = fieldVals.Any(v => compare.ValueList.Contains(v));
result &= compare.Operation == DataCompare.In ? hasIntersection : !hasIntersection;
continue;
}
// 针对checkbox的相等和不等操作
if (compare.Operation == DataCompare.Equal)
{
result &= fieldVals.Contains(compare.Value);
continue;
}
else if (compare.Operation == DataCompare.NotEqual)
{
result &= !fieldVals.Contains(compare.Value);
continue;
}
// 其他操作不适用于checkbox，默认为false
result = false;
continue;
}
// 以下是非checkbox类型的处理逻辑
// 范围操作符处理 // 范围操作符处理
if (compare.Operation == DataCompare.In || compare.Operation == DataCompare.NotIn) if (compare.Operation == DataCompare.In || compare.Operation == DataCompare.NotIn)
{ {

8
OpenAuth.App/Flow/FlowRuntime.cs
View File

@@ -124,8 +124,14 @@ namespace OpenAuth.App.Flow
if (FrmData == "" || FrmData == "{}") return lines[0].to; if (FrmData == "" || FrmData == "{}") return lines[0].to;
FrmData = FrmData.ToLower(); //统一转小写
var frmDataJson = FrmData.ToJObject(); //获取数据内容 var frmDataJson = FrmData.ToJObject(); //获取数据内容
// 将frmDataJson中的所有key转小写
var properties = frmDataJson.Properties().ToList();
foreach (var property in properties)
{
frmDataJson[property.Name.ToLower()] = property.Value;
frmDataJson.Remove(property.Name);
}
foreach (var l in lines) foreach (var l in lines)
{ {