【调整】proto的gen_types ts改为 typescript,与db和cfg统一
【调整】删除 cfg的gen_types data_erlang,不再支持erlang导出数据类型,但仍然提供对 erlang data template相关的支持main
parent
e75289d82f
commit
c72bf53579
|
|
@ -5,6 +5,12 @@
|
||||||
<TargetFramework>net5.0</TargetFramework>
|
<TargetFramework>net5.0</TargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Remove="Scripts\**" />
|
||||||
|
<EmbeddedResource Remove="Scripts\**" />
|
||||||
|
<None Remove="Scripts\**" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="CommandLineParser" Version="2.8.0" />
|
<PackageReference Include="CommandLineParser" Version="2.8.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ namespace Luban.Client.Common.Utils
|
||||||
|
|
||||||
// 清除空目录
|
// 清除空目录
|
||||||
var subDirs = new List<string>(Directory.GetDirectories(dir, "*", SearchOption.AllDirectories));
|
var subDirs = new List<string>(Directory.GetDirectories(dir, "*", SearchOption.AllDirectories));
|
||||||
subDirs.Sort((a, b) => -String.Compare(a, b, StringComparison.Ordinal));
|
subDirs.Sort((a, b) => -string.Compare(a, b, StringComparison.Ordinal));
|
||||||
foreach (var subDir in subDirs)
|
foreach (var subDir in subDirs)
|
||||||
{
|
{
|
||||||
string fullSubDirPath = Path.GetFullPath(subDir);
|
string fullSubDirPath = Path.GetFullPath(subDir);
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,6 @@ namespace Luban.Job.Cfg.Cache
|
||||||
|
|
||||||
public bool TryGetCacheLoadedRecords(DefTable table, string md5, string originFile, string sheetName, out List<Record> cacheRecords)
|
public bool TryGetCacheLoadedRecords(DefTable table, string md5, string originFile, string sheetName, out List<Record> cacheRecords)
|
||||||
{
|
{
|
||||||
// TODO text localization check
|
|
||||||
cacheRecords = null;
|
cacheRecords = null;
|
||||||
if (!_caches.TryGetValue((table.FullName, md5, sheetName), out var r))
|
if (!_caches.TryGetValue((table.FullName, md5, sheetName), out var r))
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ namespace Luban.Job.Cfg
|
||||||
{
|
{
|
||||||
public class GenArgs : GenArgsBase
|
public class GenArgs : GenArgsBase
|
||||||
{
|
{
|
||||||
|
|
||||||
[Option("input_data_dir", Required = true, HelpText = "input data dir")]
|
[Option("input_data_dir", Required = true, HelpText = "input data dir")]
|
||||||
public string InputDataDir { get; set; }
|
public string InputDataDir { get; set; }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,6 @@ namespace Luban.Job.Cfg.Generate
|
||||||
[Render("data_lua")]
|
[Render("data_lua")]
|
||||||
[Render("data_xml")]
|
[Render("data_xml")]
|
||||||
[Render("data_yaml")]
|
[Render("data_yaml")]
|
||||||
[Render("data_erlang")]
|
|
||||||
class DataScatterRender : DataRenderBase
|
class DataScatterRender : DataRenderBase
|
||||||
{
|
{
|
||||||
public override void Render(GenContext ctx)
|
public override void Render(GenContext ctx)
|
||||||
|
|
|
||||||
|
|
@ -84,28 +84,28 @@ namespace Luban.Job.Cfg.Utils
|
||||||
}
|
}
|
||||||
return string.Join('\n', content);
|
return string.Join('\n', content);
|
||||||
}
|
}
|
||||||
case "data_erlang":
|
//case "data_erlang":
|
||||||
{
|
//{
|
||||||
var content = new StringBuilder();
|
// var content = new StringBuilder();
|
||||||
switch (table.Mode)
|
// switch (table.Mode)
|
||||||
{
|
// {
|
||||||
case ETableMode.ONE:
|
// case ETableMode.ONE:
|
||||||
{
|
// {
|
||||||
ErlangExport.Ins.ExportTableSingleton(table, records[0], content);
|
// ErlangExport.Ins.ExportTableSingleton(table, records[0], content);
|
||||||
break;
|
// break;
|
||||||
}
|
// }
|
||||||
case ETableMode.MAP:
|
// case ETableMode.MAP:
|
||||||
{
|
// {
|
||||||
ErlangExport.Ins.ExportTableMap(table, records, content);
|
// ErlangExport.Ins.ExportTableMap(table, records, content);
|
||||||
break;
|
// break;
|
||||||
}
|
// }
|
||||||
default:
|
// default:
|
||||||
{
|
// {
|
||||||
throw new NotSupportedException();
|
// throw new NotSupportedException();
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
return content.ToString();
|
// return content.ToString();
|
||||||
}
|
//}
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
throw new ArgumentException($"not support datatype:{dataType}");
|
throw new ArgumentException($"not support datatype:{dataType}");
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,6 @@ namespace Luban.Job.Common.Defs
|
||||||
|
|
||||||
public override void Compile()
|
public override void Compile()
|
||||||
{
|
{
|
||||||
var FullName = this.FullName;
|
|
||||||
HashSet<string> names = new HashSet<string>();
|
HashSet<string> names = new HashSet<string>();
|
||||||
|
|
||||||
foreach (var item in Items)
|
foreach (var item in Items)
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ namespace Luban.Job.Proto
|
||||||
|
|
||||||
class GenArgs : GenArgsBase
|
class GenArgs : GenArgsBase
|
||||||
{
|
{
|
||||||
[Option('g', "gen_type", Required = true, HelpText = "cs,lua,java,cpp,ts")]
|
[Option('g', "gen_type", Required = true, HelpText = "cs,lua,java,cpp,typescript")]
|
||||||
public string GenType { get; set; }
|
public string GenType { get; set; }
|
||||||
|
|
||||||
[Option('s', "service", Required = true, HelpText = "service")]
|
[Option('s', "service", Required = true, HelpText = "service")]
|
||||||
|
|
@ -150,7 +150,7 @@ namespace Luban.Job.Proto
|
||||||
}));
|
}));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case "ts":
|
case "typescript":
|
||||||
{
|
{
|
||||||
var render = new TypescriptRender();
|
var render = new TypescriptRender();
|
||||||
var brightRequirePath = args.TypescriptBrightRequirePath;
|
var brightRequirePath = args.TypescriptBrightRequirePath;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue