diff --git a/cmd/v2/ui/views/rtask_list.go b/cmd/v2/ui/views/rtask_list.go index 3c3023366..89161c6a4 100644 --- a/cmd/v2/ui/views/rtask_list.go +++ b/cmd/v2/ui/views/rtask_list.go @@ -33,7 +33,9 @@ func (this *RtaskListView) CreateView(t *model.TestCase) fyne.CanvasObject { input.PlaceHolder = "分组编号" this.form.AppendItem(widget.NewFormItem("", input)) - + res := widget.NewEntry() + res.PlaceHolder = "已完成任务列表" + this.form.AppendItem(widget.NewFormItem("任务列表", res)) // task list button taskListBtn := widget.NewButtonWithIcon("任务列表", theme.ConfirmIcon(), func() { @@ -48,14 +50,11 @@ func (this *RtaskListView) CreateView(t *model.TestCase) fyne.CanvasObject { } }) - //修改结果 - resultBtn := widget.NewButtonWithIcon("修改结果", theme.ConfirmIcon(), func() { - - }) + modiResBtn := widget.NewButtonWithIcon("修改任务", theme.ConfirmIcon(), func() {}) // layout - split := container.NewHSplit(this.dataListWidget, container.NewVBox(this.form, taskListBtn, resultBtn)) - split.Offset = 0.7 + split := container.NewHSplit(this.dataListWidget, container.NewVBox(this.form, taskListBtn, modiResBtn)) + split.Offset = 1 //data listener for this.dataListener() diff --git a/cmd/v2/ui/views/rtask_testview.go b/cmd/v2/ui/views/rtask_testview.go index b78b2af8e..70d006947 100644 --- a/cmd/v2/ui/views/rtask_testview.go +++ b/cmd/v2/ui/views/rtask_testview.go @@ -25,8 +25,7 @@ func (this *RtaskTestView) CreateView(t *model.TestCase) fyne.CanvasObject { condiInput := widget.NewEntry() condiInput.PlaceHolder = "条件ID为空时走触发逻辑否则走校验逻辑" - res := widget.NewEntry() - res.PlaceHolder = "已完成任务列表" + input := widget.NewEntry() input.PlaceHolder = "分组编号" @@ -36,7 +35,7 @@ func (this *RtaskTestView) CreateView(t *model.TestCase) fyne.CanvasObject { this.form.AppendItem(widget.NewFormItem("条件ID", condiInput)) this.form.AppendItem(widget.NewFormItem("分组编号", input)) - this.form.AppendItem(widget.NewFormItem("任务列表", res)) + this.form.OnSubmit = func() { // if rtaskTypeInput.Text == "" { diff --git a/modules/rtask/api_choose.go b/modules/rtask/api_choose.go index f18e7980c..b2ca93921 100644 --- a/modules/rtask/api_choose.go +++ b/modules/rtask/api_choose.go @@ -78,7 +78,9 @@ func (this *apiComp) Choose(session comm.IUserSession, req *pb.RtaskChooseReq) ( continue } if err, ok := this.moduleRtask.modelRtask.checkCondi(session.GetUserId(), v); !ok { - this.moduleRtask.Error(err.Error()) + if err != nil { + this.moduleRtask.Error(err.Error()) + } code = pb.ErrorCode_RtaskCondiNoReach return }