mirror of
https://gitee.com/dotnetchina/OpenAuth.Net.git
synced 2025-09-20 18:47:55 +08:00
主从表以ParentId为准,而不是DetailTable
This commit is contained in:
@@ -118,21 +118,6 @@ namespace OpenAuth.App
|
|||||||
}
|
}
|
||||||
|
|
||||||
var obj = AddTableAndColumns(req.MapTo<BuilderTable>());
|
var obj = AddTableAndColumns(req.MapTo<BuilderTable>());
|
||||||
|
|
||||||
//创建子表
|
|
||||||
if (!string.IsNullOrEmpty(req.DetailTableName))
|
|
||||||
{
|
|
||||||
AddTableAndColumns(new BuilderTable
|
|
||||||
{
|
|
||||||
TableName = req.DetailTableName,
|
|
||||||
ParentTableId = obj.Id,
|
|
||||||
Namespace = "OpenAuth.Repository.Domain",
|
|
||||||
ModuleName = req.DetailTableName,
|
|
||||||
Folder = req.Folder,
|
|
||||||
TypeId = req.TypeId,
|
|
||||||
TypeName = req.TypeName
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
UnitWork.Save();
|
UnitWork.Save();
|
||||||
return obj.Id;
|
return obj.Id;
|
||||||
@@ -194,8 +179,6 @@ namespace OpenAuth.App
|
|||||||
{
|
{
|
||||||
TableName = obj.TableName,
|
TableName = obj.TableName,
|
||||||
Comment = obj.Comment,
|
Comment = obj.Comment,
|
||||||
DetailTableName = obj.DetailTableName,
|
|
||||||
DetailComment = obj.DetailComment,
|
|
||||||
ClassName = obj.ClassName,
|
ClassName = obj.ClassName,
|
||||||
Namespace = obj.Namespace,
|
Namespace = obj.Namespace,
|
||||||
ModuleCode = obj.ModuleCode,
|
ModuleCode = obj.ModuleCode,
|
||||||
@@ -206,10 +189,10 @@ namespace OpenAuth.App
|
|||||||
TypeName = obj.TypeName,
|
TypeName = obj.TypeName,
|
||||||
IsDynamicHeader = obj.IsDynamicHeader,
|
IsDynamicHeader = obj.IsDynamicHeader,
|
||||||
ForeignKey = obj.ForeignKey,
|
ForeignKey = obj.ForeignKey,
|
||||||
|
ParentTableId = obj.ParentTableId,
|
||||||
UpdateTime = DateTime.Now,
|
UpdateTime = DateTime.Now,
|
||||||
UpdateUserId = user.Id,
|
UpdateUserId = user.Id,
|
||||||
UpdateUserName = user.Name
|
UpdateUserName = user.Name
|
||||||
//todo:补充或调整自己需要的字段
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -642,7 +625,8 @@ namespace OpenAuth.App
|
|||||||
|
|
||||||
if (!string.IsNullOrEmpty(sysTableInfo.ParentTableId))
|
if (!string.IsNullOrEmpty(sysTableInfo.ParentTableId))
|
||||||
{
|
{
|
||||||
throw new Exception("子表不能直接生成vue,请使用该表对应的父表生成vue或删除该表的父表");
|
return;
|
||||||
|
// throw new Exception("子表不能直接生成vue,请使用该表对应的父表生成vue或删除该表的父表");
|
||||||
}
|
}
|
||||||
|
|
||||||
var tableColumns = _builderTableColumnApp.Find(req.Id);
|
var tableColumns = _builderTableColumnApp.Find(req.Id);
|
||||||
|
@@ -34,14 +34,12 @@ namespace OpenAuth.App.Request
|
|||||||
/// 表描述、中文名称
|
/// 表描述、中文名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Comment { get; set; }
|
public string Comment { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 子表英文全称
|
/// 父表ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string DetailTableName { get; set; }
|
public string ParentTableId { get; set; }
|
||||||
/// <summary>
|
|
||||||
/// 子表描述、中文名称
|
|
||||||
/// </summary>
|
|
||||||
public string DetailComment { get; set; }
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 实体类名称
|
/// 实体类名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
Reference in New Issue
Block a user