wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化代码生成额外参数编辑报错，新增排序列

Browse Source
This commit is contained in:
不做码农 2022-05-22 13:50:27 +08:00
parent 99595c1993
commit 64ce449353
15 changed files with 262 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
View File

@ -204,7 +204,7 @@ namespace ZR.Admin.WebApi.Controllers
var genTable = genTableDto.Adapt<GenTable>().ToUpdate(HttpContext);
//将前端额外参数转成字符串存入Options中
genTable.Options = JsonConvert.SerializeObject(genTableDto.Params);
genTable.Options = genTableDto.Params.Adapt<Options>();
DbResult<bool> result = GenTableService.UseTran(() =>
{
int rows = GenTableService.UpdateGenTable(genTable);

6
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
View File

@ -56,8 +56,8 @@ $end
$if(null != genTable.SubTableName && "" != genTable.SubTableName)
.Includes(it => it.Sub.MappingField(z => z.${genTable.SubTableFkName}, () => it.${replaceDto.PKName}))
$end
$if(genTable.SortField != "" && genTable.SortField != null)
.OrderBy("${genTable.SortField} ${genTable.SortType}")
$if(genTable.Options.SortField != "" && genTable.Options.SortField != null)
.OrderBy("${genTable.Options.SortField} ${genTable.Options.SortType}")
$end
.Where(predicate.ToExpression())
.ToPage(parm);
@ -88,7 +88,7 @@ $end
$end
var response = _${replaceDto.ModelTypeName}Repository.Queryable().Where(predicate.ToExpression())
.ToTree(it => it.Children, it => it.${genTable.TreeParentCode}, 0);
.ToTree(it => it.Children, it => it.${genTable.Options.TreeParentCode}, 0);
return response;
}

6
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt
View File

@ -38,7 +38,7 @@ $end
<!-- 数据区域 -->
<el-table v-if="refreshTable" :data="dataList" v-loading="loading" ref="table" border highlight-current-row @selection-change="handleSelectionChange"
:default-expand-all="isExpandAll" row-key="${tool.FirstLowerCase(genTable.TreeCode)}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
:default-expand-all="isExpandAll" row-key="${tool.FirstLowerCase(genTable.Options.TreeCode)}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="selection" width="50" align="center"/>
${VueViewListContent}
<el-table-column label="操作" align="center" width="140">
@ -204,8 +204,8 @@ $end
delete node.children;
}
return {
id: node.${tool.FirstLowerCase(genTable.TreeCode)},
label: node.${tool.FirstLowerCase(genTable.TreeName)},
id: node.${tool.FirstLowerCase(genTable.Options.TreeCode)},
label: node.${tool.FirstLowerCase(genTable.Options.TreeName)},
children: node.children,
};
},

2
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt
View File

@ -88,7 +88,7 @@ $end
highlight-current-row
@selection-change="handleSelectionChange"
:default-expand-all="isExpandAll"
row-key="${tool.FirstLowerCase(genTable.TreeCode)}"
row-key="${tool.FirstLowerCase(genTable.Options.TreeCode)}"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<el-table-column type="selection" width="50" align="center"/>

4
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
View File

@ -124,7 +124,7 @@ $elseif(column.HtmlType == "imageUpload")
</template>
</el-table-column>
$elseif(column.HtmlType == "checkbox" || column.HtmlType == "select" || column.HtmlType == "radio")
<el-table-column prop="${columnName}" label="${labelName}" align="center">
<el-table-column prop="${columnName}" label="${labelName}" align="center"${column.sortStr}>
<template #default="scope">
$if(column.HtmlType == "checkbox")
<dict-tag :options="$if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :value="scope.row.${columnName} ? scope.row.${columnName}.split(',') : []" />
@ -134,7 +134,7 @@ $end
</template>
</el-table-column>
$else
<el-table-column prop="${columnName}" label="${labelName}" align="center"${showToolTipHtml} />
<el-table-column prop="${columnName}" label="${labelName}" align="center"${showToolTipHtml}${column.sortStr} />
$end
$end
$end

296
ZR.CodeGenerator/CodeGenerateTemplate.cs
View File

