From 14203cffd17b705f0ba58d61a05e55385289f7f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Wed, 5 Jan 2022 19:43:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=20=E6=8B=BC=E5=86=99bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Vue/src/views/tool/file/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ZR.Vue/src/views/tool/file/index.vue b/ZR.Vue/src/views/tool/file/index.vue index 8e88bf3..3200fcc 100644 --- a/ZR.Vue/src/views/tool/file/index.vue +++ b/ZR.Vue/src/views/tool/file/index.vue @@ -339,7 +339,7 @@ export default { if (val == 1) { this.uploadUrl = "/common/uploadFile"; } else if (val == 2) { - thiis.uploadUrl = "/common/UploadFileAliyun"; + this.uploadUrl = "/common/UploadFileAliyun"; } }, /** 提交按钮 */ From 58d5d8ef9ddee29d871e0f83e00d1ca8717f826f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Wed, 5 Jan 2022 20:42:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90Dto?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9E=8B=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt index a424ac5..f697b72 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using ${options.ModelsNamespace}.Dto; using ${options.ModelsNamespace}.Models; @@ -12,6 +13,9 @@ namespace ${options.DtosNamespace}.Dto { $foreach(item in genTable.Columns) $if((item.IsInsert || item.IsEdit || item.IsPk || item.IsIncrement)) +$if(item.IsRequired) + [Required(ErrorMessage = "${item.ColumnComment}不能为空")] +$end public $item.CsharpType$item.RequiredStr $item.CsharpField { get; set; } $end $end From 676d466e7d2a9ca0437354176f026fb14e96a16c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Wed, 5 Jan 2022 20:43:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.CodeGenerator/CodeGenerateTemplate.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs index 1ea848c..8beb673 100644 --- a/ZR.CodeGenerator/CodeGenerateTemplate.cs +++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs @@ -80,7 +80,7 @@ namespace ZR.CodeGenerator //时间 sb.AppendLine(" "); sb.AppendLine($" "); - sb.AppendLine($" "); + sb.AppendLine($" "); sb.AppendLine(" "); sb.AppendLine(" "); } @@ -192,7 +192,7 @@ namespace ZR.CodeGenerator if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME) { sb.AppendLine($" "); - sb.AppendLine($" "); sb.AppendLine(" "); } @@ -270,6 +270,7 @@ namespace ZR.CodeGenerator } #endregion + //模板调用 public static string QueryExp(string propertyName, string queryType) { @@ -303,6 +304,7 @@ namespace ZR.CodeGenerator } return ""; } + /// /// 格式化字典数据显示到table /// From 73fb8d001b281aba31e9a610222bd8c34e890879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Wed, 5 Jan 2022 20:44:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Service/System/SysTasksLogService.cs | 4 ---- ZR.Vue/src/components/FileUpload/index.vue | 6 +----- ZR.Vue/src/views/tool/file/index.vue | 20 +++++++++----------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/ZR.Service/System/SysTasksLogService.cs b/ZR.Service/System/SysTasksLogService.cs index f2a2ace..4e66a94 100644 --- a/ZR.Service/System/SysTasksLogService.cs +++ b/ZR.Service/System/SysTasksLogService.cs @@ -37,9 +37,5 @@ namespace ZR.Service.System return logModel; } - public PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, string orderType) - { - throw new NotImplementedException(); - } } } diff --git a/ZR.Vue/src/components/FileUpload/index.vue b/ZR.Vue/src/components/FileUpload/index.vue index 097d485..0bba384 100644 --- a/ZR.Vue/src/components/FileUpload/index.vue +++ b/ZR.Vue/src/components/FileUpload/index.vue @@ -1,8 +1,7 @@