fix issue#3345

src/action/generator.go

@@ -76,7 +76,14 @@ func Print(rows [][]string, format string, table string, colIsNumArr []bool, fie
 				col = stringUtils.AddPad(col, field)
 			}
 
-			lineForText = lineForText + col
+			if j > 0 && vari.Human {
+				lineForText = strings.TrimRight(lineForText, "\t")
+				col = strings.TrimLeft(col, "\t")
+
+				lineForText = lineForText + "\t" + col
+			} else {
+				lineForText = lineForText + col
+			}
 
 			row = append(row, col)
 			rowXml.Cols = append(rowXml.Cols, col)
@@ -106,7 +113,7 @@ func printTextHeader(fields []string) {
 	for idx, field := range fields {
 		headerLine += field
 		if idx < len(fields)-1 {
-			headerLine += vari.HeadSep
+			headerLine += "\t"
 		}
 	}
 

src/service/request.go

@@ -10,7 +10,7 @@ import (
 )
 
 func ParseRequestParams(req *http.Request) (defaultFile, yamlFile, fields string, count int,
-		human string, format, table string, decode bool, input, output string) {
+		format, table string, decode bool, input, output string) {
 	query := req.URL.Query()
 
 	defaultFile = GetRequestParams(query,"default", "d")
@@ -25,8 +25,6 @@ func ParseRequestParams(req *http.Request) (defaultFile, yamlFile, fields string
 	format = constant.FormatJson
 	table = ""
 
-	human = GetRequestParams(query,"human", "H")
-
 	if req.Method == http.MethodPost {
 		// save to files
 		req.ParseForm()

src/utils/vari/var.go

@@ -22,7 +22,7 @@ var (
 
 	Total int
 	WithHead bool
-	HeadSep string
+	Human bool
 	Trim bool
 	Recursive bool
 

src/zd.go

@@ -90,8 +90,8 @@ func main() {
 
 	flagSet.StringVar(&md5, "md5", "", "")
 
-	flagSet.StringVar(&vari.HeadSep, "H", "", "")
-	flagSet.StringVar(&vari.HeadSep, "human", "", "")
+	flagSet.BoolVar(&vari.Human, "H", false, "")
+	flagSet.BoolVar(&vari.Human, "human", false, "")
 
 	flagSet.BoolVar(&decode, "D", false, "")
 	flagSet.BoolVar(&decode, "decode", false, "")
@@ -183,7 +183,7 @@ func toGen() {
 	} else if vari.RunMode == constant.RunModeParse {
 		action.ParseSql(input, output)
 	} else if vari.RunMode == constant.RunModeGen {
-		if vari.HeadSep != "" {
+		if vari.Human {
 			vari.WithHead = true
 		}
 
@@ -230,7 +230,7 @@ func StartServer() {
 func DataHandler(writer http.ResponseWriter, req *http.Request) {
 	action.HttpWriter = writer
 
-	defaultFile, configFile, fields, count, vari.HeadSep,
+	defaultFile, configFile, fields, count,
 		format, table, decode, input, output = service.ParseRequestParams(req)
 
 	if decode {