@ -12,156 +12,156 @@ namespace ZR.CodeGenerator
{
#region vue 模板
/// <summary>
/// Vue 添加修改表单
/// </summary>
/// <param name="dbFieldInfo"></param>
/// <returns></returns>
public static string TplVueFormContent(GenTableColumn dbFieldInfo, GenTable genTable)
{
string columnName = dbFieldInfo.CsharpFieldFl;
string labelName = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName);
string labelDisabled = dbFieldInfo.IsPk ? ":disabled=\"true\"" : "";
StringBuilder sb = new();
string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue";
///// <summary>
///// Vue 添加修改表单
///// </summary>
///// <param name="dbFieldInfo"></param>
///// <returns></returns>
//public static string TplVueFormContent(GenTableColumn dbFieldInfo, GenTable genTable)
//{
// string columnName = dbFieldInfo.CsharpFieldFl;
// string labelName = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName);
// string labelDisabled = dbFieldInfo.IsPk ? ":disabled=\"true\"" : "";
// StringBuilder sb = new();
// string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue";
if (GenConstants.inputDtoNoField.Any(f => f.Contains(dbFieldInfo.CsharpField, StringComparison.OrdinalIgnoreCase)))
{
}
else if (!dbFieldInfo.IsInsert && !dbFieldInfo.IsEdit)
{
sb.AppendLine(" <el-col :lg=\"12\" v-if=\"opertype == 2\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\">{{{{form.{columnName}}}}}</el-form-item>");
sb.AppendLine(" </el-col>");
}
else if (genTable.TplCategory.Equals("tree", StringComparison.OrdinalIgnoreCase) && genTable.TreeParentCode != null && dbFieldInfo.CsharpField.Equals(genTable.TreeParentCode))
{
//树
sb.AppendLine(@" <el-col :lg=""24"">");
sb.AppendLine($@" <el-form-item label=""父级id"" prop=""{columnName}"">");
sb.AppendLine($@" <treeselect v-model=""form.{columnName}"" :options=""dataList"" :normalizer=""normalizer"" :show-count=""true"" placeholder=""选择上级菜单"" />");
sb.AppendLine(@" </el-form-item>");
sb.AppendLine(@" </el-col>");
}
//主键、非自增要插入，不能编辑
else if (dbFieldInfo.IsPk || dbFieldInfo.IsIncrement)
{
sb.AppendLine(" <el-col :lg=\"12\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
//主键非自增 显示input
if (!dbFieldInfo.IsIncrement)
{
sb.AppendLine($" <el-input-number v-model.number=\"form.{columnName}\" controls-position=\"right\" placeholder=\"请输入{labelName}\" :disabled=\"title=='修改数据'\"/>");
}
else if (dbFieldInfo.IsIncrement) //只有是 自增 就显示label
{
sb.AppendLine($" <span v-html=\"form.{columnName}\"/>");
}
// if (GenConstants.inputDtoNoField.Any(f => f.Contains(dbFieldInfo.CsharpField, StringComparison.OrdinalIgnoreCase)))
// {
// }
// else if (!dbFieldInfo.IsInsert && !dbFieldInfo.IsEdit)
// {
// sb.AppendLine(" <el-col :lg=\"12\" v-if=\"opertype == 2\">");
// sb.AppendLine($" <el-form-item label=\"{labelName}\">{{{{form.{columnName}}}}}</el-form-item>");
// sb.AppendLine(" </el-col>");
// }
// else if (genTable.TplCategory.Equals("tree", StringComparison.OrdinalIgnoreCase) && genTable.TreeParentCode != null && dbFieldInfo.CsharpField.Equals(genTable.TreeParentCode))
// {
// //树
// sb.AppendLine(@" <el-col :lg=""24"">");
// sb.AppendLine($@" <el-form-item label=""父级id"" prop=""{columnName}"">");
// sb.AppendLine($@" <treeselect v-model=""form.{columnName}"" :options=""dataList"" :normalizer=""normalizer"" :show-count=""true"" placeholder=""选择上级菜单"" />");
// sb.AppendLine(@" </el-form-item>");
// sb.AppendLine(@" </el-col>");
// }
// //主键、非自增要插入，不能编辑
// else if (dbFieldInfo.IsPk || dbFieldInfo.IsIncrement)
// {
// sb.AppendLine(" <el-col :lg=\"12\">");
// sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
// //主键非自增 显示input
// if (!dbFieldInfo.IsIncrement)
// {
// sb.AppendLine($" <el-input-number v-model.number=\"form.{columnName}\" controls-position=\"right\" placeholder=\"请输入{labelName}\" :disabled=\"title=='修改数据'\"/>");
// }
// else if (dbFieldInfo.IsIncrement) //只有是 自增 就显示label
// {
// sb.AppendLine($" <span v-html=\"form.{columnName}\"/>");
// }
sb.AppendLine(" </el-form-item>");
sb.AppendLine(" </el-col>");
}
else
{
if (dbFieldInfo.HtmlType == GenConstants.HTML_INPUT_NUMBER)
{
//数字框
sb.AppendLine(" <el-col :lg=\"12\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <el-input-number v-model.number=\"form.{columnName}\" controls-position=\"right\" placeholder=\"请输入{labelName}\" {labelDisabled}/>");
sb.AppendLine(" </el-form-item>");
sb.AppendLine(" </el-col>");
}
else if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
{
//时间
sb.AppendLine(" <el-col :lg=\"12\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <el-date-picker v-model=\"form.{columnName}\" format=\"yyyy-MM-dd HH:mm:ss\" value-format=\"yyyy-MM-dd HH:mm:ss\" type=\"datetime\" placeholder=\"选择日期时间\"> </el-date-picker>");
sb.AppendLine(" </el-form-item>");
sb.AppendLine(" </el-col>");
}
else if (dbFieldInfo.HtmlType == GenConstants.HTML_IMAGE_UPLOAD)
{
//图片
sb.AppendLine(" <el-col :lg=\"24\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($@" <UploadImage v-model=""form.{columnName}"" column=""{columnName}"" @input=""handleUploadSuccess"" />");
sb.AppendLine(" </el-form-item>");
sb.AppendLine(" </el-col>");
}
else if (dbFieldInfo.HtmlType == GenConstants.HTML_FILE_UPLOAD)
{
//文件
sb.AppendLine(" <el-col :lg=\"24\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($@" <UploadFile v-model=""form.{columnName}"" column=""{columnName}"" @input=""handleUploadSuccess"" />");
sb.AppendLine(" </el-form-item>");
sb.AppendLine(" </el-col>");
}
else if (dbFieldInfo.HtmlType == GenConstants.HTML_RADIO)
{
//单选按钮
sb.AppendLine(" <el-col :lg=\"12\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <el-radio-group v-model=\"form.{columnName}\">");
sb.AppendLine($" <el-radio v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"{value}\">{{{{item.dictLabel}}}}</el-radio>");
sb.AppendLine(" </el-radio-group>");
sb.AppendLine(" </el-form-item>");
sb.AppendLine(" </el-col>");
}
else if (dbFieldInfo.HtmlType == GenConstants.HTML_TEXTAREA)
{
//文本域
sb.AppendLine(" <el-col :lg=\"24\">");
sb.AppendLine($" <el-form-item label=\"{ labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <el-input type=\"textarea\" v-model=\"form.{columnName}\" placeholder=\"请输入{labelName}\"/>");
sb.AppendLine(" </el-form-item>");
sb.AppendLine(" </el-col>");
}
else if (dbFieldInfo.HtmlType == GenConstants.HTML_EDITOR)
{
//编辑器
sb.AppendLine(" <el-col :lg=\"24\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <editor v-model=\"form.{columnName}\" :min-height=\"200\" />");
sb.AppendLine(" </el-form-item>");
sb.AppendLine(" </el-col>");
}
else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT)
{
//下拉框
sb.AppendLine(" <el-col :lg=\"12\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <el-select v-model=\"form.{columnName}\" placeholder=\"请选择{labelName}\"> ");
sb.AppendLine($" <el-option v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictLabel\" :value=\"{value}\"></el-option>");
sb.AppendLine(" </el-select>");
sb.AppendLine(" </el-form-item>");
sb.AppendLine(" </el-col>");
}
else if (dbFieldInfo.HtmlType == GenConstants.HTML_CHECKBOX)
{
//多选框
sb.AppendLine(" <el-col :lg=\"24\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <el-checkbox-group v-model=\"form.{columnName}Checked\"> ");
sb.AppendLine($" <el-checkbox v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictValue\">{{{{item.dictLabel}}}}</el-checkbox>");
sb.AppendLine(" </el-checkbox-group>");
sb.AppendLine(" </el-form-item>");
sb.AppendLine(" </el-col>");
}
else
{
string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
sb.AppendLine(" <el-col :lg=\"12\">");
sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
sb.AppendLine($" <el-input v-model{inputNumTxt}=\"form.{columnName}\" placeholder=\"请输入{labelName}\" {labelDisabled}/>");
sb.AppendLine(" </el-form-item>");
sb.AppendLine(" </el-col>");
}
}
return sb.ToString();
}
// sb.AppendLine(" </el-form-item>");
// sb.AppendLine(" </el-col>");
// }
// else
// {
// if (dbFieldInfo.HtmlType == GenConstants.HTML_INPUT_NUMBER)
// {
// //数字框
// sb.AppendLine(" <el-col :lg=\"12\">");
// sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
// sb.AppendLine($" <el-input-number v-model.number=\"form.{columnName}\" controls-position=\"right\" placeholder=\"请输入{labelName}\" {labelDisabled}/>");
// sb.AppendLine(" </el-form-item>");
// sb.AppendLine(" </el-col>");
// }
// else if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
// {
// //时间
// sb.AppendLine(" <el-col :lg=\"12\">");
// sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
// sb.AppendLine($" <el-date-picker v-model=\"form.{columnName}\" format=\"yyyy-MM-dd HH:mm:ss\" value-format=\"yyyy-MM-dd HH:mm:ss\" type=\"datetime\" placeholder=\"选择日期时间\"> </el-date-picker>");
// sb.AppendLine(" </el-form-item>");
// sb.AppendLine(" </el-col>");
// }
// else if (dbFieldInfo.HtmlType == GenConstants.HTML_IMAGE_UPLOAD)
// {
// //图片
// sb.AppendLine(" <el-col :lg=\"24\">");
// sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
// sb.AppendLine($@" <UploadImage v-model=""form.{columnName}"" column=""{columnName}"" @input=""handleUploadSuccess"" />");
// sb.AppendLine(" </el-form-item>");
// sb.AppendLine(" </el-col>");
// }
// else if (dbFieldInfo.HtmlType == GenConstants.HTML_FILE_UPLOAD)
// {
// //文件
// sb.AppendLine(" <el-col :lg=\"24\">");
// sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
// sb.AppendLine($@" <UploadFile v-model=""form.{columnName}"" column=""{columnName}"" @input=""handleUploadSuccess"" />");
// sb.AppendLine(" </el-form-item>");
// sb.AppendLine(" </el-col>");
// }
// else if (dbFieldInfo.HtmlType == GenConstants.HTML_RADIO)
// {
// //单选按钮
// sb.AppendLine(" <el-col :lg=\"12\">");
// sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
// sb.AppendLine($" <el-radio-group v-model=\"form.{columnName}\">");
// sb.AppendLine($" <el-radio v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"{value}\">{{{{item.dictLabel}}}}</el-radio>");
// sb.AppendLine(" </el-radio-group>");
// sb.AppendLine(" </el-form-item>");
// sb.AppendLine(" </el-col>");
// }
// else if (dbFieldInfo.HtmlType == GenConstants.HTML_TEXTAREA)
// {
// //文本域
// sb.AppendLine(" <el-col :lg=\"24\">");
// sb.AppendLine($" <el-form-item label=\"{ labelName}\" prop=\"{columnName}\">");
// sb.AppendLine($" <el-input type=\"textarea\" v-model=\"form.{columnName}\" placeholder=\"请输入{labelName}\"/>");
// sb.AppendLine(" </el-form-item>");
// sb.AppendLine(" </el-col>");
// }
// else if (dbFieldInfo.HtmlType == GenConstants.HTML_EDITOR)
// {
// //编辑器
// sb.AppendLine(" <el-col :lg=\"24\">");
// sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
// sb.AppendLine($" <editor v-model=\"form.{columnName}\" :min-height=\"200\" />");
// sb.AppendLine(" </el-form-item>");
// sb.AppendLine(" </el-col>");
// }
// else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT)
// {
// //下拉框
// sb.AppendLine(" <el-col :lg=\"12\">");
// sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
// sb.AppendLine($" <el-select v-model=\"form.{columnName}\" placeholder=\"请选择{labelName}\"> ");
// sb.AppendLine($" <el-option v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictLabel\" :value=\"{value}\"></el-option>");
// sb.AppendLine(" </el-select>");
// sb.AppendLine(" </el-form-item>");
// sb.AppendLine(" </el-col>");
// }
// else if (dbFieldInfo.HtmlType == GenConstants.HTML_CHECKBOX)
// {
// //多选框
// sb.AppendLine(" <el-col :lg=\"24\">");
// sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
// sb.AppendLine($" <el-checkbox-group v-model=\"form.{columnName}Checked\"> ");
// sb.AppendLine($" <el-checkbox v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictValue\">{{{{item.dictLabel}}}}</el-checkbox>");
// sb.AppendLine(" </el-checkbox-group>");
// sb.AppendLine(" </el-form-item>");
// sb.AppendLine(" </el-col>");
// }
// else
// {
// string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
// sb.AppendLine(" <el-col :lg=\"12\">");
// sb.AppendLine($" <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
// sb.AppendLine($" <el-input v-model{inputNumTxt}=\"form.{columnName}\" placeholder=\"请输入{labelName}\" {labelDisabled}/>");
// sb.AppendLine(" </el-form-item>");
// sb.AppendLine(" </el-col>");
// }
// }
// return sb.ToString();
//}
#endregion

27
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@ -46,12 +46,12 @@ namespace ZR.CodeGenerator
string PKType = "int";
ReplaceDto replaceDto = new();
replaceDto.ModelTypeName = dto.GenTable.ClassName;//表名对应C# 实体类名
replaceDto.PermissionPrefix = dto.GenTable.PermissionPrefix;
replaceDto.PermissionPrefix = dto.GenTable?.Options?.PermissionPrefix;
replaceDto.Author = dto.GenTable.FunctionAuthor;
replaceDto.ShowBtnAdd = dto.GenTable.CheckedBtn.Any(f => f == 1);
replaceDto.ShowBtnEdit = dto.GenTable.CheckedBtn.Any(f => f == 2);
replaceDto.ShowBtnDelete = dto.GenTable.CheckedBtn.Any(f => f == 3);
replaceDto.ShowBtnExport = dto.GenTable.CheckedBtn.Any(f => f == 4);
replaceDto.ShowBtnAdd = dto.GenTable.Options.CheckedBtn.Any(f => f == 1);
replaceDto.ShowBtnEdit = dto.GenTable.Options.CheckedBtn.Any(f => f == 2);
replaceDto.ShowBtnDelete = dto.GenTable.Options.CheckedBtn.Any(f => f == 3);
replaceDto.ShowBtnExport = dto.GenTable.Options.CheckedBtn.Any(f => f == 4);
//循环表字段信息
@ -219,9 +219,9 @@ namespace ZR.CodeGenerator
};
fileName = Path.Combine("v3", fileName);
var tpl = FileHelper.ReadJtTemplate(fileName);
tpl.Set("treeCode", generateDto.GenTable?.TreeCode?.ToString()?.FirstLowerCase());
tpl.Set("treeName", generateDto.GenTable.TreeName?.ToString()?.FirstLowerCase());
tpl.Set("treeParentCode", generateDto.GenTable.TreeParentCode?.ToString()?.FirstLowerCase());
tpl.Set("treeCode", generateDto.GenTable?.Options?.TreeCode?.FirstLowerCase());
tpl.Set("treeName", generateDto.GenTable?.Options?.TreeName?.FirstLowerCase());
tpl.Set("treeParentCode", generateDto.GenTable?.Options?.TreeParentCode?.FirstLowerCase());
var result = tpl.Render();
var fullPath = Path.Combine(generateDto.VueParentPath, "src", "views", generateDto.GenTable.ModuleName.FirstLowerCase(), $"{generateDto.GenTable.BusinessName.FirstUpperCase()}.vue");
@ -273,7 +273,7 @@ namespace ZR.CodeGenerator
break;
}
var tpl = FileHelper.ReadJtTemplate($"{tempName}.txt");
tpl.Set("parentId", generateDto.GenTable.ParentMenuId ?? 0);
tpl.Set("parentId", generateDto.GenTable?.Options?.ParentMenuId ?? 0);
var result = tpl.Render();
string fullPath = Path.Combine(generateDto.GenCodePath, "sql", generateDto.GenTable.BusinessName + ".sql");
@ -423,7 +423,14 @@ namespace ZR.CodeGenerator
TableComment = desc,
FunctionName = desc,
Create_by = userName,
Options = new Options()
{
SortType = "asc",
CheckedBtn = new int[] { 1, 2, 3 }
}
};
genTable.Options.PermissionPrefix = $"{genTable.ModuleName.ToLower()}:{genTable.ClassName.ToLower()}";//权限
return genTable;
}
@ -561,7 +568,7 @@ namespace ZR.CodeGenerator
}
public static bool CheckTree(GenTable genTable, string csharpField)
{
return (genTable.TplCategory.Equals("tree", StringComparison.OrdinalIgnoreCase) && genTable.TreeParentCode != null && csharpField.Equals(genTable.TreeParentCode));
return (genTable.TplCategory.Equals("tree", StringComparison.OrdinalIgnoreCase) && genTable?.Options?.TreeParentCode != null && csharpField.Equals(genTable?.Options?.TreeParentCode));
}
#endregion
}

