support child custom fields

src/action/generator.go

@@ -14,8 +14,8 @@ import (
 func Generate(file string, total int, fieldsToExport string, out string, table string) {
 	constant.ResDir = filepath.Dir(file) + string(os.PathSeparator)
 
-	gen.LoadDefinitionFromFile(file)
 	gen.LoadDefinitionFromFile("conf/buildin.yaml")
+	gen.LoadDefinitionFromFile(file)
 
 	rows := gen.GenerateForDefinition(total, fieldsToExport, out, table)
 	Print(rows)

src/gen/definition.go

@@ -6,6 +6,7 @@ import (
 	logUtils "github.com/easysoft/zendata/src/utils/log"
 	"gopkg.in/yaml.v2"
 	"io/ioutil"
+	"strings"
 )
 
 func LoadDefinitionFromFile(file string) {
@@ -23,7 +24,7 @@ func LoadDefinitionFromFile(file string) {
 		return
 	}
 
-	if constant.Definition.Title == "" { // only add the fields in first level yaml file
+	if strings.Index(file, "conf") != 0 && constant.Definition.Title == "" { // only add the fields in first level yaml file
 		constant.Definition = def
 	}
 

xdoc/data.yaml

@@ -54,7 +54,7 @@ fields:
       type: custom
       range: custom.yaml
     - name: domain
-      note: 域名
+      note: 域名，全局定义
       type: custom
 
   - name: field4