From 5868f9bd0a9b7793cd114851ad9588bdc5b038f1 Mon Sep 17 00:00:00 2001 From: walon Date: Sat, 1 May 2021 15:04:36 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E3=80=90cf?= =?UTF-8?q?g=E3=80=91=E4=BF=AE=E5=A4=8D=20=E7=94=9F=E6=88=90Typescript?= =?UTF-8?q?=E8=AF=BB=E5=8F=96json=E6=A0=BC=E5=BC=8F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Job.Cfg/Source/Generate/TypeScriptJsonCodeRender.cs | 3 +-- .../TypeVisitors/TypescriptUnderingDeserializeVisitor.cs | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Luban.Job.Cfg/Source/Generate/TypeScriptJsonCodeRender.cs b/src/Luban.Job.Cfg/Source/Generate/TypeScriptJsonCodeRender.cs index 8e50379..85540b4 100644 --- a/src/Luban.Job.Cfg/Source/Generate/TypeScriptJsonCodeRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/TypeScriptJsonCodeRender.cs @@ -26,8 +26,7 @@ namespace {{x.namespace}} { export {{if x.is_abstract_type}} abstract {{end}} class {{name}} {{if parent_def_type}} extends {{x.parent}}{{end}} { {{~if x.is_abstract_type~}} static deserialize(_json_ : any) : {{name}} { - switch (_json_.__type__) - { + switch (_json_.__type__) { case null : return null; {{~ for child in x.hierarchy_not_abstract_children~}} case '{{child.name}}': return new {{child.full_name}}(_json_); diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/TypescriptUnderingDeserializeVisitor.cs b/src/Luban.Job.Cfg/Source/TypeVisitors/TypescriptUnderingDeserializeVisitor.cs index ac3688a..5b394e5 100644 --- a/src/Luban.Job.Cfg/Source/TypeVisitors/TypescriptUnderingDeserializeVisitor.cs +++ b/src/Luban.Job.Cfg/Source/TypeVisitors/TypescriptUnderingDeserializeVisitor.cs @@ -97,7 +97,7 @@ namespace Luban.Job.Cfg.TypeVisitors } else { - return $"{{ {fieldName} = []; for(var _ele of {jsonVarName}) {{ let _e :{type.ElementType.Apply(TypescriptDefineTypeName.Ins)};{type.ElementType.Apply(this, "_ele", "_e")} {fieldName}.push(_e);}}}}"; + return $"{{ {fieldName} = []; for(let _ele of {jsonVarName}) {{ let _e :{type.ElementType.Apply(TypescriptDefineTypeName.Ins)};{type.ElementType.Apply(this, "_ele", "_e")} {fieldName}.push(_e);}}}}"; } } @@ -109,7 +109,7 @@ namespace Luban.Job.Cfg.TypeVisitors } else { - return $"{{ {fieldName} = []; for(var _ele of {jsonVarName}) {{ let _e : {type.ElementType.Apply(TypescriptDefineTypeName.Ins)};{type.ElementType.Apply(this, "_ele", "_e")} {fieldName}.push(_e);}}}}"; + return $"{{ {fieldName} = []; for(let _ele of {jsonVarName}) {{ let _e : {type.ElementType.Apply(TypescriptDefineTypeName.Ins)};{type.ElementType.Apply(this, "_ele", "_e")} {fieldName}.push(_e);}}}}"; } }