From da5031821cf10aaab133ae11b9f43707749ae647 Mon Sep 17 00:00:00 2001 From: aaron <462826@qq.com> Date: Sat, 4 Jul 2020 10:22:07 +0800 Subject: [PATCH] fix a issue caused by : in [] --- data/.cache/.data.db | Bin 126976 -> 126976 bytes data/system/address/v1.xlsx | Bin 24427 -> 24462 bytes data/system/ip/v1.yaml | 3 --- demo/numb.yaml | 14 ++++------- demo/test.yaml | 47 ++++++++++++++++++------------------ src/model/definition.go | 1 - 6 files changed, 28 insertions(+), 37 deletions(-) diff --git a/data/.cache/.data.db b/data/.cache/.data.db index 6bca4e43408efc49735f8e7645b04be49b0eeb9e..0ed9a38206940fd8d2453d575aac6afdaef753c0 100644 GIT binary patch delta 148 zcmZp8z~1nHeS)-L00RSqJP->3F&6^^qvAvzW5$4u39I=T#WwQ@JmBY*Zi)xW$u@yh z2ygx=&vJnI-}Q)154a5&MW*uzFe=N6K=d+zXfYs`24Yz#TV%VB0OJn+ delta 143 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 CY*DBH delta 12491 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 UM0T?$m>7vRW-Q>ZCTNZS1HO13zyJUM diff --git a/data/system/ip/v1.yaml b/data/system/ip/v1.yaml index 87c7f55..b048f1b 100644 --- a/data/system/ip/v1.yaml +++ b/data/system/ip/v1.yaml @@ -8,8 +8,6 @@ instances: - instance: privateC note: C类IP地址 prefix: 192.168. -# loop: 2 -# loopfix: "-" fields: - field: part3 range: 0-254 @@ -20,7 +18,6 @@ instances: - instance: privateB note: B类IP地址 prefix: 172. -# postfix: "\t" fields: - field: part2 range: 16-31 diff --git a/demo/numb.yaml b/demo/numb.yaml index 607241b..4374174 100644 --- a/demo/numb.yaml +++ b/demo/numb.yaml @@ -1,15 +1,11 @@ title: number desc: -author: wwccss +author: zentao version: 1.0 field: number -note: 数值类型数据 -#prefix: "'" -#postfix: "'" -#loop: 2 -#loopfix: "-" +note: 数字类型 ranges: - small: 1-9 - medium: 11-99 - large: 10001-99999 + small: 0-3 + medium: 11-13 + large: 101-103 diff --git a/demo/test.yaml b/demo/test.yaml index c3d8d28..3f5bb03 100644 --- a/demo/test.yaml +++ b/demo/test.yaml @@ -4,58 +4,57 @@ author: zentao version: 1.0 fields: - - field: field0 - note: 基本属性 - range: abc*5,123,456 + - field: field1 + note: 字符区间步长、随机 + range: a-f:R,0-9:2 loop: 3 loopfix: "," - prefix: "'" - postfix: "'" + prefix: "[" + postfix: "] " - - field: field1 + - field: field2 + note: 单词、重复 + range: [bug,task,story]:2{2},[testcase]{2} + postfix: " " + + - field: field3 note: 引用同级目录中的yaml文件,取small和large两个分组的值 from: numb.yaml - use: small,large -# loop: 3 -# loopfix: " " -# prefix: "[" -# postfix: "]" - expect: 1,2,3,101,102... + use: large + postfix: " " + expect: 101,102,103... - - field: field2 + - field: field4 note: 引用內置IP地址数据定义中的C类地址 from: system.ip.v1.yaml use: privateC - prefix: "[" - postfix: "]" - loop: 3 - loopfix: " " + postfix: " " expect: 192.168.0.1 ...​ - - field: field3 + - field: field5 node: 检索、引用內置城市Excel中的数据 from: system.address.v1.city select: name - where: state like '%山东%' + where: state like '%西藏%' expect: 青岛、济南 ...​ - - field: field4 + - field: fieldA node: 嵌套字段 fields: - - field: field4.1 + - field: fieldA.1 type: list range: 1-9 postfix: ". " - - field: field4.2 + - field: fieldA.2 prefix: '[' postfix: ']' loop: 2 loopfix: "," fields: - - field: field4.2.1 + - field: fieldA.2.1 type: list range: X-Z - - field: field4.2.2 + - field: fieldA.2.2 type: list range: 1-9 loop: 2 diff --git a/src/model/definition.go b/src/model/definition.go index eaff29f..71f55c9 100644 --- a/src/model/definition.go +++ b/src/model/definition.go @@ -23,7 +23,6 @@ type ResInsts struct { type ResInst struct { FieldBase `yaml:",inline"` Instance string `yaml:"instance"` - Range string `yaml:"range"` Fields []DefField `yaml:"fields,flow"` } -- GitLab