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

resource definition support loop, fix etc.

上级 f85018d3
...@@ -7,7 +7,7 @@ field: ip ...@@ -7,7 +7,7 @@ field: ip
instances: instances:
- instance: privateC - instance: privateC
prefix: 192.168. prefix: 192.168.
postfix: "\t" postfix: ","
fields: fields:
- field: part3 - field: part3
range: 0-254 range: 0-254
......
title: number title: number
desc: 多个range定义。 desc:
author: wwccss author: wwccss
version: 1.0 version: 1.0
...@@ -9,4 +9,6 @@ ranges: ...@@ -9,4 +9,6 @@ ranges:
small: 1-1000 small: 1-1000
medium: 1001-10000 medium: 1001-10000
large: 10001-100000 large: 10001-100000
postfix: \t postfix: "\t"
loop: 3
loopfix: "|"
...@@ -136,9 +136,13 @@ func getResForRanges(ranges model.ResRanges) map[string][]string { ...@@ -136,9 +136,13 @@ func getResForRanges(ranges model.ResRanges) map[string][]string {
for group, exp := range ranges.Ranges { for group, exp := range ranges.Ranges {
// convert ranges field to standard field // convert ranges field to standard field
tempField := model.DefField{Field: ranges.Field, Range: exp, Type: "cls"} tempField := model.DefField{}
copier.Copy(&tempField, ranges)
tempField.Field = ranges.Field
tempField.Range = exp
tempField.Type = "cls"
groupedValue[group] = GenerateFieldItemsFromDefinition(&tempField) groupedValue[group] = GenerateForField(&tempField, constant.Total)
} }
return groupedValue return groupedValue
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册