close task#7619,7620

demo/advanced.yaml

@@ -43,7 +43,7 @@ fields:
       use: large{3}
 
   - field: field_use_yaml
-    range: 9-7,test/nested1.yaml{5}
+    range: 测试,测,9-7,test/nested1.yaml{5}
 #    rand: true
     prefix: "***"
     postfix: "***\t"

demo/test/test.yaml

+title: 测试文件
+desc:
+author: zentao
+version: 1.0
+
+fields:
+  - field: test1
+    from: base.name.letters.v1.yaml
+    use: letters
+    postfix: "\t"
+
+  - field: test2
+    from: base.name.numbers.v1.yaml
+    use: numbers
+    postfix: "\t"
\ No newline at end of file

res/en/messages.json

@@ -71,6 +71,10 @@
       "id": "fail_to_parse_ranges",
       "translation": "%s is not ResRanges format, try to parse as ResInsts."
     },
+    {
+      "id": "fail_to_find_res",
+      "translation": "Fail to load resource from %s."
+    },
 
     {
       "id": "generate_records",

res/zh/messages.json

@@ -66,6 +66,10 @@
       "id": "fail_to_parse_ranges",
       "translation": "%s不是ResRanges格式，尝试解析为ResInsts对象。"
     },
+    {
+      "id": "fail_to_find_res",
+      "translation": "加载资源%s失败."
+    },
 
     {
       "id": "generate_records",

src/utils/file/file.go

@@ -4,7 +4,9 @@ import (
 	"github.com/easysoft/zendata/res"
 	commonUtils "github.com/easysoft/zendata/src/utils/common"
 	constant "github.com/easysoft/zendata/src/utils/const"
+	i118Utils "github.com/easysoft/zendata/src/utils/i118"
 	"github.com/easysoft/zendata/src/utils/vari"
+	"github.com/fatih/color"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -188,14 +190,15 @@ func ConvertResYamlPath(from string) (ret string) {
 		}
 		file := strings.Join(arr[i:], ".")
 
+		relatPath := ""
 		if dir != "" {
-			ret = dir + constant.PthSep + file
+			relatPath = dir + constant.PthSep + file
 		} else {
-			ret = file
+			relatPath = file
 		}
 
-		realPth1 := vari.WorkDir + constant.ResDirYaml + constant.PthSep + ret
-		realPth2 := vari.WorkDir + constant.ResDirUsers + constant.PthSep + ret
+		realPth1 := vari.WorkDir + constant.ResDirYaml + constant.PthSep + relatPath
+		realPth2 := vari.WorkDir + constant.ResDirUsers + constant.PthSep + relatPath
 		if FileExist(realPth1) {
 			ret = realPth1
 			break
@@ -205,6 +208,10 @@ func ConvertResYamlPath(from string) (ret string) {
 		}
 	}
 
+	if ret == "" {
+		color.New(color.FgCyan).Fprintf(color.Output, i118Utils.I118Prt.Sprintf("fail_to_find_res", from) + "\n")
+	}
+
 	return
 }
 
@@ -224,13 +231,14 @@ func convertResExcelPath(from string) (ret, sheet string) {
 			}
 			file := strings.Join(arr[i:], ".") + ".xlsx"
 
+			relatPath := ""
 			if dir != "" {
-				ret = dir + constant.PthSep + file
+				relatPath = dir + constant.PthSep + file
 			} else {
-				ret = file
+				relatPath = file
 			}
 
-			realPth := vari.WorkDir + constant.ResDirData + constant.PthSep + ret
+			realPth := vari.WorkDir + constant.ResDirData + constant.PthSep + relatPath
 			if FileExist(realPth) {
 				if index == 1 {
 					sheet = from[strings.LastIndex(from, ".")+1:]
@@ -241,5 +249,9 @@ func convertResExcelPath(from string) (ret, sheet string) {
 		}
 	}
 
+	if ret == "" {
+		color.New(color.FgCyan).Fprintf(color.Output, i118Utils.I118Prt.Sprintf("fail_to_find_res", from) + "\n")
+	}
+
 	return
 }
\ No newline at end of file

yaml/base/name/numbers.v1.yaml

+title: 数字账号
+desc:
+author: zentao
+version: 1.0
+
+field: account_numbers
+instances:
+  - instance: 1_number
+    note: 单个数字
+    prefix:
+    fields:
+      - field: part1
+        range: 0-9
+
+  - instance: 2_numbers
+    note: 两个数字
+    prefix:
+    fields:
+      - field: part1
+        range: 0-9
+        loop: 2
+
+  - instance: 3_numbers
+    note: 三个数字
+    prefix:
+    fields:
+      - field: part1
+        range: 0-9
+        loop: 3
+
+  - instance: 4_numbers
+    note: 四个数字
+    prefix:
+    fields:
+      - field: part1
+        range: 0-9
+        loop: 4
+
+  - instance: numbers
+    note: 多个数字
+    prefix:
+    fields:
+      - field: part1
+        range: 0-9
+        loop: 5-100
+        rand: true
\ No newline at end of file