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