diff --git a/src/ui/page/cui.go b/src/ui/page/cui.go index 1c9a18f287c1e88e92ca3b89a12273e84476b170..92688d589c44e989b08022872c334a2922cd639b 100644 --- a/src/ui/page/cui.go +++ b/src/ui/page/cui.go @@ -1,7 +1,6 @@ package page import ( - zentaoService "github.com/easysoft/zentaoatf/src/service/zentao" commonUtils "github.com/easysoft/zentaoatf/src/utils/common" "github.com/easysoft/zentaoatf/src/utils/vari" "github.com/jroimartin/gocui" @@ -9,8 +8,6 @@ import ( ) func CuiReportBug(dir string, id string) error { - vari.CurrBug, vari.CurrBugStepIds = zentaoService.PrepareBug(dir, id) - g, err := gocui.NewGui(gocui.OutputNormal) if err != nil { log.Panicln(err) @@ -26,7 +23,7 @@ func CuiReportBug(dir string, id string) error { vari.Cui = g vari.RunFromCui = true - //InitMainPage() + InitMainPage() InitReportBugPage(dir, id) diff --git a/src/ui/page/main.go b/src/ui/page/main.go index a6d541e23df4ab1cc880458a521d9d545da323ec..7d641a4fdffb59e6e7b08e8aa12df343c8ceed87 100644 --- a/src/ui/page/main.go +++ b/src/ui/page/main.go @@ -28,6 +28,9 @@ func InitMainPage() error { widget.NewHelpWidget() MainPageKeyBindings() + titleInput := widget.NewTextWidget("titleInput", 2, 2, widget.TextWidthFull-5, "bug.Title") + ui.ViewMap["reportBug"] = append(ui.ViewMap["reportBug"], titleInput.Name()) + return nil } diff --git a/src/ui/page/report-bug.go b/src/ui/page/report-bug.go index 3d7a5b724fa02c026245eb6f379b7ac99faa83c8..4751fe9f9b15d8c6d714df35159f06ab37217c16 100644 --- a/src/ui/page/report-bug.go +++ b/src/ui/page/report-bug.go @@ -16,11 +16,9 @@ import ( var filedValMap map[string]int func InitReportBugPage(resultDir string, caseId string) error { - InitMainPage() - DestoryReportBugPage() - //vari.CurrBug, vari.CurrBugStepIds = zentaoService.PrepareBug(resultDir, caseId) + vari.CurrBug, vari.CurrBugStepIds = zentaoService.PrepareBug(resultDir, caseId) bug := vari.CurrBug w, h := vari.Cui.Size() @@ -41,7 +39,7 @@ func InitReportBugPage(resultDir string, caseId string) error { // steps left = right + ui.Space stepsWidth := w - left - 3 - stepsInput := widget.NewTextareaWidget("stepsInput", left, y, stepsWidth, h-constant.CmdViewHeight-2, "bug.Steps") + stepsInput := widget.NewTextareaWidget("stepsInput", left, y, stepsWidth, h-constant.CmdViewHeight-2, bug.Steps) stepsInput.Title = i118Utils.I118Prt.Sprintf("steps") ui.ViewMap["reportBug"] = append(ui.ViewMap["reportBug"], stepsInput.Name())