提交 6e3234a9 编写于 作者: aaronchen2k2k's avatar aaronchen2k2k

fix issue of chinese rune

上级 fbd1f9d5
...@@ -10,7 +10,7 @@ fields: ...@@ -10,7 +10,7 @@ fields:
fields: fields:
- field: title1 - field: title1
type: list type: list
range: "Title" range: "[标题A,TitleB]"
postfix: "-" postfix: "-"
- field: title2 - field: title2
range: 1-999 range: 1-999
......
...@@ -139,6 +139,8 @@ func Print(rows [][]string, format string, table string, colTypes []bool, fields ...@@ -139,6 +139,8 @@ func Print(rows [][]string, format string, table string, colTypes []bool, fields
} }
func RowsToMap(rows [][]string, fieldsToExport []string) (ret map[string]string) { func RowsToMap(rows [][]string, fieldsToExport []string) (ret map[string]string) {
ret = map[string]string{}
for _, cols := range rows { for _, cols := range rows {
for j, col := range cols { for j, col := range cols {
ret[fieldsToExport[j]] = col ret[fieldsToExport[j]] = col
......
...@@ -128,16 +128,22 @@ func ParseRange(rang string) []string { ...@@ -128,16 +128,22 @@ func ParseRange(rang string) []string {
tagOpen := false tagOpen := false
temp := "" temp := ""
for i := 0; i < len(rang); i++ {
c := rang[i]
if int32(c) == constant.RightChar { runeArr := make([]rune, 0)
for _, c := range rang {
runeArr = append(runeArr, c)
}
for i := 0; i < len(runeArr); i++ {
c := runeArr[i]
if c == constant.RightChar {
tagOpen = false tagOpen = false
} else if int32(c) == constant.LeftChar { } else if c == constant.LeftChar {
tagOpen = true tagOpen = true
} }
if i == len(rang) - 1 { if i == len(runeArr) - 1 {
temp += fmt.Sprintf("%c", c) temp += fmt.Sprintf("%c", c)
items = append(items, temp) items = append(items, temp)
} else if !tagOpen && c == ',' { } else if !tagOpen && c == ',' {
......
...@@ -31,8 +31,8 @@ var ( ...@@ -31,8 +31,8 @@ var (
Def = model.DefData{} Def = model.DefData{}
Res = map[string]map[string][]string{} Res = map[string]map[string][]string{}
LeftChar = '(' LeftChar rune = '('
RightChar = ')' RightChar rune = ')'
ResDir = "data/" ResDir = "data/"
ResPath = ResDir + "system/buildin.yaml" ResPath = ResDir + "system/buildin.yaml"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册