wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3.4.6

Browse Source
This commit is contained in:
潘飞
2023-05-31 10:19:05 +08:00
parent 1b65a7a9e5
commit 9c621c75cd
238 changed files with 9905 additions and 4034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
visualdev/Tnb.VisualDev.Engine/Model/CodeGen/CodeGenConfigModel.cs
View File

@@ -259,6 +259,11 @@ public class CodeGenConfigModel
/// </summary>
public bool IsSystemControl { get; set; }
/// <summary>
/// 是否查询条件多选.
/// </summary>
public bool IsSearchMultiple { get; set; }
/// <summary>
/// 需解析的控件类型 JnpfKeyConst @@ 需解析的字段集合（以,隔开）.
/// </summary>
@@ -268,4 +273,24 @@ public class CodeGenConfigModel
/// 需解析的控件类型 JnpfKeyConst @@ 需解析的字段集合（以,隔开）详情页 （行内编辑的时候特殊处理）.
/// </summary>
public List<string[]> ParsJnpfKeyConstListDetails { get; set; }
/// <summary>
/// 是否树形表格.
/// </summary>
public bool IsTreeTable { get; set; }
/// <summary>
/// 树形表格-父级字段.
/// </summary>
public string ParentField { get; set; }
/// <summary>
/// 树形表格-显示字段.
/// </summary>
public string TreeShowField { get; set; }
/// <summary>
/// 是否开启逻辑删除.
/// </summary>
public bool IsLogicalDelete { get; set; }
}

20
visualdev/Tnb.VisualDev.Engine/Model/CodeGen/CodeGenExportPropertyJsonModel.cs Normal file
View File

@@ -0,0 +1,20 @@
namespace JNPF.VisualDev.Engine.Model.CodeGen;
public class CodeGenExportPropertyJsonModel
{
public string filedName { get; set; }
public string jnpfKey { get; set; }
public string filedId { get; set; }
/// <summary>
/// 是否必填.
/// </summary>
public bool required { get; set; }
/// <summary>
/// 是否多选.
/// </summary>
public bool multiple { get; set; }
}

15
visualdev/Tnb.VisualDev.Engine/Model/CodeGen/CodeGenFormRealControlModel.cs Normal file
View File

@@ -0,0 +1,15 @@
namespace JNPF.VisualDev.Engine.Model.CodeGen;
/// <summary>
/// 代码生成表单真实控件.
/// </summary>
public class CodeGenFormRealControlModel
{
public string jnpfKey { get; set; }
public string vModel { get; set; }
public bool multiple { get; set; }
public List<CodeGenFormRealControlModel> children { get; set; }
}

7
visualdev/Tnb.VisualDev.Engine/Model/CodeGen/CodeGenTableRelationsModel.cs
View File

@@ -142,4 +142,11 @@ public class CodeGenTableRelationsModel
/// 是否更新.
/// </summary>
public bool IsUpdate { get; set; }
public bool IsControlParsing { get; set; }
/// <summary>
/// 是否查询条件多选.
/// </summary>
public bool IsSearchMultiple { get; set; }
}

167
visualdev/Tnb.VisualDev.Engine/Model/CodeGen/DefaultFormControlModel.cs Normal file
View File

