GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-09-05 23:51:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: add lost options

Browse Source
This commit is contained in:
buyuxiang
2023-10-26 22:05:04 +08:00
parent c22dc0836c
commit a772f836ec
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/pkg/uixt/action.go
+16
View File
@@ -121,6 +121,7 @@ type ActionOptions struct {
ScreenShotWithLiveType bool `json:"screenshot_with_live_type,omitempty" yaml:"screenshot_with_live_type,omitempty"` ScreenShotWithLiveType bool `json:"screenshot_with_live_type,omitempty" yaml:"screenshot_with_live_type,omitempty"`
ScreenShotWithUITypes []string `json:"screenshot_with_ui_types,omitempty" yaml:"screenshot_with_ui_types,omitempty"` ScreenShotWithUITypes []string `json:"screenshot_with_ui_types,omitempty" yaml:"screenshot_with_ui_types,omitempty"`
ScreenShotWithClosePopups bool `json:"screenshot_with_close_popups,omitempty" yaml:"screenshot_with_close_popups,omitempty"` ScreenShotWithClosePopups bool `json:"screenshot_with_close_popups,omitempty" yaml:"screenshot_with_close_popups,omitempty"`
ScreenShotWithOCRCluster string `json:"screenshot_with_ocr_cluster,omitempty" yaml:"screenshot_with_ocr_cluster,omitempty"`
} }
func (o *ActionOptions) Options() []ActionOption { func (o *ActionOptions) Options() []ActionOption {
@@ -180,6 +181,9 @@ func (o *ActionOptions) Options() []ActionOption {
if len(o.AbsScope) == 4 { if len(o.AbsScope) == 4 {
options = append(options, WithAbsScope( options = append(options, WithAbsScope(
o.AbsScope[0], o.AbsScope[1], o.AbsScope[2], o.AbsScope[3])) o.AbsScope[0], o.AbsScope[1], o.AbsScope[2], o.AbsScope[3]))
} else if len(o.Scope) == 4 {
options = append(options, WithScope(
o.Scope[0], o.Scope[1], o.Scope[2], o.Scope[3]))
} }
if len(o.Offset) == 2 { if len(o.Offset) == 2 {
// for tap [x,y] offset // for tap [x,y] offset
@@ -224,6 +228,12 @@ func (o *ActionOptions) Options() []ActionOption {
if len(o.ScreenShotWithUITypes) > 0 { if len(o.ScreenShotWithUITypes) > 0 {
options = append(options, WithScreenShotUITypes(o.ScreenShotWithUITypes...)) options = append(options, WithScreenShotUITypes(o.ScreenShotWithUITypes...))
} }
if o.ScreenShotWithClosePopups {
options = append(options, WithScreenShotClosePopups(true))
}
if o.ScreenShotWithOCRCluster != "" {
options = append(options, WithScreenOCRCluster(o.ScreenShotWithOCRCluster))
}
return options return options
} }
@@ -472,6 +482,12 @@ func WithScreenShotClosePopups(closeOn bool) ActionOption {
} }
} }
func WithScreenOCRCluster(ocrCluster string) ActionOption {
return func(o *ActionOptions) {
o.ScreenShotWithOCRCluster = ocrCluster
}
}
func (dExt *DriverExt) ParseActionOptions(options ...ActionOption) []ActionOption { func (dExt *DriverExt) ParseActionOptions(options ...ActionOption) []ActionOption {
actionOptions := NewActionOptions(options...) actionOptions := NewActionOptions(options...)
hrp/pkg/uixt/service_vedem.go
+3
View File
@@ -217,6 +217,9 @@ func (s *veDEMImageService) GetImage(imageBuf *bytes.Buffer, options ...ActionOp
for _, uiType := range actionOptions.ScreenShotWithUITypes { for _, uiType := range actionOptions.ScreenShotWithUITypes {
bodyWriter.WriteField("uiTypes", uiType) bodyWriter.WriteField("uiTypes", uiType)
} }
if actionOptions.ScreenShotWithOCRCluster != "" {
bodyWriter.WriteField("ocrCluster", actionOptions.ScreenShotWithOCRCluster)
}
if actionOptions.Timeout > 0 { if actionOptions.Timeout > 0 {
bodyWriter.WriteField("timeout", fmt.Sprintf("%v", actionOptions.Timeout)) bodyWriter.WriteField("timeout", fmt.Sprintf("%v", actionOptions.Timeout))