v3.4.6
This commit is contained in:
@@ -17,7 +17,7 @@ public class CodeGenUnifiedHandlerHelper
|
||||
var template = new List<FieldsModel>();
|
||||
|
||||
// 循环表单内控件
|
||||
formDataModel.ForEach(item =>
|
||||
foreach (var item in formDataModel)
|
||||
{
|
||||
var config = item.__config__;
|
||||
switch (config.jnpfKey)
|
||||
@@ -67,7 +67,7 @@ public class CodeGenUnifiedHandlerHelper
|
||||
|
||||
break;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
return template;
|
||||
}
|
||||
@@ -176,7 +176,7 @@ public class CodeGenUnifiedHandlerHelper
|
||||
// dataType = dynamic && templateJson属性有长度,则代表有远端联动
|
||||
if (config.dataType == "dynamic" && config.templateJson?.Count() > 0)
|
||||
{
|
||||
config.templateJson.FindAll(it => it.relationField.Any()).ForEach(items =>
|
||||
config.templateJson.FindAll(it => it.relationField != null && it.relationField.Any()).ForEach(items =>
|
||||
{
|
||||
var fieldModel = NewFormDataModel.Where(it => it.__vModel__.Equals(items.relationField) && it.__config__.jnpfKey.Equals(items.jnpfKey)).FirstOrDefault();
|
||||
fieldModel.IsLinked = true;
|
||||
@@ -199,7 +199,7 @@ public class CodeGenUnifiedHandlerHelper
|
||||
{
|
||||
var childrenFieldModel = childrenFormModel.Where(it => item.__vModel__.Equals(it.__vModel__) && it.__config__.jnpfKey.Equals(config.jnpfKey)).FirstOrDefault();
|
||||
childrenFieldModel.IsLinkage = true;
|
||||
config.templateJson.FindAll(it => it.relationField.Any()).ForEach(items =>
|
||||
config.templateJson.FindAll(it => it.relationField != null && it.relationField.Any()).ForEach(items =>
|
||||
{
|
||||
var isTrigger = false;
|
||||
var fieldModel = childrenFormModel.Where(it => items.relationField.Equals(string.Format("{0}-{1}", tableControlsKey, it.__vModel__)) && it.__config__.jnpfKey.Equals(items.jnpfKey)).FirstOrDefault();
|
||||
@@ -233,27 +233,30 @@ public class CodeGenUnifiedHandlerHelper
|
||||
case true:
|
||||
var mainFieldModel = NewFormDataModel.Where(it => item.__vModel__.Equals(it.__vModel__) && it.__config__.jnpfKey.Equals(config.jnpfKey)).FirstOrDefault();
|
||||
mainFieldModel.IsLinkage = true;
|
||||
item.templateJson?.FindAll(it => it.relationField.Any()).ForEach(items =>
|
||||
item.templateJson?.FindAll(it => it.relationField != null && it.relationField.Any()).ForEach(items =>
|
||||
{
|
||||
var fieldModel = NewFormDataModel.Where(it => it.__vModel__.Equals(items.relationField) && it.__config__.jnpfKey.Equals(items.jnpfKey)).FirstOrDefault();
|
||||
fieldModel.IsLinked = true;
|
||||
List<LinkageConfig> linkageConfigs = new List<LinkageConfig>
|
||||
if (fieldModel != null)
|
||||
{
|
||||
new LinkageConfig()
|
||||
fieldModel.IsLinked = true;
|
||||
List<LinkageConfig> linkageConfigs = new List<LinkageConfig>
|
||||
{
|
||||
field = item.__vModel__,
|
||||
fieldName = item.__vModel__.ToLowerCase(),
|
||||
jnpfKey = config.jnpfKey,
|
||||
IsMultiple = config.jnpfKey.Equals(JnpfKeyConst.CASCADER) ? item.props.props.multiple : config.jnpfKey.Equals(JnpfKeyConst.CHECKBOX) ? true : item.multiple,
|
||||
}
|
||||
};
|
||||
fieldModel.linkageReverseRelationship.AddRange(linkageConfigs);
|
||||
new LinkageConfig()
|
||||
{
|
||||
field = item.__vModel__,
|
||||
fieldName = item.__vModel__.ToLowerCase(),
|
||||
jnpfKey = config.jnpfKey,
|
||||
IsMultiple = config.jnpfKey.Equals(JnpfKeyConst.CASCADER) ? item.props.props.multiple : config.jnpfKey.Equals(JnpfKeyConst.CHECKBOX) ? true : item.multiple,
|
||||
}
|
||||
};
|
||||
fieldModel.linkageReverseRelationship.AddRange(linkageConfigs);
|
||||
}
|
||||
});
|
||||
break;
|
||||
default:
|
||||
var childrenFieldModel = childrenFormModel.Where(it => item.__vModel__.Equals(it.__vModel__) && it.__config__.jnpfKey.Equals(config.jnpfKey)).FirstOrDefault();
|
||||
childrenFieldModel.IsLinkage = true;
|
||||
item.templateJson?.FindAll(it => it.relationField.Any()).ForEach(items =>
|
||||
item.templateJson?.FindAll(it => it.relationField != null && it.relationField.Any()).ForEach(items =>
|
||||
{
|
||||
var isTrigger = false;
|
||||
var fieldModel = childrenFormModel.Where(it => items.relationField.Equals(string.Format("{0}-{1}", tableControlsKey, it.__vModel__)) && it.__config__.jnpfKey.Equals(items.jnpfKey)).FirstOrDefault();
|
||||
|
||||
Reference in New Issue
Block a user