diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_InputDto.cs.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_InputDto.cs.vm index f68a2c22..1cae2652 100644 --- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_InputDto.cs.vm +++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_InputDto.cs.vm @@ -86,10 +86,16 @@ if (@column.WhetherAddUpdate == "Y"){ @if(@column.WhetherRequired=="Y"){ @:[Required(ErrorMessage = "@(@column.ColumnComment)不能为空")] } + @if(@column.NetType.StartsWith("string")&&!@column.RuleItems.Any(t=>t.Type=="length")){ + @:[StringLength(@(@column.ColumnLength), ErrorMessage = "@(@column.ColumnComment)不能超过@(@column.ColumnLength)个字符")] + } @if(@column.AnyRule){ @foreach(var rule in @column.RuleItems){ @if(rule.Type=="pattern"){ - @:[RegularExpression(@@"@(@rule.Pattern)", ErrorMessage = "@(@rule.Message)")] + @:[RegularExpression(@@"@(@FormatPattern(rule.Pattern))", ErrorMessage = "@(@rule.Message)")] + } + @if(rule.Type=="length"){ + @:[StringLength(@(@rule.Max),MinimumLength = @(@rule.Min), ErrorMessage = "@(@column.ColumnComment)只能是@(@rule.Min)至@(@rule.Max)字符")] } } } @@ -137,10 +143,16 @@ if (@column.WhetherAddUpdate == "Y"){ @if(@column.WhetherRequired=="Y"){ @:[Required(ErrorMessage = "@(@column.ColumnComment)不能为空")] } + @if(@column.NetType.StartsWith("string")&&!@column.RuleItems.Any(t=>t.Type=="length")){ + @:[StringLength(@(@column.ColumnLength), ErrorMessage = "@(@column.ColumnComment)不能超过@(@column.ColumnLength)个字符")] + } @if(@column.AnyRule){ @foreach(var rule in @column.RuleItems){ @if(rule.Type=="pattern"){ - @:[RegularExpression(@@"@(@rule.Pattern)", ErrorMessage = "@(@rule.Message)")] + @:[RegularExpression(@@"@(@FormatPattern(rule.Pattern))", ErrorMessage = "@(@rule.Message)")] + } + @if(rule.Type=="length"){ + @:[StringLength(@(@rule.Max),MinimumLength = @(@rule.Min), ErrorMessage = "@(@column.ColumnComment)只能是@(@rule.Min)至@(@rule.Max)字符")] } } } @@ -175,4 +187,15 @@ if (@column.WhetherAddUpdate == "Y"){ @:/// @:public string OldFieldName { get; set; } @:} +} +@{ +string FormatPattern(string pattern) +{ + if (pattern.EndsWith('g')) + { + pattern = pattern.TrimEnd('g'); + } + pattern = pattern.Trim('/'); + return pattern; +} } \ No newline at end of file