close task#7904

demo/test/test-datetime.yaml

+title: 测试文件
+desc:
+author: zentao
+version: 1.0
+
+fields:
+  - field: date
+    from: time.date.v1.yaml
+    use: date
+    postfix: "\t"
+
+  - field: date_with_line
+    from: time.date.v1.yaml
+    use: with_line
+    postfix: "\t"
+
+  - field: date_chinese
+    from: time.date.v1.yaml
+    use: chinese
+    postfix: "\t"
+
+  - field: time
+    from: time.time.v1.yaml
+    use: time
+    postfix: "\t"
+
+  - field: time_chinese
+    from: time.time.v1.yaml
+    use: chinese
+    postfix: "\t"
\ No newline at end of file

yaml/domain/domain.v1.yaml

@@ -12,7 +12,7 @@ instances:
         range: 1-9
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: all
   - instance: one_number_at_cn
     note: 单数字CN域名
@@ -21,7 +21,7 @@ instances:
         range: 1-9
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: cn
   - instance: one_number_at_new
     note: 单数字新域名
@@ -30,7 +30,7 @@ instances:
         range: 1-9
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: new
 
   - instance: one_letter_at_common
@@ -40,7 +40,7 @@ instances:
         range: a-z
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: all
   - instance: one_letter_at_cn
     note: 单字母CN域名
@@ -49,7 +49,7 @@ instances:
         range: a-z
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: cn
   - instance: one_letter_at_new
     note: 单字母新域名
@@ -58,7 +58,7 @@ instances:
         range: a-z
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: new
 
   - instance: numbers_at_common
@@ -69,7 +69,7 @@ instances:
         loop: 5-8
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: all
   - instance: numbers_at_cn
     note: 纯数字CN域名
@@ -79,7 +79,7 @@ instances:
         loop: 5-8
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: cn
   - instance: numbers_at_new
     note: 纯数字新域名
@@ -89,38 +89,38 @@ instances:
         loop: 5-8
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: new
 
   - instance: letters_at_common
     note: 使用英文字符的域名
     fields:
       - field: letters
-        from: base.name.letters.v1.yaml
+        from: name.letters.v1.yaml
         use: letters
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: all
   - instance: letters_at_cn
     note: 使用英文字符的CN域名
     fields:
       - field: letters
-        from: base.name.letters.v1.yaml
+        from: name.letters.v1.yaml
         use: letters
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: cn
   - instance: letters_at_new
     note: 使用英文字符的新域名
     fields:
       - field: letters
-        from: base.name.letters.v1.yaml
+        from: name.letters.v1.yaml
         use: letters
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: new
 
   - instance: mixed_at_common
@@ -131,7 +131,7 @@ instances:
         loop: 5-8
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: all
   - instance: mixed_at_cn
     note: 字母和数字混合的CN域名
@@ -141,7 +141,7 @@ instances:
         loop: 5-8
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: cn
   - instance: mixed_at_new
     note: 字母和数字混合的新域名
@@ -151,26 +151,26 @@ instances:
         loop: 5-8
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: new
 
   - instance: enaccount_at_common
     note: 使用英文账号的CN域名
     fields:
       - field: english_account
-        from: base.name.enaccount.v1.yaml
+        from: name.enaccount.v1.yaml
         use: common_underline
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: cn
   - instance: cnaccount_at_cn
     note: 使用中文账号的新域名
     fields:
       - field: chinese_account
-        from: base.name.cnaccount.v1.yaml
+        from: name.cnaccount.v1.yaml
         use: common_dot
         postfix: "."
       - field: domain_postfix
-        from: base.domain.postfix.v1.yaml
+        from: domain.postfix.v1.yaml
         use: new
\ No newline at end of file

yaml/email/v1.yaml

@@ -9,82 +9,82 @@ instances:
     note: 数字加服务商域名
     fields:
       - field: several_numbers
-        from: base.name.numbers.v1.yaml
+        from: name.numbers.v1.yaml
         use: numbers
         postfix: "@"
       - field: esp_domain
-        from: base.domain.esp.v1.yaml
+        from: domain.esp.v1.yaml
         use: esp
   - instance: number_with_self
     note: 数字加自定义域名
     fields:
       - field: several_numbers
-        from: base.name.numbers.v1.yaml
+        from: name.numbers.v1.yaml
         use: numbers
         postfix: "@"
       - field: custom_domain
-        from: base.domain.domain.v1.yaml
+        from: domain.domain.v1.yaml
         use: mixed_at_common
 
   - instance: letter_with_esp
     note: 英文字符加服务商域名
     fields:
       - field: letters
-        from: base.name.letters.v1.yaml
+        from: name.letters.v1.yaml
         use: letters
         postfix: "@"
       - field: esp_domain