22
ZR.Model/System/Dto/GenTableDto.cs
View File

@ -1,4 +1,5 @@
using System.Collections.Generic;
using ZR.Model.System.Generate;
namespace ZR.Model.System.Dto
{
@ -18,7 +19,7 @@ namespace ZR.Model.System.Dto
public string FunctionAuthor { get; set; }
public string GenType { get; set; }
public string GenPath { get; set; }
public string PermissionPrefix { get; set; }
//public string PermissionPrefix { get; set; }
public string Remark { get; set; }
/// <summary>
/// 额外参数
@ -31,19 +32,19 @@ namespace ZR.Model.System.Dto
/// 额外参数
/// ****注意里面参数统一首字母小写*****
/// </summary>
public class Options
public class Params
{
public string treeCode { get; set; }
public string treeName { get; set; }
public string treeParentCode { get; set; }
public int? parentMenuId { get; set; }
public string sortField { get; set; }
public string sortType { get; set; }
public string TreeCode { get; set; }
public string TreeName { get; set; }
public string TreeParentCode { get; set; }
public int? ParentMenuId { get; set; }
public string SortField { get; set; }
public string SortType { get; set; }
/// <summary>
/// 额外参数字符串
/// </summary>
public string checkedBtn { get; set; }
public string permissionPrefix { get; set; }
public string CheckedBtn { get; set; }
public string PermissionPrefix { get; set; }
}
public class GenTableColumnDto
{
@ -56,6 +57,7 @@ namespace ZR.Model.System.Dto
public bool IsEdit { get; set; }
public bool IsList { get; set; }
public bool IsQuery { get; set; }
public bool IsSort { get; set; }
public bool IsRequired { get; set; }
/// <summary>
/// 显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）

50
ZR.Model/System/Generate/GenTable.cs
View File

@ -72,7 +72,8 @@ namespace ZR.Model.System.Generate
/// <summary>
/// 其他生成选项
/// </summary>
public string Options { get; set; }
[SqlSugar.SugarColumn(IsJson = true)]
public Options Options { get; set; }
#region 表额外字段
/** 表列信息 */
@ -80,29 +81,29 @@ namespace ZR.Model.System.Generate
public List<GenTableColumn> Columns { get; set; }
//以下 Options扩展字段
[SqlSugar.SugarColumn(IsIgnore = true)]
public object ParentMenuId { get; set; }
[SqlSugar.SugarColumn(IsIgnore = true)]
public object SortType { get; set; } = "asc";
//[SqlSugar.SugarColumn(IsIgnore = true)]
//public object ParentMenuId { get; set; }
//[SqlSugar.SugarColumn(IsIgnore = true)]
//public object SortType { get; set; } = "asc";
[SqlSugar.SugarColumn(IsIgnore = true)]
public object SortField { get; set; } = string.Empty;
//[SqlSugar.SugarColumn(IsIgnore = true)]
//public object SortField { get; set; } = string.Empty;
[SqlSugar.SugarColumn(IsIgnore = true)]
public object TreeCode { get; set; } = string.Empty;
//[SqlSugar.SugarColumn(IsIgnore = true)]
//public object TreeCode { get; set; } = string.Empty;
[SqlSugar.SugarColumn(IsIgnore = true)]
public object TreeName { get; set; } = string.Empty;
//[SqlSugar.SugarColumn(IsIgnore = true)]
//public object TreeName { get; set; } = string.Empty;
[SqlSugar.SugarColumn(IsIgnore = true)]
public object TreeParentCode { get; set; }
[SqlSugar.SugarColumn(IsIgnore = true)]
public string PermissionPrefix { get; set; }
//[SqlSugar.SugarColumn(IsIgnore = true)]
//public object TreeParentCode { get; set; }
//[SqlSugar.SugarColumn(IsIgnore = true)]
//public string PermissionPrefix { get; set; }
/// <summary>
/// 生成的按钮功能
/// </summary>
[SqlSugar.SugarColumn(IsIgnore = true)]
public int[] CheckedBtn { get; set; } = new int[] { 1, 2, 3 };
//[SqlSugar.SugarColumn(IsIgnore = true)]
//public int[] CheckedBtn { get; set; } = new int[] { 1, 2, 3 };
/// <summary>
/// 字表信息
@ -111,4 +112,19 @@ namespace ZR.Model.System.Generate
public GenTable SubTable { get; set; }
#endregion
}
public class Options
{
public long ParentMenuId { get; set; } = 0;
public string SortType { get; set; } = "asc";
public string SortField { get; set; } = string.Empty;
public string TreeCode { get; set; } = string.Empty;
public string TreeName { get; set; } = string.Empty;
public string TreeParentCode { get; set; } = string.Empty;
public string PermissionPrefix { get; set; }= string.Empty;
/// <summary>
/// 额外参数字符串
/// </summary>
public int[] CheckedBtn { get; set; } = new int[] { 1, 2, 3 };
}
}

