From 8b26da25c6b6662c71d9b08540ee1ffd66486d35 Mon Sep 17 00:00:00 2001
From: aaron <462826@qq.com>
Date: Wed, 26 Aug 2020 13:53:19 +0800
Subject: [PATCH] update yaml def

---
 demo/test/test-account.yaml | 115 +++++++++++++++++
 demo/test/test-domain.yaml  |  85 +++++++++++++
 demo/test/test-email.yaml   |  50 ++++++++
 demo/test/test.yaml         | 239 +-----------------------------------
 4 files changed, 253 insertions(+), 236 deletions(-)
 create mode 100644 demo/test/test-account.yaml
 create mode 100644 demo/test/test-domain.yaml
 create mode 100644 demo/test/test-email.yaml

diff --git a/demo/test/test-account.yaml b/demo/test/test-account.yaml
new file mode 100644
index 00000000..a14078e1
--- /dev/null
+++ b/demo/test/test-account.yaml
@@ -0,0 +1,115 @@
+title: 测试文件
+desc:
+author: zentao
+version: 1.0
+
+fields:
+  - field: letters
+    from: base.name.letters.v1.yaml
+    use: letters
+    postfix: "\t"
+
+  - field: numbers
+    from: base.name.numbers.v1.yaml
+    use: numbers
+    postfix: "\t"
+
+  - field: given
+    from: name.en.given.v1
+    select: name
+    where: "`index`='b'"
+    postfix: "\t"
+
+  - field: family
+    from: name.en.family.v1
+    select: name
+    where: "`index`='c'"
+    postfix: "\t"
+
+  - field: enreal
+    from: base.name.enreal.v1.yaml
+    use: common
+    prefix: "["
+    postfix: "]\t"
+
+  - field: enreal_male
+    from: base.name.enreal.v1.yaml
+    use: male_common
+    prefix: "["
+    postfix: "]\t"
+
+  - field: enreal_female
+    from: base.name.enreal.v1.yaml
+    use: female_with_middle
+    prefix: "["
+    postfix: "]\t"
+
+  - field: cnreal
+    from: base.name.cnreal.v1.yaml
+    use: two
+    prefix: "["
+    postfix: "]\t"
+
+  - field: cnreal_male
+    from: base.name.cnreal.v1.yaml
+    use: male_three
+    prefix: "["
+    postfix: "]\t"
+
+  - field: cnreal_female
+    from: base.name.cnreal.v1.yaml
+    use: female_four
+    prefix: "["
+    postfix: "]\t"
+
+  - field: enaccount_common
+    from: base.name.enaccount.v1.yaml
+    use: common
+    prefix: "["
+    postfix: "]\t"
+  - field: enaccount_underline
+    from: base.name.enaccount.v1.yaml
+    use: common_underline
+    prefix: "["
+    postfix: "]\t"
+  - field: enaccount_dot
+    from: base.name.enaccount.v1.yaml
+    use: common_dot
+    prefix: "["
+    postfix: "]\t"
+  - field: enaccount_reverse
+    from: base.name.enaccount.v1.yaml
+    use: reverse
+    prefix: "["
+    postfix: "]\t"
+
+  - field: cnaccount_common
+    from: base.name.cnaccount.v1.yaml
+    use: common
+    prefix: "["
+    postfix: "]\t"
+  - field: cnaccount_underline
+    from: base.name.cnaccount.v1.yaml
+    use: common_underline
+    prefix: "["
+    postfix: "]\t"
+  - field: cnaccount_dot
+    from: base.name.cnaccount.v1.yaml
+    use: common_dot
+    prefix: "["
+    postfix: "]\t"
+  - field: cnaccount_reverse
+    from: base.name.cnaccount.v1.yaml
+    use: reverse
+    prefix: "["
+    postfix: "]\t"
+  - field: cnaccount_family
+    from: base.name.cnaccount.v1.yaml
+    use: family
+    prefix: "["
+    postfix: "]\t"
+  - field: cnaccount_given
+    from: base.name.cnaccount.v1.yaml
+    use: given
+    prefix: "["
+    postfix: "]\t"
\ No newline at end of file
diff --git a/demo/test/test-domain.yaml b/demo/test/test-domain.yaml
new file mode 100644
index 00000000..e7a45b38
--- /dev/null
+++ b/demo/test/test-domain.yaml
@@ -0,0 +1,85 @@
+title: 测试文件
+desc:
+author: zentao
+version: 1.0
+
+fields:
+  - field: one_number_at_common
+    from: base.domain.domain.v1.yaml
+    use: one_number_at_common
+    prefix: ""
+    postfix: "\t"
+  - field: one_number_at_cn
+    from: base.domain.domain.v1.yaml
+    use: one_number_at_cn
+    prefix: ""
+    postfix: "\t"
+  - field: one_number_at_new
+    from: base.domain.domain.v1.yaml
+    use: one_number_at_new
+    prefix: ""
+    postfix: "\t"
+
+  - field: one_letter_at_common
+    from: base.domain.domain.v1.yaml
+    use: one_letter_at_common
+    prefix: ""
+    postfix: "\t"
+  - field: one_letter_at_cn
+    from: base.domain.domain.v1.yaml
+    use: one_letter_at_cn
+    prefix: ""
+    postfix: "\t"
+  - field: one_letter_at_new
+    from: base.domain.domain.v1.yaml
+    use: one_letter_at_new
+    prefix: ""
+    postfix: "\t"
+
+  - field: numbers_at_common
+    from: base.domain.domain.v1.yaml
+    use: numbers_at_common
+    prefix: ""
+    postfix: "\t"
+  - field: numbers_at_cn
+    from: base.domain.domain.v1.yaml
+    use: numbers_at_cn
+    prefix: ""
+    postfix: "\t"
+  - field: numbers_at_new
+    from: base.domain.domain.v1.yaml
+    use: numbers_at_new
+    prefix: ""
+    postfix: "\t"
+
+  - field: letters_at_common
+    from: base.domain.domain.v1.yaml
+    use: letters_at_common
+    prefix: ""
+    postfix: "\t"
+  - field: letters_at_cn
+    from: base.domain.domain.v1.yaml
+    use: letters_at_cn
+    prefix: ""
+    postfix: "\t"
+  - field: letters_at_new
+    from: base.domain.domain.v1.yaml
+    use: letters_at_new
+    prefix: ""
+    postfix: "\t"
+
+  - field: mixed_at_common
+    from: base.domain.domain.v1.yaml
+    use: mixed_at_common
+    prefix: ""
+    postfix: "\t"
+  - field: mixed_at_cn
+    from: base.domain.domain.v1.yaml
+    use: mixed_at_cn
+    prefix: ""
+    postfix: "\t"
+  - field: mixed_at_new
+    from: base.domain.domain.v1.yaml
+    use: mixed_at_new
+    prefix: ""
+    postfix: "\t"
\ No newline at end of file
diff --git a/demo/test/test-email.yaml b/demo/test/test-email.yaml
new file mode 100644
index 00000000..d31d4fa3
--- /dev/null
+++ b/demo/test/test-email.yaml
@@ -0,0 +1,50 @@
+title: 测试文件
+desc:
+author: zentao
+version: 1.0
+
+fields:
+
+  - field: number_with_esp
+    from: base.email.email.v1.yaml
+    use: number_with_esp
+    prefix: ""
+    postfix: "\t"
+  - field: number_with_self
+    from: base.email.email.v1.yaml
+    use: number_with_self
+    prefix: ""
+    postfix: "\t"
+
+  - field: letter_with_esp
+    from: base.email.email.v1.yaml
+    use: letter_with_esp
+    prefix: ""
+    postfix: "\t"
+  - field: letter_with_self
+    from: base.email.email.v1.yaml
+    use: letter_with_self
+    prefix: ""
+    postfix: "\t"
+
+  - field: western_with_esp
+    from: base.email.email.v1.yaml
+    use: western_with_esp
+    prefix: ""
+    postfix: "\t"
+  - field: western_with_self
+    from: base.email.email.v1.yaml
+    use: western_with_self
+    prefix: ""
+    postfix: "\t"
+
+  - field: pinyin_with_esp
+    from: base.email.email.v1.yaml
+    use: pinyin_with_esp
+    prefix: ""
+    postfix: "\t"
+  - field: pinyin_with_self
+    from: base.email.email.v1.yaml
+    use: pinyin_with_self
+    prefix: ""
+    postfix: "\t"
\ No newline at end of file
diff --git a/demo/test/test.yaml b/demo/test/test.yaml
index 5457b4cc..3bf56481 100644
--- a/demo/test/test.yaml
+++ b/demo/test/test.yaml
@@ -4,239 +4,6 @@ author: zentao
 version: 1.0
 
 fields:
-  #account
-#  - field: letters
-#    from: base.name.letters.v1.yaml
-#    use: letters
-#    postfix: "\t"
-#
-#  - field: numbers
-#    from: base.name.numbers.v1.yaml
-#    use: numbers
-#    postfix: "\t"
-#
-#  - field: given
-#    from: name.en.given.v1
-#    select: name
-#    where: "`index`='b'"
-#    postfix: "\t"
-#
-#  - field: family
-#    from: name.en.family.v1
-#    select: name
-#    where: "`index`='c'"
-#    postfix: "\t"
-#
-#  - field: enreal
-#    from: base.name.enreal.v1.yaml
-#    use: common
-#    prefix: "["
-#    postfix: "]\t"
-#
-#  - field: enreal_male
-#    from: base.name.enreal.v1.yaml
-#    use: male_common
-#    prefix: "["
-#    postfix: "]\t"
-#
-#  - field: enreal_female
-#    from: base.name.enreal.v1.yaml
-#    use: female_with_middle
-#    prefix: "["
-#    postfix: "]\t"
-#
-#  - field: cnreal
-#    from: base.name.cnreal.v1.yaml
-#    use: two
-#    prefix: "["
-#    postfix: "]\t"
-#
-#  - field: cnreal_male
-#    from: base.name.cnreal.v1.yaml
-#    use: male_three
-#    prefix: "["
-#    postfix: "]\t"
-#
-#  - field: cnreal_female
-#    from: base.name.cnreal.v1.yaml
-#    use: female_four
-#    prefix: "["
-#    postfix: "]\t"
-#
-#  - field: enaccount_common
-#    from: base.name.enaccount.v1.yaml
-#    use: common
-#    prefix: "["
-#    postfix: "]\t"
-#  - field: enaccount_underline
-#    from: base.name.enaccount.v1.yaml
-#    use: common_underline
-#    prefix: "["
-#    postfix: "]\t"
-#  - field: enaccount_dot
-#    from: base.name.enaccount.v1.yaml
-#    use: common_dot
-#    prefix: "["
-#    postfix: "]\t"
-#  - field: enaccount_reverse
-#    from: base.name.enaccount.v1.yaml
-#    use: reverse
-#    prefix: "["
-#    postfix: "]\t"
-#
-#  - field: cnaccount_common
-#    from: base.name.cnaccount.v1.yaml
-#    use: common
-#    prefix: "["
-#    postfix: "]\t"
-#  - field: cnaccount_underline
-#    from: base.name.cnaccount.v1.yaml
-#    use: common_underline
-#    prefix: "["
-#    postfix: "]\t"
-#  - field: cnaccount_dot
-#    from: base.name.cnaccount.v1.yaml
-#    use: common_dot
-#    prefix: "["
-#    postfix: "]\t"
-#  - field: cnaccount_reverse
-#    from: base.name.cnaccount.v1.yaml
-#    use: reverse
-#    prefix: "["
-#    postfix: "]\t"
-#  - field: cnaccount_family
-#    from: base.name.cnaccount.v1.yaml
-#    use: family
-#    prefix: "["
-#    postfix: "]\t"
-#  - field: cnaccount_given
-#    from: base.name.cnaccount.v1.yaml
-#    use: given
-#    prefix: "["
-#    postfix: "]\t"
-
-  # domain
-  - field: one_number_at_common
-    from: base.domain.domain.v1.yaml
-    use: one_number_at_common
-    prefix: ""
-    postfix: "\t"
-  - field: one_number_at_cn
-    from: base.domain.domain.v1.yaml
-    use: one_number_at_cn
-    prefix: ""
-    postfix: "\t"
-  - field: one_number_at_new
-    from: base.domain.domain.v1.yaml
-    use: one_number_at_new
-    prefix: ""
-    postfix: "\t"
-
-  - field: one_letter_at_common
-    from: base.domain.domain.v1.yaml
-    use: one_letter_at_common
-    prefix: ""
-    postfix: "\t"
-  - field: one_letter_at_cn
-    from: base.domain.domain.v1.yaml
-    use: one_letter_at_cn
-    prefix: ""
-    postfix: "\t"
-  - field: one_letter_at_new
-    from: base.domain.domain.v1.yaml
-    use: one_letter_at_new
-    prefix: ""
-    postfix: "\t"
-
-  - field: numbers_at_common
-    from: base.domain.domain.v1.yaml
-    use: numbers_at_common
-    prefix: ""
-    postfix: "\t"
-  - field: numbers_at_cn
-    from: base.domain.domain.v1.yaml
-    use: numbers_at_cn
-    prefix: ""
-    postfix: "\t"
-  - field: numbers_at_new
-    from: base.domain.domain.v1.yaml
-    use: numbers_at_new
-    prefix: ""
-    postfix: "\t"
-
-  - field: letters_at_common
-    from: base.domain.domain.v1.yaml
-    use: letters_at_common
-    prefix: ""
-    postfix: "\t"
-  - field: letters_at_cn
-    from: base.domain.domain.v1.yaml
-    use: letters_at_cn
-    prefix: ""
-    postfix: "\t"
-  - field: letters_at_new
-    from: base.domain.domain.v1.yaml
-    use: letters_at_new
-    prefix: ""
-    postfix: "\t"
-
-  - field: mixed_at_common
-    from: base.domain.domain.v1.yaml
-    use: mixed_at_common
-    prefix: ""
-    postfix: "\t"
-  - field: mixed_at_cn
-    from: base.domain.domain.v1.yaml
-    use: mixed_at_cn
-    prefix: ""
-    postfix: "\t"
-  - field: mixed_at_new
-    from: base.domain.domain.v1.yaml
-    use: mixed_at_new
-    prefix: ""
-    postfix: "\t"
-
-#  #email
-#  - field: number_with_esp
-#    from: base.email.email.v1.yaml
-#    use: number_with_esp
-#    prefix: ""
-#    postfix: "\t"
-#  - field: number_with_self
-#    from: base.email.email.v1.yaml
-#    use: number_with_self
-#    prefix: ""
-#    postfix: "\t"
-#
-#  - field: letter_with_esp
-#    from: base.email.email.v1.yaml
-#    use: letter_with_esp
-#    prefix: ""
-#    postfix: "\t"
-#  - field: letter_with_self
-#    from: base.email.email.v1.yaml
-#    use: letter_with_self
-#    prefix: ""
-#    postfix: "\t"
-#
-#  - field: western_with_esp
-#    from: base.email.email.v1.yaml
-#    use: western_with_esp
-#    prefix: ""
-#    postfix: "\t"
-#  - field: western_with_self
-#    from: base.email.email.v1.yaml
-#    use: western_with_self
-#    prefix: ""
-#    postfix: "\t"
-#
-#  - field: pinyin_with_esp
-#    from: base.email.email.v1.yaml
-#    use: pinyin_with_esp
-#    prefix: ""
-#    postfix: "\t"
-#  - field: pinyin_with_self
-#    from: base.email.email.v1.yaml
-#    use: pinyin_with_self
-#    prefix: ""
-#    postfix: "\t"
\ No newline at end of file
+  - field: test1
+    range: [userA,a-z,1-9,1-10000] # 字面常量及列表
+    postfix: "\t"
\ No newline at end of file
-- 
GitLab