diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt new file mode 100644 index 0000000..2c37aa2 --- /dev/null +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt @@ -0,0 +1,109 @@ +$foreach(column in genTable.Columns) +$set(labelName = "") +$set(labelDisabled = "") +$set(columnName = column.CsharpFieldFl) +$set(value = "item.dictValue") + +$if(column.ColumnComment != "") +$set(labelName = column.ColumnComment) +$else +$set(labelName = column.CsharpFieldFl) +$end +$if(column.IsPk == true) +$set(labelDisabled = ":disabled=true") +$end +$if(column.CsharpType == "int" || column.CsharpType == "long") + $set(value = "parseInt(item.dictValue)") +$end + +$if(tool.CheckInputDtoNoField(column.CsharpField)) +$elseif(column.IsInsert == false && column.IsEdit == false) + + {{form.${columnName}}} + +$elseif(tool.CheckTree(genTable ,column.CsharpField)) + + + + + +$elseif(column.IsPK || column.IsIncrement) + + +$if(column.IsIncrement == false) + +$else + +$end + + +$else +$if(column.HtmlType == "inputNumber") + + + + + +$elseif(column.HtmlType == "datetime") + + + + + +$elseif(column.HtmlType == "imageUpload") + + + + + +$elseif(column.HtmlType == "fileUpload") + + + + + +$elseif(column.HtmlType == "radio") + + + + {{item.dictLabel}} + + + +$elseif(column.HtmlType == "textarea") + + + + + +$elseif(column.HtmlType == "editor") + + + + + +$elseif(column.HtmlType == "select") + + + + + + + +$elseif(column.HtmlType == "checkbox") + + + + {{item.dictLabel}} + + + +$else + + + + + +$end +$end +$end \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt index 3b3edef..1528c3e 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt @@ -48,7 +48,7 @@ ${VueViewListContent} -${VueViewFormContent} + ${VueViewFormContent}
@@ -107,6 +107,7 @@ $end // 弹出层标题 title: "", // 操作类型 1、add 2、edit + opertype: 0, // 是否显示弹出层 open: false, // 是否展开，默认全部折叠 diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt index 2d89645..1332064 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt @@ -57,7 +57,7 @@ $end -${VueViewFormContent} + ${VueViewFormContent}
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt index d1f186f..34709e2 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt @@ -3,7 +3,6 @@ - $foreach(column in genTable.Columns) $set(labelName = "") $set(columnName = "") diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs index b3820d9..e027e23 100644 --- a/ZR.CodeGenerator/CodeGenerateTemplate.cs +++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs @@ -27,9 +27,8 @@ namespace ZR.CodeGenerator if (GenConstants.inputDtoNoField.Any(f => f.Contains(dbFieldInfo.CsharpField, StringComparison.OrdinalIgnoreCase))) { - return sb.ToString(); } - if (!dbFieldInfo.IsInsert && !dbFieldInfo.IsEdit) + else if (!dbFieldInfo.IsInsert && !dbFieldInfo.IsEdit) { sb.AppendLine(" "); sb.AppendLine($" {{{{form.{columnName}}}}}"); @@ -200,36 +199,5 @@ namespace ZR.CodeGenerator return $"it => it.{ propertyName} == parm.{propertyName})"; } - /// - /// 格式化字典数据显示到table - /// - /// - /// - /// - public static string GetFormatter(string htmlType, string columnName) - { - if (htmlType.Equals(GenConstants.HTML_CHECKBOX) || - htmlType.Equals(GenConstants.HTML_SELECT) || - htmlType.Equals(GenConstants.HTML_RADIO)) - { - return $" :formatter=\"{columnName}Format\""; - } - return ""; - } - - /// - /// 超出隐藏 - /// - /// - /// - public static string ShowToolTip(GenTableColumn column) - { - if (column.CsharpType.Equals("string") || - column.HtmlType.Equals(GenConstants.HTML_DATETIME)) - { - return $" :show-overflow-tooltip=\"true\""; - } - return ""; - } } } diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index 1f8e228..8b09e05 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/ZR.CodeGenerator/CodeGeneratorTool.cs @@ -65,11 +65,6 @@ namespace ZR.CodeGenerator replaceDto.UploadFile = 1; } dbFieldInfo.CsharpFieldFl = dbFieldInfo.CsharpField.FirstLowerCase(); - //CodeGenerateTemplate.GetQueryDtoProperty(dbFieldInfo, replaceDto); - - replaceDto.VueViewFormHtml += CodeGenerateTemplate.TplVueFormContent(dbFieldInfo, dto.GenTable); - //replaceDto.VueViewListHtml += CodeGenerateTemplate.TplTableColumn(dbFieldInfo, dto.GenTable); - //replaceDto.VueQueryFormHtml += CodeGenerateTemplate.TplQueryFormHtml(dbFieldInfo); } replaceDto.PKName = PKName; @@ -78,9 +73,9 @@ namespace ZR.CodeGenerator InitJntTemplate(dto, replaceDto); replaceDto.VueViewListHtml = GenerateVueTableList(); replaceDto.VueQueryFormHtml = GenerateVueQueryForm(); + replaceDto.VueViewFormHtml = GenerateCurdForm(); GenerateModels(replaceDto, dto); - GenerateInputDto(replaceDto, dto); GenerateRepository(replaceDto, dto); GenerateService(replaceDto, dto); GenerateControllers(replaceDto, dto); @@ -107,25 +102,13 @@ namespace ZR.CodeGenerator private static void GenerateModels(ReplaceDto replaceDto, GenerateDto generateDto) { var tpl = FileHelper.ReadJtTemplate("TplModel.txt"); - var result = tpl.Render(); + var tplDto = FileHelper.ReadJtTemplate("TplDto.txt"); string fullPath = generateDto.IsPreview ? string.Empty : Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Models", _option.SubNamespace, replaceDto.ModelTypeName + ".cs"); - generateDto.GenCodes.Add(new GenCode(1, "Model.cs", fullPath, result)); - } + string fullPathDto = generateDto.IsPreview ? string.Empty : Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Dto", _option.SubNamespace, $"{replaceDto.ModelTypeName}Dto.cs"); - /// - /// 生成表单提交输入参数Dto - /// - /// - /// 替换实体 - private static void GenerateInputDto(ReplaceDto replaceDto, GenerateDto generateDto) - { - var tpl = FileHelper.ReadJtTemplate("TplDto.txt"); - - var result = tpl.Render(); - var fullPath = generateDto.IsPreview ? string.Empty : Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Dto", _option.SubNamespace, $"{replaceDto.ModelTypeName}Dto.cs"); - - generateDto.GenCodes.Add(new GenCode(2, "Dto.cs", fullPath, result)); + generateDto.GenCodes.Add(new GenCode(1, "Model.cs", fullPath, tpl.Render())); + generateDto.GenCodes.Add(new GenCode(2, "Dto.cs", fullPathDto, tplDto.Render())); } /// @@ -193,7 +176,6 @@ namespace ZR.CodeGenerator } var tpl = FileHelper.ReadJtTemplate(fileName); tpl.Set("vueQueryFormHtml", replaceDto.VueQueryFormHtml); - tpl.Set("VueViewEditFormRuleContent", replaceDto.VueViewEditFormRuleContent);//添加、修改表单验证规则 tpl.Set("VueViewFormContent", replaceDto.VueViewFormHtml);//添加、修改表单 tpl.Set("VueViewListContent", replaceDto.VueViewListHtml);//查询 table列 @@ -227,15 +209,11 @@ namespace ZR.CodeGenerator } fileName = Path.Combine("v3", fileName); var tpl = FileHelper.ReadJtTemplate(fileName); - //tpl.Set("vueQueryFormHtml", replaceDto.VueQueryFormHtml); - //tpl.Set("VueViewEditFormRuleContent", replaceDto.VueViewEditFormRuleContent);//添加、修改表单验证规则 - //tpl.Set("VueViewFormContent", replaceDto.VueViewFormHtml);//添加、修改表单 - //tpl.Set("VueViewListContent", replaceDto.VueViewListHtml);//查询 table列 var result = tpl.Render(); var fullPath = generateDto.IsPreview ? string.Empty : Path.Combine(generateDto.GenCodePath, "ZR.Vue3", "src", "views", generateDto.GenTable.ModuleName.FirstLowerCase(), $"{generateDto.GenTable.BusinessName.FirstUpperCase()}.vue"); //Console.WriteLine(result); - generateDto.GenCodes.Add(new GenCode(16, "index.vue", fullPath, result)); + generateDto.GenCodes.Add(new GenCode(16, "vue3.vue", fullPath, result)); } /// /// 生成vue页面api @@ -297,6 +275,17 @@ namespace ZR.CodeGenerator { var tpl = FileHelper.ReadJtTemplate("TableList.txt"); var result = tpl.Render(); + //Console.WriteLine(result); + return result; + } + /// + /// 生成vue表单 + /// + /// + public static string GenerateCurdForm() + { + var tpl = FileHelper.ReadJtTemplate("CurdForm.txt"); + var result = tpl.Render(); Console.WriteLine(result); return result; } @@ -445,7 +434,7 @@ namespace ZR.CodeGenerator IsIncrement = column.IsIdentity, Create_by = genTable.Create_by, Create_time = DateTime.Now, - IsInsert = !column.IsIdentity,//非自增字段都需要插入 + IsInsert = !column.IsIdentity || GenConstants.inputDtoNoField.Any(f => f.Contains(column.DbColumnName, StringComparison.OrdinalIgnoreCase)),//非自增字段都需要插入 IsEdit = true, IsQuery = false, HtmlType = GenConstants.HTML_INPUT @@ -520,7 +509,7 @@ namespace ZR.CodeGenerator options.Data.Set("replaceDto", replaceDto); options.Data.Set("options", dto.GenOptions); options.Data.Set("genTable", dto.GenTable); - options.Data.Set("btns", dto.CheckedBtn); + //options.Data.Set("btns", dto.CheckedBtn); options.Data.Set("showCustomInput", showCustomInput); options.Data.Set("tool", new CodeGeneratorTool()); options.Data.Set("codeTool", new CodeGenerateTemplate()); @@ -528,5 +517,21 @@ namespace ZR.CodeGenerator //...其它数据 }); } + + #region 模板用 + /// + /// 模板用 + /// + /// + /// + public static bool CheckInputDtoNoField(string str) + { + return GenConstants.inputDtoNoField.Any(f => f.Contains(str, StringComparison.OrdinalIgnoreCase)); + } + public static bool CheckTree(GenTable genTable, string csharpField) + { + return (genTable.TplCategory.Equals("tree", StringComparison.OrdinalIgnoreCase) && genTable.TreeParentCode != null && csharpField.Equals(genTable.TreeParentCode)); + } + #endregion } } diff --git a/ZR.CodeGenerator/Model/ReplaceDto.cs b/ZR.CodeGenerator/Model/ReplaceDto.cs index 6f3296a..2251b83 100644 --- a/ZR.CodeGenerator/Model/ReplaceDto.cs +++ b/ZR.CodeGenerator/Model/ReplaceDto.cs @@ -39,10 +39,6 @@ namespace ZR.CodeGenerator.Model /// public string VueQueryFormHtml { get; set; } - /// - /// vue 添加、编辑表单规则 - /// - public string VueViewEditFormRuleContent { get; set; } /// /// 查询条件 ///