load range and instant resource

src/gen/excel.go

@@ -57,12 +57,12 @@ func GenerateFieldValuesFromExcel(field *model.DefField, fieldValue *model.Field
 			continue
 		}
 
-		fieldValue.Values["all"] = append(fieldValue.Values["all"], item)
+		fieldValue.Values = append(fieldValue.Values, item)
 		index = index + 1
 	}
 
 	if len(fieldValue.Values) == 0 {
-		fieldValue.Values["all"] = append(fieldValue.Values["all"], "N/A")
+		fieldValue.Values = append(fieldValue.Values, "N/A")
 	}
 }
 

src/gen/generator.go

@@ -132,7 +132,7 @@ func GenerateFieldVal(field model.DefField, fieldValue model.FieldValue, index *
 
 	// 叶节点
 	idx := *index % len(fieldValue.Values)
-	val := fieldValue.Values["all"][idx]
+	val := fieldValue.Values[idx]
 	str = GetFieldValStr(field, val)
 
 	return str
@@ -185,7 +185,7 @@ func LoopSubFields(field *model.DefField, oldValues []string, total int) []strin
 	fieldValue := model.FieldValue{}
 
 	for _, val := range oldValues {
-		fieldValue.Values["all"] = append(fieldValue.Values["all"], val)
+		fieldValue.Values = append(fieldValue.Values, val)
 	}
 
 	index := 0

src/gen/list.go

@@ -83,12 +83,12 @@ func GenerateFieldValuesFromList(field *model.DefField, fieldValue *model.FieldV
 			}
 		}
 
-		fieldValue.Values["all"] = append(fieldValue.Values["all"], items...)
+		fieldValue.Values = append(fieldValue.Values, items...)
 		index = index + len(items)
 	}
 
 	if len(fieldValue.Values) == 0 {
-		fieldValue.Values["all"] = append(fieldValue.Values["all"], "N/A")
+		fieldValue.Values = append(fieldValue.Values, "N/A")
 	}
 }
 

src/gen/text.go

@@ -31,7 +31,7 @@ func GenerateFieldValuesFromText(field *model.DefField, fieldValue *model.FieldV
 		if err != nil {
 			logUtils.Screen("fail to read " + relaPath + ", will return")
 
-			fieldValue.Values["all"] = append(fieldValue.Values["all"], "N/A")
+			fieldValue.Values = append(fieldValue.Values, "N/A")
 			return
 		} else {
 			logUtils.Screen("success to read " + relaPath)
@@ -65,11 +65,11 @@ func GenerateFieldValuesFromText(field *model.DefField, fieldValue *model.FieldV
 		if index >= constant.MaxNumb { break }
 		if strings.TrimSpace(item) == "" { continue }
 
-		fieldValue.Values["all"] = append(fieldValue.Values["all"], item)
+		fieldValue.Values = append(fieldValue.Values, item)
 		index = index + 1
 	}
 
 	if len(fieldValue.Values) == 0 {
-		fieldValue.Values["all"] = append(fieldValue.Values["all"], "N/A")
+		fieldValue.Values = append(fieldValue.Values, "N/A")
 	}
 }
\ No newline at end of file

src/model/definition.go

@@ -61,5 +61,5 @@ type FieldValue struct {
 	FieldBase
 	Field     string  `yaml:"field"`
 
-	Values   map[string][]interface{}
+	Values   []interface{}
 }
\ No newline at end of file