@@ -0,0 +1,167 @@
using JNPF.DependencyInjection;
namespace JNPF.VisualDev.Engine.Model.CodeGen;
/// <summary>
/// 表单默认值控件模型.
/// </summary>
[SuppressSniffer]
public class DefaultFormControlModel
{
/// <summary>
/// 是否存在日期控件.
/// </summary>
public bool IsExistDate { get; set; }
/// <summary>
/// 是否存在组织选择.
/// </summary>
public bool IsExistComSelect { get; set; }
/// <summary>
/// 是否存在部门织选择.
/// </summary>
public bool IsExistDepSelect { get; set; }
/// <summary>
/// 是否存在用户选择.
/// </summary>
public bool IsExistUserSelect { get; set; }
/// <summary>
/// 是否存在子表.
/// </summary>
public bool IsExistSubTable { get; set; }
/// <summary>
/// 日期选择字段.
/// </summary>
public List<string> DateField { get; set; }
/// <summary>
/// 子表名称.
/// </summary>
public string SubTableName { get; set; }
/// <summary>
/// 组织选择控件列表.
/// </summary>
public List<DefaultComSelectControl> ComSelectList { get; set; }
/// <summary>
/// 部门选择控件列表.
/// </summary>
public List<DefaultDepSelectControl> DepSelectList { get; set; }
/// <summary>
/// 用户选择控件列表.
/// </summary>
public List<DefaultUserSelectControl> UserSelectList { get; set; }
/// <summary>
/// 子表默认值.
/// </summary>
public List<DefaultFormControlModel> SubTabelDefault { get; set; }
}
/// <summary>
/// 组织选择默认值.
/// </summary>
public class DefaultComSelectControl
{
/// <summary>
/// 表单多选.
/// </summary>
public bool IsMultiple { get; set; }
/// <summary>
/// 查询多选.
/// </summary>
public bool IsSearchMultiple { get; set; }
public string Field { get; set; }
}
/// <summary>
/// 部门选择默认值.
/// </summary>
public class DefaultDepSelectControl
{
/// <summary>
/// 表单多选.
/// </summary>
public bool IsMultiple { get; set; }
/// <summary>
/// 查询多选.
/// </summary>
public bool IsSearchMultiple { get; set; }
/// <summary>
/// 可选范围
/// custom-自定义,all-全部.
/// </summary>
public string selectType { get; set; }
/// <summary>
/// 可选部门.
/// </summary>
public string ableDepIds { get; set; }
/// <summary>
/// 字段名称.
/// </summary>
public string Field { get; set; }
}
/// <summary>
/// 用户选择默认值.
/// </summary>
public class DefaultUserSelectControl
{
/// <summary>
/// 表单多选.
/// </summary>
public bool IsMultiple { get; set; }
/// <summary>
/// 查询多选.
/// </summary>
public bool IsSearchMultiple { get; set; }
/// <summary>
/// 可选范围
/// custom-自定义,all-全部.
/// </summary>
public string selectType { get; set; }
/// <summary>
/// 可选部门.
/// </summary>
public string ableDepIds { get; set; }
/// <summary>
/// 可选用户.
/// </summary>
public string ableUserIds { get; set; }
/// <summary>
/// 可选岗位.
/// </summary>
public string ablePosIds { get; set; }
/// <summary>
/// 可选角色.
/// </summary>
public string ableRoleIds { get; set; }
/// <summary>
/// 可选分组.
/// </summary>
public string ableGroupIds { get; set; }
/// <summary>
/// 字段名称.
/// </summary>
public string Field { get; set; }
}

21
visualdev/Tnb.VisualDev.Engine/Model/CodeGen/FormControlDesignModel.cs
View File

@@ -648,4 +648,25 @@ public class FormControlDesignModel
/// 是否关联表单.
/// </summary>
public bool IsRelationForm { get; set; }
/// <summary>
/// 路径类型.
/// </summary>
public string PathType { get; set; }
/// <summary>
/// 是否开启 分用户存储
/// 0-关闭,1-开启.
/// </summary>
public string IsAccount { get; set; }
/// <summary>
/// 文件夹名.
/// </summary>
public string Folder { get; set; }
/// <summary>
/// 当前默认值.
/// </summary>
public bool DefaultCurrent { get; set; }
}

81
visualdev/Tnb.VisualDev.Engine/Model/CodeGen/FrontEndGenConfigModel.cs
View File

@@ -50,7 +50,7 @@ public class FrontEndGenConfigModel
/// <summary>
/// 列表布局
/// 1-普通列表,2-左侧树形+普通表格,3-分组表格,4-行内编辑.
/// 1-普通列表,2-左侧树形+普通表格,3-分组表格,4-行内编辑,5-树形表格.
/// </summary>
public int Type { get; set; }
@@ -74,6 +74,11 @@ public class FrontEndGenConfigModel
/// </summary>
public string TreeDataSource { get; set; }
/// <summary>
/// 是否左侧树绑定字段查询条件多选.
/// </summary>
public bool IsTreeRelationMultiple { get; set; }
/// <summary>
/// 树数据字典.
/// </summary>
@@ -159,6 +164,16 @@ public class FrontEndGenConfigModel
/// </summary>
public bool IsBatchRemoveDel { get; set; }
/// <summary>
/// 是否有批量打印.
/// </summary>
public bool IsBatchPrint { get; set; }
/// <summary>
/// 批量打印IDS.
/// </summary>
public string PrintIds { get; set; }
/// <summary>
/// 是否有导出.
/// </summary>
@@ -194,6 +209,11 @@ public class FrontEndGenConfigModel
/// </summary>
public bool IsUpload { get; set; }
/// <summary>
/// 是否开启控件默认值.
/// </summary>
public bool IsDefaultFormControl { get; set; }
/// <summary>
/// 是否开启按钮权限.
/// </summary>
@@ -339,4 +359,63 @@ public class FrontEndGenConfigModel
/// 是否冻结.
/// </summary>
public bool IsFixed { get; set; }
/// <summary>
/// 是否存在子表正则.
/// </summary>
public bool IsChildrenRegular { get; set; }
/// <summary>
/// 左侧树同步类型
/// 0-同步,1-异步.
/// </summary>
public int TreeSynType { get; set; }
/// <summary>
/// 是否开启左侧树查询.
/// </summary>
public bool HasTreeQuery { get; set; }
/// <summary>
/// 左侧树异步接口.
/// </summary>
public CodeGenColumnData ColumnData { get; set; }
/// <summary>
/// 是否开启合计.
/// </summary>
public bool ShowSummary { get; set; }
/// <summary>
/// 列表合计字段.
/// </summary>
public List<string> SummaryField { get; set; }
/// <summary>
/// 表单控件默认值.
/// </summary>
public DefaultFormControlModel DefaultFormControlList { get; set; }
/// <summary>
/// 流程引擎表单字段json.
/// </summary>
public string PropertyJson { get; set; }
/// <summary>
/// 表单真实控件(剔除布局控件).
/// </summary>
public List<CodeGenFormRealControlModel> FormRealControl { get; set; }
}
public class CodeGenColumnData
{
/// <summary>
/// 左侧树异步接口.
/// </summary>
public string treeInterfaceId { get; set; }
/// <summary>
/// 左侧树模板JSON.
/// </summary>
public List<object> treeTemplateJson { get; set; }
}

