From f11857fbe84da72db211212e4ef4e1d38e737248 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: Sun, 23 Jan 2022 20:57:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8D=95=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/CodeGenTemplate/TplTreeVue.txt | 4 +- .../wwwroot/CodeGenTemplate/TplVue.txt | 4 +- .../wwwroot/CodeGenTemplate/TplVueSelect.txt | 262 ++++++++++++++++++ ZR.CodeGenerator/CodeGenerateTemplate.cs | 12 - ZR.CodeGenerator/CodeGeneratorTool.cs | 4 +- ZR.Vue/src/views/system/dept/index.vue | 10 +- ZR.Vue/src/views/tool/gen/editTable.vue | 4 +- ZR.Vue/src/views/tool/gen/genInfoForm.vue | 4 +- ZR.Vue/src/views/tool/gen/index.vue | 3 +- 9 files changed, 280 insertions(+), 27 deletions(-) create mode 100644 ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt index 9525bb7..10b772e 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt @@ -46,13 +46,13 @@ ${VueViewListContent} - + ${VueViewFormContent} diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt index dc56444..af71c5a 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt @@ -45,13 +45,13 @@ ${VueViewListContent} - + ${VueViewFormContent} diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt new file mode 100644 index 0000000..64812dd --- /dev/null +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt @@ -0,0 +1,262 @@ + + \ No newline at end of file diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs index 16d6611..3542a6f 100644 --- a/ZR.CodeGenerator/CodeGenerateTemplate.cs +++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs @@ -108,10 +108,6 @@ namespace ZR.CodeGenerator sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); - //if (string.IsNullOrEmpty(dbFieldInfo.DictType)) - //{ - // sb.AppendLine(" 请选择字典生成"); - //} sb.AppendLine($" {{{{item.dictLabel}}}}"); sb.AppendLine(" "); sb.AppendLine(" "); @@ -141,10 +137,6 @@ namespace ZR.CodeGenerator sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); - //if (string.IsNullOrEmpty(dbFieldInfo.DictType)) - //{ - // sb.AppendLine($" "); - //} sb.AppendLine($" "); sb.AppendLine(" "); sb.AppendLine(" "); @@ -156,10 +148,6 @@ namespace ZR.CodeGenerator sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); - //if (string.IsNullOrEmpty(dbFieldInfo.DictType)) - //{ - // sb.AppendLine($" 请选择字典生成"); - //} sb.AppendLine($" {{{{item.dictLabel}}}}"); sb.AppendLine(" "); sb.AppendLine(" "); diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index 9278285..427823d 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/ZR.CodeGenerator/CodeGeneratorTool.cs @@ -181,6 +181,9 @@ namespace ZR.CodeGenerator case "crud": fileName = "TplVue.txt"; break; + case "select": + fileName = "TplVueSelect.txt"; + break; default: break; } @@ -189,7 +192,6 @@ namespace ZR.CodeGenerator tpl.Set("VueViewEditFormRuleContent", replaceDto.VueViewEditFormRuleContent);//添加、修改表单验证规则 tpl.Set("VueViewFormContent", replaceDto.VueViewFormHtml);//添加、修改表单 tpl.Set("VueViewListContent", replaceDto.VueViewListHtml);//查询 table列 - //tpl.Set("lowerBusinessName", FirstLowerCase(generateDto.GenTable.BusinessName)); var result = tpl.Render(); var fullPath = generateDto.IsPreview ? string.Empty : Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src", "views", generateDto.GenTable.ModuleName.FirstLowerCase(), $"{generateDto.GenTable.BusinessName.FirstUpperCase()}.vue"); diff --git a/ZR.Vue/src/views/system/dept/index.vue b/ZR.Vue/src/views/system/dept/index.vue index 952e9c6..2fe0289 100644 --- a/ZR.Vue/src/views/system/dept/index.vue +++ b/ZR.Vue/src/views/system/dept/index.vue @@ -26,7 +26,8 @@ - + @@ -44,7 +45,8 @@ @@ -52,7 +54,7 @@ - + @@ -93,8 +95,8 @@ diff --git a/ZR.Vue/src/views/tool/gen/editTable.vue b/ZR.Vue/src/views/tool/gen/editTable.vue index 8abe17e..970dcdf 100644 --- a/ZR.Vue/src/views/tool/gen/editTable.vue +++ b/ZR.Vue/src/views/tool/gen/editTable.vue @@ -36,12 +36,12 @@ - + - + diff --git a/ZR.Vue/src/views/tool/gen/genInfoForm.vue b/ZR.Vue/src/views/tool/gen/genInfoForm.vue index 2975ce2..e95184a 100644 --- a/ZR.Vue/src/views/tool/gen/genInfoForm.vue +++ b/ZR.Vue/src/views/tool/gen/genInfoForm.vue @@ -6,7 +6,7 @@ 生成模板 - + @@ -125,7 +125,7 @@ - + diff --git a/ZR.Vue/src/views/tool/gen/index.vue b/ZR.Vue/src/views/tool/gen/index.vue index f88d6d2..7cd9614 100644 --- a/ZR.Vue/src/views/tool/gen/index.vue +++ b/ZR.Vue/src/views/tool/gen/index.vue @@ -7,7 +7,6 @@ 查询 - 重置 @@ -36,7 +35,7 @@ - +