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

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

View File

@@ -72,37 +72,38 @@ namespace ZR.Model.System.Generate
/// <summary>
/// 其他生成选项
/// </summary>
public string Options { get; set; }
[SqlSugar.SugarColumn(IsJson = true)]
public Options Options { get; set; }
#region
/** 表列信息 */
[SqlSugar.SugarColumn(IsIgnore = true)]
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 };
}
}

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
}
}