21
ZR.Model/System/Generate/GenTableColumn.cs
View File

@ -71,6 +71,10 @@ namespace ZR.Model.System.Generate
/// </summary>
public bool IsQuery { get; set; }
/// <summary>
/// 是否排序（1是）
/// </summary>
public bool IsSort { get; set; }
/// <summary>
/// 显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）
/// </summary>
public string HtmlType { get; set; }
@ -95,15 +99,22 @@ namespace ZR.Model.System.Generate
}
}
/// <summary>
/// 前端排序字符串
/// </summary>
[SugarColumn(IsIgnore = true)]
public string SortStr
{
get
{
return IsSort ? " sortable" : "";
}
}
/// <summary>
/// C# 字段名 首字母小写，用于前端
/// </summary>
[SugarColumn(IsIgnore = true)]
public string CsharpFieldFl { get; set; }
/// <summary>
/// 字典集合
/// </summary>
//[SqlSugar.SugarColumn(IsIgnore = true)]
//public List<SysDictData> DictDatas { get; set; }
#endregion
}
}

3
ZR.Repository/System/GenTableRepository.cs
View File

@ -82,7 +82,8 @@ namespace ZR.Repository.System
it.Update_time,
it.DictType,
it.Update_by,
it.Remark
it.Remark,
it.IsSort
})
.ExecuteCommand();
}

