修复清理vengine

This commit is contained in:
2023-09-19 10:55:14 +08:00
parent b9e9636d72
commit 0bf34fa215
31 changed files with 289 additions and 252 deletions

View File

@@ -10,15 +10,15 @@ namespace Tnb.Vengine;
public class TypeAdapter
{
public static TypeAdapterConfig IgnoreNull { get; }
static TypeAdapter()
{
TypeAdapterConfig.GlobalSettings.Default.PreserveReference(true);
TypeAdapterConfig.GlobalSettings.NewConfig<JToken, JToken>().MapWith(json => json);
TypeAdapterConfig.GlobalSettings.NewConfig<JObject, JObject>().MapWith(json => json);
TypeAdapterConfig.GlobalSettings.NewConfig<JArray, JArray>().MapWith(json => json);
IgnoreNull = TypeAdapterConfig.GlobalSettings.Clone();
IgnoreNull.Default.IgnoreNullValues(true);
}
public static TypeAdapterConfig IgnoreNull { get; }
}
static TypeAdapter()
{
TypeAdapterConfig.GlobalSettings.Default.PreserveReference(true);
TypeAdapterConfig.GlobalSettings.NewConfig<JToken, JToken>().MapWith(json => json);
TypeAdapterConfig.GlobalSettings.NewConfig<JObject, JObject>().MapWith(json => json);
TypeAdapterConfig.GlobalSettings.NewConfig<JArray, JArray>().MapWith(json => json);
IgnoreNull = TypeAdapterConfig.GlobalSettings.Clone();
IgnoreNull.Default.IgnoreNullValues(true);
}
}

View File

@@ -13,41 +13,41 @@ namespace Tnb.Vengine;
public class VmodelMapper : IRegister
{
public void Register(TypeAdapterConfig config)
{
config.ForType<VmGetInput, VmQueryInput>()
.Map(dest => dest.psize, src => 1)
.Map(dest => dest.pnum, src => 0)
.Map(dest => dest.q, src => string.IsNullOrEmpty(src.q) ? null : src.q.ToObject<DObject>());
config.ForType<VmGetListInput, VmQueryInput>()
.Map(dest => dest.q, src => string.IsNullOrEmpty(src.q) ? null : src.q.ToObject<DObject>());
config.ForType<DbColumnInfo, VmDbProp>()
.Map(dest => dest.code, src => src.DbColumnName.ToCamel())
.Map(dest => dest.name, src => src.ColumnDescription)
.Map(dest => dest.field, src => src.DbColumnName)
.Map(dest => dest.dataType, src => src.DataType)
//.Map(dest => dest.csType, src => src.DbColumnName)
//.Map(dest => dest.propType, src => ePropType.DbTable)
.Map(dest => dest.length, src => src.Length)
.Map(dest => dest.digit, src => src.DecimalDigits)
//.Map(dest => dest.ordinal, src => src.i)
.Map(dest => dest.required, src => !src.IsNullable)
.Map(dest => dest.pkey, src => src.IsPrimarykey)
public void Register(TypeAdapterConfig config)
{
config.ForType<VmGetInput, VmQueryInput>()
.Map(dest => dest.psize, src => 1)
.Map(dest => dest.pnum, src => 0)
.Map(dest => dest.q, src => string.IsNullOrEmpty(src.q) ? null : src.q.ToObject<DObject>());
config.ForType<VmGetListInput, VmQueryInput>()
.Map(dest => dest.q, src => string.IsNullOrEmpty(src.q) ? null : src.q.ToObject<DObject>());
config.ForType<DbColumnInfo, VmDbProp>()
.Map(dest => dest.code, src => src.DbColumnName.ToCamel())
.Map(dest => dest.name, src => src.ColumnDescription)
.Map(dest => dest.field, src => src.DbColumnName)
.Map(dest => dest.dataType, src => src.DataType)
//.Map(dest => dest.csType, src => src.DbColumnName)
//.Map(dest => dest.propType, src => ePropType.DbTable)
.Map(dest => dest.length, src => src.Length)
.Map(dest => dest.digit, src => src.DecimalDigits)
//.Map(dest => dest.ordinal, src => src.i)
.Map(dest => dest.required, src => !src.IsNullable)
.Map(dest => dest.pkey, src => src.IsPrimarykey)
//.Map(dest => dest.descrip, src => src.DbColumnName)
.Map(dest => dest.defValue, src => src.DefaultValue);
config.ForType<SugarColumn, VmDbProp>()
//.Map(dest => dest.code, src => src.DbColumnName.SnakeToCamelCase(false))
.Map(dest => dest.name, src => src.ColumnDescription)
.Map(dest => dest.field, src => src.ColumnName)
.Map(dest => dest.dataType, src => src.ColumnDataType)
//.Map(dest => dest.csType, src => src.DbColumnName)
//.Map(dest => dest.propType, src => ePropType.DbTable)
.Map(dest => dest.length, src => src.Length)
.Map(dest => dest.digit, src => src.DecimalDigits)
//.Map(dest => dest.ordinal, src => src.i)
.Map(dest => dest.required, src => !src.IsNullable)
.Map(dest => dest.pkey, src => src.IsPrimaryKey);
//.Map(dest => dest.descrip, src => src.DbColumnName)
.Map(dest => dest.defValue, src => src.DefaultValue);
config.ForType<SugarColumn, VmDbProp>()
//.Map(dest => dest.code, src => src.DbColumnName.SnakeToCamelCase(false))
.Map(dest => dest.name, src => src.ColumnDescription)
.Map(dest => dest.field, src => src.ColumnName)
.Map(dest => dest.dataType, src => src.ColumnDataType)
//.Map(dest => dest.csType, src => src.DbColumnName)
//.Map(dest => dest.propType, src => ePropType.DbTable)
.Map(dest => dest.length, src => src.Length)
.Map(dest => dest.digit, src => src.DecimalDigits)
//.Map(dest => dest.ordinal, src => src.i)
.Map(dest => dest.required, src => !src.IsNullable)
.Map(dest => dest.pkey, src => src.IsPrimaryKey);
//.Map(dest => dest.descrip, src => src.DbColumnName)
//.Map(dest => dest.defValue, src => src.DefaultValue);
}
}
//.Map(dest => dest.defValue, src => src.DefaultValue);
}
}