Merge branch 'sprint/165_test' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165_test

test/data/branch.yaml

@@ -0,0 +1,29 @@
+title: table zt_branch
+desc: "平台/分支"
+author: automated export
+version: "1.0"
+fields:
+  - field: id
+    note: "ID"
+    range: 1-10000
+  - field: product
+    note: "所属产品"
+    range: 41-120{2!}
+  - field: name
+    note: "名称"
+    range: 1-10000
+    fields:
+    - field: name1
+      range: 分支
+    - field: name2
+      range: 1-10000
+  - field: order
+    note: "排序"
+    range: 1-2
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: deleted
+    note: "是否删除"
+    range: 0

test/data/product.yaml

@@ -0,0 +1,89 @@
+title: table zt_product
+desc: "产品"
+author: automated export
+version: "1.0"
+fields:
+  - field: id
+    range: 1-1000
+  - field: program
+    note: "所属项目集"
+    range: 1-40
+  - field: name
+    note: "产品名称"
+    #fields:
+    #- field: name1
+    #  range: [独立产品@#$%%&&*测试名称长度能有多长并且包含特殊字符的一个长长的字符串（）！@#￥%……&*],独立产品{2},正常产品{6},多分支产品{6},多平台产品{6}
+    #- field: name2
+    #  range: 1-1000
+    fields:
+    - field: name1
+      range: 正常产品{40},多分支产品{40},多平台产品{40}
+    - field: name2
+      range: 1-1000
+  - field: code
+    note: "产品代号"
+    range: 1-300
+    prefix: "code"
+  - field: line
+    note: "产品线"
+    range: 0
+  - field: type
+    note: "产品类型"
+    range: normal{40},branch{40},platform{40}
+  - field: status
+    note: "状态"
+    range: normal{20},closed{20}
+  - field: subStatus
+    note: "子状态"
+    range: 0
+  - field: desc
+    note: "产品描述"
+    range: 1-10000
+    prefix: "这里是产品描述"
+  - field: PO
+    note: "产品负责人"
+    fields:
+    - field: po1
+      range: po{10}
+    - field: po2
+      range: 1-10
+  - field: QD
+    note: "测试负责人"
+    fields:
+    - field: account1
+      range: test{100}
+    - field: account2
+      range: 1-100
+  - field: RD
+    note: "发布负责人"
+    fields:
+    - field: dev1
+      range: dev{200}
+    - field: dev2
+      range: 1-200
+  - field: storyConcept
+    note: "需求概念"
+    range: 0
+  - field: acl
+    note: "访问控制"
+    range: open{10},private{10}
+  - field: whitelist
+    note: "分组白名单"
+    range: []{15},`,test1,dev1,pm1,td1,pd2,qd2,top1,others1`{5}
+  - field: createdBy
+    note: "创建者"
+    from: user.yaml
+    user: account
+  - field: createdDate
+    note: "创建日期"
+    from: common.date.v1.yaml
+    use: datetime
+  - field: createdVersion
+    note: "创建版本"
+    range: 15.6
+  - field: order
+    note: "排序"
+    range: 5-10000:5
+  - field: deleted
+    note: "是否删除"
+    range: 0

test/data/usergroup.yaml

@@ -4,15 +4,15 @@ author: Li yuchun
 version: "1.0"
 fields:
   - field: account
-    note:  "用户名"
+    note: "用户名"
     fields:
-        - field: account1
-          range: test{120},dev{220}
-        - field: account2
-          range: 1-10{3},11-100,101-110{3},111-300
+    - field: account1
+      range: test{100},dev{200},pm{10},po{10},td{2},pd{2},qd{2},top{6},test,dev,pm,po,td,pd,qd,other{10}
+    - field: account2
+      range: 1-100,1-200,1-10,1-10,1-2,1-2,1-2,1-5,1{8},1-10
   - field: group
     note: "分组名称"
-    range: 1-3{10!},11-50,1-50,1-3{10!},11-50,1-50{3!}
+    range: 3{100},2{200},4{10},5{10},6{2},7{2},8{2},9{5},1{8},12{10}
   - field: project
     note:  "项目ID"
     range:

test/data/zentao/config.php

@@ -15,4 +15,6 @@ $builder->deptGrade3 = array('rows' => 10, 'data' => array('dept', 'deptgrade3')
 
 $builder->company   = array('rows' => 1,   'data' => array('company'));
 $builder->user      = array('rows' => 350, 'data' => array('user'));
-$builder->usergroup = array('rows' => 340, 'data' => array('usergroup'));
+$builder->usergroup = array('rows' => 349, 'data' => array('usergroup'));
+$builder->product   = array('rows' => 120, 'data' => array('product'));
+$builder->branch    = array('rows' => 160, 'data' => array('branch'));