diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs index 19575e63c..e1ca30669 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs @@ -220,6 +220,12 @@ namespace IRaCIS.Core.Application.ViewModel public string ChildDataLabel { get; set; } + + /// + /// 前端渲染数组 数组名 和数组值 英文名称 + /// + public string ChildDataEnLabel { get; set; } = string.Empty; + /// /// 子数据Value /// @@ -274,6 +280,8 @@ namespace IRaCIS.Core.Application.ViewModel /// public string ForeignKeyEnText { get; set; } = string.Empty; + + /// /// 接口名 diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs index 858d8a4db..7a6f06dd6 100644 --- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs +++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs @@ -84,6 +84,13 @@ namespace IRaCIS.Core.Domain.Models //前端渲染数组 数组名 和数组值 public string ChildDataLabel { get; set; } + + + /// + /// 前端渲染数组 数组名 和数组值 英文名称 + /// + public string ChildDataEnLabel { get; set; } = string.Empty; + public string ChildDataValue { get; set; } diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index d5f83d4f4..4ed2f2334 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -760,7 +760,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common SelectList = selectList.Join(list, t => t.Id, u => u.DictionaryId, (t, u) => new { - t.Value, + Value = _userInfo.IsEn_Us ? t.Value : t.ValueCN, t.ValueCN, t.Description, t.ShowOrder, @@ -787,7 +787,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common //查询出字典的Value ValueCN Des 保存 var dicIdList = allList.Select(t => t.DictionaryId).ToList(); - var selectList = await _dbContext.Dictionary.Where(x => dicIdList.Contains(x.Id)).Select(t => new { t.Id, t.Value, t.ValueCN, t.Description, t.ShowOrder }).ToListAsync(); + var selectList = await _dbContext.Dictionary.Where(x => dicIdList.Contains(x.Id)).Select(t => new { t.Id, + + Value= _userInfo.IsEn_Us? t.Value: t.ValueCN, + t.ValueCN, t.Description, t.ShowOrder }).ToListAsync(); foreach (var list in allList.GroupBy(t => t.ParentCode)) @@ -825,7 +828,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common SelectList = selectList.Join(list, t => t.Id, u => u.DictionaryId, (t, u) => new { - t.Value, + Value = _userInfo.IsEn_Us ? t.Value : t.ValueCN, t.ValueCN, t.Description, t.ShowOrder,