mirror of
https://gitee.com/dotnetchina/OpenAuth.Net.git
synced 2025-04-05 17:38:01 +08:00
fix issue #I7XLQK checkbox控件值表单条件判断
This commit is contained in:
parent
24db84cda4
commit
19fc3bc933
@ -1,98 +1,118 @@
|
||||
// <copyright file="FlowLine.cs" company="openauth.net.cn">
|
||||
// Copyright (c) 2019 openauth.net.cn. All rights reserved.
|
||||
// </copyright>
|
||||
// <author>www.cnblogs.com/yubaolee</author>
|
||||
// <date>2019-03-05</date>
|
||||
// <summary>流程中的连线</summary>
|
||||
|
||||
using System.Collections.Generic;
|
||||
using Infrastructure.Extensions;
|
||||
using Newtonsoft.Json.Linq;
|
||||
|
||||
namespace OpenAuth.App.Flow
|
||||
{
|
||||
/// <summary>
|
||||
/// 流程连线
|
||||
/// </summary>
|
||||
public class FlowLine
|
||||
{
|
||||
public string id { get; set; }
|
||||
public string label { get; set; }
|
||||
public string type { get; set; }
|
||||
public string from { get; set; }
|
||||
public string to { get; set; }
|
||||
public string name { get; set; }
|
||||
public bool dash { get; set; }
|
||||
|
||||
/// <summary> 分支条件 </summary>
|
||||
public List<DataCompare> Compares { get; set; }
|
||||
|
||||
public bool Compare(JObject frmDataJson)
|
||||
{
|
||||
bool result = true;
|
||||
foreach (var compare in Compares)
|
||||
{
|
||||
|
||||
bool isDecimal = decimal.TryParse(compare.Value, out decimal value);
|
||||
var fieldVal = frmDataJson.GetValue(compare.FieldName.ToLower()).ToString();
|
||||
|
||||
if (isDecimal) //如果是数字或小数
|
||||
{
|
||||
decimal frmvalue = decimal.Parse(fieldVal); //表单中填写的值
|
||||
|
||||
switch (compare.Operation)
|
||||
{
|
||||
case DataCompare.Equal:
|
||||
result &= compare.Value == fieldVal;
|
||||
break;
|
||||
case DataCompare.Larger:
|
||||
result &= frmvalue > value;
|
||||
break;
|
||||
case DataCompare.Less:
|
||||
result &= frmvalue < value;
|
||||
break;
|
||||
case DataCompare.LargerEqual:
|
||||
result &= frmvalue >= value;
|
||||
break;
|
||||
case DataCompare.LessEqual:
|
||||
result &= frmvalue <= value;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else //如果只是字符串,只判断相等
|
||||
{
|
||||
result &= compare.Value == fieldVal;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 分支条件
|
||||
/// </summary>
|
||||
public class DataCompare
|
||||
{
|
||||
public const string Larger = ">";
|
||||
public const string Less = "<";
|
||||
public const string LargerEqual = ">=";
|
||||
public const string LessEqual = "<=";
|
||||
public const string NotEqual = "!=";
|
||||
public const string Equal = "=";
|
||||
|
||||
/// <summary>操作类型比如大于/等于/小于</summary>
|
||||
public string Operation { get; set; }
|
||||
|
||||
/// <summary> form种的字段名称 </summary>
|
||||
public string FieldName { get; set; }
|
||||
|
||||
/// <summary> 字段类型:"form":为表单中的字段,后期扩展系统表等. </summary>
|
||||
public string FieldType { get; set; }
|
||||
|
||||
/// <summary>比较的值</summary>
|
||||
public string Value { get; set; }
|
||||
}
|
||||
}
|
||||
// <copyright file="FlowLine.cs" company="openauth.net.cn">
|
||||
// Copyright (c) 2019 openauth.net.cn. All rights reserved.
|
||||
// </copyright>
|
||||
// <author>www.cnblogs.com/yubaolee</author>
|
||||
// <date>2019-03-05</date>
|
||||
// <summary>流程中的连线</summary>
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Infrastructure;
|
||||
using Infrastructure.Extensions;
|
||||
using Newtonsoft.Json.Linq;
|
||||
|
||||
namespace OpenAuth.App.Flow
|
||||
{
|
||||
/// <summary>
|
||||
/// 流程连线
|
||||
/// </summary>
|
||||
public class FlowLine
|
||||
{
|
||||
public string id { get; set; }
|
||||
public string label { get; set; }
|
||||
public string type { get; set; }
|
||||
public string from { get; set; }
|
||||
public string to { get; set; }
|
||||
public string name { get; set; }
|
||||
public bool dash { get; set; }
|
||||
|
||||
/// <summary> 分支条件 </summary>
|
||||
public List<DataCompare> Compares { get; set; }
|
||||
|
||||
public bool Compare(JObject frmDataJson)
|
||||
{
|
||||
bool result = true;
|
||||
foreach (var compare in Compares)
|
||||
{
|
||||
|
||||
bool isDecimal = decimal.TryParse(compare.Value, out decimal value);
|
||||
var fieldVal = frmDataJson.GetValue(compare.FieldName.ToLower()).ToString();
|
||||
|
||||
if (isDecimal) //如果是数字或小数
|
||||
{
|
||||
decimal frmvalue = 0;
|
||||
if (fieldVal.Contains("["))//表单中的数据包含[],为数组,一般是checkbox的值
|
||||
{
|
||||
var tempvals = JsonHelper.Instance.Deserialize<List<decimal>>(fieldVal);
|
||||
frmvalue = tempvals.Max();
|
||||
}
|
||||
else
|
||||
{
|
||||
frmvalue = decimal.Parse(fieldVal); //表单中填写的值
|
||||
}
|
||||
|
||||
switch (compare.Operation)
|
||||
{
|
||||
case DataCompare.Equal:
|
||||
result &= compare.Value == fieldVal;
|
||||
break;
|
||||
case DataCompare.Larger:
|
||||
result &= frmvalue > value;
|
||||
break;
|
||||
case DataCompare.Less:
|
||||
result &= frmvalue < value;
|
||||
break;
|
||||
case DataCompare.LargerEqual:
|
||||
result &= frmvalue >= value;
|
||||
break;
|
||||
case DataCompare.LessEqual:
|
||||
result &= frmvalue <= value;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else //如果只是字符串,只判断相等
|
||||
{
|
||||
if (fieldVal.Contains("["))//表单中的数据包含[],为数组,一般是checkbox的值
|
||||
{
|
||||
var tempvals = JsonHelper.Instance.Deserialize<List<string>>(fieldVal);
|
||||
result &= tempvals.Contains(compare.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
result &= compare.Value == fieldVal;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 分支条件
|
||||
/// </summary>
|
||||
public class DataCompare
|
||||
{
|
||||
public const string Larger = ">";
|
||||
public const string Less = "<";
|
||||
public const string LargerEqual = ">=";
|
||||
public const string LessEqual = "<=";
|
||||
public const string NotEqual = "!=";
|
||||
public const string Equal = "=";
|
||||
|
||||
/// <summary>操作类型比如大于/等于/小于</summary>
|
||||
public string Operation { get; set; }
|
||||
|
||||
/// <summary> form种的字段名称 </summary>
|
||||
public string FieldName { get; set; }
|
||||
|
||||
/// <summary> 字段类型:"form":为表单中的字段,后期扩展系统表等. </summary>
|
||||
public string FieldType { get; set; }
|
||||
|
||||
/// <summary>比较的值</summary>
|
||||
public string Value { get; set; }
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user