43
ZR.Service/System/GenTableService.cs
View File

@ -56,14 +56,9 @@ namespace ZR.Service.System
public GenTable GetGenTableInfo(long tableId)
{
var info = GenTableRepository.GetId(tableId);
SetTableFromOptions(info);
if (info != null && !info.SubTableName.IsEmpty())
{
info.SubTable = GenTableRepository.Queryable().Where(f => f.SubTableName == info.TableName).First();
if (info?.SubTable != null)
{
SetTableFromOptions(info?.SubTable);
}
}
return info;
}
@ -84,31 +79,31 @@ namespace ZR.Service.System
private void SetTableFromOptions(GenTable genTable)
{
//附加参数，key，value格式
if (!string.IsNullOrEmpty(genTable?.Options))
{
Dictionary<string, object> options = JsonConvert.DeserializeObject<Dictionary<string, object>>(genTable.Options);
if (options == null) return;
//if (!string.IsNullOrEmpty(genTable?.Options))
//{
// Dictionary<string, object> options = JsonConvert.DeserializeObject<Dictionary<string, object>>(genTable.Options);
// if (options == null) return;
genTable.ParentMenuId = options.GetValueOrDefault("parentMenuId") ?? null;
// genTable.ParentMenuId = options.GetValueOrDefault("parentMenuId") ?? null;
genTable.SortType = options.GetValueOrDefault("sortType") ?? "asc";
genTable.SortField = options.GetValueOrDefault("sortField") ?? "";
// genTable.SortType = options.GetValueOrDefault("sortType") ?? "asc";
// genTable.SortField = options.GetValueOrDefault("sortField") ?? "";
genTable.TreeParentCode = options.GetValueOrDefault("treeParentCode") ?? "";
genTable.TreeName = options.GetValueOrDefault("treeName") ?? "";
genTable.TreeCode = options.GetValueOrDefault("treeCode") ?? "";
// genTable.TreeParentCode = options.GetValueOrDefault("treeParentCode") ?? "";
// genTable.TreeName = options.GetValueOrDefault("treeName") ?? "";
// genTable.TreeCode = options.GetValueOrDefault("treeCode") ?? "";
var checkdBtn = options.GetValueOrDefault("checkedBtn") ?? "";
genTable.CheckedBtn = Tools.SpitIntArrary(checkdBtn.ToString());
// var checkdBtn = options.GetValueOrDefault("checkedBtn") ?? "";
// genTable.CheckedBtn = Tools.SpitIntArrary(checkdBtn.ToString());
var permPrefix = options.GetValueOrDefault("permissionPrefix", "");
// var permPrefix = options.GetValueOrDefault("permissionPrefix", "");
genTable.PermissionPrefix = permPrefix?.ToString();
}
if (genTable.PermissionPrefix.IsEmpty())
{
genTable.PermissionPrefix = $"{genTable.ModuleName.ToLower()}:{genTable.ClassName.ToLower()}";//权限
}
// genTable.PermissionPrefix = permPrefix?.ToString();
//}
//if (genTable?.Options?.PermissionPrefix.IsEmpty())
//{
// genTable?.Options?.PermissionPrefix = $"{genTable.ModuleName.ToLower()}:{genTable.ClassName.ToLower()}";//权限
//}
}
/// <summary>

