change to add pad by width after replacing random placeholder

src/action/generator.go

@@ -12,6 +12,7 @@ import (
 	stringUtils "github.com/easysoft/zendata/src/utils/string"
 	"github.com/easysoft/zendata/src/utils/vari"
 	"github.com/fatih/color"
+	"github.com/mattn/go-runewidth"
 	"net/http"
 	"os"
 	"regexp"
@@ -70,6 +71,10 @@ func Print(rows [][]string, format string, table string, colIsNumArr []bool, fie
 
 		for j, col := range cols {
 			col = replacePlaceholder(col)
+			field := vari.TopFiledMap[fields[j]]
+			if field.Width > runewidth.StringWidth(col) {
+				col = stringUtils.AddPad(col, field)
+			}
 
 			lineForText = lineForText + col
 
@@ -194,8 +199,10 @@ func replacePlaceholder(col string) string {
 
 func getValForPlaceholder(placeholderStr string, count int) []string {
 	mp := vari.RandFieldNameToValuesMap[placeholderStr]
+
 	tp := mp["type"].(string)
 	repeatObj := mp["repeat"]
+
 	repeat := "1"
 	if repeatObj != nil {
 		repeat = repeatObj.(string)

src/gen/definition.go

@@ -77,6 +77,7 @@ func mergerDefine(defaultDef, configDef *model.DefData, fieldsToExport *[]string
 		CreatePathToFieldMap(&defaultDef.Fields[i], defaultFieldMap, nil)
 	}
 	for i, field := range configDef.Fields {
+		vari.TopFiledMap[field.Field] = field
 		if !isSetFieldsToExport {
 			_, exist := defaultFieldMap[field.Path]
 			if !exist {
@@ -106,6 +107,10 @@ func mergerDefine(defaultDef, configDef *model.DefData, fieldsToExport *[]string
 			defaultDef.Fields = append(defaultDef.Fields, *field)
 		}
 	}
+
+	for _, field := range defaultDef.Fields {
+		vari.TopFiledMap[field.Field] = field
+	}
 }
 
 func orderFields(defaultDef *model.DefData, fieldsToExport []string) {

src/gen/generator.go

@@ -10,7 +10,6 @@ import (
 	stringUtils "github.com/easysoft/zendata/src/utils/string"
 	"github.com/easysoft/zendata/src/utils/vari"
 	"github.com/fatih/color"
-	"github.com/mattn/go-runewidth"
 	"strconv"
 	"strings"
 )
@@ -232,10 +231,6 @@ func loopFieldValWithFix(field *model.DefField, fieldValue model.FieldWithValues
 		loopStr = prefix + loopStr + postfix
 	}
 
-	if field.Width > runewidth.StringWidth(loopStr) {
-		loopStr = stringUtils.AddPad(loopStr, *field)
-	}
-
 	return
 }
 

src/utils/vari/var.go

@@ -33,6 +33,7 @@ var (
 	Def = model.DefData{}
 	Res = map[string]map[string][]string{}
 	RandFieldNameToValuesMap = map[string]map[string]interface{}{}
+	TopFiledMap  = map[string]model.DefField{}
 
 	DefaultDir string
 	ConfigDir string