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

Merge branch 'net5.0'

Browse Source
This commit is contained in:
不做码农
2022-05-09 12:28:54 +08:00
parent 6313e802e2 647e725ff9
commit 7e9f9301ff
32 changed files with 854 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@@ -513,7 +513,7 @@ namespace ZR.CodeGenerator
/// <param name="replaceDto"></param>
private static void InitJntTemplate(GenerateDto dto, ReplaceDto replaceDto)
{
Engine.Current.Clean();
//Engine.Current.Clean();
dto.GenTable.Columns = dto.GenTable.Columns.OrderBy(x => x.Sort).ToList();
bool showCustomInput = dto.GenTable.Columns.Any(f => f.HtmlType.Equals(GenConstants.HTML_CUSTOM_INPUT, StringComparison.OrdinalIgnoreCase));
//jnt模板引擎全局变量
@@ -525,6 +525,7 @@ namespace ZR.CodeGenerator
options.OutMode = OutMode.Auto;
//options.DisableeLogogram = true;//禁用简写
options.Data.Set("refs", "$");//特殊标签替换
options.Data.Set("t", "$");//特殊标签替换
options.Data.Set("modal", "$");//特殊标签替换
options.Data.Set("index", "$");//特殊标签替换
options.Data.Set("confirm", "$");//特殊标签替换

2
ZR.CodeGenerator/ZR.CodeGenerator.csproj
View File

@@ -12,6 +12,6 @@
<ItemGroup>
<PackageReference Include="JinianNet.JNTemplate" Version="2.2.5" />
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.7.6" />
<PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.7.8" />
</ItemGroup>
</Project>