Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'd1108700e0ad43b6bfea3f9a79bbb14799a2d29c'

Browse Source
This commit is contained in:
SimpleJouer
2023-08-16 15:31:25 +08:00
parent b2e6f2bdf1 d1108700e0
commit 00b182ee7c
18 changed files with 73 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@@ -26,11 +26,11 @@ namespace ZR.CodeGenerator
/// <param name="dto"></param>
public static void Generate(GenerateDto dto)
{
var vuePath = AppSettings.GetConfig("gen:vuePath");
var genOptions = AppSettings.Get<Gen>("gen");
dto.VueParentPath = dto.VueVersion == 3 ? "ZRAdmin-vue" : "ZR.Vue";
if (!vuePath.IsEmpty())
if (!genOptions.VuePath.IsEmpty())
{
dto.VueParentPath = vuePath;
dto.VueParentPath = genOptions.VuePath;
}
dto.GenOptions = GenerateOption(dto.GenTable);
if (dto.GenTable.SubTable != null)
@@ -82,9 +82,12 @@ namespace ZR.CodeGenerator
}
GenerateVueJs(dto);
GenerateSql(dto);
GenerateAppVueViews(replaceDto, dto);
GenerateAppVueFormViews(replaceDto, dto);
GenerateAppJs(dto);
if (genOptions.ShowApp)
{
GenerateAppVueViews(replaceDto, dto);
GenerateAppVueFormViews(replaceDto, dto);
GenerateAppJs(dto);
}
dto.ReplaceDto = replaceDto;
}