-        from: base.domain.esp.v1.yaml
+        from: domain.esp.v1.yaml
         use: esp
   - instance: letter_with_self
     note: 英文字符加自定义CN域名
     fields:
       - field: letters
-        from: base.name.letters.v1.yaml
+        from: name.letters.v1.yaml
         use: letters
         postfix: "@"
       - field: custom_domain
-        from: base.domain.domain.v1.yaml
+        from: domain.domain.v1.yaml
         use: mixed_at_cn
 
   - instance: western_with_esp
     note: 英文账号加服务商域名
     fields:
       - field: english_account
-        from: base.name.enaccount.v1.yaml
+        from: name.enaccount.v1.yaml
         use: common_underline
         postfix: "@"
       - field: esp_domain
-        from: base.domain.esp.v1.yaml
+        from: domain.esp.v1.yaml
         use: esp
   - instance: western_with_self
     note: 英文账号加自定义新域名
     fields:
       - field: english_account
-        from: base.name.enaccount.v1.yaml
+        from: name.enaccount.v1.yaml
         use: common_dot
         postfix: "@"
       - field: custom_domain
-        from: base.domain.domain.v1.yaml
+        from: domain.domain.v1.yaml
         use: mixed_at_new
 
   - instance: pinyin_with_esp
     note: 拼音加服务商域名
     fields:
       - field: chinese_account
-        from: base.name.cnaccount.v1.yaml
+        from: name.cnaccount.v1.yaml
         use: common_underline
         postfix: "@"
       - field: esp_domain
-        from: base.domain.esp.v1.yaml
+        from: domain.esp.v1.yaml
         use: esp
   - instance: pinyin_with_self
     note: 拼音加自有域名
     fields:
       - field: chinese_account
-        from: base.name.cnaccount.v1.yaml
+        from: name.cnaccount.v1.yaml
         use: common_dot
         postfix: "@"
       - field: part2
-        from: base.domain.domain.v1.yaml
+        from: domain.domain.v1.yaml
         use: mixed_at_common
\ No newline at end of file

yaml/time/date.v1.yaml

-title: 日期时间
+title: 日期
 desc:
 author: zentao
 version: 1.0
 
 field: date
 instances:
-  - instance: common
+  - instance: date
     note: 普通
     prefix:
     fields:
       - field: year
         range: 2020
       - field: month_day
-        from: base.time.monthday.v1.yaml
+        from: time.monthday.v1.yaml
         use: common
         prefix: ""
         postfix: "\t"
@@ -25,7 +25,7 @@ instances:
         range: 2020
         postfix: "-"
       - field: month_day
-        from: base.time.monthday.v1.yaml
+        from: time.monthday.v1.yaml
         use: with_line
         prefix: ""
         postfix: "\t"
@@ -38,7 +38,7 @@ instances:
         range: 2020
         postfix: "年"
       - field: month_day
-        from: base.time.monthday.v1.yaml
+        from: time.monthday.v1.yaml
         use: chinese
         prefix: ""
         postfix: "\t"
\ No newline at end of file

yaml/time/hour.v1.yaml

-title: 日期时间
-desc:
-author: zentao
-version: 1.0
-
-field: date
-instances:
-  - instance: common
-    note: 普通
-    prefix:
-    fields:
-      - field: year
-        range: 2020
-      - field: month_day
-        from: base.time.monthday.v1.yaml
-        use: common
-        prefix: ""
-        postfix: "\t"
-
-  - instance: with_line
-    note: 下划线
-    prefix:
-    fields:
-      - field: year
-        range: 2020
-        postfix: "-"
-      - field: month_day
-        from: base.time.monthday.v1.yaml
-        use: with_line
-        prefix: ""
-        postfix: "\t"
-
-  - instance: chinese
-    note: 中文
-    prefix:
-    fields:
-      - field: year
-        range: 2020
-        postfix: "年"
-      - field: month_day
-        from: base.time.monthday.v1.yaml
-        use: chinese
-        prefix: ""
-        postfix: "\t"
\ No newline at end of file

yaml/time/time.v1.yaml

+title: 时间
+desc:
+author: zentao
+version: 1.0
+
+field: time
+instances:
+  - instance: time
+    note: 时间
+    mode: r
+    fields:
+      - field: hour
+        range: 0-12
+        format: "%02d"
+        postfix: ":"
+      - field: minute
+        range: 0-60
+        format: "%02d"
+        postfix: ":"
+      - field: second
+        range: 0-60
+        format: "%02d"
+        postfix: "\t"
+
+  - instance: chinese
+    note: 时间
+    mode: r
+    fields:
+      - field: hour
+        range: 0-12
+        postfix: "点"
+      - field: minute
+        range: 0-60
+        postfix: "分"
+      - field: second
+        range: 0-60
+        postfix: "秒"
\ No newline at end of file