From 9cf1f6e09d48541e34122bc0fcac9ca4f1baccb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Sat, 9 Oct 2021 09:14:42 +0800
Subject: [PATCH] * Adjust user.yaml.

---
 test/data/user.yaml         | 18 +++++++++++++-----
 test/data/zentao/config.php | 11 ++++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/test/data/user.yaml b/test/data/user.yaml
index 61f9e36a20..2f860b3d28 100644
--- a/test/data/user.yaml
+++ b/test/data/user.yaml
@@ -5,7 +5,7 @@ version: "1.0"
 fields:
   - field: id
     note: "ID"
-    range: 2-10000
+    range: 1-10000
     prefix: ""
     postfix: ""
     loop: 0
@@ -41,8 +41,11 @@ fields:
     format: ""
   - field: realname
     note: "真实姓名"
-    from: name.cnreal.v1.yaml
-    use: three 
+    fields:
+    - field: realname1
+      range: admi,测试{100},开发{200},项目经理{10},产品经理{10},研发主管{2},产品主管{2},测试主管{2},高层管理{5},其他{10},短用户名,BB,CCC,非常长非常长的用户名怎么这么长?
+    - field: realname2
+      range: n,1-100,1-200,1-10,1-10,1-2,1-2,1-2,1-5,1-10
   - field: nickname
     note: "昵称"
   - field: commiter
@@ -68,8 +71,13 @@ fields:
     format: ""
   - field: email
     note: "邮箱"
-    from: email.v1.yaml
-    use: number_with_esp
+    fields:
+    - field: email1
+      range: 100-999:R
+    - field: email2
+      range: 100-999:R
+    - field: email3
+      range: [@qq.com,@163.com,@gmail.com] 
   - field: skype
     note: "Skype"
     range: Skype
diff --git a/test/data/zentao/config.php b/test/data/zentao/config.php
index b6937c516b..79d7f68227 100644
--- a/test/data/zentao/config.php
+++ b/test/data/zentao/config.php
@@ -13,11 +13,12 @@ $builder->deptGrade1 = array('rows' => 15, 'data' => array('dept', 'deptgrade1')
 $builder->deptGrade2 = array('rows' => 10, 'data' => array('dept', 'deptgrade2'));
 $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' => 349, 'data' => array('usergroup'));
-$builder->product   = array('rows' => 190, 'data' => array('product'));
-$builder->branch    = array('rows' => 160, 'data' => array('branch'));
+$builder->company     = array('rows' => 1,   'data' => array('company'));
+$builder->user        = array('rows' => 346, 'data' => array('user'));
+$builder->usergroup   = array('rows' => 349, 'data' => array('usergroup'));
+$builder->product     = array('rows' => 190, 'data' => array('product'));
+$builder->productplan = array('rows' => 120, 'data' => array('productplan'));
+$builder->branch      = array('rows' => 160, 'data' => array('branch'));
 
 $builder->blockDefault   = array('rows' => 150, 'data' => array('blockdefault'));
 $builder->blockRandom    = array('rows' => 120, 'data' => array('blockrandom'));