Merge branch 'main' into ztf-35_zhaoke

cmd/agent/main.go

-package main
-
-func main() {
-
-}

cmd/command/main.go

@@ -11,7 +11,6 @@ import (
 	logUtils "github.com/easysoft/zentaoatf/pkg/lib/log"
 	stringUtils "github.com/easysoft/zentaoatf/pkg/lib/string"
 	"github.com/fatih/color"
-	"log"
 	"os"
 	"os/signal"
 	"strings"
@@ -83,58 +82,33 @@ func main() {
 	switch os.Args[1] {
 	case "set", "-set":
 		flagSet.Parse(os.Args[2:])
-		if commConsts.Verbose {
-			log.Println("WorkDir=" + commConsts.WorkDir)
-			log.Println("ZtfDir=" + commConsts.ZtfDir)
-		}
 		action.Set()
 
 	case "expect":
 		files := fileUtils.GetFilesFromParams(os.Args[2:])
 		action.GenExpectFiles(files)
+
 	case "extract":
 		files := fileUtils.GetFilesFromParams(os.Args[2:])
 		action.Extract(files)
 
 	case "checkout", "co":
-		if err := flagSet.Parse(os.Args[2:]); err == nil {
-			action.Checkout(productId, moduleId, suiteId, taskIdOrName, independentFile, language)
-		}
+		checkout()
 
 	case "ci":
-		files := fileUtils.GetFilesFromParams(os.Args[2:])
-		if err := flagSet.Parse(os.Args[len(files)+2:]); err == nil {
-			action.CheckIn(files)
-		}
+		ci()
 
 	case "cr":
-		files := fileUtils.GetFilesFromParams(os.Args[2:])
-		if err := flagSet.Parse(os.Args[len(files)+2:]); err == nil {
-			action.CommitZTFTestResult(files, stringUtils.ParseInt(productId),
-				taskIdOrName, noNeedConfirm)
-		}
+		cr()
 
 	case "cb":
-		files := fileUtils.GetFilesFromParams(os.Args[2:])
-		if err := flagSet.Parse(os.Args[len(files)+2:]); err == nil {
-			action.CommitBug(files, stringUtils.ParseInt(productId), noNeedConfirm)
-		}
+		cb()
 
 	case "list", "ls", "-l":
-		files := fileUtils.GetFilesFromParams(os.Args[2:])
-		if err := flagSet.Parse(os.Args[len(files)+2:]); err == nil {
-			if len(files) == 0 {
-				files = append(files, ".")
-			}
-
-			action.List(files, keywords)
-		}
+		list()
 
 	case "view", "-v":
-		files := fileUtils.GetFilesFromParams(os.Args[2:])
-		if err := flagSet.Parse(os.Args[len(files)+2:]); err == nil {
-			action.View(files, keywords)
-		}
+		view()
 
 	case "clean", "-clean", "-c":
 		action.Clean()
@@ -160,6 +134,52 @@ func main() {
 	}
 }
 
+func checkout() {
+	if err := flagSet.Parse(os.Args[2:]); err == nil {
+		action.Checkout(productId, moduleId, suiteId, taskIdOrName, independentFile, language)
+	}
+}
+
+func ci() {
+	files := fileUtils.GetFilesFromParams(os.Args[2:])
+	if err := flagSet.Parse(os.Args[len(files)+2:]); err == nil {
+		action.CheckIn(files)
+	}
+}
+
+func cr() {
+	files := fileUtils.GetFilesFromParams(os.Args[2:])
+	if err := flagSet.Parse(os.Args[len(files)+2:]); err == nil {
+		action.CommitZTFTestResult(files, stringUtils.ParseInt(productId),
+			taskIdOrName, noNeedConfirm)
+	}
+}
+
+func cb() {
+	files := fileUtils.GetFilesFromParams(os.Args[2:])
+	if err := flagSet.Parse(os.Args[len(files)+2:]); err == nil {
+		action.CommitBug(files, stringUtils.ParseInt(productId), noNeedConfirm)
+	}
+}
+
+func list() {
+	files := fileUtils.GetFilesFromParams(os.Args[2:])
+	if err := flagSet.Parse(os.Args[len(files)+2:]); err == nil {
+		if len(files) == 0 {
+			files = append(files, ".")
+		}
+
+		action.List(files, keywords)
+	}
+}
+
+func view() {
+	files := fileUtils.GetFilesFromParams(os.Args[2:])
+	if err := flagSet.Parse(os.Args[len(files)+2:]); err == nil {
+		action.View(files, keywords)
+	}
+}
+
 func run(args []string) {
 	if len(args) >= 3 && stringUtils.FindInArr(args[2], commConsts.UnitTestTypes) { // unit test
 		runUnitTest(args)

demo/sample/2_with_group.php

@@ -4,7 +4,7 @@
 
 title=with multi groups
 cid=2
-pid=0
+pid=1
 
 step 1 >> expect 1
 step 2 >> expect 2

internal/command/config/config.go

@@ -72,6 +72,7 @@ func Init() {
 	i118Utils.Init(commConsts.Language, commConsts.AppServer)
 
 	langHelper.GetExtToNameMap()
+	langHelper.GetEditorExtToLangMap()
 
 	commConsts.ExecFrom = commConsts.FromCmd
 	return

internal/pkg/grpc/proto/greater/greater.pb.go

-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.27.1
-// 	protoc        v3.17.3
-// source: greater/greater.proto
-
-package greater
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// The request message containing the user's name.
-type HelloRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-}
-
-func (x *HelloRequest) Reset() {
-	*x = HelloRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_greater_greater_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HelloRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HelloRequest) ProtoMessage() {}
-
-func (x *HelloRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_greater_greater_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HelloRequest.ProtoReflect.Descriptor instead.
-func (*HelloRequest) Descriptor() ([]byte, []int) {
-	return file_greater_greater_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *HelloRequest) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-// The response message containing the greetings
-type HelloReply struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"`
-}
-
-func (x *HelloReply) Reset() {
-	*x = HelloReply{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_greater_greater_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *HelloReply) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*HelloReply) ProtoMessage() {}
-
-func (x *HelloReply) ProtoReflect() protoreflect.Message {
-	mi := &file_greater_greater_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use HelloReply.ProtoReflect.Descriptor instead.
-func (*HelloReply) Descriptor() ([]byte, []int) {
-	return file_greater_greater_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *HelloReply) GetMessage() string {
-	if x != nil {
-		return x.Message
-	}
-	return ""
-}
-
-var File_greater_greater_proto protoreflect.FileDescriptor
-
-var file_greater_greater_proto_rawDesc = []byte{
-	0x0a, 0x15, 0x67, 0x72, 0x65, 0x61, 0x74, 0x65, 0x72, 0x2f, 0x67, 0x72, 0x65, 0x61, 0x74, 0x65,
-	0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x07, 0x67, 0x72, 0x65, 0x61, 0x74, 0x65, 0x72,
-	0x22, 0x22, 0x0a, 0x0c, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x22, 0x26, 0x0a, 0x0a, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x52, 0x65, 0x70,
-	0x6c, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0x43, 0x0a, 0x07,
-	0x47, 0x72, 0x65, 0x65, 0x74, 0x65, 0x72, 0x12, 0x38, 0x0a, 0x08, 0x53, 0x61, 0x79, 0x48, 0x65,
-	0x6c, 0x6c, 0x6f, 0x12, 0x15, 0x2e, 0x67, 0x72, 0x65, 0x61, 0x74, 0x65, 0x72, 0x2e, 0x48, 0x65,
-	0x6c, 0x6c, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x67, 0x72, 0x65,
-	0x61, 0x74, 0x65, 0x72, 0x2e, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22,
-	0x00, 0x42, 0x0b, 0x5a, 0x09, 0x2e, 0x2f, 0x67, 0x72, 0x65, 0x61, 0x74, 0x65, 0x72, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_greater_greater_proto_rawDescOnce sync.Once
-	file_greater_greater_proto_rawDescData = file_greater_greater_proto_rawDesc
-)
-
-func file_greater_greater_proto_rawDescGZIP() []byte {
-	file_greater_greater_proto_rawDescOnce.Do(func() {
-		file_greater_greater_proto_rawDescData = protoimpl.X.CompressGZIP(file_greater_greater_proto_rawDescData)
-	})
-	return file_greater_greater_proto_rawDescData
-}
-
-var file_greater_greater_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_greater_greater_proto_goTypes = []interface{}{
-	(*HelloRequest)(nil), // 0: greater.HelloRequest
-	(*HelloReply)(nil),   // 1: greater.HelloReply
-}
-var file_greater_greater_proto_depIdxs = []int32{
-	0, // 0: greater.Greeter.SayHello:input_type -> greater.HelloRequest
-	1, // 1: greater.Greeter.SayHello:output_type -> greater.HelloReply
-	1, // [1:2] is the sub-list for method output_type
-	0, // [0:1] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_greater_greater_proto_init() }
-func file_greater_greater_proto_init() {
-	if File_greater_greater_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_greater_greater_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HelloRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_greater_greater_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*HelloReply); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_greater_greater_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_greater_greater_proto_goTypes,
-		DependencyIndexes: file_greater_greater_proto_depIdxs,
-		MessageInfos:      file_greater_greater_proto_msgTypes,
-	}.Build()
-	File_greater_greater_proto = out.File
-	file_greater_greater_proto_rawDesc = nil
-	file_greater_greater_proto_goTypes = nil
-	file_greater_greater_proto_depIdxs = nil
-}

internal/pkg/grpc/proto/greater/greater.proto

-syntax = "proto3";
-
-package greater;
-option go_package="./greater";
-
-// The greeting service definition.
-service Greeter {
-  // Sends a greeting
-  rpc SayHello (HelloRequest) returns (HelloReply) {}
-}
-
-// The request message containing the user's name.
-message HelloRequest {
-  string name = 1;
-}
-
-// The response message containing the greetings
-message HelloReply {
-  string message = 1;
-}
\ No newline at end of file

internal/pkg/grpc/proto/greater/greater_grpc.pb.go

-// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
-
-package greater
-
-import (
-	context "context"
-	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-// Requires gRPC-Go v1.32.0 or later.
-const _ = grpc.SupportPackageIsVersion7
-
-// GreeterClient is the client API for Greeter service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type GreeterClient interface {
-	// Sends a greeting
-	SayHello(ctx context.Context, in *HelloRequest, opts ...grpc.CallOption) (*HelloReply, error)
-}
-
-type greeterClient struct {
-	cc grpc.ClientConnInterface
-}
-
-func NewGreeterClient(cc grpc.ClientConnInterface) GreeterClient {
-	return &greeterClient{cc}
-}
-
-func (c *greeterClient) SayHello(ctx context.Context, in *HelloRequest, opts ...grpc.CallOption) (*HelloReply, error) {
-	out := new(HelloReply)
-	err := c.cc.Invoke(ctx, "/greater.Greeter/SayHello", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// GreeterServer is the server API for Greeter service.
-// All implementations must embed UnimplementedGreeterServer
-// for forward compatibility
-type GreeterServer interface {
-	// Sends a greeting
-	SayHello(context.Context, *HelloRequest) (*HelloReply, error)
-	mustEmbedUnimplementedGreeterServer()
-}
-
-// UnimplementedGreeterServer must be embedded to have forward compatible implementations.
-type UnimplementedGreeterServer struct {
-}
-
-func (UnimplementedGreeterServer) SayHello(context.Context, *HelloRequest) (*HelloReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SayHello not implemented")
-}
-func (UnimplementedGreeterServer) mustEmbedUnimplementedGreeterServer() {}
-
-// UnsafeGreeterServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to GreeterServer will
-// result in compilation errors.
-type UnsafeGreeterServer interface {
-	mustEmbedUnimplementedGreeterServer()
-}
-
-func RegisterGreeterServer(s grpc.ServiceRegistrar, srv GreeterServer) {
-	s.RegisterService(&Greeter_ServiceDesc, srv)
-}
-
-func _Greeter_SayHello_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(HelloRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(GreeterServer).SayHello(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/greater.Greeter/SayHello",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(GreeterServer).SayHello(ctx, req.(*HelloRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// Greeter_ServiceDesc is the grpc.ServiceDesc for Greeter service.
-// It's only intended for direct use with grpc.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var Greeter_ServiceDesc = grpc.ServiceDesc{
-	ServiceName: "greater.Greeter",
-	HandlerType: (*GreeterServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "SayHello",
-			Handler:    _Greeter_SayHello_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "greater/greater.proto",
-}

internal/pkg/helper/exec/report-unit.go

@@ -274,14 +274,10 @@ func GetSuiteFiles(resultDir string, startTime int64, testTool commConsts.TestTo
 					continue
 				}
 
-				if testTool == commConsts.Allure && ext == ".json" {
-					pth := filepath.Join(resultDir, name)
-					resultFiles = append(resultFiles, pth)
-				} else if ext == ".xml" {
+				if (testTool == commConsts.Allure && ext == ".json") || ext == ".xml" {
 					pth := filepath.Join(resultDir, name)
 					resultFiles = append(resultFiles, pth)
 				}
-
 			}
 		}
 	} else {
@@ -344,17 +340,11 @@ func GetTestSuite(xmlFile string, testTool commConsts.TestTool) (
 		if err == nil {
 			testSuite = ConvertRobotResult(robotResult)
 		}
-	} else if testTool == commConsts.Cypress {
-		cyResult := commDomain.CypressTestsuites{}
-		err = xml.Unmarshal([]byte(content), &cyResult)
-		if err == nil {
-			testSuite = ConvertCyResult(cyResult)
-		}
-	} else if testTool == commConsts.Playwright {
-		cyResult := commDomain.CypressTestsuites{}
-		err = xml.Unmarshal([]byte(content), &cyResult)
+	} else if testTool == commConsts.Cypress || testTool == commConsts.Playwright {
+		result := commDomain.CypressTestsuites{}
+		err = xml.Unmarshal([]byte(content), &result)
 		if err == nil {
-			testSuite = ConvertCyResult(cyResult)
+			testSuite = ConvertCyResult(result)
 		}
 	} else if testTool == commConsts.Puppeteer {
 		cyResult := commDomain.CypressTestsuites{}
@@ -477,11 +467,7 @@ func GetAllureCaseSuiteName(cs commDomain.AllureCase) (name string) {
 			if label.Value != "" {
 				suiteArr = append(suiteArr, label.Value)
 			}
-		} else if label.Name == "suite" {
-			if label.Value != "" && (len(suiteArr) == 0 || label.Value != suiteArr[len(suiteArr)-1]) {
-				suiteArr = append(suiteArr, label.Value)
-			}
-		} else if label.Name == "subSuite" {
+		} else if label.Name == "suite" || label.Name == "subSuite" {
 			if label.Value != "" && (len(suiteArr) == 0 || label.Value != suiteArr[len(suiteArr)-1]) {
 				suiteArr = append(suiteArr, label.Value)
 			}

internal/pkg/helper/exec/result.go

@@ -25,24 +25,16 @@ func CheckCaseResult(scriptFile string, logs string, report *commDomain.ZtfRepor
 	total int, secs string, pathMaxWidth int, numbMaxWidth int,
 	wsMsg *websocket.Message, errOutput string) {
 
-	steps, isOldFormat := scriptHelper.GetStepAndExpectMap(scriptFile)
+	steps := scriptHelper.GetStepAndExpectMap(scriptFile)
 
 	isIndependent, expectIndependentContent := scriptHelper.GetDependentExpect(scriptFile)
 	if isIndependent {
-		if isOldFormat {
-			scriptHelper.GetExpectMapFromIndependentFileObsolete(&steps, expectIndependentContent, false)
-		} else {
-			scriptHelper.GetExpectMapFromIndependentFile(&steps, expectIndependentContent, false)
-		}
+		scriptHelper.GetExpectMapFromIndependentFile(&steps, expectIndependentContent, false)
 	}
 
 	skip := false
 	actualArr := make([][]string, 0)
-	if isOldFormat {
-		skip, actualArr = scriptHelper.ReadLogArrObsolete(logs)
-	} else {
-		skip, actualArr = scriptHelper.ReadLogArr(logs)
-	}
+	skip, actualArr = scriptHelper.ReadLogArr(logs)
 
 	language := langHelper.GetLangByFile(scriptFile)
 	ValidateCaseResult(scriptFile, language, steps, skip, actualArr, report,

internal/pkg/helper/script/generator.go

@@ -55,20 +55,12 @@ func GenerateScript(cs commDomain.ZtfCase, langType string, independentFile bool
 		targetDir = filepath.Join(targetDir, strconv.Itoa(moduleId))
 	}
 
-	content := ""
-	isOldFormat := false
-
 	scriptPath = cs.ScriptPath
 	if scriptPath == "" {
 		fileUtils.MkDirIfNeeded(targetDir)
 		scriptPath = filepath.Join(targetDir, fmt.Sprintf("%d.%s", caseId, commConsts.LangMap[langType]["extName"]))
 	}
 
-	if fileUtils.FileExist(scriptPath) { // update title and steps
-		content = fileUtils.ReadFile(scriptPath)
-		isOldFormat = strings.Index(content, "[esac]") > -1
-	}
-
 	*caseIds = append(*caseIds, strconv.Itoa(caseId))
 
 	info := make([]string, 0)
@@ -84,12 +76,8 @@ func GenerateScript(cs commDomain.ZtfCase, langType string, independentFile bool
 	StepWidth := 20
 	stepDisplayMaxWidth := 0
 	computerTestStepWidth(cs.Steps, &stepDisplayMaxWidth, StepWidth)
+	generateTestStepAndScript(cs.Steps, &steps, &independentExpects, independentFile)
 
-	if isOldFormat {
-		generateTestStepAndScriptObsolete(cs.Steps, &steps, &independentExpects, independentFile)
-	} else {
-		generateTestStepAndScript(cs.Steps, &steps, &independentExpects, independentFile)
-	}
 	info = append(info, strings.Join(steps, "\n"))
 
 	if independentFile {
@@ -128,108 +116,6 @@ func GenEmptyScript(name, lang, pth string, productId int) {
 	fileUtils.WriteFile(pth, out)
 }
 
-func generateTestStepAndScriptObsolete(testSteps []commDomain.ZtfStep, steps *[]string, independentExpects *[]string, independentFile bool) {
-	nestedSteps := make([]commDomain.ZtfStep, 0)
-	currGroup := commDomain.ZtfStep{}
-	idx := 0
-
-	// convert steps to nested
-	for true {
-		if idx >= len(testSteps) {
-			break
-		}
-
-		ts := testSteps[idx]
-		if ts.Parent == 0 && ts.Type != "group" { // flat step
-			currGroup = commDomain.ZtfStep{Id: -1, Desc: "group", Children: make([]commDomain.ZtfStep, 0)}
-			currGroup.Children = append(currGroup.Children, ts)
-			idx++
-
-			mutiLine := false
-			for true {
-				if idx >= len(testSteps) {
-					currGroup.MultiLine = mutiLine
-					nestedSteps = append(nestedSteps, currGroup)
-					break
-				}
-
-				child := testSteps[idx]
-				if child.Type != "group" { // flat step
-					if !mutiLine {
-						mutiLine = IsMultiLine(child)
-					}
-
-					currGroup.Children = append(currGroup.Children, child)
-				} else { // found a group step
-					currGroup.MultiLine = mutiLine
-					nestedSteps = append(nestedSteps, currGroup)
-					break
-				}
-				idx++
-			}
-		} else if ts.Type == "group" {
-			currGroup = commDomain.ZtfStep{Desc: ts.Desc, Children: make([]commDomain.ZtfStep, 0)}
-			idx++
-
-			mutiLine := false
-			for true {
-				if idx >= len(testSteps) {
-					nestedSteps = append(nestedSteps, currGroup)
-					break
-				}
-
-				child := testSteps[idx]
-				if child.Type != "group" && child.Parent == ts.Id { // child step
-					if !mutiLine {
-						mutiLine = IsMultiLine(child)
-					}
-
-					currGroup.Children = append(currGroup.Children, child)
-				} else { // found a group step
-					currGroup.MultiLine = mutiLine
-					nestedSteps = append(nestedSteps, currGroup)
-					break
-				}
-				idx++
-			}
-		}
-	}
-
-	stepNumb := 1
-	// print nested steps, only one level
-	for _, group := range nestedSteps {
-		if group.Id == -1 { // [group]
-			*steps = append(*steps, fmt.Sprintf("\n[group]"))
-
-			for _, child := range group.Children {
-				stepContent, expectContent := GetCaseContent(child, strconv.Itoa(stepNumb), independentFile, group.MultiLine)
-				*steps = append(*steps, stepContent)
-
-				if independentFile && strings.TrimSpace(child.Expect) != "" {
-					*independentExpects = append(*independentExpects, expectContent)
-				}
-
-				stepNumb++
-			}
-		} else { // [1. title]
-			*steps = append(*steps, "\n"+fmt.Sprintf("[%d. %s]", stepNumb, group.Desc))
-
-			for childNo, child := range group.Children {
-				numbStr := fmt.Sprintf("%d.%d", stepNumb, childNo+1)
-
-				stepContent, expectContent := GetCaseContent(child, numbStr, independentFile, group.MultiLine)
-				*steps = append(*steps, stepContent)
-
-				if independentFile && strings.TrimSpace(child.Expect) != "" {
-					*independentExpects = append(*independentExpects, expectContent)
-				}
-			}
-
-			stepNumb++
-		}
-	}
-}
-
 func generateTestStepAndScript(testSteps []commDomain.ZtfStep, steps *[]string, independentExpects *[]string, independentFile bool) {
 	nestedSteps := make([]commDomain.ZtfStep, 0)
 

internal/pkg/helper/script/parser.go

@@ -34,7 +34,7 @@ func ReplaceCaseDesc(desc, file string) {
 	fileUtils.WriteFile(file, out)
 }
 
-func GetStepAndExpectMap(file string) (steps []commDomain.ZentaoCaseStep, isOldFormat bool) {
+func GetStepAndExpectMap(file string) (steps []commDomain.ZentaoCaseStep) {
 	if !fileUtils.FileExist(file) {
 		return
 	}
@@ -42,63 +42,20 @@ func GetStepAndExpectMap(file string) (steps []commDomain.ZentaoCaseStep, isOldF
 	lang := langHelper.GetLangByFile(file)
 	txt := fileUtils.ReadFile(file)
 
-	isOldFormat = strings.Index(txt, "[esac]") > -1
-	_, checkpoints := ReadCaseInfo(txt, lang, isOldFormat)
+	_, checkpoints := ReadCaseInfo(txt, lang)
 	lines := strings.Split(checkpoints, "\n")
 
-	if isOldFormat {
-		groupBlockArr := getGroupBlockArr(lines)
-		groupArr := getStepNestedArrObsolete(groupBlockArr)
-		_, steps = getSortedTextFromNestedStepsObsolete(groupArr)
-	} else {
-		groupArr := getStepNestedArr(lines)
-		_, steps = getSortedTextFromNestedSteps(groupArr)
-	}
+	groupArr := getStepNestedArr(lines)
+	_, steps = getSortedTextFromNestedSteps(groupArr)
 
 	isIndependent, expectIndependentContent := GetDependentExpect(file)
 	if isIndependent {
-		if isOldFormat {
-			GetExpectMapFromIndependentFileObsolete(&steps, expectIndependentContent, false)
-		} else {
-			GetExpectMapFromIndependentFile(&steps, expectIndependentContent, false)
-		}
+		GetExpectMapFromIndependentFile(&steps, expectIndependentContent, false)
 	}
 
 	return
 }
 
-//func SortFile(file string) {
-//	stepsTxt := ""
-//
-//	if fileUtils.FileExist(file) {
-//		txt := fileUtils.ReadFile(file)
-//		lang := langUtils.GetLangByFile(file)
-//		isOldFormat := strings.Index(txt, "[esac]") > -1
-//		info, content := ReadCaseInfo(txt, lang, isOldFormat)
-//		lines := strings.Split(content, "\n")
-//
-//		groupBlockArr := getGroupBlockArr(lines)
-//		groupArr := getStepNestedArrObsolete(groupBlockArr)
-//		stepsTxt, _, _, _ = getSortedTextFromNestedStepsObsolete(groupArr)
-//
-//		// replace info
-//		from := ""
-//		to := ""
-//		if isOldFormat {
-//			from = `(?s)\[case\].*\[esac\]`
-//			to = "[case]\n" + info + "\n" + stepsTxt + "\n\n[esac]"
-//		} else {
-//			from = fmt.Sprintf(`(?s)%s.*%s`, langUtils.LangCommentsRegxMap[lang][0], langUtils.LangCommentsRegxMap[lang][1])
-//			to = fmt.Sprintf("%s\n"+info+"\n"+stepsTxt+"\n\n%s",
-//				langUtils.LangCommentsRegxMap[lang][0], langUtils.LangCommentsRegxMap[lang][1])
-//		}
-//		re, _ := regexp.Compile(from)
-//		script := re.ReplaceAllString(txt, to)
-//
-//		fileUtils.WriteFile(file, script)
-//	}
-//}
-
 func getGroupBlockArr(lines []string) [][]string {
 	groupBlockArr := make([][]string, 0)
 
@@ -141,28 +98,6 @@ func getGroupBlockArr(lines []string) [][]string {
 	return groupBlockArr
 }
 
-func getStepNestedArrObsolete(blocks [][]string) (ret []commDomain.ZtfStep) {
-	for _, block := range blocks {
-		name := block[0]
-		group := commDomain.ZtfStep{Desc: name}
-
-		if isStepsIdent(block[1]) { // muti line
-			group.MultiLine = true
-			childs := loadMultiLineSteps(block[1:])
-
-			group.Children = append(group.Children, childs...)
-		} else {
-			childs := loadSingleLineSteps(block[1:])
-
-			group.Children = append(group.Children, childs...)
-		}
-
-		ret = append(ret, group)
-	}
-
-	return ret
-}
-
 func getStepNestedArr(lines []string) (ret []commDomain.ZtfStep) {
 	parent := commDomain.ZtfStep{}
 	increase := 0
@@ -346,125 +281,6 @@ func isGroup(str string) bool {
 	return ret
 }
 
-func getSortedTextFromNestedStepsObsolete(groups []commDomain.ZtfStep) (stepsText string, steps []commDomain.ZentaoCaseStep) {
-	ret := make([]string, 0)
-
-	groupNumb := 1
-	for _, group := range groups {
-		desc := group.Desc
-
-		if desc == "[group]" {
-			ret = append(ret, "\n"+desc)
-
-			for idx, child := range group.Children { // level 1 item
-				step := commDomain.ZentaoCaseStep{}
-
-				if group.MultiLine {
-					// steps
-					tag := replaceNumb("[steps]", groupNumb, -1, true)
-					ret = append(ret, "  "+tag)
-
-					stepTxt := printMutiStepOrExpect(child.Desc)
-					ret = append(ret, stepTxt)
-
-					step.Desc = stepTxt
-
-					// expects
-					tag = replaceNumb("[expects]", groupNumb, -1, true)
-					ret = append(ret, "  "+tag)
-
-					expectTxt := printMutiStepOrExpect(child.Expect)
-					ret = append(ret, expectTxt)
-					if idx < len(group.Children)-1 {
-						ret = append(ret, "")
-					}
-
-					step.Expect = expectTxt
-				} else {
-					stepTxt := strings.TrimSpace(child.Desc)
-					stepTxtWithNumb := replaceNumb(stepTxt, groupNumb, -1, false)
-
-					step.Desc = stepTxt
-
-					expectTxt := child.Expect
-					expectTxt = strings.TrimSpace(expectTxt)
-
-					step.Expect = expectTxt
-
-					if expectTxt != "" {
-						expectTxt = ">> " + expectTxt
-					}
-
-					ret = append(ret, fmt.Sprintf("  %s %s", stepTxtWithNumb, expectTxt))
-				}
-
-				steps = append(steps, step)
-
-				groupNumb++
-			}
-		} else {
-			groupStep := commDomain.ZentaoCaseStep{}
-
-			desc = replaceNumb(group.Desc, groupNumb, -1, true)
-			ret = append(ret, "\n"+desc)
-
-			groupStep.Type = commConsts.Group
-			groupStep.Desc = getGroupName(group.Desc)
-			groupStep.Expect = ""
-
-			steps = append(steps, groupStep)
-
-			childNumb := 1
-			for _, child := range group.Children {
-				itemStep := commDomain.ZentaoCaseStep{}
-
-				itemStep.Type = commConsts.Item
-
-				if group.MultiLine {
-					// steps
-					tag := replaceNumb("[steps]", groupNumb, childNumb, true)
-					ret = append(ret, "  "+tag)
-
-					stepTxt := printMutiStepOrExpect(child.Desc)
-					ret = append(ret, stepTxt)
-
-					itemStep.Desc = stepTxt
-
-					// expects
-					tag = replaceNumb("[expects]", groupNumb, childNumb, true)
-					ret = append(ret, "  "+tag)
-
-					expectTxt := printMutiStepOrExpect(child.Expect)
-					ret = append(ret, expectTxt)
-
-					itemStep.Expect = expectTxt
-				} else {
-					stepTxt := strings.TrimSpace(child.Desc)
-					itemStep.Desc = stepTxt
-
-					expectTxt := child.Expect
-					expectTxt = strings.TrimSpace(expectTxt)
-					itemStep.Expect = expectTxt
-
-					if expectTxt != "" {
-						expectTxt = ">> " + expectTxt
-					}
-
-					ret = append(ret, fmt.Sprintf("  %s %s", stepTxt, expectTxt))
-				}
-
-				childNumb++
-			}
-
-			groupNumb++
-		}
-	}
-
-	stepsText = strings.Join(ret, "\n")
-
-	return
-}
-
 func getSortedTextFromNestedSteps(groups []commDomain.ZtfStep) (ret string, steps []commDomain.ZentaoCaseStep) {
 	arr := make([]string, 0)
 
@@ -565,20 +381,6 @@ func printMutiStepOrExpect(str string) string {
 	return strings.Join(ret, "\r\n")
 }
 
-func GetExpectMapFromIndependentFileObsolete(steps *[]commDomain.ZentaoCaseStep, content string, withEmptyExpect bool) {
-	expectArr := ReadExpectIndependentArrObsolete(content)
-
-	for idx, step := range *steps {
-		if len(expectArr) > idx {
-			step.Expect = strings.Join(expectArr[idx], "\r\n")
-		} else {
-			if withEmptyExpect {
-				step.Expect = ""
-			}
-		}
-	}
-}
-
 func GetExpectMapFromIndependentFile(steps *[]commDomain.ZentaoCaseStep, content string, withEmptyExpect bool) {
 	expectArr := ReadExpectIndependentArr(content)
 
@@ -752,105 +554,6 @@ func GetCaseInfo(file string) (pass bool, caseId, productId int, title string) {
 	return
 }
 
-//func ReadScriptCheckpoints(file string) ([]string, [][]string) {
-//	_, expectIndependentContent := GetDependentExpect(file)
-//
-//	content := fileUtils.ReadFile(file)
-//	_, checkpoints := ReadCaseInfo(content)
-//
-//	cpStepArr, expectArr := getCheckpointStepArr(checkpoints, expectIndependentContent)
-//
-//	return cpStepArr, expectArr
-//}
-//func getCheckpointStepArr(content string, expectIndependentContent string) ([]string, [][]string) {
-//	cpStepArr := make([]string, 0)
-//	expectArr := make([][]string, 0)
-//
-//	independentExpect := expectIndependentContent != ""
-//
-//	lines := strings.Split(content, "\n")
-//	i := 0
-//	for i < len(lines) {
-//		step := ""
-//		expects := make([]string, 0)
-//
-//		line := strings.TrimSpace(lines[i])
-//
-//		regx := regexp.MustCompile(`(?U:[\d\.]*)(.+)>>(.*)`)
-//		arr := regx.FindStringSubmatch(line)
-//		if len(arr) > 2 {
-//			step = arr[1]
-//			if !independentExpect {
-//				expects = append(expects, strings.TrimSpace(arr[2]))
-//			}
-//		} else {
-//			regx = regexp.MustCompile(`\[([\d\.]*).*expects\]`)
-//			arr = regx.FindStringSubmatch(line)
-//			if len(arr) > 1 {
-//				step = arr[1]
-//
-//				if !independentExpect {
-//					for i+1 < len(lines) {
-//						ln := strings.TrimSpace(lines[i+1])
-//
-//						if strings.Index(ln, "[") == 0 || strings.Index(ln, ">>") > 0 || ln == "" {
-//							break
-//						} else {
-//							expects = append(expects, ln)
-//							i++
-//						}
-//					}
-//				}
-//			}
-//		}
-//
-//		if step != "" && len(expects) > 0 {
-//			cpStepArr = append(cpStepArr, step)
-//			if !independentExpect {
-//				expectArr = append(expectArr, expects)
-//			}
-//		}
-//		i++
-//	}
-//
-//	if independentExpect {
-//		expectArr = ReadExpectIndependentArrObsolete(expectIndependentContent)
-//	}
-//
-//	return cpStepArr, expectArr
-//}
-
-func ReadExpectIndependentArrObsolete(content string) [][]string {
-	lines := strings.Split(content, "\n")
-
-	ret := make([][]string, 0)
-	var cpArr []string
-
-	for idx, line := range lines {
-		line = strings.TrimSpace(line)
-
-		if line == ">>" { // more than one line
-			cpArr = make([]string, 0)
-		} else if strings.Index(line, ">>") == 0 { // single line
-			line = strings.Replace(line, ">>", "", -1)
-			line = strings.TrimSpace(line)
-
-			cpArr = append(cpArr, line)
-			ret = append(ret, cpArr)
-			cpArr = make([]string, 0)
-		} else { // under >>
-			cpArr = append(cpArr, line)
-
-			if idx == len(lines)-1 || strings.Index(lines[idx+1], ">>") > -1 {
-				ret = append(ret, cpArr)
-				cpArr = make([]string, 0)
-			}
-		}
-	}
-
-	return ret
-}
-
 func ReadExpectIndependentArr(content string) [][]string {
 	//正常显示6
 	//E2.16
@@ -889,8 +592,6 @@ func ReadExpectIndependentArr(content string) [][]string {
 
 				idx += 1
 			}
-		} else if line == ">>" {
-			continue
 		} else {
 			currModel = "single"
 
@@ -907,51 +608,6 @@ func ReadExpectIndependentArr(content string) [][]string {
 	return ret
 }
 
-func ReadLogArrObsolete(content string) (isSkip bool, ret [][]string) {
-	lines := strings.Split(content, "\n")
-
-	ret = make([][]string, 0)
-	var cpArr []string
-
-	model := ""
-	for idx, line := range lines {
-		line = strings.TrimSpace(line)
-
-		if line == "skip" {
-			isSkip = true
-			return
-		}
-
-		if line == ">>" { // more than one line
-			model = "multi"
-			cpArr = make([]string, 0)
-		} else if strings.Index(line, ">>") == 0 { // single line
-			model = "single"
-
-			line = strings.Replace(line, ">>", "", -1)
-			line = strings.TrimSpace(line)
-
-			cpArr = append(cpArr, line)
-			ret = append(ret, cpArr)
-			cpArr = make([]string, 0)
-		} else {
-			if model == "" || model == "single" {
-				continue
-			}
-
-			// under >>
-			cpArr = append(cpArr, line)
-
-			if idx == len(lines)-1 || strings.Index(lines[idx+1], ">>") > -1 {
-				ret = append(ret, cpArr)
-				cpArr = make([]string, 0)
-			}
-		}
-	}
-
-	return
-}
-
 func ReadLogArr(content string) (isSkip bool, ret [][]string) {
 	lines := strings.Split(content, "\n")
 
@@ -983,8 +639,6 @@ func ReadLogArr(content string) (isSkip bool, ret [][]string) {
 				idx = idx + 1
 				model = ""
 			}
-		} else if line == ">>" {
-			continue
 		} else {
 			model = "single"
 
@@ -1013,14 +667,10 @@ func CheckFileContentIsScript(content string) bool {
 	return pass
 }
 
-func ReadCaseInfo(content, lang string, isOldFormat bool) (info, checkpoints string) {
-	regStr := ""
-	if isOldFormat {
-		regStr = `(?s)\[case\]((?U:.*pid.*))\n(.*)\[esac\]`
-	} else {
-		regStr = fmt.Sprintf(`(?smU)%s((?U:.*pid.*))\n(.*)%s`,
-			commConsts.LangCommentsRegxMap[lang][0], commConsts.LangCommentsRegxMap[lang][1])
-	}
+func ReadCaseInfo(content, lang string) (info, checkpoints string) {
+	regStr := fmt.Sprintf(`(?smU)%s((?U:.*pid.*))\n(.*)%s`,
+		commConsts.LangCommentsRegxMap[lang][0], commConsts.LangCommentsRegxMap[lang][1])
+
 	myExp := regexp.MustCompile(regStr)
 	arr := myExp.FindStringSubmatch(content)
 

internal/pkg/helper/zentao/bug.go

@@ -58,7 +58,7 @@ func PrepareBug(workspacePath, seq string, caseIdStr string, productId int) (bug
 	}
 
 	for _, cs := range report.FuncResult {
-		if cs.Id != caseId {
+		if cs.Id != caseId || cs.Status != commConsts.FAIL {
 			continue
 		}
 

internal/pkg/helper/zentao/case.go

@@ -22,8 +22,8 @@ import (
 	"github.com/kataras/iris/v12"
 )
 
-func CommitCase(caseId int, title string,
-	steps []commDomain.ZentaoCaseStep, config commDomain.WorkspaceConf) (err error) {
+func CommitCase(caseId int, title string, steps []commDomain.ZentaoCaseStep, script serverDomain.TestScript,
+	config commDomain.WorkspaceConf) (err error) {
 
 	err = Login(config)
 	if err != nil {
@@ -39,9 +39,11 @@ func CommitCase(caseId int, title string,
 	url := GenApiUrl(uri, nil, config.Url)
 
 	requestObj := map[string]interface{}{
-		"type":  "feature",
-		"title": title,
-		"steps": steps,
+		"type":   "feature",
+		"title":  title,
+		"steps":  steps,
+		"script": script.Code,
+		"lang":   script.Lang,
 	}
 
 	json, err := json.Marshal(requestObj)

internal/pkg/helper/zentao/sync.go

@@ -76,8 +76,9 @@ func SyncToZentao(cases []string, config commDomain.WorkspaceConf) (count int, e
 			continue
 		}
 
-		steps, _ := scriptHelper.GetStepAndExpectMap(cs)
-		err = CommitCase(id, title, steps, config)
+		steps := scriptHelper.GetStepAndExpectMap(cs)
+		script, _ := scriptHelper.GetScriptContent(cs, -1)
+		err = CommitCase(id, title, steps, script, config)
 
 		if err == nil {
 			count++

internal/server/config/log.go

@@ -15,6 +15,10 @@ import (
 	"go.uber.org/zap/zapcore"
 )
 
+const (
+	WinFileSchema = "winfile:///"
+)
+
 func InitLog() {
 	CONFIG.Zap.Director = filepath.Join(commConsts.WorkDir, CONFIG.Zap.Director)
 	if !dir.IsExist(CONFIG.Zap.Director) { // 判断是否有Director文件夹
@@ -50,7 +54,7 @@ func InitExecLog(workspacePath string) {
 	// print to test log file
 	logPath := filepath.Join(commConsts.ExecLogDir, commConsts.LogText)
 	if commonUtils.IsWin() {
-		logPath = filepath.Join("winfile:///", logPath)
+		logPath = filepath.Join(WinFileSchema, logPath)
 		zap.RegisterSink("winfile", newWinFileSink)
 	}
 
@@ -69,7 +73,7 @@ func InitExecLog(workspacePath string) {
 	// print to test result file
 	logPathResult := filepath.Join(commConsts.ExecLogDir, commConsts.ResultText)
 	if commonUtils.IsWin() {
-		logPathResult = filepath.Join("winfile:///", logPathResult)
+		logPathResult = filepath.Join(WinFileSchema, logPathResult)
 		zap.RegisterSink("winfile", newWinFileSink)
 	}
 	config.OutputPaths = []string{logPathResult}
@@ -133,8 +137,8 @@ func getLogConfig() (config zap.Config) {
 	logPathInfo := filepath.Join(CONFIG.Zap.Director, "info.log")
 	logPathErr := filepath.Join(CONFIG.Zap.Director, "err.log")
 	if commonUtils.IsWin() {
-		logPathInfo = filepath.Join("winfile:///", logPathInfo)
-		logPathErr = filepath.Join("winfile:///", logPathErr)
+		logPathInfo = filepath.Join(WinFileSchema, logPathInfo)
+		logPathErr = filepath.Join(WinFileSchema, logPathErr)
 	}
 
 	config = zap.Config{

internal/server/core/web/index.go

@@ -81,7 +81,6 @@ func Init(port int) *WebServer {
 		close(idleConnClosed)
 	})
 
-	// init grpc
 	mvc.New(app)
 
 	// init websocket

internal/server/modules/v1/repo/interpreter.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/easysoft/zentaoatf/internal/server/modules/v1/model"
 	"github.com/fatih/color"
-	"go.uber.org/zap"
 	"gorm.io/gorm"
 )
 
@@ -33,7 +32,7 @@ func (r *InterpreterRepo) Get(id uint) (po model.Interpreter, err error) {
 		Where("NOT deleted").
 		First(&po).Error
 	if err != nil {
-		logUtils.Errorf(color.RedString("find interpreter by id failed, error: %s.", err.Error()))
+		logUtils.Info(color.RedString("find interpreter by id failed, %s.", err.Error()))
 		return
 	}
 
@@ -48,7 +47,7 @@ func (r *InterpreterRepo) Create(interpreter model.Interpreter) (id uint, err er
 
 	err = r.DB.Model(&model.Interpreter{}).Create(&interpreter).Error
 	if err != nil {
-		logUtils.Errorf(color.RedString("create interpreter failed, error: %s.", err.Error()))
+		logUtils.Info(color.RedString("create interpreter failed, %s.", err.Error()))
 		return 0, err
 	}
 
@@ -65,7 +64,7 @@ func (r *InterpreterRepo) Update(interpreter model.Interpreter) error {
 
 	err = r.DB.Model(&model.Interpreter{}).Where("id = ?", interpreter.ID).Updates(&interpreter).Error
 	if err != nil {
-		logUtils.Errorf(color.RedString("update interpreter failed, error: %s.", err.Error()))
+		logUtils.Info(color.RedString("update interpreter failed, %s.", err.Error()))
 		return err
 	}
 
@@ -76,7 +75,7 @@ func (r *InterpreterRepo) Delete(id uint) (err error) {
 	err = r.DB.Model(&model.Interpreter{}).Where("id = ?", id).
 		Updates(map[string]interface{}{"deleted": true}).Error
 	if err != nil {
-		logUtils.Errorf("delete interpreter by id error", zap.String("error:", err.Error()))
+		logUtils.Info(color.RedString("delete interpreter by id error, %s.", err.Error()))
 		return
 	}
 

internal/server/modules/v1/repo/site.go

@@ -36,7 +36,7 @@ func (r *SiteRepo) Paginate(req serverDomain.ReqPaginate) (data domain.PageData,
 
 	err = db.Count(&count).Error
 	if err != nil {
-		logUtils.Errorf("count site error", zap.String("error:", err.Error()))
+		logUtils.Info(color.RedString("count site error %s.", err.Error()))
 		return
 	}
 

internal/server/modules/v1/repo/workspace.go

@@ -11,7 +11,6 @@ import (
 	serverDomain "github.com/easysoft/zentaoatf/internal/server/modules/v1/domain"
 	"github.com/easysoft/zentaoatf/internal/server/modules/v1/model"
 	"github.com/fatih/color"
-	"go.uber.org/zap"
 	"gorm.io/gorm"
 )
 
@@ -40,7 +39,6 @@ func (r *WorkspaceRepo) Paginate(req serverDomain.WorkspaceReqPaginate) (data do
 
 	err = db.Count(&count).Error
 	if err != nil {
-		logUtils.Errorf("count site error", zap.String("error:", err.Error()))
 		return
 	}
 
@@ -50,7 +48,7 @@ func (r *WorkspaceRepo) Paginate(req serverDomain.WorkspaceReqPaginate) (data do
 		Scopes(dao.PaginateScope(req.Page, req.PageSize, req.Order, req.Field)).
 		Find(&pos).Error
 	if err != nil {
-		logUtils.Errorf("query site error", zap.String("error:", err.Error()))
+		logUtils.Info(color.RedString("query site error, %s.", err.Error()))
 		return
 	}
 
@@ -65,7 +63,7 @@ func (r *WorkspaceRepo) Get(id uint) (po model.Workspace, err error) {
 		Where("NOT deleted").
 		First(&po).Error
 	if err != nil {
-		logUtils.Errorf(color.RedString("find workspace by id failed, error: %s.", err.Error()))
+		logUtils.Info(color.RedString("find workspace by id failed, %s.", err.Error()))
 		return
 	}
 
@@ -80,7 +78,7 @@ func (r *WorkspaceRepo) Create(workspace model.Workspace) (id uint, err error) {
 
 	err = r.DB.Model(&model.Workspace{}).Create(&workspace).Error
 	if err != nil {
-		logUtils.Errorf(color.RedString("create site failed, error: %s.", err.Error()))
+		logUtils.Info(color.RedString("create site failed, %s.", err.Error()))
 		return 0, err
 	}
 
@@ -132,7 +130,7 @@ func (r *WorkspaceRepo) DeleteByPath(path string, productId uint) (err error) {
 		Error
 
 	if err != nil {
-		logUtils.Errorf(color.RedString("by path, delete workspace failed, error: %s.", err.Error()))
+		logUtils.Info(color.RedString("by path, delete workspace failed, %s.", err.Error()))
 		return
 	}
 
@@ -156,7 +154,7 @@ func (r *WorkspaceRepo) FindByPath(workspacePath string) (po model.Workspace, er
 
 	err = db.First(&po).Error
 	if err != nil {
-		logUtils.Errorf("find workspace by path error", err.Error())
+		logUtils.Info(color.RedString("find workspace by path error, %s.", err.Error()))
 		return
 	}
 

internal/server/modules/v1/service/file.go

@@ -18,6 +18,10 @@ import (
 	"github.com/snowlyg/helper/str"
 )
 
+const (
+	UploadFail = "file upload failed, %s."
+)
+
 var (
 	ErrEmpty = errors.New("请上传正确的文件")
 )
@@ -39,12 +43,12 @@ func (s *FileService) UploadFile(ctx iris.Context, fh *multipart.FileHeader) (ir
 	path := filepath.Join(dir.GetCurrentAbPath(), "static", "upload", "images")
 	err = dir.InsureDir(path)
 	if err != nil {
-		logUtils.Infof(color.RedString("file upload failed, error: %s.", err.Error()))
+		logUtils.Infof(color.RedString(UploadFail, err.Error()))
 		return nil, err
 	}
 	_, err = ctx.SaveFormFile(fh, filepath.Join(path, filename))
 	if err != nil {
-		logUtils.Infof(color.RedString("file upload failed, error: %s.", err.Error()))
+		logUtils.Infof(color.RedString(UploadFail, err.Error()))
 		return nil, err
 	}
 
@@ -104,13 +108,13 @@ func (s *FileService) addDir(pth string, parent *serverDomain.TestAsset) (dirNod
 func GetFileName(name string) (string, error) {
 	fns := strings.Split(strings.TrimLeft(name, "./"), ".")
 	if len(fns) != 2 {
-		logUtils.Infof(color.RedString("file upload failed, error: wrong file name %s.", name))
+		logUtils.Infof(color.RedString(UploadFail, "wrong file name "+name))
 		return "", ErrEmpty
 	}
 	ext := fns[1]
 	md5, err := dir.MD5(name)
 	if err != nil {
-		logUtils.Errorf(color.RedString("file upload failed, error: %s.", name))
+		logUtils.Errorf(color.RedString(UploadFail, name))
 		return "", err
 	}
 	return str.Join(md5, ".", ext), nil

pkg/core/mq/broker.go

@@ -6,6 +6,10 @@ import (
 	"time"
 )
 
+const (
+	BrokerClosed = "broker closed"
+)
+
 type Broker interface {
 	publish(topic string, msg interface{}) error
 	subscribe(topic string) (<-chan interface{}, error)
@@ -50,7 +54,7 @@ func (b *BrokerImpl) close() {
 func (b *BrokerImpl) publish(topic string, pub interface{}) error {
 	select {
 	case <-b.exit:
-		return errors.New("broker closed")
+		return errors.New(BrokerClosed)
 	default:
 	}
 
@@ -107,7 +111,7 @@ func (b *BrokerImpl) broadcast(msg interface{}, subscribers []chan interface{})
 func (b *BrokerImpl) subscribe(topic string) (<-chan interface{}, error) {
 	select {
 	case <-b.exit:
-		return nil, errors.New("broker closed")
+		return nil, errors.New(BrokerClosed)
 	default:
 	}
 
@@ -121,7 +125,7 @@ func (b *BrokerImpl) subscribe(topic string) (<-chan interface{}, error) {
 func (b *BrokerImpl) unsubscribe(topic string, sub <-chan interface{}) error {
 	select {
 	case <-b.exit:
-		return errors.New("broker closed")
+		return errors.New(BrokerClosed)
 	default:
 	}
 

pkg/lib/common/utils.go

@@ -52,14 +52,6 @@ func IsMac() bool {
 	return GetOs() == "mac"
 }
 
-func UpdateUrl(url string) string {
-	if strings.LastIndex(url, "/") < len(url)-1 {
-		url += "/"
-	}
-
-	return url
-}
-
 func IntToStrArr(intArr []int) (strArr []string) {
 	for _, i := range intArr {
 		strArr = append(strArr, strconv.Itoa(i))

pkg/lib/shell/shell.go

@@ -4,16 +4,13 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
-
 	commonUtils "github.com/easysoft/zentaoatf/pkg/lib/common"
 	i118Utils "github.com/easysoft/zentaoatf/pkg/lib/i118"
 	logUtils "github.com/easysoft/zentaoatf/pkg/lib/log"
 	stringUtils "github.com/easysoft/zentaoatf/pkg/lib/string"
-	"github.com/kataras/iris/v12/websocket"
 	"io"
 	"os"
 	"os/exec"
-	"regexp"
 	"strings"
 )
 
@@ -31,12 +28,7 @@ func ExecWinCmd(cmdStr string) (string, error) {
 }
 
 func ExeSysCmd(cmdStr string) (string, error) {
-	var cmd *exec.Cmd
-	if commonUtils.IsWin() {
-		cmd = exec.Command("cmd", "/C", cmdStr)
-	} else {
-		cmd = exec.Command("/bin/bash", "-c", cmdStr)
-	}
+	cmd := getCmd(cmdStr)
 
 	var out bytes.Buffer
 	cmd.Stdout = &out
@@ -62,12 +54,7 @@ func ExeShellWithPid(cmdStr string) (string, error, int) {
 }
 
 func ExeShellInDirWithPid(cmdStr string, dir string) (ret string, err error, pid int) {
-	var cmd *exec.Cmd
-	if commonUtils.IsWin() {
-		cmd = exec.Command("cmd", "/C", cmdStr)
-	} else {
-		cmd = exec.Command("/bin/bash", "-c", cmdStr)
-	}
+	cmd := getCmd(cmdStr)
 	if dir != "" {
 		cmd.Dir = dir
 	}
@@ -94,12 +81,7 @@ func ExeShellWithOutputInDir(cmdStr string, dir string) ([]string, error) {
 }
 
 func ExeShellWithEnvVarsAndOutputInDir(cmdStr, dir string, envVars []string) ([]string, error) {
-	var cmd *exec.Cmd
-	if commonUtils.IsWin() {
-		cmd = exec.Command("cmd", "/C", cmdStr)
-	} else {
-		cmd = exec.Command("/bin/bash", "-c", cmdStr)
-	}
+	cmd := getCmd(cmdStr)
 
 	if dir != "" {
 		cmd.Dir = dir
@@ -139,123 +121,18 @@ func ExeShellWithEnvVarsAndOutputInDir(cmdStr, dir string, envVars []string) ([]
 	return output, nil
 }
 
-func ExeShellCallback(ch chan int, cmdStr, dir string,
-	fun func(info string, msg websocket.Message), msg websocket.Message) (err error) {
-
-	var cmd *exec.Cmd
+func getCmd(cmdStr string) (cmd *exec.Cmd) {
 	if commonUtils.IsWin() {
-		cmd = exec.Command("cmd", "/C", cmdStr)
+		cmd = getWinCmd(cmdStr)
 	} else {
-		cmd = exec.Command("/bin/bash", "-c", cmdStr)
-	}
-
-	if dir != "" {
-		cmd.Dir = dir
-	}
-
-	stdout, err := cmd.StdoutPipe()
-
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	cmd.Start()
-
-	if err != nil {
-		return
-	}
-
-	reader := bufio.NewReader(stdout)
-	for {
-		line, err2 := reader.ReadString('\n')
-		if err2 != nil || io.EOF == err2 {
-			break
-		}
-
-		line = strings.Trim(line, "\n")
-		fun(line, msg)
-
-		select {
-		case <-ch:
-			fmt.Println("exiting...")
-			ch <- 1
-			return
-		default:
-			fmt.Println("continue...")
-		}
+		cmd = getLinuxCmd(cmdStr)
 	}
 
-	cmd.Wait()
 	return
 }
-
-func GetProcess(app string) (string, error) {
-	var cmd *exec.Cmd
-
-	tmpl := ""
-	cmdStr := ""
-	if commonUtils.IsWin() {
-		tmpl = `tasklist`
-		cmdStr = fmt.Sprintf(tmpl)
-
-		cmd = exec.Command("cmd", "/C", cmdStr)
-	} else {
-		tmpl = `ps -ef | grep "%s" | grep -v "grep" | awk '{print $2}'`
-		cmdStr = fmt.Sprintf(tmpl, app)
-
-		cmd = exec.Command("/bin/bash", "-c", cmdStr)
-	}
-
-	var out bytes.Buffer
-	cmd.Stdout = &out
-
-	err := cmd.Run()
-	output := ""
-	if commonUtils.IsWin() {
-		arr := strings.Split(out.String(), "\n")
-		for _, line := range arr {
-			if strings.Index(line, app+".exe") > -1 {
-				arr2 := regexp.MustCompile(`\s+`).Split(line, -1)
-				output = arr2[1]
-				break
-			}
-		}
-	} else {
-		output = out.String()
-	}
-
-	return output, err
-}
-
-func KillProcess(app string) (string, error) {
-	var cmd *exec.Cmd
-
-	tmpl := ""
-	cmdStr := ""
-	if commonUtils.IsWin() {
-		// tasklist | findstr ztf.exe
-		tmpl = `taskkill.exe /f /im %s.exe`
-		cmdStr = fmt.Sprintf(tmpl, app)
-
-		cmd = exec.Command("cmd", "/C", cmdStr)
-	} else {
-		tmpl = `ps -ef | grep '%s' | grep -v "grep" | awk '{print $2}' | xargs kill -9`
-		cmdStr = fmt.Sprintf(tmpl, app)
-
-		cmd = exec.Command("/bin/bash", "-c", cmdStr)
-	}
-
-	var out bytes.Buffer
-	cmd.Stdout = &out
-
-	err := cmd.Run()
-	output := out.String()
-
-	return output, err
+func getWinCmd(cmdStr string) (cmd *exec.Cmd) {
+	return exec.Command("cmd", "/C", cmdStr)
 }
-
-func KillProcessById(pid int) {
-	cmdStr := fmt.Sprintf("kill -9 %d", pid)
-	ExeShell(cmdStr)
+func getLinuxCmd(cmdStr string) (cmd *exec.Cmd) {
+	return exec.Command("/bin/bash", "-c", cmdStr)
 }

ui/src/components/LayoutToolbar.vue

-<template>
-  <Toolbar>
-    <Button class="rounded pure" icon="panel-left" :hint="t('switch_display_left_side')" />
-    <Button class="rounded pure" icon="panel-bottom" :hint="t('switch_display_bottom_side')" />
-    <Button class="rounded pure" icon="panel-right" :hint="t('switch_display_right_side')" />
-  </Toolbar>
-</template>
-
-<script setup lang="ts">
-import Button from './Button.vue';
-import Toolbar from './Toolbar.vue';
-import {useI18n} from "vue-i18n";
-const { t } = useI18n();
-</script>

ui/src/components/Table.vue

@@ -219,12 +219,12 @@
 import {computed, defineComponent, nextTick, onBeforeUpdate, onMounted, reactive, ref, watch,} from "vue";
 import {useI18n} from "vue-i18n";
 
-interface pageOption {
+interface PageOption {
   value: number;
   text: number | string;
 }
 
-interface tableSetting {
+interface TableSetting {
   isSlotMode: boolean;
   isCheckAll: boolean;
   isHidePaging: boolean;
@@ -237,15 +237,15 @@ interface tableSetting {
   paging: Array<number>;
   order: string;
   sort: string;
-  pageOptions: Array<pageOption>;
+  pageOptions: Array<PageOption>;
 }
 
-interface column {
+interface Column {
   isKey: string;
   field: string;
 }
 
-interface pageMessage {
+interface PageMessage {
   pagingInfo: string
   pageSizeChangeLabel: string
   gotoPageLabel: string
@@ -334,7 +334,7 @@ export default defineComponent({
     // Display text
     messages: {
       type: Object,
-      default: {} as pageMessage,
+      default: {} as PageMessage,
     },
     // Static mode(no refresh server data)
     isStaticMode: {
@@ -389,11 +389,11 @@ export default defineComponent({
     let localTable = ref<HTMLElement | null>(null);
 
     // Validate dropdown values have page-size value or not
-    let tmpPageOptions = props.pageOptions as Array<pageOption>;
+    let tmpPageOptions = props.pageOptions as Array<PageOption>;
     let defaultPageSize =
         props.pageOptions.length > 0 ? ref(tmpPageOptions[0].value) : ref(props.pageSize);
     if (tmpPageOptions.length > 0) {
-      tmpPageOptions.forEach((v: pageOption) => {
+      tmpPageOptions.forEach((v: PageOption) => {
         if (
             Object.prototype.hasOwnProperty.call(v, "value") &&
             Object.prototype.hasOwnProperty.call(v, "text") &&
@@ -405,7 +405,7 @@ export default defineComponent({
     }
 
     // Internal set value for components
-    const setting: tableSetting = reactive({
+    const setting: TableSetting = reactive({
       // Enable slot mode
       isSlotMode: props.isSlotMode,
       // Whether to select all
@@ -415,7 +415,7 @@ export default defineComponent({
       // KEY field name
       keyColumn: computed(() => {
         let key = "";
-        Object.assign(props.columns).forEach((col: column) => {
+        Object.assign(props.columns).forEach((col: Column) => {
           if (col.isKey) {
             key = col.field;
           }
@@ -466,11 +466,11 @@ export default defineComponent({
       order: props.sortable.order,
       sort: props.sortable.sort,
       pageOptions: computed(() => {
-        const ops: pageOption[] = [];
+        const ops: PageOption[] = [];
         props.pageOptions?.forEach((o) => {
           ops.push({
-            value: (o as pageOption).value,
-            text: (o as pageOption).text,
+            value: (o as PageOption).value,
+            text: (o as PageOption).text,
           });
         });
         return ops;
@@ -485,7 +485,7 @@ export default defineComponent({
       if (setting.sort === "desc") {
         sort_order = -1;
       }
-      let rows = props.rows as Array<unknown>;
+      let rows = props.rows
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       rows.sort((a: any, b: any): number => {
         if (a[property] < b[property]) {
@@ -642,16 +642,16 @@ export default defineComponent({
     /**
      * Switch page number
      *
-     * @param page      number  New page number
-     * @param prevPage  number  Current page number
+     * @param pageNum      number  New page number
+     * @param prevPageNum  number  Current page number
      */
-    const changePage = (page: number, prevPage: number) => {
+    const changePage = (pageNum: number, prevPageNum: number) => {
       setting.isCheckAll = false;
       let order = setting.order;
       let sort = setting.sort;
-      let offset = (page - 1) * setting.pageSize;
+      let offset = (pageNum - 1) * setting.pageSize;
       let limit = setting.pageSize;
-      if (!props.isReSearch || page > 1 || page == prevPage) {
+      if (!props.isReSearch || pageNum > 1 || pageNum == prevPageNum) {
         // Call query will only be executed if the page number is changed without re-query
 
         console.log("do-search", offset, limit)

ui/src/components/TreeNode.vue

@@ -50,13 +50,6 @@
   </div>
 </template>
 
-<script lang="ts">
-export default {
-    name: 'TreeNode',
-    inheritAttrs: false
-}
-</script>
-
 <script setup lang="ts">
 import { defineProps, defineEmits, withDefaults, computed, ref } from 'vue';
 import Toolbar, { ToolbarItemProps } from './Toolbar.vue';
@@ -65,6 +58,7 @@ import Button from './Button.vue';
 
 export interface TreeNodeData {
     id: string,
+    type: string,
     title: string,
     level?: number,
     indent?: number,

ui/src/config/i18n.ts

@@ -22,10 +22,10 @@ const i18n = createI18n({
  * @param locale
  */
 export function setI18nLanguage(locale: string, realReload = false): void {
-    setLocale(locale,realReload, function() {
+    setLocale(locale, function() {
         // i18n.global.locale = locale // legacy: true
         i18n.global.locale.value = locale;
-    })
+    }, realReload)
 }
 
 export default i18n;

ui/src/config/settings.ts

-import {getCmdHistories, getInitStatus, getOpenedScripts} from "@/utils/cache";
-
 /**
  * 站点配置
  */
@@ -102,4 +100,4 @@ const settings: SettingsType = {
 };
 
 export default settings;
-  
+

ui/src/services/websocket.ts

@@ -11,7 +11,6 @@ export type WsEvent = {
 };
 
 export const WsDefaultNameSpace = 'default'
-// export const WsDefaultRoom = 'default'
 
 export class WebSocket {
   static conn: NSConn
@@ -62,10 +61,10 @@ export class WebSocket {
   static joinRoomAndSend(roomName: string, msg: string): void {
     if (WebSocket.conn && WebSocket.conn.room(roomName)) {
       WebSocket.conn.room(roomName).emit('OnChat', msg)
-      return
+
     } else {
       WebSocket.init(true).then(() => {
-        WebSocket.conn.joinRoom(roomName).then((room) => {
+        WebSocket.conn.joinRoom(roomName).then((_room) => {
           console.log(`success to join room "${roomName}"`)
           WebSocket.conn.room(roomName).emit('OnChat', msg)
 

ui/src/store/global.ts

 
 import { Mutation/* , Action */ , Getter} from 'vuex';
 import { StoreModuleType } from "@/utils/store";
-import { TabNavItem } from '@/utils/routes';
 import settings from '@/config/settings';
-import router from '@/config/routes';
 
 export interface StateType {
   // 左侧展开收起
@@ -87,9 +85,9 @@ const StoreModel: ModuleType = {
     setLogPaneSize(state, payload) {
       if (100 == payload) {
         state.logPaneMaximized = true;
-        return; 
+        return;
       }
-      
+
       state.logPaneOriginSize = payload;
       state.logPaneMaximized = false;
     },

ui/src/store/tabs.ts

@@ -206,7 +206,6 @@ const TabsModel: TabsModuleType = {
             }
         },
         close(context, payload: {id: string}) {
-            const {id} = payload;
             context.commit('removeTab', payload);
             context.commit('activateLast');
         },
@@ -214,10 +213,8 @@ const TabsModel: TabsModuleType = {
             context.commit('activateLast', {exceptID: payload.id});
         },
         update(context, payload: PageTab) {
-            const {state} = context;
-            const {id} = payload;
             context.commit('updateTab', payload);
-            }
+        }
     }
 };
 

ui/src/store/websoket.ts

-import { Mutation, Action } from 'vuex';
+import {Mutation, Action} from 'vuex';
 import { StoreModuleType } from "@/utils/store";
 import {WebSocket} from "@/services/websocket";
 
@@ -41,9 +41,8 @@ const StoreModel: ModuleType = {
     }
   },
   actions: {
-    async connect({ commit }, room) {
+    async connect(_ctx, room) {
       console.log("connect to websocket")
-
       await WebSocket.init(false)
 
       const msg = {act: 'init'}
@@ -53,7 +52,6 @@ const StoreModel: ModuleType = {
     },
     async changeStatus({ commit }, status) {
       console.log("changeStatus")
-
       commit('saveConnStatus', status)
 
       return true;
@@ -62,4 +60,3 @@ const StoreModel: ModuleType = {
 }
 
 export default StoreModel;
-  
\ No newline at end of file

ui/src/store/workspace.ts

@@ -62,20 +62,16 @@ const StoreModel: ModuleType = {
         return false;
       }
     },
-    async removeWorkspace({ commit }, selectedWorkspacePath) {
+    async removeWorkspace(_ctx, selectedWorkspacePath) {
       try {
         await deleteWorkspace(selectedWorkspacePath);
 
-//        const response: ResponseData = await getWorkspace('');
-//        const { data } = response;
-//        commit('saveWorkspaces', data || {});
-
         return true;
       } catch (error) {
         return false;
       }
     },
-    async save({ commit }, payload) {
+    async save(_ctx, payload) {
         try {
             await save(payload);
             return true;
@@ -87,4 +83,4 @@ const StoreModel: ModuleType = {
 }
 
 export default StoreModel;
-  
+

ui/src/utils/array.ts

 export function isInArray(item, arr) {
-  for(let i = 0; i < arr.length; i++){
-    if(item === arr[i]){
+  for(const val of arr){
+    if(item === val){
       return true;
     }
   }

ui/src/utils/cache.ts

@@ -12,16 +12,14 @@ export const setExecBy = async (execBy) => {
 }
 
 export const getInitStatus = async () => {
-    const initStatus = await getCache(settings.initStatus);
-    return initStatus
+    return getCache(settings.initStatus);
 }
 export const setInitStatus = async () => {
     await setCache(settings.initStatus, true);
 }
 
 export const getCurrSiteId = async () => {
-    const currSiteId = await getCache(settings.currSiteId);
-    return currSiteId
+    return getCache(settings.currSiteId);
 }
 export const setCurrSiteId = async (val) => {
     await setCache(settings.currSiteId, val);
@@ -29,8 +27,7 @@ export const setCurrSiteId = async (val) => {
 
 export const getCurrProductIdBySite = async (currSiteId) => {
     const mp = await getCache(settings.currProductIdBySite);
-    const currProductId = mp ? mp[currSiteId] : 0
-    return currProductId
+    return mp ? mp[currSiteId] : 0
 }
 export const setCurrProductIdBySite = async (currSiteId, currProductId) => {
     if (!currSiteId) return
@@ -129,8 +126,7 @@ export const setExpandedKeys = async (siteId, productId, keys) => {
 
 export const getCmdHistories = async (workspaceId) => {
     const mp = await getCache(settings.cmdHistories);
-    const items = mp && mp[workspaceId] ? mp[workspaceId] : []
-    return items
+    return mp && mp[workspaceId] ? mp[workspaceId] : []
 }
 export const setCmdHistories = async (workspaceId, items) => {
     console.log('setCmdHistories', workspaceId)

ui/src/utils/datetime.ts

-import moment, {utc} from "moment";
+import moment from "moment";
 
 export function momentUtcDef(dt) {
     return moment.parseZone(dt).format("YYYY-MM-DD HH:mm:ss")

ui/src/utils/dom.ts

@@ -9,10 +9,10 @@ export function resizeWidth(mainId: string, leftId: string, resizeId: string, co
     if (!resize) return false
 
     // 鼠标按下事件
-    resize.onmousedown = function (e) {
+    resize.onmousedown = function (event) {
         //色彩高亮
         resize.classList.add('active');
-        const startX = e.clientX;
+        const startX = event.clientX;
 
         // 鼠标拖动事件
         document.onmousemove = function (e) {
@@ -29,7 +29,7 @@ export function resizeWidth(mainId: string, leftId: string, resizeId: string, co
         };
 
         // 鼠标松开事件
-        document.onmouseup = function (evt) {
+        document.onmouseup = function (_e) {
             resize.classList.remove('active'); //色彩复原
 
             document.onmousemove = null;
@@ -56,10 +56,10 @@ export function resizeHeight(contentId: string, topId: string, splitterId: strin
     }
 
     // 鼠标按下事件
-    splitter.onmousedown = function (e) {
+    splitter.onmousedown = function (event) {
         //色彩高亮
         splitter.classList.add('active');
-        const startY = e.clientY - gap;
+        const startY = event.clientY - gap;
 
         // 鼠标拖动事件
         document.onmousemove = function (e) {
@@ -76,7 +76,7 @@ export function resizeHeight(contentId: string, topId: string, splitterId: strin
         };
 
         // 鼠标松开事件
-        document.onmouseup = function (evt) {
+        document.onmouseup = function (_e) {
             splitter.classList.remove('active'); //色彩复原
 
             document.onmousemove = null;
@@ -125,20 +125,19 @@ export function removeClass( elements, cName ){
 }
 
 export function jsonStrDef(obj) {
-    const msg = JSON.stringify(obj)
-    return msg
+    return JSON.stringify(obj)
 }
 
 export function getContextMenuStyle(x, y, height) {
     let top = y
     if (y + height > document.body.clientHeight)
         top = document.body.clientHeight - height
-    const menuStyle = {
+
+    return {
         zIndex: 9,
         position: 'fixed',
         left: `${x + 10}px`,
         top: `${top}px`,
     }
-
-    return menuStyle
 }
+

ui/src/utils/form.ts

@@ -9,8 +9,8 @@ export function useForm(modelRef, rulesRef) {
 
   const rules = unref(rulesRef)
   const ruleKeys = unref(Object.keys(rules))
-  ruleKeys.forEach((key, index) => {
-    rules[key].forEach((item, index) => {
+  ruleKeys.forEach((key) => {
+    rules[key].forEach((item) => {
       if (item.required) validateInfos.value[key] = {required: []}
     })
   })
@@ -20,11 +20,11 @@ export function useForm(modelRef, rulesRef) {
 
     const model = unref(modelRef)
 
-    ruleKeys.forEach((key, index) => {
+    ruleKeys.forEach((key) => {
       const errorMap = {}
       let pass = true
 
-      rules[key].forEach((item, index) => {
+      rules[key].forEach((item) => {
         if (item.required) pass &&= checkRequired(key, item, model, errorMap)
         if (pass && item.email) pass &&= checkEmail(key, item, model, errorMap)
         if (pass && item.regex) pass &&= checkRegex(key, item, model, errorMap)

ui/src/utils/i18n.ts

@@ -17,7 +17,7 @@ export const defaultLang = 'zh-CN';
  * @author LiQingSong
  */
 export const localeNameExp = (lang: string): boolean => {
-    const localeExp = new RegExp(`^([a-z]{2})-?([A-Z]{2})?$`);
+    const localeExp = /^([a-z]{2})-?([A-Z]{2})?$/
     return localeExp.test(lang);
 }
 
@@ -39,8 +39,8 @@ export const setHtmlLang = (lang: string): void => {
  * @returns string
  * @author LiQingSong
  */
-export const getLocale = (): string => {   
-    const lang = typeof window.localStorage !== 'undefined' ? window.localStorage.getItem(localeKey) : '';    
+export const getLocale = (): string => {
+    const lang = typeof window.localStorage !== 'undefined' ? window.localStorage.getItem(localeKey) : '';
     const isNavigatorLanguageValid = typeof navigator !== 'undefined' && typeof navigator.language === 'string';
     const browserLang = isNavigatorLanguageValid ? navigator.language.split('-').join('-') : '';
     return lang || browserLang || defaultLang;
@@ -52,8 +52,8 @@ export const getLocale = (): string => {
  * @param realReload 是否刷新页面，默认刷新
  * @author LiQingSong
  */
-export const setLocale = (lang: string, realReload = true, callback: () => void): void => {
-  
+export const setLocale = (lang: string, callback: () => void, realReload = true): void => {
+
   if (lang !== undefined && !localeNameExp(lang)) {
     // for reset when lang === undefined
     throw new Error('setLocale lang format error');
@@ -62,7 +62,7 @@ export const setLocale = (lang: string, realReload = true, callback: () => void)
     if (typeof window.localStorage !== 'undefined') {
       window.localStorage.setItem(localeKey, lang || '');
     }
-    
+
     if (realReload) {
         window.location.reload();
     } else {
@@ -84,43 +84,43 @@ export function importAllLocales(): LocaleMessages<VueMessageType> {
     const modules: LocaleMessages<VueMessageType> = {};
     try {
         // 导入 @/views 下文件，包含子目录，文件名为：[/\\]locales[/\\]([a-z]{2})-?([A-Z]{2})?\.ts
-        const viewsRequireContext: __WebpackModuleApi.RequireContext = require.context('../views', true, /[/\\]locales[/\\]([a-z]{2})-?([A-Z]{2})?\.ts$/); 
+        const viewsRequireContext: __WebpackModuleApi.RequireContext = require.context('../views', true, /[/\\]locales[/\\]([a-z]{2})-?([A-Z]{2})?\.ts$/);
         viewsRequireContext.keys().forEach(fileName => {
             // 获取内容
             const modulesConent = viewsRequireContext(fileName);
-            if(modulesConent.default) {               
+            if(modulesConent.default) {
                 // 获取 PascalCase 命名
                 const modulesName = fileName.replace(/(.*\/)*([^.]+).*/ig,"$2");
-                
+
                 if(modules[modulesName]) {
                     modules[modulesName] = {
                         ...modules[modulesName],
                         ...modulesConent.default
                     }
                 } else {
-                    modules[modulesName] = modulesConent.default; 
+                    modules[modulesName] = modulesConent.default;
                 }
 
             }
 
         });
-        
+
         // 导入 @/layouts 下文件，包含子目录，文件名为：[/\\]locales[/\\]([a-z]{2})-?([A-Z]{2})?\.ts
-        const layoutsRequireContext: __WebpackModuleApi.RequireContext = require.context('../layouts', true, /[/\\]locales[/\\]([a-z]{2})-?([A-Z]{2})?\.ts$/); 
+        const layoutsRequireContext: __WebpackModuleApi.RequireContext = require.context('../layouts', true, /[/\\]locales[/\\]([a-z]{2})-?([A-Z]{2})?\.ts$/);
         layoutsRequireContext.keys().forEach(fileName => {
             // 获取内容
             const modulesConent = layoutsRequireContext(fileName);
-            if(modulesConent.default) {               
+            if(modulesConent.default) {
                 // 获取 PascalCase 命名
                 const modulesName = fileName.replace(/(.*\/)*([^.]+).*/ig,"$2");
-                
+
                 if(modules[modulesName]) {
                     modules[modulesName] = {
                         ...modules[modulesName],
                         ...modulesConent.default
                     }
                 } else {
-                    modules[modulesName] = modulesConent.default; 
+                    modules[modulesName] = modulesConent.default;
                 }
 
             }
@@ -128,21 +128,21 @@ export function importAllLocales(): LocaleMessages<VueMessageType> {
         });
 
         // 导入 @/components 下文件，包含子目录，文件名为：[/\\]locales[/\\]([a-z]{2})-?([A-Z]{2})?\.ts
-        const componentsRequireContext: __WebpackModuleApi.RequireContext = require.context('../components', true, /[/\\]locales[/\\]([a-z]{2})-?([A-Z]{2})?\.ts$/); 
+        const componentsRequireContext: __WebpackModuleApi.RequireContext = require.context('../components', true, /[/\\]locales[/\\]([a-z]{2})-?([A-Z]{2})?\.ts$/);
         componentsRequireContext.keys().forEach(fileName => {
             // 获取内容
             const modulesConent = componentsRequireContext(fileName);
-            if(modulesConent.default) {               
+            if(modulesConent.default) {
                 // 获取 PascalCase 命名
                 const modulesName = fileName.replace(/(.*\/)*([^.]+).*/ig,"$2");
-                
+
                 if(modules[modulesName]) {
                     modules[modulesName] = {
                         ...modules[modulesName],
                         ...modulesConent.default
                     }
                 } else {
-                    modules[modulesName] = modulesConent.default; 
+                    modules[modulesName] = modulesConent.default;
                 }
 
             }
@@ -150,11 +150,11 @@ export function importAllLocales(): LocaleMessages<VueMessageType> {
         });
 
         // 导入 @/locales 下文件，不包含子目录，文件名为：([a-z]{2})-?([A-Z]{2})?\.ts
-        const localesRequireContext: __WebpackModuleApi.RequireContext = require.context('../locales', false, /([a-z]{2})-?([A-Z]{2})?\.ts$/); 
+        const localesRequireContext: __WebpackModuleApi.RequireContext = require.context('../locales', false, /([a-z]{2})-?([A-Z]{2})?\.ts$/);
         localesRequireContext.keys().forEach(fileName => {
             // 获取内容
             const modulesConent = localesRequireContext(fileName);
-            if(modulesConent.default) {               
+            if(modulesConent.default) {
                 // 获取 PascalCase 命名
                 const modulesName = fileName.replace(/(.*\/)*([^.]+).*/ig,"$2");
                 if(modules[modulesName]) {
@@ -163,14 +163,14 @@ export function importAllLocales(): LocaleMessages<VueMessageType> {
                         ...modulesConent.default
                     }
                 } else {
-                    modules[modulesName] = modulesConent.default; 
+                    modules[modulesName] = modulesConent.default;
                 }
 
             }
 
         });
-        
-        
+
+
     } catch (error) {
       // eslint-disable-next-line no-console
       console.log(error);

ui/src/utils/localCache.ts

 
 import localforage from 'localforage';
-import settings from '@/config/settings';
 
 export const getCache = async (key: string): Promise<any | null> => {
-  return await localforage.getItem(key);
+  return localforage.getItem(key);
 };
 
 export const setCache = async (key: string, val: any): Promise<boolean> => {
@@ -14,12 +13,3 @@ export const setCache = async (key: string, val: any): Promise<boolean> => {
     return false;
   }
 };
-
-export const removeCache = async (key: string): Promise<boolean> => {
-  try {
-    await localforage.removeItem(settings.siteTokenKey);
-    return true;
-  } catch (error) {
-    return false;
-  }
-};
\ No newline at end of file

ui/src/utils/localToken.ts

@@ -9,7 +9,7 @@ import settings from '@/config/settings';
  * 获取本地Token
  */
 export const getToken = async (): Promise<string | null> => {
-  return await localforage.getItem(settings.siteTokenKey);
+  return localforage.getItem(settings.siteTokenKey);
 };
 
 /**

ui/src/utils/mitt.ts

@@ -83,10 +83,10 @@ export default function mitt(all?: EventHandlerMap): Emitter {
      * @memberOf mitt
      */
     emit<T = any>(type: EventType, evt: T) {
-      ((all?.get(type) || []) as EventHandlerList).slice().map((handler) => {
+      ((all?.get(type) || []) as EventHandlerList).slice().forEach((handler) => {
         handler(evt);
       });
-      ((all?.get('*') || []) as WildCardEventHandlerList).slice().map((handler) => {
+      (all?.get('*') || []).slice().forEach((handler) => {
         handler(type, evt);
       });
     },

ui/src/utils/request.ts

-/**
- * 自定义 request 网络请求工具,基于axios
- * @author LiQingSong
- */
 import axios, { AxiosPromise, AxiosRequestConfig, AxiosResponse } from 'axios';
 import settings from '@/config/settings';
-import { getCache, setCache } from '@/utils/localCache';
 import i18n from "@/config/i18n";
 import {getCurrProductIdBySite, getCurrSiteId} from "@/utils/cache";
 import bus from "@/utils/eventBus";
@@ -46,9 +41,6 @@ const request = axios.create({
     timeout: 0 // 请求超时时间,5000(单位毫秒) / 0 不做限制
 });
 
-// 全局设置 - post请求头
-// request.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-
 /**
  * 请求拦截器
  */
@@ -72,11 +64,6 @@ request.interceptors.request.use(
 
         console.log(`currSiteId=${config.params[settings.currSiteId]}, currProductId=${config.params[settings.currProductId]}`)
 
-        // if (!config.params[settings.currWorkspace]) {
-        //     const workspacePath = await getCache(settings.currWorkspace);
-        //     config.params = { ...config.params, [settings.currWorkspace]: workspacePath, lang: i18n.global.locale.value };
-        // }
-
         console.log('=== request ===', config.url, config)
         return config;
     },
@@ -91,7 +78,7 @@ request.interceptors.response.use(
         console.log('=== response ===', axiosResponse.config.url, axiosResponse)
 
         const data: ResponseData = axiosResponse.data;
-        const { code, msg } = data;
+        const { code } = data;
 
         // 自定义状态码验证
         if (code !== 0) {

ui/src/utils/routes.ts

+import { RouteRecordRaw,  RouteLocationNormalizedLoaded } from 'vue-router';
+
 /**
  * Route utils
- * @author LiQingSong
  */
 /**
  * 面包屑类型
@@ -17,7 +18,6 @@
  */
 export type TabNavType = 'path' | 'querypath';
 
-import 'vue-router'
 declare module 'vue-router' {
   /**
    * 自定义补充扩展 - 路由 - 类型字段
@@ -31,13 +31,6 @@ declare module 'vue-router' {
       roles?: string[];
       // 标题，路由在菜单、浏览器title 或 面包屑中展示的文字，目前可以使用locales
       title: string;
-      /**
-       * 面包屑自定义内容：
-       *     1、默认不配置按照路由自动读取；
-       *     2、设置为 false , 按照路由自动读取并不读当前自己；
-       *     3、配置对应的面包屑格式如下：
-       */
-      breadcrumb?: BreadcrumbType[] | false;
       /**
        * 设置tab导航存储规则类型
        *    1、默认不配置按照path(route.path)规则
@@ -64,22 +57,12 @@ declare module 'vue-router' {
       belongTopMenu?: string;
   }
 }
-import { RouteRecordRaw,  RouteLocationNormalizedLoaded } from 'vue-router';
-
 
 /**
  * 自定义重命名 - 路由类型
  */
 export type RoutesDataItem = RouteRecordRaw;
 
-/**
- * 头部tab导航类型
- */
-export interface TabNavItem {
-  route: RouteLocationNormalizedLoaded,
-  menu: RoutesDataItem
-}
-
 import { isExternal } from './validate';
 import { equalObject } from "./object";
 
@@ -99,7 +82,7 @@ export const getRouteItem = (pathname: string, routesData: RoutesDataItem[]): Ro
       item = element;
       break;
     } else if (element.path.indexOf(':') > 0)  {
-      const reg = new RegExp("(:[^/]+)","gmi");
+      const reg = /(:[^/]+)/gmi
       const path = element.path.replaceAll(reg,".+")
       const pass = new RegExp(path).test(pathname)
 
@@ -168,7 +151,7 @@ export const setRoutePathForParent = (pathname: string, parentPath = '/', headSt
     return pathname;
   }
 
-  return pathname.substr(0, headStart.length) === headStart
+  return pathname.substring(0, headStart.length) === headStart
     ? pathname
     : `${parentPath}/${pathname}`;
 };
@@ -192,26 +175,6 @@ export const getPathsTheRoutes = ( pathname: string[], routesData: RoutesDataIte
   return routeItem;
 };
 
-
-/**
- * 获取面包屑对应的 route 数组
- * @param route route 当前routeItem
- * @param pathname path[]
- * @param routesData routes
- */
-export const getBreadcrumbRoutes = (route: RoutesDataItem, pathname: string[], routesData: RoutesDataItem[]): BreadcrumbType[] => {
-  if (!route.breadcrumb) {
-
-    const routePaths = getPathsTheRoutes(pathname, routesData);
-
-    const ret = route.breadcrumb === false ? routePaths : [...routePaths, route]
-    return ret;
-  }
-
-  return route.breadcrumb;
-};
-
-
 /**
  * 获取当前路由选中的侧边栏菜单path
  * @param route route
@@ -242,9 +205,9 @@ export const vueRoutes = (routesData: RoutesDataItem[], parentPath = '/', headSt
   return routesData.map(item => {
     const { children, ...other } = item;
     const itemChildren = children || [];
-    const newItem: RoutesDataItem = { ...other };
+    const newItem: RoutesDataItem = {children: [], ...other };
     newItem.path = setRoutePathForParent(newItem.path, parentPath, headStart);
-    
+
     if (item.children) {
       newItem.children = [
         ...vueRoutes(itemChildren, newItem.path, headStart),
@@ -261,20 +224,19 @@ export const vueRoutes = (routesData: RoutesDataItem[], parentPath = '/', headSt
  */
  export const routesSetMeta = (routesData: RoutesDataItem[]): RoutesDataItem[] => {
   return routesData.map(item => {
-    const { children, tabNavType, meta, ...other } = item;    
+    const { children, tabNavType, meta, ...other } = item;
     const newItem: RoutesDataItem = {
       meta: {
         ...meta,
 
         // 自定义设置的 meta 值 S
-
-        tabNavType: tabNavType || 'path',  
-
+        tabNavType: tabNavType || 'path',
         // 自定义设置的 meta 值 E
       },
+      children: [],
       ...other
      };
-    
+
     if (item.children) {
       const itemChildren = children || [];
       newItem.children = [
@@ -304,7 +266,7 @@ export const hasPermissionRouteRoles = (userRoles: string[], roles?: string | st
 
   if (typeof roles === 'string') {
     return userRoles.includes(roles);
-  } 
+  }
 
   if(roles instanceof Array && roles.length > 0) {
     return roles.some(role => userRoles.includes(role));
@@ -325,7 +287,6 @@ export const hasPermission = (roles: string[], route: RoutesDataItem): boolean =
 
   if (route.roles) {
     return route.roles.some(role => roles.includes(role));
-    //return roles.some(role => route.roles?.includes(role));
   }
 
   return true;
@@ -357,28 +318,24 @@ export const getPermissionMenuData = ( roles: string[], routes: RoutesDataItem[]
  * @param route1 vue-route
  * @param route2 vue-route
  * @param type 判断规则
- * @returns 
+ * @returns
  */
  export const equalTabNavRoute = (route1: RouteLocationNormalizedLoaded,
                                   route2: RouteLocationNormalizedLoaded,
                                   type: TabNavType = 'path'): boolean=> {
 
   let is = false;
-  switch (type) {
-    case 'querypath': // path + query
-      is = equalObject(route1.query,route2.query) && route1.path === route2.path
-      break;
-    default: // path
-      is = route1.path === route2.path
+  if (type === 'querypath') { // path + query
+    is = equalObject(route1.query, route2.query) && route1.path === route2.path
+  } else { // path
+    is = route1.path === route2.path
 
-      if (!is) {
-        const arr1 = route1.path.split('/')
-        const arr2 = route2.path.split('/')
+    if (!is) {
+      const arr1 = route1.path.split('/')
+      const arr2 = route2.path.split('/')
 
-        is = arr1[1] == '~' && arr2[1] == '~' && arr1[2] == arr2[2] // 同源高亮
-      }
-
-      break;
+      is = arr1[1] == '~' && arr2[1] == '~' && arr1[2] == arr2[2] // 同源高亮
+    }
   }
 
   return is;

ui/src/utils/testing.ts

 import moment from "moment";
-import {AutoTestTools, ScriptLanguages, TestTools, BuildTools} from "@/utils/const";
-import request from "@/utils/request";
+import {AutoTestTools, TestTools, BuildTools} from "@/utils/const";
+
+function addItems(item, list, map) {
+    const lowerCase = item.toLowerCase()
+    list.push(lowerCase)
+    map[lowerCase] = item
+}
 
 export function getUnitTestFrameworks(): any {
     const list = new Array<string>()
     const map = {}
     TestTools.forEach((item) => {
-        const lowerCase = item.toLowerCase()
-        list.push(lowerCase)
-        map[lowerCase] = item
+        addItems(item, list, map)
     })
 
     return {list: list, map: map}
@@ -34,9 +37,7 @@ export function getAutoTestTools(): any {
     const list = new Array<string>()
     const map = {}
     AutoTestTools.forEach((item) => {
-        const lowerCase = item.toLowerCase()
-        list.push(lowerCase)
-        map[lowerCase] = item
+        addItems(item, list, map)
     })
 
     return {list: list, map: map}

ui/src/views/interpreter/service.ts

@@ -10,8 +10,7 @@ export async function getLangSettings() {
     })
 
     if (json.code === 0) {
-        const data = json.data
-        return data
+        return json.data
     }
 
     return {languages: [], languageMap: {}}
@@ -26,8 +25,7 @@ export async function getLangInterpreter(lang) {
     })
 
     if (json.code === 0) {
-        const data = json.data
-        return data
+        return json.data
     }
 
     return {path: '', info: ''}

ui/src/views/refresh/index.vue

@@ -2,7 +2,7 @@
 import { defineComponent } from 'vue'
 
 export default defineComponent({
-    beforeRouteEnter(to, from, next) {
+    beforeRouteEnter(_to, from, next) {
         // 在渲染该组件的对应路由被验证前调用
         // 不能获取组件实例 `this` ！
         // 因为当守卫执行时，组件实例还没被创建！

ui/src/views/result/store.ts

@@ -82,7 +82,7 @@ const StoreModel: ModuleType = {
 
             return true;
         },
-        async delete({ commit , dispatch, state}, data: any ) {
+        async delete({ dispatch}, data: any ) {
             try {
                 await remove(data);
                 dispatch('list', {})

ui/src/views/script/TreeContextMenu.vue

@@ -35,13 +35,10 @@
 </template>
 
 <script lang="ts">
-import {computed, defineComponent, PropType, ref, Ref} from "vue";
+import {computed, defineComponent, PropType, ref} from "vue";
 import {useI18n} from "vue-i18n";
 import {useStore} from "vuex";
-import {StateType as GlobalData} from "@/store/global";
-import {ZentaoData} from "@/store/zentao";
 import {ScriptData} from "@/views/script/store";
-import {WorkspaceData} from "@/store/workspace";
 
 export default defineComponent({
   name: 'TreeContextMenu',

ui/src/views/script/WorkDir.vue

@@ -199,7 +199,6 @@ const selectCasesFromReport = async (): Promise<void> => {
 
   getCaseIdsFromReport(workspace, seq, scope).then((json) => {
     checkedKeys.value = json.data
-    router.push(`/script/index`) // remove the params of re-test
   })
 }
 selectCasesFromReport()

ui/src/views/script/index.vue

-<template>
-  <div class="script-main">
-    <div id="main">
-      <div id="left">
-        <ScriptTreePage></ScriptTreePage>
-      </div>
-
-      <div id="splitter-h"></div>
-
-      <div id="right">
-        <ZtfScriptPage v-if="currWorkspace?.type === 'ztf'"></ZtfScriptPage>
-        <UnitScriptPage v-if="currWorkspace?.type !== 'ztf'"></UnitScriptPage>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-import {
-  computed,
-  defineComponent,
-  onMounted,
-  ref,
-  watch
-} from "vue";
-import {useStore} from "vuex";
-import {useI18n} from "vue-i18n";
-
-import {ScriptData} from "./store";
-import {resizeWidth, resizeHeight} from "@/utils/dom";
-import {Empty, notification} from "ant-design-vue";
-
-import {ZentaoData} from "@/store/zentao";
-
-import ScriptTreePage from "./component/tree.vue";
-import ZtfScriptPage from "./component/ztf.vue"
-import UnitScriptPage from "./component/unit.vue"
-
-export default defineComponent({
-  name: 'ScriptListPage',
-  components: {
-    ScriptTreePage,
-    ZtfScriptPage,
-    UnitScriptPage,
-  },
-  setup() {
-    const { t } = useI18n();
-
-    const zentaoStore = useStore<{ Zentao: ZentaoData }>();
-    const currSite = computed<any>(() => zentaoStore.state.Zentao.currSite);
-    const currProduct = computed<any>(() => zentaoStore.state.Zentao.currProduct);
-
-    const scriptStore = useStore<{ Script: ScriptData }>();
-    const currWorkspace = computed<any>(() => scriptStore.state.Script.currWorkspace);
-
-    onMounted(() => {
-      console.log('onMounted')
-      setTimeout(() => {
-        resizeWidth('main', 'left', 'splitter-h', 'right', 380, 800)
-      }, 600)
-    })
-
-    return {
-      t,
-      currSite,
-      currProduct,
-
-      currWorkspace,
-      simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
-    }
-  }
-
-})
-</script>
-
-<style lang="less" scoped>
-.script-main {
-  margin: 0px;
-  height: 100%;
-
-  #main {
-    height: 100%;
-    width: 100%;
-
-    #left {
-      float: left;
-      width: 30%;
-
-      height: 100%;
-      padding: 0;
-    }
-
-    #splitter-h {
-      float: left;
-      width: 0px;
-      border: solid 1px #D0D7DE;
-      height: 100%;
-      cursor: ew-resize;
-
-      &.active {
-        border-color: #a9aeb4;
-      }
-    }
-
-    #right {
-      float: left;
-      width: calc(70% - 2px);
-      height: 100%;
-    }
-  }
-}
-</style>
-
-<style lang="less">
-.monaco-editor {
-  padding: 10px 0;
-}
-</style>

ui/src/views/script/service.ts

@@ -218,27 +218,22 @@ export const getFileNodesUnderParent = (node): string[] => {
     getNodeMap(node, nodeMap)
 
     const arr = [] as string[]
-    Object.keys(nodeMap).forEach((k, v) => {
-        const node = nodeMap[k]
-        if (node.type === 'file') {
-            node.childrem = null
-            arr.push(node)
+    Object.keys(nodeMap).forEach((k, _v) => {
+        const item = nodeMap[k]
+        if (item.type === 'file') {
+            item.childrem = null
+            arr.push(item)
         }
     })
 
     return arr
 }
 
-export function getSyncToInfoFromMenu(key: string, node: any): any {
-
-    return
-}
-
 export function scriptTreeAddAttr(treeData) {
     if(treeData == undefined){
         return treeData;
     }
-    treeData = treeData.map((item, index) => {
+    treeData = treeData.map((item) => {
         item.id = item.path;
         item.checkable = item.workspaceType == 'ztf' ? true : false;
         if (item.isLeaf) {

ui/src/views/script/store.ts

@@ -107,7 +107,7 @@ const StoreModel: ModuleType = {
             commit('setQueryParams', playload);
             return true;
         },
-        async loadChildren({ commit }, treeNode: any ) {
+        async loadChildren(_ctx, treeNode: any ) {
             console.log('load node children', treeNode.dataRef.workspaceType)
             if (treeNode.dataRef.workspaceType === 'ztf')
                 return true
@@ -118,19 +118,16 @@ const StoreModel: ModuleType = {
             })
         },
 
-        async getScript({ commit, dispatch }, script: any ) {
+        async getScript({ commit}, script: any ) {
             if (!script || script.type !== 'file') {
                 commit('setItem', null);
-                return true;
-            }
-
-            if (script.path.indexOf('zentao-') === 0) {
+            } else if (script.path.indexOf('zentao-') === 0) {
                 commit('setItem', {id: script.caseId, workspaceId: script.workspaceId, code: ScriptFileNotExist});
-                return true;
+            } else {
+                const response: ResponseData = await get(script.path, script.workspaceId);
+                commit('setItem', response.data);
             }
 
-            const response: ResponseData = await get(script.path, script.workspaceId);
-            commit('setItem', response.data);
             return true;
         },
 
@@ -150,7 +147,7 @@ const StoreModel: ModuleType = {
             return resp
         },
 
-        async syncToZentao({ commit, dispatch, state }, payload: any ) {
+        async syncToZentao({ dispatch, state }, payload: any ) {
             const resp = await syncToZentao(payload)
 
             if (resp.code === 0) {
@@ -170,7 +167,7 @@ const StoreModel: ModuleType = {
             return data.done
         },
 
-        async createScript({ commit , dispatch, state}, payload: any) {
+        async createScript({ dispatch, state}, payload: any) {
             try {
                 const jsn = await create(payload);
                 const path = jsn.data
@@ -182,7 +179,7 @@ const StoreModel: ModuleType = {
                 return ''
             }
         },
-        async updateScript({ commit }, payload: any ) {
+        async updateScript(_ctx, payload: any ) {
             try {
                 const { id, ...params } = payload;
                 await update(id, { ...params });
@@ -192,7 +189,7 @@ const StoreModel: ModuleType = {
             }
         },
 
-        async updateCode({ commit, dispatch, state }, payload: any ) {
+        async updateCode({ dispatch, state }, payload: any ) {
             try {
                 await updateCode(payload);
                 await dispatch('listScript', state.queryParams)
@@ -202,7 +199,7 @@ const StoreModel: ModuleType = {
             }
         },
 
-        async pasteScript({ commit , dispatch, state}, data: any ) {
+        async pasteScript({ dispatch, state}, data: any ) {
             try {
                 await paste(data);
                 await dispatch('listScript', state.queryParams)
@@ -213,7 +210,7 @@ const StoreModel: ModuleType = {
             }
         },
 
-        async moveScript({ commit , dispatch, state}, data: any ) {
+        async moveScript({ dispatch, state}, data: any ) {
             try {
                 await move(data);
                 await dispatch('listScript', state.queryParams)
@@ -224,7 +221,7 @@ const StoreModel: ModuleType = {
             }
         },
 
-        async deleteScript({ commit , dispatch, state}, path: string ) {
+        async deleteScript({ dispatch, state}, path: string ) {
             try {
                 await remove(path);
                 await dispatch('listScript', state.queryParams)

ui/src/views/site/store.ts

@@ -76,7 +76,7 @@ const StoreModel: ModuleType = {
             commit('setDetailResult',data);
             return true;
         },
-        async save({ commit }, payload) {
+        async save(_ctx, payload) {
             try {
                 await save(payload);
                 return true;
@@ -84,7 +84,7 @@ const StoreModel: ModuleType = {
                 return false;
             }
         },
-        async delete({ commit , dispatch, state}, id: number ) {
+        async delete({ dispatch}, id: number ) {
             try {
                 await remove(id);
                 dispatch('list', {})

ui/src/views/workspace/store.ts

@@ -97,7 +97,7 @@ const StoreModel: ModuleType = {
             commit('setDetailResult',data);
             return true;
         },
-        async save({ commit }, payload) {
+        async save(_ctx, payload) {
             try {
                 await save(payload);
                 return true;
@@ -105,7 +105,7 @@ const StoreModel: ModuleType = {
                 return false;
             }
         },
-        async delete({ commit , dispatch, state}, id: number ) {
+        async delete({ dispatch}, id: number ) {
             try {
                 await remove(id);
                 dispatch('list', {})

xdoc/notes.txt

@@ -61,3 +61,9 @@ sips -z 32 32 ztf.png --out tmp.iconset/icon_32x32.png
 
 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ GOOS=windows GOARCH=amd64 go build -ldflags "-X 'commConsts.appVersion=3.0.0' -X 'commConsts.buildTime=Mon Jul 25 09:31:39 2022 +0800' -X 'commConsts.goVersion=go version go1.17.1 darwin/amd64
 ' -X 'commConsts.gitHash=d118c05ae38d76231abfb6430e52ec517e080f50'" -x -v -ldflags "-s -w" -o client/bin/win32/ztf.exe cmd/command/main.go cmd/command/main.syso
+
+sonar-scanner \
+  -Dsonar.projectKey=ztf \
+  -Dsonar.sources=. \
+  -Dsonar.host.url=http://localhost:59001 \
+  -Dsonar.login=sqp_94f2484e50b1cfea719eb791f4e5d544be887f87