1.增加电梯的路径判断与平均分配

2.载具查询异常抛出
3.在线开发的子表使用弹窗时,编辑显示时bug,例如"_point_code_"在dictionary中 不存在
This commit is contained in:
FanLian
2023-07-27 14:30:31 +08:00
parent 1a01ea378e
commit 5cbe089b10
8 changed files with 240 additions and 9 deletions

View File

@@ -3635,8 +3635,10 @@ public class RunService : IRunService, ITransient
{
var relationValueId = dataItem[item.__vModel__].ToString(); // 获取关联表单id
// 添加到 子表 列
model.__config__.children.Where(x => x.relationField.ReplaceRegex(@"_jnpfTable_(\w+)", string.Empty) == item.__vModel__).ToList().ForEach(citem =>
// 添加到 子表 列
// 配置弹窗关联控件会将弹窗选择控件一起配置,导致报错,将弹窗选择控件移除 增加 && x.__vModel__ != item.__vModel__ --modified by lianFan 20230727
model.__config__.children.Where(x => x.relationField.ReplaceRegex(@"_jnpfTable_(\w+)", string.Empty) == item.__vModel__ && x.__vModel__ != item.__vModel__).ToList().ForEach(citem =>
{
citem.__vModel__ = item.__vModel__ + "_" + citem.showField;
var value = pDataList.Where(x => x.Values.Contains(dataItem[item.__vModel__].ToString())).FirstOrDefault();