diff --git a/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs b/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs index 2ecf9373..01523379 100644 --- a/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs +++ b/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs @@ -83,7 +83,7 @@ public class VmodelAppService : VengineAppService, IVmodelAppService { ThrowIf.IsNull(input.data); //ArgumentNullException.ThrowIfNull(input.data); - Vmodel vm = input.data.Adapt(); + Vmodel vm = input.data.ToObject(); vm.areaCode = vm.areaCode.ToKebab(); vm.vmCode = vm.vmCode.ToKebab(); await _db.Insertable(vm).ExecuteCommandAsync(); @@ -97,7 +97,7 @@ public class VmodelAppService : VengineAppService, IVmodelAppService { ThrowIf.IsNull(input.data); //ArgumentNullException.ThrowIfNull(input.data); - Vmodel vm = input.data.Adapt(); + Vmodel vm = input.data.ToObject(); vm.areaCode = vm.areaCode.ToKebab(); vm.vmCode = vm.vmCode.ToKebab(); vm.navProps.ForEach(a => a.naviModel = null); diff --git a/visualdev/Tnb.Vengine/Domain/VmNavProp.cs b/visualdev/Tnb.Vengine/Domain/VmNavProp.cs index ae6d0957..fd523b2f 100644 --- a/visualdev/Tnb.Vengine/Domain/VmNavProp.cs +++ b/visualdev/Tnb.Vengine/Domain/VmNavProp.cs @@ -20,37 +20,28 @@ public class VmNavProp : VmBaseProp public string vmid { get; set; } = string.Empty; /// - /// 导航关联类型 + /// 导航关联类型, 1:一对一,2:一对多 /// public eNavigateType navType { get; set; } /// - /// 源表字段 + /// 源表代码,默认为m,表示与主表关联,可设置为中间表导航属性code,用来表示多对多 /// public string refCode { get; set; } = VmSelectProp.MAIN_ALIES; /// - /// 被引用字段 + /// 源表字段, 源表的外键字段 /// public string refField { get; set; } = string.Empty; /// - /// 源表字段 + /// 导航表字段 /// public string fkField { get; set; } = string.Empty; - ///// - ///// 关联表表名 - ///// - //[JsonIgnore] - //public string refTable { get; set; } = string.Empty; - - ///// - ///// 被引用表(中间表) - ///// - //[JsonIgnore] - //public string? midTable { get; set; } - + /// + /// 关联模型 + /// [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public Vmodel? naviModel { get; set; }