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

merge from 2023-03-14

Browse Source
This commit is contained in:
潘飞
2023-03-24 09:37:07 +08:00
parent f95ef4cf73
commit 3de92dab06
57 changed files with 1538 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
common/Tnb.Common/CodeGenUpload/Attributes/CodeGenUploadAttribute.cs
View File

@@ -86,12 +86,14 @@ public class CodeGenUploadAttribute : Attribute
/// 构造函数
/// "popupSelect".
/// </summary>
public CodeGenUploadAttribute(string Model, string SecondParameter, string ThreeParameters, string FourParameters, string Config)
public CodeGenUploadAttribute(string Model, string dataConversionModel, string SecondParameter, string ThreeParameters, string FourParameters, string ShowField, string Config)
{
__Model__ = Model;
__vModel__ = dataConversionModel;
interfaceId = SecondParameter;
propsValue = ThreeParameters;
relationField = FourParameters;
showField = ShowField;
__config__ = Config.ToObject<CodeGenConfigModel>();
}
@@ -135,9 +137,7 @@ public class CodeGenUploadAttribute : Attribute
/// <summary>
/// 构造函数
/// "treeSelect"
/// "usersSelect":
/// "depSelect":
/// "relationForm".
/// "depSelect":.
/// </summary>
public CodeGenUploadAttribute(string Model, bool Multiple, string ThreeParameters, string FourParameters, string Config)
{
@@ -146,18 +146,10 @@ public class CodeGenUploadAttribute : Attribute
__config__ = Config.ToObject<CodeGenConfigModel>();
switch (__config__.jnpfKey)
{
case JnpfKeyConst.RELATIONFORM:
modelId = ThreeParameters;
relationField = FourParameters;
break;
case JnpfKeyConst.DEPSELECT:
selectType = ThreeParameters;
ableDepIds = FourParameters?.ToObject<List<string>>();
break;
case JnpfKeyConst.USERSSELECT:
selectType = ThreeParameters;
ableIds = FourParameters?.ToObject<List<string>>();
break;
default:
props = ThreeParameters?.ToObject<CodeGenPropsModel>();
options = FourParameters?.ToObject<List<object>>();
@@ -165,10 +157,25 @@ public class CodeGenUploadAttribute : Attribute
}
}
/// <summary>
/// 构造函数
/// "usersSelect":.
/// </summary>
public CodeGenUploadAttribute(string Model, string dataConversionModel, bool Multiple, string ThreeParameters, string FourParameters, string Config)
{
__Model__ = Model;
__vModel__ = dataConversionModel;
multiple = Multiple;
__config__ = Config.ToObject<CodeGenConfigModel>();
selectType = ThreeParameters;
ableIds = FourParameters?.ToObject<List<string>>();
}
/// <summary>
/// 构造函数
/// "cascader"
/// "posSelect":
/// "relationForm"
/// "popupTableSelect".
/// </summary>
public CodeGenUploadAttribute(string Model, bool Multiple, string InterfaceId, string PropsValue, string RelationField, string Config)
@@ -196,6 +203,21 @@ public class CodeGenUploadAttribute : Attribute
}
}
/// <summary>
/// 构造函数
/// "relationForm".
/// </summary>
public CodeGenUploadAttribute(string Model, string dataConversionModel, bool Multiple, string InterfaceId, string PropsValue, string RelationField, string Config)
{
__Model__ = Model;
__vModel__ = dataConversionModel;
multiple = Multiple;
__config__ = Config.ToObject<CodeGenConfigModel>();
modelId = InterfaceId;
relationField = PropsValue;
showField = RelationField;
}
/// <summary>
/// 构造函数
/// "userSelect":.
@@ -218,6 +240,11 @@ public class CodeGenUploadAttribute : Attribute
/// </summary>
public string __Model__ { get; set; }
/// <summary>
/// 数据转换.
/// </summary>
public string __vModel__ { get; set; }
/// <summary>
/// 最小值.
/// </summary>
@@ -332,4 +359,9 @@ public class CodeGenUploadAttribute : Attribute
/// 新用户选择控件.
/// </summary>
public List<string> ableIds { get; set; }
/// <summary>
/// 展示字段.
/// </summary>
public string showField { get; set; }
}

18
common/Tnb.Common/Enums/ErrorCode.cs
View File

@@ -222,6 +222,18 @@ public enum ErrorCode
[ErrorCodeItemMetadata("登录票据已失效")]
D1035,
/// <summary>
/// 主系统不允许禁用.
/// </summary>
[ErrorCodeItemMetadata("主系统不允许禁用")]
D1036,
/// <summary>
/// 主系统不允许更改应用编码.
/// </summary>
[ErrorCodeItemMetadata("主系统不允许更改应用编码")]
D1037,
#endregion
#region 机构 2
@@ -504,6 +516,12 @@ public enum ErrorCode
[ErrorCodeItemMetadata("当前导入菜单为Web端菜单，请在对应模块下导入！")]
D4013,
/// <summary>
/// 该系统已被禁用
/// </summary>
[ErrorCodeItemMetadata("切换失败，当前系统已被管理员禁用")]
D4014,
#endregion
#region 用户 5

5
common/Tnb.Common/Models/SuperQueryModel.cs
View File

@@ -83,4 +83,9 @@ public class ConvertSuperQuery
/// 是否主条件.
/// </summary>
public bool mainWhere { get; set; }
/// <summary>
/// 象征.
/// </summary>
public string symbol { get; set; }
}

16
common/Tnb.Common/Security/CodeGenHelper.cs
View File

@@ -22,14 +22,14 @@ public static class CodeGenHelper
case "nchar":
case "timestamp":
case "string":
return "string";
return "string?";
case "int":
case "smallint":
return "int";
return "int?";
case "tinyint":
return "byte";
return "byte?";
case "bigint":
// sqlite数据库
@@ -43,10 +43,10 @@ public static class CodeGenHelper
case "smallmoney":
case "numeric":
case "decimal":
return "decimal";
return "decimal?";
case "real":
return "Single";
return "Single?";
case "datetime":
case "datetime2":
@@ -55,7 +55,7 @@ public static class CodeGenHelper
return "DateTime?";
case "float":
return "double";
return "double?";
case "image":
case "binary":
@@ -218,7 +218,7 @@ public static class CodeGenHelper
result.Add(label, "系统自动生成");
break;
case JnpfKeyConst.COMSELECT:
result.Add(label, multiple ? "例:拓通智联/产品部,拓通智联/技术部" : "例:拓通智联/技术部");
result.Add(label, multiple ? "例:引迈信息/产品部,引迈信息/技术部" : "例:引迈信息/技术部");
break;
case JnpfKeyConst.DEPSELECT:
result.Add(label, multiple ? "例:产品部/部门编码,技术部/部门编码" : "例:技术部/部门编码");
@@ -230,7 +230,7 @@ public static class CodeGenHelper
result.Add(label, multiple ? "例:张三/账号,李四/账号" : "例:张三/账号");
break;
case JnpfKeyConst.USERSSELECT:
result.Add(label, multiple ? "例:拓通智联/产品部,产品部/部门编码,技术经理/岗位编码,研发人员/角色编码,A分组/分组编码,张三/账号" : "例:李四/账号");
result.Add(label, multiple ? "例:引迈信息/产品部,产品部/部门编码,技术经理/岗位编码,研发人员/角色编码,A分组/分组编码,张三/账号" : "例:李四/账号");
break;
case JnpfKeyConst.ROLESELECT:
result.Add(label, multiple ? "例:研发人员/角色编码,测试人员/角色编码" : "例:研发人员/角色编码");