parent、child fields

demo/default.yaml

@@ -8,12 +8,12 @@ fields:
     note: 测试自定义字段
     from: numb.yaml
     use: small,large
-    loop: 2
 
   - field: field2
-    note: 测试系统字段
+    note: 测试系统字段 in default
     from: system.ip.v1.yaml
     use: privateC,privateB
+    loop: 2
 
   - field: field3
     note: 测试Excel数据

demo/output.txt

-192.168.0.1
-192.168.1.2
-192.168.2.3
-192.168.3.4
+192.168.0.1192.168.1.2
+192.168.2.3192.168.3.4
+192.168.4.5172.16.0.0	
+172.17.1.1	172.18.2.2	

demo/test.yaml

@@ -16,7 +16,7 @@ fields:
     loop: 3
 
   - field: field2
-    note: 测试系统字段
+    note: 测试系统字段 in yaml
     from: system.ip.v1.yaml
     use: privateC,privateB
     loop: 3

src/gen/definition.go

@@ -53,12 +53,12 @@ func MergerDefine(defaultDef, ymlDef *model.DefData) {
 	defaultFieldMap := map[string]*model.DefField{}
 	ymlFieldMap := map[string]*model.DefField{}
 
-	for _, field := range defaultDef.Fields {
-		CreatePathToFieldMap(&field, defaultFieldMap)
+	for _, field1 := range defaultDef.Fields {
+		CreatePathToFieldMap(field1, defaultFieldMap)
 	}
 
-	for _, field := range ymlDef.Fields {
-		CreatePathToFieldMap(&field, ymlFieldMap)
+	for _, field2 := range ymlDef.Fields {
+		CreatePathToFieldMap(field2, ymlFieldMap)
 	}
 
 	for path, field := range ymlFieldMap {
@@ -78,7 +78,7 @@ func MergerDefine(defaultDef, ymlDef *model.DefData) {
 	}
 }
 
-func CreatePathToFieldMap(field *model.DefField, mp map[string]*model.DefField) {
+func CreatePathToFieldMap(field model.DefField, mp map[string]*model.DefField) {
 	if field.Path == "" { // root
 		field.Path = field.Field
 	}
@@ -87,11 +87,16 @@ func CreatePathToFieldMap(field *model.DefField, mp map[string]*model.DefField)
 		for _, child := range field.Fields {
 			child.Path = field.Path + "~~" + child.Field
 
-			CreatePathToFieldMap(&child, mp)
+			CreatePathToFieldMap(child, mp)
 		}
 	} else {
-		mp[field.Path] = field
+		path := field.Path
+		logUtils.Screen(path + " -> " + field.Field)
+		mp[path] = &field
 	}
+
+	a := 1
+	a = a + 1
 }
 
 func CopyField(child model.DefField, parent *model.DefField) {

src/gen/generator.go

@@ -77,12 +77,13 @@ func GenerateForField(field *model.DefField,  total int) []string {
 			for _, group := range groups {
 				values = append(values, groupValues[group]...)
 			}
-
 		} else { // refer to excel
 			slct := field.Select
 			values = append(values, groupValues[slct]...)
 		}
 
+		values = LoopSubFields(field, values, total)
+
 	} else { // basic field
 		values = GenerateFieldItemsFromDefinition(field)
 	}