Merge branch 'main' into ztf-38_zhaoke

internal/pkg/consts/enum.go

@@ -29,6 +29,7 @@ var (
 	ErrZentaoConfig            = ResponseCode{2000, "Zentao Config Error"}
 	ErrZentaoRequest           = ResponseCode{3000, "zentao request Error"}
 	ErrRecordWithSameNameExist = ResponseCode{3010, "Record Exist"}
+	ErrRecordWithSamePathExist = ResponseCode{3011, "Record Exist"}
 	ErrRecordNotExist          = ResponseCode{4000, "Record Not Found"}
 	NotAvailable               = ResponseCode{5000, "Not Available"}
 

internal/pkg/helper/exec/ztf.go

@@ -179,7 +179,9 @@ func FilterCases(cases []string, conf commDomain.WorkspaceConf) (casesToRun, cas
 			interpreter := configHelper.GetFieldVal(conf, stringUtils.UcFirst(lang))
 			if interpreter == "-" || interpreter == "" {
 				interpreter = ""
-				casesToIgnore = append(casesToIgnore, cs)
+				if lang != "bat" {
+					casesToIgnore = append(casesToIgnore, cs)
+				}
 			}
 			if lang != "bat" && interpreter == "" { // ignore the ones with no interpreter set
 				continue

internal/pkg/helper/zentao/bug.go

@@ -195,7 +195,9 @@ func PrepareBug(workspacePath, seq string, caseIdStr string, productId int) (bug
 func GenBugStepText(step commDomain.StepLog) string {
 	stepResults := make([]string, 0)
 
-	stepTxt := fmt.Sprintf("步骤%s： %s %s\n", step.Id, step.Name, step.Status)
+	stepId, _ := strconv.Atoi(step.Id)
+	stepId += 1
+	stepTxt := fmt.Sprintf("步骤%d： %s %s\n", stepId, step.Name, step.Status)
 
 	for _, checkpoint := range step.CheckPoints {
 		text := fmt.Sprintf(

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

@@ -67,7 +67,7 @@ func (c *WorkspaceCtrl) Create(ctx iris.Context) {
 	req.ProductId = uint(currProductId)
 	id, err := c.WorkspaceService.Create(req)
 	if err != nil {
-		ctx.JSON(c.ErrResp(commConsts.CommErr, err.Error()))
+		ctx.JSON(c.ErrResp(commConsts.ErrRecordWithSamePathExist, err.Error()))
 		return
 	}
 

ui/src/components/Table.vue

@@ -898,6 +898,10 @@ tr {
   top: 0;
 }
 
+.z-table td{
+    position: inherit;
+}
+
 .z-table-hover tbody tr:hover {
   color: #212529;
   background-color: rgba(0, 0, 0, 0.075);

ui/src/locales/en-US.ts

@@ -90,6 +90,7 @@ export default {
     'execution.execTask': 'Execute By Task',
     'execution.execUnit': 'Execute UnitTest',
     'workspace': 'Work Dir',
+    'filter': 'Filter',
     'dir': 'Dir',
     'create_workspace': 'Create WorkDir',
     'edit_workspace': 'Edit WorkDir',
@@ -288,6 +289,7 @@ export default {
     'biz_1100': 'Can not delete dir that is not empty.',
     'biz_2000': 'Zentao Config Failed',
     'biz_3010': 'Record with same name already exist',
+    'biz_3011': 'Record with same path already exist',
     'biz_4000': 'Record Not Found',
     'biz_5000': 'Not Available',
     'biz_6000': 'File or dir already Exist',

ui/src/locales/zh-CN.ts

@@ -98,6 +98,7 @@ export default {
     'execution.execTask': '执行任务',
     'execution.execUnit': '执行单元测试',
     'workspace': '工作目录',
+    'filter': '筛选',
     'dir': '目录',
     'create_workspace': '新建工作目录',
     'edit_workspace': '编辑工作目录',
@@ -300,6 +301,7 @@ export default {
     'biz_2000': '禅道配置失败',
     'biz_3000': '禅道请求错误',
     'biz_3010': '已存在相同名称的记录',
+    'biz_3011': '已存在相同路径的记录',
     'biz_4000': '记录不存在',
     'biz_5000': '无效的请求',
     'biz_6000': '文件或目录已存在',

ui/src/views/script/FilterModal.vue

 <template>
-  <div class="popper layer rounded" :style="menuFinalStyle" ref="menuRef">
+  <div class="popper layer rounded" :style="menuFinalStyle" ref="menuRef" id="filterModal">
     <template v-if="state.show">
       <div class="tab-group">
         <div

ui/src/views/script/FormSyncFromZentao.vue

 <template>
   <ZModal
+    id="syncFromZentaoFormModal"
     :showModal="showModalRef"
     @onCancel="cancel"
     @onOk="submit"

ui/src/views/script/WorkDirPanel.vue

@@ -34,6 +34,7 @@
       </FilterModal>
       <Button
       id="filterBtn"
+      :hint="t('filter')"
       class="filter-btn"
       :label="filerLabel"
       v-show="currSite.id != 1"
@@ -153,6 +154,9 @@ watch(bugMap, () => {
   genCheckedCaseIds()
 }, { deep: true });
 
+watch(treeDataMap, () => {
+  loadFilterItems()
+}, { deep: true });
 const genCheckedCaseIds = () => {
   checkedCaseIds.value = [];
   for(let key in selectedNodes.value){

ui/src/views/settings/SettingsModal.vue

@@ -25,7 +25,7 @@
       :sortable="{}"
     >
       <template #lang="record">
-        {{ languageMap[record.value.lang].name }}
+        {{ languageMap[record.value.lang]?.name }}
       </template>
 
       <template #createdAt="record">

ui/src/views/site/FormSite.vue

 <template>
   <ZModal
+    id="siteFormModal"
     :showModal="showModalRef"
     @onCancel="cancel"
     @onOk="submit"

ui/src/views/workspace/FormWorkspace.vue

 <template>
   <ZModal
+     id="workspaceFormModal"
     :showModal="showModalRef"
     @onCancel="cancel"
     @onOk="submit"