diff --git a/demo/numb.yaml b/demo/numb.yaml index 2e786a3fc23d0d8c4c9776a95d4b8a12294abddb..de531eac0c9fe0722aaf1cd0397747a0ff334fc1 100644 --- a/demo/numb.yaml +++ b/demo/numb.yaml @@ -7,7 +7,7 @@ field: number prefix: "'" postfix: "'" loop: 2 -loopfix: "-" +loopfix: "." ranges: small: 1-9 medium: 11-99 diff --git a/src/action/generator.go b/src/action/generator.go index f50e8c23eaa4626352d1e28d14e4c21761037632..d673c5e2d65edac4c9ac5696b2ccd8cfdba151f2 100644 --- a/src/action/generator.go +++ b/src/action/generator.go @@ -18,14 +18,15 @@ import ( func Generate(deflt string, yml string, total int, fieldsToExportStr string, out string, format string, table string) { startTime := time.Now().Unix() - vari.InputDir = filepath.Dir(yml) + string(os.PathSeparator) - constant.Total = total if deflt != "" && yml == "" { yml = deflt deflt = "" } + vari.InputDir = filepath.Dir(yml) + string(os.PathSeparator) + constant.Total = total + fieldsToExport := strings.Split(fieldsToExportStr, ",") rows, colTypes := gen.GenerateForDefinition(deflt, yml, fieldsToExport, total) content := Print(rows, format, table, colTypes, fieldsToExport) diff --git a/src/gen/generator.go b/src/gen/generator.go index 49e0a77e82f4c9e87848ebc2dd5c71a074cd7286..9cf9134c863105efc8358afe5195d7a3cb21247e 100644 --- a/src/gen/generator.go +++ b/src/gen/generator.go @@ -183,7 +183,7 @@ func LoopSubFields(field *model.DefField, oldValues []string, total int) []strin count := 0 for { // 处理格式、前后缀、loop等 - str := GenerateFieldValWithFix(*field, fieldValue, &index, false) + str := GenerateFieldValWithFix(*field, fieldValue, &index, true) values = append(values, str) count++