generate output

project1/test.yaml

@@ -12,10 +12,14 @@ fields:
   - field: field2
     note: 测试系统字段
     from: system.ip.yaml
-    use: privatec,privateb
+    use: privateC,privateB
 
   - field: field3
     note: 测试Excel数据
     from: system.address.city
     select: name
-    where: state like '%山东%'
+    where: state like '%山东%'
\ No newline at end of file
+
+  - field: field4
+    note: 测试Excel数据
+    range: a-z,0-9
\ No newline at end of file

src/action/generator.go

@@ -23,11 +23,7 @@ func Generate(defFile string, total int, fieldsToExportStr string, out string, f
 	constant.Total = total
 
 	fieldsToExport := strings.Split(fieldsToExportStr, ",")
-
-	referFieldValueMap := gen.LoadClsDef(defFile, fieldsToExport)
-	referFieldValueMap = referFieldValueMap
-
-	rows, colTypes := gen.GenerateForDefinition(total, fieldsToExport)
+	rows, colTypes := gen.GenerateForDefinition(defFile, fieldsToExport, total)
 	content := Print(rows, format, table, colTypes, fieldsToExport)
 
 	WriteToFile(out, content)

src/gen/cls.go

@@ -17,20 +17,7 @@ import (
 func LoadClsDef(file string, fieldsToExport []string) map[string]map[string][]string {
 	referFieldValueMap := map[string]map[string][]string{}
 
-	yamlContent, err := ioutil.ReadFile(file)
-	if err != nil {
-		logUtils.Screen("fail to read " + file)
-		return referFieldValueMap
-	}
-
-	def := model.DefData{}
-	err = yaml.Unmarshal(yamlContent, &def)
-	if err != nil {
-		logUtils.Screen("fail to parse " + file)
-		return referFieldValueMap
-	}
-
-	for _, field := range def.Fields {
+	for _, field := range constant.RootDef.Fields {
 		if !stringUtils.FindInArr(field.Field, fieldsToExport) { continue }
 
 		loadClsField(&field, &referFieldValueMap)

src/gen/definition.go

@@ -2,48 +2,25 @@ package gen
 
 import (
 	"github.com/easysoft/zendata/src/model"
-	constant "github.com/easysoft/zendata/src/utils/const"
 	logUtils "github.com/easysoft/zendata/src/utils/log"
-	stringUtils "github.com/easysoft/zendata/src/utils/string"
 	"gopkg.in/yaml.v2"
 	"io/ioutil"
 )
 
-func LoadRootDef(file string, fieldsToExport []string) ([]model.ClsRanges, []model.ClsInst) {
-	referRangeFields := make([]model.ClsRanges, 0)
-	referInstFields := make([]model.ClsInst, 0)
+func LoadRootDef(file string) model.DefData {
+	def := model.DefData{}
 
 	yamlContent, err := ioutil.ReadFile(file)
 	if err != nil {
 		logUtils.Screen("fail to read " + file)
-		return referRangeFields, referInstFields
+		return def
 	}
 
-	def := model.DefData{}
 	err = yaml.Unmarshal(yamlContent, &def)
 	if err != nil {
 		logUtils.Screen("fail to parse " + file)
-		return referRangeFields, referInstFields
-	}
-
-	constant.RootDef = def
-	//constant.ResMap =
-
-	for _, field := range def.Fields {
-		if !stringUtils.FindInArr(field.Field, fieldsToExport) { continue }
-
-		if field.From != "" {
-			if field.Select != "" { // excel
-
-			} else if field.Use != "" { // range or instance format
-				//referFile, referType := getReferProp(field.From)
-
-				// init const.ResMap
-			}
-		}
-
-		// TODO:
+		return def
 	}
 
-	return referRangeFields, referInstFields
+	return def
 }

src/gen/generator.go

@@ -9,21 +9,22 @@ import (
 	"strings"
 )
 
-func GenerateForDefinition(total int, fieldsToExport []string) ([][]string, []bool) {
-	def := constant.RootDef
+func GenerateForDefinition(defFile string, fieldsToExport []string, total int) ([][]string, []bool) {
+	constant.RootDef = LoadRootDef(defFile)
+	constant.ReferedValues = LoadClsDef(defFile, fieldsToExport)
 
 	fieldNameToValues := map[string][]string{}
 
 	colTypes := make([]bool, 0)
 
 	// 为每个field生成值列表
-	for index, field := range def.Fields {
+	for index, field := range constant.RootDef.Fields {
 		if !stringUtils.FindInArr(field.Field, fieldsToExport) {
 			continue
 		}
 
 		values := GenerateForField(&field, total)
-		def.Fields[index].Precision = field.Precision
+		constant.RootDef.Fields[index].Precision = field.Precision
 
 		fieldNameToValues[field.Field] = values
 		colTypes = append(colTypes, field.IsNumb)
@@ -32,7 +33,7 @@ func GenerateForDefinition(total int, fieldsToExport []string) ([][]string, []bo
 	// 生成指定数量行的数据
 	rows := make([][]string, 0)
 	for i := 0; i < total; i++ {
-		for _, field := range def.Fields {
+		for _, field := range constant.RootDef.Fields {
 			if !stringUtils.FindInArr(field.Field, fieldsToExport) {
 				continue
 			}
@@ -60,7 +61,7 @@ func GenerateForField(field *model.DefField,  total int) []string {
 		for i := 0; i < total; i++ {
 			concat := ""
 			for _, row := range arr {
-				concat = concat + row[i] // a1 or b2
+				concat = concat + row[i] // get one item from each child, grouped as a1 or b2
 			}
 
 			concat = field.Prefix + concat + field.Postfix
@@ -68,32 +69,21 @@ func GenerateForField(field *model.DefField,  total int) []string {
 		}
 		values = LoopSubFields(field, values, total)
 
-	} else if field.From != "" && field.Select != "" { // refer to excel
-		arr := strings.Split(field.From, ".")
-		referField := constant.ResMap[arr[0]]
+	} else if field.From != "" { // refer field
+		groupValues := constant.ReferedValues[field.From]
 
-		referField.From = field.From
-		referField.Select = field.Select
-		referField.Where = field.Where
-
-		referField.Format = field.Format
-		referField.Prefix = field.Prefix
-		referField.Postfix = field.Postfix
-		referField.Loop = field.Loop
-		referField.Loopfix = field.Loopfix
-
-		//values = GenerateFieldItemsFromDefinition(&referField, total)
+		if field.Use != "" { // refer to cls
+			groups := strings.Split(field.Use, ",")
+			for _, group := range groups {
+				values = append(values, groupValues[group]...)
+			}
 
-	} else if field.From != "" && field.Range != "" { // refer to yaml file
-		if field.Range != "" { // specific custom file
-			//LoadRootDef(constant.InputDir + field.Range)
+		} else { // refer to excel
+			slct := field.Select
+			values = append(values, groupValues[slct]...)
 		}
 
-		//referField := constant.ResMap[field.Field]
-		//values = GenerateForField(&referField, total)
-		// TODO: 需要处理range: small,large等逻辑
-
-	} else {
+	} else { // basic field
 		values = GenerateFieldItemsFromDefinition(field)
 	}
 

src/utils/const/const.go

@@ -28,17 +28,17 @@ var (
 	Total = 10
 	MaxNumb = 100000 // max number in array
 
-	RootDef model.DefData               = model.DefData{}
-	ResMap  map[string]model.FieldValue = map[string]model.FieldValue{}
+	RootDef       = model.DefData{}
+	ReferedValues = map[string]map[string][]string{}
 
-	ResDir     string = "data/"
-	ResBuildIn string = ResDir + "system/buildin.yaml"
+	ResDir      = "data/"
+	ResBuildIn  = ResDir + "system/buildin.yaml"
 
-	SqliteDriver string = "sqlite3"
-	SqliteSource string = "file:" + ResDir + ".cache/.data.db"
-	SqliteTrackTable string = "excel_update"
+	SqliteDriver  = "sqlite3"
+	SqliteSource  = "file:" + ResDir + ".cache/.data.db"
+	SqliteTrackTable  = "excel_update"
 
-	ExcelBorder string = `{"border": [{"type":"left","color":"999999","style":1}, {"type":"top","color":"999999","style":1},
+	ExcelBorder  = `{"border": [{"type":"left","color":"999999","style":1}, {"type":"top","color":"999999","style":1},
 		                              {"type":"bottom","color":"999999","style":1}, {"type":"right","color":"999999","style":1}]}`
-	ExcelHeader string = `{"fill":{"type":"pattern","pattern":1,"color":["E0EBF5"]}}`
+	ExcelHeader  = `{"fill":{"type":"pattern","pattern":1,"color":["E0EBF5"]}}`
 )