4
ZR.Vue/src/views/tool/gen/editTable.vue
View File

@ -171,7 +171,7 @@ export default {
getGenTable(tableId).then((res) => {
this.loading = false
this.columns = res.data.info.columns
this.info = res.data.info
this.info = { ...res.data.info, ...res.data.info.options }
this.tables = res.data.tables // 子表
})
/** 查询字典下拉列表 */
@ -201,7 +201,7 @@ export default {
parentMenuId: genTable.parentMenuId,
sortField: genTable.sortField,
sortType: genTable.sortType,
checkedBtn: genTable.checkedBtn.toString(),
checkedBtn: genTable.checkedBtn,
permissionPrefix: genTable.permissionPrefix,
}
console.log('genForm', genTable)

1
document/admin-mysql.sql
View File

@ -786,6 +786,7 @@ CREATE TABLE `gen_table_column` (
`isEdit` tinyint(1) NULL DEFAULT NULL COMMENT '是否编辑字段（1是）',
`isList` tinyint(1) NULL DEFAULT NULL COMMENT '是否列表字段（1是）',
`isQuery` tinyint(4) NULL DEFAULT NULL COMMENT '是否查询字段（1是）',
`isSort` tinyint(4) NULL DEFAULT NULL COMMENT '是否排序字段（1是）',
`queryType` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'EQ' COMMENT '查询方式（等于、不等于、大于、小于、范围）',
`htmlType` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）',
`dictType` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典类型',

1
document/admin-sqlserver.sql
View File

@ -735,6 +735,7 @@ create table gen_table_column (
isInsert TINYINT , --'是否为插入字段（1是）',
isEdit TINYINT , --'是否编辑字段（1是）',
isList TINYINT , --'是否列表字段（1是）',
isSort TINYINT , --'是否排序字段（1是）',
isQuery TINYINT ,-- '是否查询字段（1是）',
queryType varchar(200) default 'EQ' , --'查询方式（等于、不等于、大于、小于、范围）',
htmlType varchar(200) , --'显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）',