xiang.li
/
luban
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

【调整】proto的gen_types ts改为 typescript，与db和cfg统一 

【调整】删除 cfg的gen_types data_erlang，不再支持erlang导出数据类型，但仍然提供对 erlang data template相关的支持
main
walon 2021-09-23 14:59:47 +08:00
parent e75289d82f
commit c72bf53579
8 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Luban.Client/Luban.Client.csproj
View File

@ -5,6 +5,12 @@
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Scripts\**" />
<EmbeddedResource Remove="Scripts\**" />
<None Remove="Scripts\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
</ItemGroup>

2
src/Luban.Client/Source/Utils/FileCleaner.cs
View File

@ -78,7 +78,7 @@ namespace Luban.Client.Common.Utils
// 清除空目录
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)
{
string fullSubDirPath = Path.GetFullPath(subDir);

1
src/Luban.Job.Cfg/Source/Cache/FileRecordCacheManager.cs
View File

@ -41,7 +41,6 @@ namespace Luban.Job.Cfg.Cache
public bool TryGetCacheLoadedRecords(DefTable table, string md5, string originFile, string sheetName, out List<Record> cacheRecords)
{
// TODO text localization check
cacheRecords = null;
if (!_caches.TryGetValue((table.FullName, md5, sheetName), out var r))
{

1
src/Luban.Job.Cfg/Source/GenArgs.cs
View File

@ -5,7 +5,6 @@ namespace Luban.Job.Cfg
{
public class GenArgs : GenArgsBase
{
[Option("input_data_dir", Required = true, HelpText = "input data dir")]
public string InputDataDir { get; set; }

1
src/Luban.Job.Cfg/Source/Generate/DataScatterRender.cs
View File

@ -12,7 +12,6 @@ namespace Luban.Job.Cfg.Generate
[Render("data_lua")]
[Render("data_xml")]
[Render("data_yaml")]
[Render("data_erlang")]
class DataScatterRender : DataRenderBase
{
public override void Render(GenContext ctx)

44
src/Luban.Job.Cfg/Source/Utils/DataExporterUtil.cs
View File

@ -84,28 +84,28 @@ namespace Luban.Job.Cfg.Utils
}
return string.Join('\n', content);
}
case "data_erlang":
{
var content = new StringBuilder();
switch (table.Mode)
{
case ETableMode.ONE:
{
ErlangExport.Ins.ExportTableSingleton(table, records[0], content);
break;
}
case ETableMode.MAP:
{
ErlangExport.Ins.ExportTableMap(table, records, content);
break;
}
default:
{
throw new NotSupportedException();
}
}
return content.ToString();
}
//case "data_erlang":
//{
// var content = new StringBuilder();
// switch (table.Mode)
// {
// case ETableMode.ONE:
// {
// ErlangExport.Ins.ExportTableSingleton(table, records[0], content);
// break;
// }
// case ETableMode.MAP:
// {
// ErlangExport.Ins.ExportTableMap(table, records, content);
// break;
// }
// default:
// {
// throw new NotSupportedException();
// }
// }
// return content.ToString();
//}
default:
{
throw new ArgumentException($"not support datatype:{dataType}");

1
src/Luban.Job.Common/Source/Defs/DefConst.cs
View File

@ -36,7 +36,6 @@ namespace Luban.Job.Common.Defs
public override void Compile()
{
var FullName = this.FullName;
HashSet<string> names = new HashSet<string>();
foreach (var item in Items)

4
src/Luban.Job.Proto/Source/JobController.cs
View File

@ -24,7 +24,7 @@ namespace Luban.Job.Proto
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; }
[Option('s', "service", Required = true, HelpText = "service")]
@ -150,7 +150,7 @@ namespace Luban.Job.Proto
}));
break;
}
case "ts":
case "typescript":
{
var render = new TypescriptRender();
var brightRequirePath = args.TypescriptBrightRequirePath;