10
visualdev/Tnb.VisualDev.Engine/Model/CodeGen/IndexColumnDesign.cs
View File

@@ -48,11 +48,6 @@ public class IndexColumnDesign
/// </summary>
public string Align { get; set; }
/// <summary>
/// 是否自动转换.
/// </summary>
public bool IsAutomatic { get; set; }
/// <summary>
/// 时间格式化.
/// </summary>
@@ -77,4 +72,9 @@ public class IndexColumnDesign
/// 子表配置.
/// </summary>
public List<IndexColumnDesign> ChildTableDesigns { get; set; }
/// <summary>
/// 关联表单模板ID.
/// </summary>
public string ModelId { get; set; }
}

5
visualdev/Tnb.VisualDev.Engine/Model/CodeGen/IndexSearchFieldDesignModel.cs
View File

@@ -98,6 +98,11 @@ public class IndexSearchFieldDesignModel
/// </summary>
public bool IsCustomSelect => SelectType == "all" ? false : true;
/// <summary>
/// 是否多选.
/// </summary>
public bool IsMultiple { get; set; }
/// <summary>
/// 可选部门.
/// </summary>

15
visualdev/Tnb.VisualDev.Engine/Model/CodeGen/TableColumnConfigModel.cs
View File

@@ -68,6 +68,11 @@ public class TableColumnConfigModel
/// </summary>
public int QueryType { get; set; }
/// <summary>
/// 是否查询多选.
/// </summary>
public bool QueryMultiple { get; set; }
/// <summary>
/// 是否展示.
/// </summary>
@@ -188,6 +193,11 @@ public class TableColumnConfigModel
/// </summary>
public bool IsUpdate { get; set; }
/// <summary>
/// 控制解析.
/// </summary>
public bool IsControlParsing { get; set; }
#endregion
#region 副表使用
@@ -253,4 +263,9 @@ public class TableColumnConfigModel
/// 展示字段.
/// </summary>
public string ShowField { get; set; }
/// <summary>
/// 是否树形父级字段.
/// </summary>
public bool IsTreeParentField { get; set; }
}

53
visualdev/Tnb.VisualDev.Engine/Model/ColumnDesignModel.cs
View File

@@ -8,11 +8,26 @@ namespace JNPF.VisualDev.Engine;
[SuppressSniffer]
public class ColumnDesignModel
{
/// <summary>
/// 打印模板ID.
/// </summary>
public List<string> printIds { get; set; }
/// <summary>
/// 查询列表.
/// </summary>
public List<IndexSearchFieldModel> searchList { get; set; }
/// <summary>
/// 数据过滤.
/// </summary>
public List<RuleFieldModel> ruleList { get; set; }
/// <summary>
/// App数据过滤.
/// </summary>
public List<RuleFieldModel> ruleListApp { get; set; }
/// <summary>
/// 显示列.
/// </summary>
@@ -35,7 +50,7 @@ public class ColumnDesignModel
/// <summary>
/// 列表布局
/// 1-普通列表,2-左侧树形+普通表格,3-分组表格,4-编辑表格.
/// 1-普通列表,2-左侧树形+普通表格,3-分组表格,4-编辑表格,5-树形表格.
/// </summary>
public int type { get; set; } = 1;
@@ -110,11 +125,37 @@ public class ColumnDesignModel
/// </summary>
public string treePropsLabel { get; set; }
/// <summary>
/// 左侧树同步类型
/// 0-同步,1-异步.
/// </summary>
public int treeSynType { get; set; }
/// <summary>
/// 是否开启左侧树查询.
/// </summary>
public bool hasTreeQuery { get; set; }
/// <summary>
/// 左侧树异步接口.
/// </summary>
public string treeInterfaceId { get; set; }
/// <summary>
/// 左侧树模板JSON.
/// </summary>
public List<object> treeTemplateJson { get; set; }
/// <summary>
/// 分组字段.
/// </summary>
public string groupField { get; set; }
/// <summary>
/// 树形表格 - 父级字段.
/// </summary>
public string parentField { get; set; }
/// <summary>
/// 列表权限.
/// </summary>
@@ -150,6 +191,16 @@ public class ColumnDesignModel
/// </summary>
public List<ButtonConfigModel> customBtnsList { get; set; }
/// <summary>
/// 是否合计.
/// </summary>
public bool showSummary { get; set; }
/// <summary>
/// 列表合计字段.
/// </summary>
public List<string> summaryField { get; set; }
/// <summary>
/// 上传数据模板json.
/// </summary>

5
visualdev/Tnb.VisualDev.Engine/Model/ConfigModel.cs
View File

@@ -83,6 +83,11 @@ public class ConfigModel
/// </summary>
public object defaultValue { get; set; }
/// <summary>
/// 当前默认值.
/// </summary>
public bool defaultCurrent { get; set; }
/// <summary>
/// 远端数据接口.
/// </summary>

21
visualdev/Tnb.VisualDev.Engine/Model/FieldsModel.cs
View File

@@ -135,6 +135,11 @@ public class FieldsModel
/// </summary>
public bool multiple { get; set; }
/// <summary>
/// 是否多选查询.
/// </summary>
public bool searchMultiple { get; set; }
/// <summary>
/// 配置选项.
/// </summary>
@@ -546,6 +551,22 @@ public class FieldsModel
/// </summary>
public List<LinkageConfig> templateJson { get; set; }
/// <summary>
/// 路径类型.
/// </summary>
public string pathType { get; set; }
/// <summary>
/// 是否开启 分用户存储
/// 0-关闭,1-开启.
/// </summary>
public int isAccount { get; set; } = -1;
/// <summary>
/// 文件夹名.
/// </summary>
public string folder { get; set; }
/// <summary>
/// 后端自我创建字段、用于统一处理减少循环判断
/// 是否查询字段.

2
visualdev/Tnb.VisualDev.Engine/Model/FormDataModel.cs
View File

@@ -131,7 +131,7 @@ public class FormDataModel
/// <summary>
/// 打印模板ID.
/// </summary>
public string printId { get; set; }
public List<string> printId { get; set; }
/// <summary>
/// 表单样式.

9
visualdev/Tnb.VisualDev.Engine/Model/IndexGridFieldModel.cs
View File

@@ -8,11 +8,10 @@ namespace JNPF.VisualDev.Engine;
[SuppressSniffer]
public class IndexGridFieldModel : IndexEachConfigBase
{
//modified by PhilPan
///// <summary>
///// 对齐.
///// </summary>
//public string align { get; set; }
/// <summary>
/// 对齐.
/// </summary>
public string align { get; set; }
/// <summary>
/// 固定.

57
visualdev/Tnb.VisualDev.Engine/Model/IndexSearchFieldModel.cs
View File

@@ -14,9 +14,56 @@ public class IndexSearchFieldModel : IndexEachConfigBase
/// </summary>
public string value { get; set; }
//modified by PhilPan
///// <summary>
///// 查询类型.
///// </summary>
//public int? searchType { get; set; }
/// <summary>
/// 查询类型.
/// </summary>
public int? searchType { get; set; }
}
/// <summary>
/// 数据过滤集合.
/// 数据过滤条件.
/// </summary>
public class RuleFieldModel : IndexEachConfigBase
{
/// <summary>
/// 字段过滤值.
/// </summary>
public object fieldValue { get; set; }
/// <summary>
/// 字段类型.
/// </summary>
public string fieldType { get; set; }
/// <summary>
/// 字段值类型.
/// </summary>
public string fieldValueType { get; set; }
/// <summary>
/// .
/// </summary>
public string fieldLabel { get; set; }
/// <summary>
/// 逻辑名.
/// </summary>
public string logicName { get; set; }
/// <summary>
/// 字段.
/// </summary>
public string field { get; set; }
/// <summary>
/// 条件符号标识.
/// </summary>
public string symbol { get; set; }
/// <summary>
/// 逻辑： 并且、或者.
/// </summary>
public string logic { get; set; }
}