diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TableList.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TableList.txt new file mode 100644 index 0000000..829aa13 --- /dev/null +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TableList.txt @@ -0,0 +1,45 @@ +$foreach(column in genTable.Columns) +$set(labelName = "") +$set(checkboxHtml = "") +$set(showToolTipHtml = "") +$set(columnName = column.CsharpFieldFl) +$if(column.CsharpType == "string" || column.HtmlType == "datetime") +$set(showToolTipHtml = " :show-overflow-tooltip=\"true\"") +$end +$if(column.ColumnComment != "") +$set(labelName = column.ColumnComment) +$else +$set(labelName = column.CsharpFieldFl) +$end +$if(column.IsList == true) +$if(column.HtmlType == "customInput" && column.IsPk == false) + + + +$elseif(column.HtmlType == "imageUpload") + + + +$elseif(column.HtmlType == "checkbox" || column.HtmlType == "select" || column.HtmlType == "radio") + + + +$else + +$end +$end +$end \ No newline at end of file diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs index 3354a19..def1212 100644 --- a/ZR.CodeGenerator/CodeGenerateTemplate.cs +++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs @@ -203,59 +203,59 @@ namespace ZR.CodeGenerator // return sb.ToString(); //} - /// - /// Vue 查询列表 - /// - /// - /// - /// - public static string TplTableColumn(GenTableColumn dbFieldInfo, GenTable genTable) - { - string columnName = dbFieldInfo.CsharpFieldFl; - string label = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName); - string showToolTip = ShowToolTip(dbFieldInfo); - string formatter = GetFormatter(dbFieldInfo.HtmlType, columnName); - StringBuilder sb = new StringBuilder(); - //自定义排序字段 - if (GenConstants.HTML_CUSTOM_INPUT.Equals(dbFieldInfo.HtmlType) && !dbFieldInfo.IsPk) - { - sb.AppendLine($@" "); - sb.AppendLine(@" "); - sb.AppendLine(@" "); - } - else if (dbFieldInfo.IsList && dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD)) - { - sb.AppendLine($" "); - sb.AppendLine(" "); - sb.AppendLine(" "); - } - else if (dbFieldInfo.IsList && !string.IsNullOrEmpty(formatter)) - { - sb.AppendLine($@" "); - sb.AppendLine(@" "); - sb.AppendLine(@" "); - } - else if (dbFieldInfo.IsList) - { - sb.AppendLine($" "); - } - return sb.ToString(); - } + ///// + ///// Vue 查询列表 + ///// + ///// + ///// + ///// + //public static string TplTableColumn(GenTableColumn dbFieldInfo, GenTable genTable) + //{ + // string columnName = dbFieldInfo.CsharpFieldFl; + // string label = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName); + // string showToolTip = ShowToolTip(dbFieldInfo); + // string formatter = GetFormatter(dbFieldInfo.HtmlType, columnName); + // StringBuilder sb = new StringBuilder(); + // //自定义排序字段 + // if (GenConstants.HTML_CUSTOM_INPUT.Equals(dbFieldInfo.HtmlType) && !dbFieldInfo.IsPk) + // { + // sb.AppendLine($@" "); + // sb.AppendLine(@" "); + // sb.AppendLine(@" "); + // } + // else if (dbFieldInfo.IsList && dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD)) + // { + // sb.AppendLine($" "); + // sb.AppendLine(" "); + // sb.AppendLine(" "); + // } + // else if (dbFieldInfo.IsList && !string.IsNullOrEmpty(formatter)) + // { + // sb.AppendLine($@" "); + // sb.AppendLine(@" "); + // sb.AppendLine(@" "); + // } + // else if (dbFieldInfo.IsList) + // { + // sb.AppendLine($" "); + // } + // return sb.ToString(); + //} #endregion diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index 4c02410..0b09e65 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/ZR.CodeGenerator/CodeGeneratorTool.cs @@ -51,6 +51,7 @@ namespace ZR.CodeGenerator replaceDto.ShowBtnDelete = dto.GenTable.CheckedBtn.Any(f => f == 3); replaceDto.ShowBtnExport = dto.GenTable.CheckedBtn.Any(f => f == 4); + //循环表字段信息 foreach (GenTableColumn dbFieldInfo in dto.GenTable.Columns.OrderBy(x => x.Sort)) { @@ -67,7 +68,7 @@ namespace ZR.CodeGenerator //CodeGenerateTemplate.GetQueryDtoProperty(dbFieldInfo, replaceDto); replaceDto.VueViewFormHtml += CodeGenerateTemplate.TplVueFormContent(dbFieldInfo, dto.GenTable); - replaceDto.VueViewListHtml += CodeGenerateTemplate.TplTableColumn(dbFieldInfo, dto.GenTable); + //replaceDto.VueViewListHtml += CodeGenerateTemplate.TplTableColumn(dbFieldInfo, dto.GenTable); //replaceDto.VueQueryFormHtml += CodeGenerateTemplate.TplQueryFormHtml(dbFieldInfo); } @@ -75,8 +76,9 @@ namespace ZR.CodeGenerator replaceDto.PKType = PKType; replaceDto.FistLowerPk = PKName.FirstLowerCase(); InitJntTemplate(dto, replaceDto); - + replaceDto.VueViewListHtml = GenerateVueTableList(); replaceDto.VueQueryFormHtml = GenerateVueQueryForm(); + GenerateModels(replaceDto, dto); GenerateInputDto(replaceDto, dto); GenerateRepository(replaceDto, dto); @@ -245,8 +247,6 @@ namespace ZR.CodeGenerator /// /// 生成vue页面查询form /// - /// - /// /// public static string GenerateVueQueryForm() { @@ -254,6 +254,17 @@ namespace ZR.CodeGenerator var result = tpl.Render(); return result; } + /// + /// 生成vue页面table + /// + /// + public static string GenerateVueTableList() + { + var tpl = FileHelper.ReadJtTemplate("TableList.txt"); + var result = tpl.Render(); + Console.WriteLine(result); + return result; + } #endregion #region 帮助方法 @@ -467,6 +478,7 @@ namespace ZR.CodeGenerator options.OutMode = OutMode.Auto; //options.DisableeLogogram = true;//禁用简写 options.Data.Set("refs", "$");//特殊标签替换 + options.Data.Set("index", "$");//特殊标签替换 options.Data.Set("confirm", "$");//特殊标签替换 options.Data.Set("nextTick", "$"); options.Data.Set("replaceDto", replaceDto); diff --git a/ZR.Vue/src/main.js b/ZR.Vue/src/main.js index 0066bce..d669df8 100644 --- a/ZR.Vue/src/main.js +++ b/ZR.Vue/src/main.js @@ -26,8 +26,6 @@ import RightToolbar from "@/components/RightToolbar" import Editor from "@/components/Editor"; // 字典标签组件 import DictTag from '@/components/DictTag' -// 字典数据组件 -// import DictData from '@/components/DictData' // 上传图片 import UploadImage from '@/components/UploadImage/index'; // 上传文件