diff --git a/test/data/blockdefault.yaml b/test/data/block.yaml similarity index 95% rename from test/data/blockdefault.yaml rename to test/data/block.yaml index d487ffa90b..fc569bbf3d 100644 --- a/test/data/blockdefault.yaml +++ b/test/data/block.yaml @@ -1,15 +1,15 @@ title: zt_block -desc: 区块表 -version: 1.0 +author: Tian shujie +version: "1.0" fields: - field: id range: 1-10000 - field: account fields: - field: account1 - range: admin{30},test{30},pm{30},pd{30},qd{30} + range: - field: account2 - range: []{30},1{120} + range: - field: module range: my{16},product{5},project{5},qa{4} - field: type diff --git a/test/data/blockrandom.yaml b/test/data/blockrandom.yaml deleted file mode 100644 index 3319773f67..0000000000 --- a/test/data/blockrandom.yaml +++ /dev/null @@ -1,32 +0,0 @@ -title: zt_block -desc: 区块表 -version: 1.0 -fields: - - field: id - range: 10001-20000 - - field: account - fields: - - field: account1 - range: test{30},dev{30},pm{30},po{30} - - field: account2 - range: 2{5},3{5},4{5},5{5},6{5},9{5} - - field: module - range: my{16},product{5},project{5},qa{4} - - field: type - range: []{21},scrum{5},[]{4} - - field: title - range: [欢迎,最新动态,我的贡献,待处理,我的待办,项目统计,我近期参与的项目,项目人力投入,项目列表,版本列表,执行统计,执行总览,执行列表,任务列表,产品统计,测试统计,产品统计,未关闭的产品,指派给我的软件需求,发布列表,计划列表,项目概况,迭代列表,待测版本,迭代总览,最新动态,测试统计,由我创建的Bug,指派给我的用例,所有版本列表] - - field: source - range: []{4},todo,project{4},execution{5},product,qa,product{5},project{5},qa{4} - - field: block - range: [welcome,dynamic,contribute,assigntome,list,statistic,recentproject,projectteam,project,build,statistic,overview,list,task,statistic,statistic,statistic,list,story,release,plan,scrumoverview,scrumlist,scrumtest,sprint,projectdynamic,statistic,bug,case,testtask] - - field: params - range: []{3},`{"todoCount":"20","taskCount":"20","bugCount":"20","riskCount":"20","issueCount":"20","storyCount":"20","meetingCount":"20"}`,`{"count":"10"}`,`{"type":"undone","count":"15"}`, , ,`{"orderBy":"id_desc","count":"15"}`,`{"count":"20"}`,`{"type":"undone","count":"20"}`, ,`{"type":"doing","count":"20"}`,`{"type":"assignedTo","count":"20","orderBy":"id_desc"}`,`{"type":"all","count":"20"}`,`{"type":"all","count":"20"}`,`{"type":"closed","count":"20"}`,`{"count":"15","type":"noclosed"}`,`{"count":"15","orderBy":"id_desc","type":"assignedTo"}`,`{"count":"10"}`,`{"count":"10"}`,`{"count":"10"}`,`{"type":"involved","count":"10"}`,`{"type":"wait","count":"15"}`, , ,`{"type":"noclosed","count":"20"}`,`{"count":"15","orderBy":"id_asc","type":"openedBy"}`,`{"count":"15","orderBy":"pri_asc","type":"assigntome"}`,`{"count":"15","orderBy":"id_desc","type":"all"}` - - field: order - range: 1-16,1-5,1-5,1-4 - - field: grid - range: 8{2},4,8,4{3},8{4},4,8{5},4{3},8,4{2},8{4},4{2},8 - - field: height - range: 0 - - field: hidden - range: 0 diff --git a/test/data/zentao/blockdefault.yaml b/test/data/zentao/blockdefault.yaml new file mode 100644 index 0000000000..0ed01e6f1b --- /dev/null +++ b/test/data/zentao/blockdefault.yaml @@ -0,0 +1,12 @@ +title: blockDefault +author: Tian shujie +version: "1.0" +fields: + - field: id + range: 1-10000 + - field: account + fields: + - field: account1 + range: admin{30},test{30},pm{30},pd{30},qd{30} + - field: account2 + range: []{30},1{120} diff --git a/test/data/zentao/blockrandom.yaml b/test/data/zentao/blockrandom.yaml new file mode 100644 index 0000000000..ee76b36121 --- /dev/null +++ b/test/data/zentao/blockrandom.yaml @@ -0,0 +1,12 @@ +title: blockRandom +author: Tian shujie +version: "1.0" +fields: + - field: id + range: 151-10000 + - field: account + fields: + - field: account1 + range: test{30},dev{30},pm{30},po{30} + - field: account2 + range: 2{5},3{5},4{5},5{5},6{5},9{5} diff --git a/test/data/zentao/config.php b/test/data/zentao/config.php index b6937c516b..0bf8bfcaf2 100644 --- a/test/data/zentao/config.php +++ b/test/data/zentao/config.php @@ -19,9 +19,9 @@ $builder->usergroup = array('rows' => 349, 'data' => array('usergroup')); $builder->product = array('rows' => 190, 'data' => array('product')); $builder->branch = array('rows' => 160, 'data' => array('branch')); -$builder->blockDefault = array('rows' => 150, 'data' => array('blockdefault')); -$builder->blockRandom = array('rows' => 120, 'data' => array('blockrandom')); -$builder->projectProduct = array('rows' => 14, 'data' => array('projectproduct')); - $builder->build = array('rows' => 8, 'data' => array('build')); $builder->release = array('rows' => 8, 'data' => array('release')); + +$builder->blockDefault = array('rows' => 150, 'data' => array('block', 'blockdefault')); +$builder->blockRandom = array('rows' => 120, 'data' => array('block', 'blockrandom')); +$builder->projectProduct = array('rows' => 14, 'data' => array('projectproduct'));