Add ICustomConditionalFunc

This commit is contained in:
sunkaixuan 2022-11-03 22:52:38 +08:00
parent 07a768c810
commit 2152cd065e
5 changed files with 44 additions and 1 deletions

View File

@ -129,7 +129,17 @@ namespace SqlSugar
if (model is ConditionalModel) if (model is ConditionalModel)
{ {
var item = model as ConditionalModel; var item = model as ConditionalModel;
if (item.FieldName == $"[value=sql{UtilConstants.ReplaceKey}]") if (item.CustomConditionalFunc != null)
{
var colIndex = mainIndex + beginIndex;
var colType = colIndex == 0 ? "" : "AND";
var custom = item.CustomConditionalFunc.GetConditionalSql(item, colIndex);
parameters.AddRange(custom.Value);
builder.AppendFormat(" "+colType + " "+custom.Key);
mainIndex++;
continue;
}
else if (item.FieldName == $"[value=sql{UtilConstants.ReplaceKey}]")
{ {
builder.Append(item.FieldValue); builder.Append(item.FieldValue);
continue; continue;

View File

@ -25,6 +25,14 @@ namespace SqlSugar
public string FieldName { get; set; } public string FieldName { get; set; }
public string FieldValue { get; set; } public string FieldValue { get; set; }
public string CSharpTypeName { get; set; } public string CSharpTypeName { get; set; }
public ICustomConditionalFunc CustomConditionalFunc { get; set; }
public string CustomP1 { get; set; }
public string CustomP2 { get; set; }
public string CustomP3 { get; set; }
public string CustomP4 { get; set; }
public ConditionalType ConditionalType { get; set; } public ConditionalType ConditionalType { get; set; }
[Newtonsoft.Json.JsonIgnoreAttribute] [Newtonsoft.Json.JsonIgnoreAttribute]
public Func<string,object> FieldValueConvertFunc { get; set; } public Func<string,object> FieldValueConvertFunc { get; set; }

View File

@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SqlSugar
{
public interface ICustomConditionalFunc
{
KeyValuePair<string, SugarParameter[]> GetConditionalSql(ConditionalModel json,int index);
}
}

View File

@ -138,6 +138,7 @@
<Compile Include="ExpressionsToSql\Subquery\Items\SubSelectStringJoin.cs" /> <Compile Include="ExpressionsToSql\Subquery\Items\SubSelectStringJoin.cs" />
<Compile Include="ExpressionsToSql\Subquery\Items\SubWithNoLock.cs" /> <Compile Include="ExpressionsToSql\Subquery\Items\SubWithNoLock.cs" />
<Compile Include="ExpressionsToSql\Subquery\Items\SubEnableTableFilter.cs" /> <Compile Include="ExpressionsToSql\Subquery\Items\SubEnableTableFilter.cs" />
<Compile Include="Interface\ICustomConditionalFunc.cs" />
<Compile Include="Json2Sql\Entities\JsonDeleteResult.cs" /> <Compile Include="Json2Sql\Entities\JsonDeleteResult.cs" />
<Compile Include="Json2Sql\Entities\JsonInsertResult.cs" /> <Compile Include="Json2Sql\Entities\JsonInsertResult.cs" />
<Compile Include="Json2Sql\Entities\JsonQueryResult.cs" /> <Compile Include="Json2Sql\Entities\JsonQueryResult.cs" />

View File

@ -79,6 +79,17 @@ namespace SqlSugar
} }
return value; return value;
} }
public static string ToCheckRegexW(this string value)
{
if (Regex.IsMatch(value,@"^\w+$"))
{
return value;
}
else
{
throw new Exception($"ToCheckRegexW {value} format error ");
}
}
internal static string ToLower(this string value ,bool isAutoToLower) internal static string ToLower(this string value ,bool isAutoToLower)
{ {
if (value == null) return null; if (value == null) return null;