提交 3bf85616 编写于 作者: aaronchen2k2k's avatar aaronchen2k2k

fix the scroll bug caused by new gocui lib

上级 8e3e950c
...@@ -34,16 +34,16 @@ func GetBugFiledOptions(productId int) { ...@@ -34,16 +34,16 @@ func GetBugFiledOptions(productId int) {
bugFields.Modules = fieldMapToListOrderByInt(mp) bugFields.Modules = fieldMapToListOrderByInt(mp)
mp, _ = jsonData.Get("categories").Map() mp, _ = jsonData.Get("categories").Map()
bugFields.Categories = fieldMapToListOrderByStr(mp) bugFields.Categories = fieldMapToListOrderByStr(mp, false)
mp, _ = jsonData.Get("versions").Map() mp, _ = jsonData.Get("versions").Map()
bugFields.Versions = fieldMapToListOrderByStr(mp) bugFields.Versions = fieldMapToListOrderByStr(mp, true)
mp, _ = jsonData.Get("severities").Map() mp, _ = jsonData.Get("severities").Map()
bugFields.Severities = fieldMapToListOrderByInt(mp) bugFields.Severities = fieldMapToListOrderByInt(mp)
arr, _ := jsonData.Get("priorities").Array() arr, _ := jsonData.Get("priorities").Array()
bugFields.Priorities = fieldArrToListKeyStr(arr) bugFields.Priorities = fieldArrToListKeyStr(arr, true)
} else { } else {
logUtils.PrintToCmd(err.Error(), color.FgRed) logUtils.PrintToCmd(err.Error(), color.FgRed)
...@@ -95,7 +95,7 @@ func fieldMapToListOrderByInt(mp map[string]interface{}) []model.Option { ...@@ -95,7 +95,7 @@ func fieldMapToListOrderByInt(mp map[string]interface{}) []model.Option {
return arr return arr
} }
func fieldMapToListOrderByStr(mp map[string]interface{}) []model.Option { func fieldMapToListOrderByStr(mp map[string]interface{}, notNull bool) []model.Option {
arr := make([]model.Option, 0) arr := make([]model.Option, 0)
keys := make([]string, 0) keys := make([]string, 0)
...@@ -108,7 +108,9 @@ func fieldMapToListOrderByStr(mp map[string]interface{}) []model.Option { ...@@ -108,7 +108,9 @@ func fieldMapToListOrderByStr(mp map[string]interface{}) []model.Option {
for _, key := range keys { for _, key := range keys {
name := strings.TrimSpace(mp[key].(string)) name := strings.TrimSpace(mp[key].(string))
if name == "" { if name == "" {
name = "-" if notNull {
continue
}
} }
opt := model.Option{Id: key, Name: name} opt := model.Option{Id: key, Name: name}
...@@ -118,7 +120,7 @@ func fieldMapToListOrderByStr(mp map[string]interface{}) []model.Option { ...@@ -118,7 +120,7 @@ func fieldMapToListOrderByStr(mp map[string]interface{}) []model.Option {
return arr return arr
} }
func fieldArrToListKeyStr(arr0 []interface{}) []model.Option { func fieldArrToListKeyStr(arr0 []interface{}, notNull bool) []model.Option {
arr := make([]model.Option, 0) arr := make([]model.Option, 0)
keys := make([]string, 0) keys := make([]string, 0)
...@@ -131,7 +133,9 @@ func fieldArrToListKeyStr(arr0 []interface{}) []model.Option { ...@@ -131,7 +133,9 @@ func fieldArrToListKeyStr(arr0 []interface{}) []model.Option {
for _, val := range arr0 { for _, val := range arr0 {
name := val.(string) name := val.(string)
if name == "" { if name == "" {
name = "-" if notNull {
continue
}
} }
opt := model.Option{Id: val.(string), Name: name} opt := model.Option{Id: val.(string), Name: name}
......
...@@ -24,7 +24,6 @@ func CuiReportBug(dir string, id string) error { ...@@ -24,7 +24,6 @@ func CuiReportBug(dir string, id string) error {
vari.RunFromCui = true vari.RunFromCui = true
InitMainPage() InitMainPage()
InitReportBugPage(dir, id) InitReportBugPage(dir, id)
if err := g.MainLoop(); err != nil && err != gocui.ErrQuit { if err := g.MainLoop(); err != nil && err != gocui.ErrQuit {
......
...@@ -5,6 +5,7 @@ import ( ...@@ -5,6 +5,7 @@ import (
"github.com/awesome-gocui/gocui" "github.com/awesome-gocui/gocui"
"github.com/easysoft/zentaoatf/src/model" "github.com/easysoft/zentaoatf/src/model"
"github.com/easysoft/zentaoatf/src/ui" "github.com/easysoft/zentaoatf/src/ui"
logUtils "github.com/easysoft/zentaoatf/src/utils/log"
"github.com/easysoft/zentaoatf/src/utils/vari" "github.com/easysoft/zentaoatf/src/utils/vari"
"strings" "strings"
) )
...@@ -52,6 +53,8 @@ func (w *SelectWidget) Layout() (*gocui.View, error) { ...@@ -52,6 +53,8 @@ func (w *SelectWidget) Layout() (*gocui.View, error) {
v.Title = w.title v.Title = w.title
logUtils.PrintToCmd(fmt.Sprintf("%s: defalut=%s", v.Name(), w.defaultt), -1)
labels := make([]string, 0) labels := make([]string, 0)
defaultValIndex := -1 defaultValIndex := -1
for idx, opt := range w.options { for idx, opt := range w.options {
......
...@@ -107,6 +107,8 @@ func GetInput(regx string, defaultVal string, fmtStr string, params ...interface ...@@ -107,6 +107,8 @@ func GetInput(regx string, defaultVal string, fmtStr string, params ...interface
// fmt.Scanln(&ret) // fmt.Scanln(&ret)
Scanf(&ret) Scanf(&ret)
//logUtils.PrintToStdOut(fmt.Sprintf("%v", ret), -1)
if strings.TrimSpace(ret) == "" && defaultVal != "" { if strings.TrimSpace(ret) == "" && defaultVal != "" {
ret = defaultVal ret = defaultVal
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册