From 7ec93246dc7804f6d00dd82db361b21781909f61 Mon Sep 17 00:00:00 2001 From: Aaron Chen <462826@qq.com> Date: Mon, 2 Sep 2019 18:22:31 +0800 Subject: [PATCH] test on win10 --- src/ui/page/cui.go | 5 +---- src/ui/page/main.go | 3 +++ src/ui/page/report-bug.go | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/ui/page/cui.go b/src/ui/page/cui.go index 1c9a18f2..92688d58 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 a6d541e2..7d641a4f 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 3d7a5b72..4751fe9f 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()) -- GitLab