提交 bf390f04 编写于 作者: aaronchen2k2k's avatar aaronchen2k2k

fix a issue that missing the additional fields defined in test.yaml than in default.xml

上级 fbc95d13
......@@ -27,7 +27,4 @@ fields:
postfix: "]"
- field: field_nested_refer
from: custom.ip.private.yaml
use: all
prefix: "["
postfix: "]"
\ No newline at end of file
prefix: "["
\ No newline at end of file
......@@ -46,6 +46,7 @@ func LoadConfigDef(defaultFile, configFile string, fieldsToExport *[]string) mod
return configDef
}
isSetFieldsToExport := false
// use all fields from default
if len(*fieldsToExport) == 0 {
if len(defaultDef.Fields) >0 {
......@@ -59,9 +60,17 @@ func LoadConfigDef(defaultFile, configFile string, fieldsToExport *[]string) mod
*fieldsToExport = append(*fieldsToExport, field.Field)
}
}
} else {
isSetFieldsToExport = true
}
mergerDefine(&defaultDef, &configDef)
if !isSetFieldsToExport {
for _, field := range configDef.Fields {
*fieldsToExport = append(*fieldsToExport, field.Field)
}
}
mergerDefine(&defaultDef, &configDef, fieldsToExport)
orderFields(&defaultDef, *fieldsToExport)
for _, field := range defaultDef.Fields {
......@@ -74,7 +83,7 @@ func LoadConfigDef(defaultFile, configFile string, fieldsToExport *[]string) mod
return defaultDef
}
func mergerDefine(defaultDef, configDef *model.DefData, fieldsToExport *[]string) {
func mergerDefine(defaultDef, configDef *model.DefData) {
defaultFieldMap := map[string]*model.DefField{}
configFieldMap := map[string]*model.DefField{}
sortedKeys := make([]string, 0)
......@@ -92,8 +101,6 @@ func mergerDefine(defaultDef, configDef *model.DefData, fieldsToExport *[]string
if exist {
CopyField(*field, parent)
defaultFieldMap[path] = parent
} else {
*fieldsToExport = append(*fieldsToExport, field.Field)
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册