Merge remote-tracking branch 'origin/main'

internal/pkg/helper/exec/ztf.go

@@ -26,12 +26,12 @@ import (
 )
 
 func ExecCases(ch chan int, testSet serverDomain.TestSet, msg *websocket.Message) (report commDomain.ZtfReport, pathMaxWidth int, err error) {
-	if testSet.Cmd != "" {
-		err = execCmd(testSet.Cmd, testSet.WorkspacePath)
-		if err != nil {
-			return
-		}
-	}
+	// if testSet.Cmd != "" {
+	// 	err = execCmd(testSet.Cmd, testSet.WorkspacePath)
+	// 	if err != nil {
+	// 		return
+	// 	}
+	// }
 
 	return RunZtf(ch, testSet.WorkspacePath, 0, 0, commConsts.Case, testSet.Cases, msg)
 }

internal/pkg/helper/script/parser.go

@@ -400,6 +400,9 @@ func ScriptToExpectName(file string) string {
 }
 
 func getScriptComments(content, lang string) (ret string) {
+	if lang == "" {
+		return
+	}
 	reg := fmt.Sprintf(`(?smU)%s((?U:.*))%s`, commConsts.LangCommentsRegxMap[lang][0], commConsts.LangCommentsRegxMap[lang][1])
 	arr := regexp.MustCompile(reg).FindStringSubmatch(content)
 	if len(arr) < 2 { // wrong format

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

@@ -64,7 +64,7 @@ func (s *JobService) Start(po *model.Job) {
 		s.JobRepo.UpdateStatus(po, commConsts.JobInprogress, true, false)
 
 		if po.Cmd != "" {
-			shellUtils.ExeShellWithOutput(po.Cmd)
+			shellUtils.ExeShellWithOutputInDir(po.Cmd, po.Workspace)
 		}
 
 		err := execHelper.Exec(nil, req, nil)

ui/src/locales/en-US.ts

@@ -18,6 +18,7 @@ export default {
     'name': 'Name',
     'path': 'Path',
     'type': 'Type',
+    'file': 'File',
     'create_time': 'Create Time',
     'created_by': 'Created By',
     'start_time': 'Start Time',

ui/src/locales/zh-CN.ts

@@ -19,6 +19,7 @@ export default {
     'name': '名称',
     'path': '路径',
     'type': '类型',
+    'file': '文件',
     'create_time': '创建时间',
     'created_by': '创建者',
     'start_time': '开始时间',

ui/src/views/script/FormSyncFromZentao.vue

@@ -162,7 +162,7 @@ const submit = () => {
   }
   okTitle.value = t('syncing');
   disabled.value = true;
-  console.log("syncFromZentaoSubmit", console.log(selectedCases.value));
+  console.log("syncFromZentaoSubmit", selectedCases.value);
   if (validate()) {
     emit("submit", {caseIds:selectedCases.value, ...modelRef.value});
   }
@@ -191,6 +191,7 @@ const fetchCases = () => {
     ...modelRef.value,
   }).then((res) => {
     tableNotice.value = t('empty_data');
+    selectedCases.value = [];
     res.data.forEach((item, index) => {
       res.data[index].checked = true;
       selectedCases.value.push(item.Id);

ui/src/views/script/WorkDir.vue

@@ -504,7 +504,7 @@ const menuClick = (menuKey: string, targetId: number) => {
     Modal.confirm({
       title: t("confirm_delete", {
         name: contextNodeData.title,
-        typ: t("node"),
+        typ: t(contextNodeData.type),
       }),
       okText: t("confirm"),
       cancelText: t("cancel"),