From cbd8001b6674dd8ece367b9a9495949b9ba1039b Mon Sep 17 00:00:00 2001 From: aaron <462826@qq.com> Date: Mon, 18 Oct 2021 14:25:49 +0800 Subject: [PATCH] fix issue --- demo/t.yaml | 10 ++-------- src/gen/definition.go | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/demo/t.yaml b/demo/t.yaml index a07e49f6..8dc79e80 100644 --- a/demo/t.yaml +++ b/demo/t.yaml @@ -5,11 +5,5 @@ author: zentao version: 1.0 fields: - - field: field2 - fields: - - field: field2.1 - range: 1-9:R - divider: ',' - - field: field2.2 - range: a-z - postfix: ',' + - field: field2.1 + range: "【】`<.>WWW" diff --git a/src/gen/definition.go b/src/gen/definition.go index 36162368..4b6b79ce 100644 --- a/src/gen/definition.go +++ b/src/gen/definition.go @@ -23,7 +23,7 @@ func LoadDataDef(files []string, fieldsToExport *[]string) (ret model.DefData) { newFiles = append(newFiles, f) } - ret = LoadDef(newFiles[0]) + ret = model.DefData{} for _, f := range newFiles { right := LoadDef(f) @@ -48,7 +48,7 @@ func LoadDef(file string) (ret model.DefData) { } err = yaml.Unmarshal(defaultContent, &ret) if err != nil { - logUtils.PrintToWithColor(i118Utils.I118Prt.Sprintf("fail_to_read_file", pathDefaultFile), color.FgCyan) + logUtils.PrintToWithColor(i118Utils.I118Prt.Sprintf("fail_to_parse_file", pathDefaultFile), color.FgCyan) return } -- GitLab